fix issues found by Phalanger

diff --git a/ipf/orm/datadict/mysql.php b/ipf/orm/datadict/mysql.php
index e9ec373d730cad19c6e5fbbc38d3f0271c0c52dd..0041994337dc8ebe2ea5934ec5bb0e8dad746973 100644 (file)
--- a/ipf/orm/datadict/mysql.php
+++ b/ipf/orm/datadict/mysql.php
@@ -239,7 +239,6 @@ class IPF_ORM_DataDict_Mysql extends IPF_ORM_DataDict
             case 'mediumtext':
             case 'longtext':
             case 'text':
-            case 'text':
             case 'varchar':
                 $fixed = false;
             case 'string':
@@ -372,4 +371,5 @@ class IPF_ORM_DataDict_Mysql extends IPF_ORM_DataDict
 
         return $name . ' ' . $this->getNativeDeclaration($field) . $unsigned . $default . $notnull . $autoinc;
     }
-}
\ No newline at end of file
+}
+

diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php
index 9f72a894ce85a2eab9974942c056f746b4c74ad1..5e6c6f6f646147a1da197d0b9fa2c59b87c4ca08 100644 (file)
--- a/ipf/orm/import/builder.php
+++ b/ipf/orm/import/builder.php
@@ -429,7 +429,7 @@ class IPF_ORM_Import_Builder extends IPF_ORM_Builder
         return $build;
     }
 
-    private function innerBuildActAs($actAs, $level = 0, $parent = null, array &$emittedActAs)
+    private function innerBuildActAs($actAs, $level, $parent, array &$emittedActAs)
     {
         // rewrite special case of actAs: [Behavior] which gave [0] => Behavior
         if(is_array($actAs) && isset($actAs[0]) && !is_array($actAs[0])) {
@@ -749,4 +749,4 @@ class IPF_ORM_Import_Builder extends IPF_ORM_Builder
 
         IPF_ORM::loadModel($definition['className'], $writePath);
     }
-}
\ No newline at end of file
+}

diff --git a/ipf/orm/query/abstract.php b/ipf/orm/query/abstract.php
index 00533c2cfcbb73dd28733265b3d251baa7647f0c..4cc164a2dbf95f813c2a3f466a3e5a206aa5edd2 100644 (file)
--- a/ipf/orm/query/abstract.php
+++ b/ipf/orm/query/abstract.php
@@ -729,7 +729,7 @@ abstract class IPF_ORM_Query_Abstract
 
     public function forUpdate($flag = true)
     {
-        $this->_sqlParts[self::FOR_UPDATE] = (bool) $flag;
+        $this->_sqlParts['forUpdate'] = (bool) $flag;
         return $this;
     }