Permalink
Browse files

Fixing a few CS errors

  • Loading branch information...
1 parent 5f0ff0e commit befeb4d28719d0d96be195cd66118bc118fd85de @lorenzo lorenzo committed Jan 16, 2014
Showing with 6 additions and 6 deletions.
  1. +4 −4 src/Database/Expression/TupleComparison.php
  2. +1 −1 src/ORM/Association/BelongsToMany.php
  3. +1 −1 src/ORM/Table.php
View
8 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']);
}
}
View
2 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);
View
2 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]);

0 comments on commit befeb4d

Please sign in to comment.