chinpei215 / cakephp-eager-loader

Test/test_app/Model/Behavior/QueryCounterBehavior.php

Doc Comments +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  *
  * @param Model $model Model
  * @param array $query Query
- * @return mixed
+ * @return boolean
  */
 	public function beforeFind(Model $model, $query) {
 		$db = $model->getDataSource();

Test/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -1,11 +1,11 @@
 <?php
 App::build(array(
-	'Model' => array(App::pluginPath('EagerLoader') . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
-	'Model/Behavior' => array(App::pluginPath('EagerLoader') . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Behavior' . DS),
+	'Model' => array(App::pluginPath('EagerLoader').'Test'.DS.'test_app'.DS.'Model'.DS),
+	'Model/Behavior' => array(App::pluginPath('EagerLoader').'Test'.DS.'test_app'.DS.'Model'.DS.'Behavior'.DS),
 ), true);
 
 App::uses('ConnectionManager', 'Model');
 ConnectionManager::create('test_external', array(
 	'datasource' => 'Database/Sqlite',
-	'database' => TMP . 'tests' . DS . 'test_external.db',
+	'database' => TMP.'tests'.DS.'test_external.db',
 ))->cacheSources = false;

Test/Case/Model/Behavior/EagerLoaderBehaviorTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once App::pluginPath('EagerLoader') . 'Test' . DS . 'bootstrap.php';
+require_once App::pluginPath('EagerLoader').'Test'.DS.'bootstrap.php';
 
 class EagerLoaderBehaviorTest extends CakeTestCase {
 

Test/Case/Model/EagerLoaderTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once App::pluginPath('EagerLoader') . 'Test' . DS . 'bootstrap.php';
+require_once App::pluginPath('EagerLoader').'Test'.DS.'bootstrap.php';
 
 App::uses('EagerLoader', 'EagerLoader.Model');
 
@@ -191,7 +191,7 @@ 
 					'alias' => 'User',
 					'conditions' => array(
 						array('Article.user_id' => array(1, 2, 3)),
-						array('Article.user_id' => (object)array('type' => 'identifier', 'value' => 'User.id')),
+						array('Article.user_id' => (object) array('type' => 'identifier', 'value' => 'User.id')),
 					),
 				),
 			),
@@ -791,7 +791,7 @@ 
 						'(CASE WHEN Category.parent_id = 0 THEN 1 ELSE 0 END) AS  Category__is_root',
 					),
 					'conditions' => array(
-						(object)array(
+						(object) array(
 							'type' => 'expression',
 							'value' => '(CASE WHEN Category.parent_id = 0 THEN 1 ELSE 0 END) = 0',
 						)
@@ -830,8 +830,8 @@ 
 			'target' => $target,
 			'alias' => $target->alias,
 			'parentAlias' => $parent->alias,
-			'aliasPath' => $parent->alias . '.' . $target->alias,
-			'propertyPath' => $parent->alias . '.' . $target->alias,
+			'aliasPath' => $parent->alias.'.'.$target->alias,
+			'propertyPath' => $parent->alias.'.'.$target->alias,
 		);
 
 		if (isset($meta['habtmAlias'])) {

Test/Case/AllEagerLoaderTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 	public static function suite() {
 		$suite = new CakeTestSuite('All Tests');
-		$suite->addTestDirectoryRecursive(App::pluginPath('EagerLoader') . 'Test' . DS . 'Case' . DS);
+		$suite->addTestDirectoryRecursive(App::pluginPath('EagerLoader').'Test'.DS.'Case'.DS);
 		return $suite;
 	}
 

Model/EagerLoader.php

Spacing +17 added lines, -17 removed lines

@@ -112,7 +112,7 @@ 
 
 		$db = $model->getDataSource();
 		$value = $db->value($this->id);
-		$name = $db->name('EagerLoaderModel' . '__' . 'id');
+		$name = $db->name('EagerLoaderModel'.'__'.'id');
 		$query['fields'][] = "($value) AS $name";
 		$query['callbacks'] = true;
 
@@ -243,7 +243,7 @@ 
 				$assocResults = array_merge($assocResults, $eachAssocResults);
 			}
 		} else {
-			$options['fields'][] = '(' . $db->name($assocAlias . '.' . $assocKey) . ') AS ' . $db->name('EagerLoaderModel' . '__' . 'assoc_id');
+			$options['fields'][] = '('.$db->name($assocAlias.'.'.$assocKey).') AS '.$db->name('EagerLoaderModel'.'__'.'assoc_id');
 			$options['conditions'][] = array("$assocAlias.$assocKey" => $ids);
 			$assocResults = $db->read($target, $options);
 		}
@@ -262,7 +262,7 @@ 
 		foreach ($results as &$result) {
 			$assoc = array();
 			foreach ($assocResults as $assocResult) {
-				if ((string)$result[$parentAlias][$parentKey] === (string)$assocResult['EagerLoaderModel']['assoc_id']) {
+				if ((string) $result[$parentAlias][$parentKey] === (string) $assocResult['EagerLoaderModel']['assoc_id']) {
 					$assoc[] = $assocResult[$alias];
 				}
 			}
@@ -291,10 +291,10 @@ 
 			if ($result[$alias][$targetKey] === null) {
 				// Remove NULL association created by LEFT JOIN
 				if (empty($eager)) {
-					$assocResults[$n] = array( $alias => array() );
+					$assocResults[$n] = array($alias => array());
 				}
 			} else {
-				$assocResults[$n] = array( $alias => $result[$alias] );
+				$assocResults[$n] = array($alias => $result[$alias]);
 			}
 			unset($result[$alias]);
 		}
@@ -325,7 +325,7 @@ 
  * @return array
  */
 	private function mergeAssocResult(array $result, array $assoc, $propertyPath) { // @codingStandardsIgnoreLine
-		return Hash::insert($result, $propertyPath, $assoc + (array)Hash::get($result, $propertyPath));
+		return Hash::insert($result, $propertyPath, $assoc + (array) Hash::get($result, $propertyPath));
 	}
 
 /**
@@ -340,7 +340,7 @@ 
 			'contain' => array(),
 		);
 
-		$contain = (array)$contain;
+		$contain = (array) $contain;
 		foreach ($contain as $key => $val) {
 			if (is_int($key)) {
 				$key = $val;
@@ -352,8 +352,8 @@ 
 					$expanded = Hash::expand(array($key => $val));
 					list($key, $val) = each($expanded);
 				}
-				$ref =& $result['contain'][$key];
-				$ref = Hash::merge((array)$ref, $this->reformatContain($val));
+				$ref = & $result['contain'][$key];
+				$ref = Hash::merge((array) $ref, $this->reformatContain($val));
 			} else {
 				$result['options'][$key] = $val;
 			}
@@ -382,7 +382,7 @@ 
 			$query['fields'] = $db->fields($model, null, array(), false);
 		}
 
-		$query['fields'] = (array)$query['fields'];
+		$query['fields'] = (array) $query['fields'];
 		foreach ($query['fields'] as &$field) {
 			if ($model->isVirtualField($field)) {
 				$fields = $db->fields($model, null, array($field), false);
@@ -393,7 +393,7 @@ 
 		}
 		unset($field);
 
-		$query['conditions'] = (array)$query['conditions'];
+		$query['conditions'] = (array) $query['conditions'];
 		foreach ($query['conditions'] as $key => $val) {
 			if ($model->hasField($key)) {
 				unset($query['conditions'][$key]);
@@ -407,7 +407,7 @@ 
 		}
 
 		$order = array();
-		foreach ((array)$query['order'] as $key => $val) {
+		foreach ((array) $query['order'] as $key => $val) {
 			if (is_int($key)) {
 				$val = $this->normalizeField($model, $val);
 			} else {
@@ -429,12 +429,12 @@ 
  */
 	private function normalizeField(Model $model, $field) { // @codingStandardsIgnoreLine
 		if ($model->hasField($field)) {
-			$field = $model->alias . '.' . $field;
+			$field = $model->alias.'.'.$field;
 		} elseif ($model->isVirtualField($field)) {
 			$db = $model->getDataSource();
 			$field = $model->getVirtualField($field);
 			$field = $db->dispatchMethod('_quoteFields', array($field));
-			$field = '(' . $field . ')';
+			$field = '('.$field.')';
 		}
 		return $field;
 	}
@@ -505,8 +505,8 @@ 
 			);
 		}
 
-		$aliasPath = $context['aliasPath'] . '.' . $alias;
-		$propertyPath = ($context['propertyPath'] ? $context['propertyPath'] . '.' : '') . $alias;
+		$aliasPath = $context['aliasPath'].'.'.$alias;
+		$propertyPath = ($context['propertyPath'] ? $context['propertyPath'].'.' : '').$alias;
 
 		$types = $parent->getAssociated();
 		if (!isset($types[$alias])) {
@@ -556,7 +556,7 @@ 
 		);
 
 		if ($this->isExternal($context, $meta)) {
-			$meta['propertyPath'] = ($context['propertyPath'] ? $parentAlias . '.' : '') . $alias;
+			$meta['propertyPath'] = ($context['propertyPath'] ? $parentAlias.'.' : '').$alias;
 			$meta['external'] = true;
 
 			$context['root'] = $aliasPath;