From befeb4d28719d0d96be195cd66118bc118fd85de Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Thu, 16 Jan 2014 08:40:37 +0100 Subject: [PATCH] Fixing a few CS errors --- src/Database/Expression/TupleComparison.php | 8 ++++---- src/ORM/Association/BelongsToMany.php | 2 +- src/ORM/Table.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Database/Expression/TupleComparison.php b/src/Database/Expression/TupleComparison.php index 6d75994fdf5..e8748613fd5 100644 --- a/src/Database/Expression/TupleComparison.php +++ b/src/Database/Expression/TupleComparison.php @@ -14,8 +14,8 @@ */ namespace Cake\Database\Expression; -use Cake\Database\Expression\Comparison; use Cake\Database\ExpressionInterface; +use Cake\Database\Expression\Comparison; use Cake\Database\ValueBinder; /** @@ -108,7 +108,7 @@ protected function _stringifyValues($generator) { return implode(', ', $values); } -/* +/** * Traverses the tree of expressions stored in this object, visiting first * expressions in the left hand side and the the rest. * @@ -162,8 +162,8 @@ protected function _traverseValue($value, $callable) { * * @return boolean */ - protected function isMulti() { - return in_array(strtolower($this->_conjunction), ['in', 'not in']);; + public function isMulti() { + return in_array(strtolower($this->_conjunction), ['in', 'not in']); } } diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php index 526d0d908a2..d7147cf92e4 100644 --- a/src/ORM/Association/BelongsToMany.php +++ b/src/ORM/Association/BelongsToMany.php @@ -884,7 +884,7 @@ protected function _addFilteringCondition($query, $key, $filter) { */ protected function _linkField($options) { $links = []; - $name = $this->_junctionAssociationName(); + $name = $this->_junctionAssociationName(); foreach ((array)$options['foreignKey'] as $key) { $links[] = sprintf('%s.%s', $name, $key); diff --git a/src/ORM/Table.php b/src/ORM/Table.php index e8ea48f678f..ae7c109a110 100644 --- a/src/ORM/Table.php +++ b/src/ORM/Table.php @@ -1222,7 +1222,7 @@ protected function _insert($entity, $data) { * @return null|mixed Either null or the new primary key value. */ protected function _newId($primary) { - if (!$primary || count((array)$primary) > 1) { + if (!$primary || count((array)$primary) > 1) { return null; } $typeName = $this->schema()->columnType($primary[0]);