Fixing coding style

cakephp · Aug 5, 2013 · 4bd9fae · 4bd9fae
1 parent fb3b540
commit 4bd9fae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/Cake/Database/Expression/Comparison.php b/lib/Cake/Database/Expression/Comparison.php
@@ -75,7 +75,7 @@ public function sql(ValueBinder $generator) {
 				$value = $this->_flattenValue($generator);
 			} else {
 				$template = '%s %s %s';
-				$value = $this->_bindValue($generator, $value,  $this->_type);
+				$value = $this->_bindValue($generator, $value, $this->_type);
 			}
 		} else {
 			$value = $value->sql($generator);

diff --git a/lib/Cake/Database/Expression/FunctionExpression.php b/lib/Cake/Database/Expression/FunctionExpression.php
@@ -117,7 +117,7 @@ public function sql(ValueBinder $generator) {
 		foreach ($this->_conditions as $condition) {
 			if ($condition instanceof ExpressionInterface) {
 				$condition = $condition->sql($generator);
-			} else if (is_array($condition)){
+			} elseif (is_array($condition)) {
 				$p = $generator->placeholder('param');
 				$generator->bind($p, $condition['value'], $condition['type']);
 				$condition = $p;

diff --git a/lib/Cake/Database/Expression/UnaryExpression.php b/lib/Cake/Database/Expression/UnaryExpression.php
@@ -34,7 +34,7 @@ public function sql(ValueBinder $generator) {
 				$condition = $condition->sql($generator);
 			}
 			// We only use the first (and only) condition
-			return $this->_conjunction . ' (' . ((string)$condition) . ')';
+			return $this->_conjunction . ' (' . $condition . ')';
 		}
 	}