From d4b89ce20183c0a9e90b961237e0e38ab29dc504 Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Thu, 30 Aug 2012 17:53:41 +0300 Subject: [PATCH] fix issues found by Phalanger --- ipf/orm/datadict/mysql.php | 4 ++-- ipf/orm/import/builder.php | 4 ++-- ipf/orm/query/abstract.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ipf/orm/datadict/mysql.php b/ipf/orm/datadict/mysql.php index e9ec373..0041994 100644 --- 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 9f72a89..5e6c6f6 100644 --- 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 00533c2..4cc164a 100644 --- 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; } -- 2.49.0