From 4bd9faed888935ff5116e6ff7621b3734f673a67 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Tue, 6 Aug 2013 00:09:47 +0200 Subject: [PATCH] Fixing coding style --- lib/Cake/Database/Expression/Comparison.php | 2 +- lib/Cake/Database/Expression/FunctionExpression.php | 2 +- lib/Cake/Database/Expression/UnaryExpression.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Database/Expression/Comparison.php b/lib/Cake/Database/Expression/Comparison.php index 67f4d195b06..ba1666243e9 100644 --- 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 index 4969c146a60..ba752b7826a 100644 --- 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 index 57eae9474d0..b88c927006a 100644 --- 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 . ')'; } }