Skip to content

Commit

Permalink
Fixing a few CS errors
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Jan 16, 2014
1 parent 5f0ff0e commit befeb4d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/Database/Expression/TupleComparison.php
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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.
*
Expand Down Expand Up @@ -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']);
}

}
2 changes: 1 addition & 1 deletion src/ORM/Association/BelongsToMany.php
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Table.php
Expand Up @@ -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]);
Expand Down

0 comments on commit befeb4d

Please sign in to comment.