chinpei215 / cakephp-eager-loader

Model/EagerLoader.php

Spacing +18 added lines, -18 removed lines

@@ -76,7 +76,7 @@ 
 		}
 
 		$class = get_class($db);
-		$cache =& $class::$methodCache['fields'];
+		$cache = & $class::$methodCache['fields'];
 		if (!is_array($cache) || count($cache) >= 1000) {
 			$cache = array();
 		}
@@ -124,7 +124,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;
 
@@ -255,7 +255,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);
 		}
@@ -278,7 +278,7 @@ 
 
 			$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];
 				}
 			}
@@ -307,10 +307,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]);
 		}
@@ -341,7 +341,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));
 	}
 
 /**
@@ -356,7 +356,7 @@ 
 			'contain' => array(),
 		);
 
-		$contain = (array)$contain;
+		$contain = (array) $contain;
 		foreach ($contain as $key => $val) {
 			if (is_int($key)) {
 				$key = $val;
@@ -368,8 +368,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;
 			}
@@ -398,7 +398,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);
@@ -409,7 +409,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]);
@@ -423,7 +423,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 {
@@ -445,12 +445,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;
 	}
@@ -521,8 +521,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])) {
@@ -572,7 +572,7 @@ 
 		);
 
 		if ($this->isExternal($context, $meta)) {
-			$meta['propertyPath'] = ($context['propertyPath'] ? $parentAlias . '.' : '') . $alias;
+			$meta['propertyPath'] = ($context['propertyPath'] ? $parentAlias.'.' : '').$alias;
 			$meta['external'] = true;
 
 			$context['root'] = $aliasPath;