Browse Source

Fixed CS errors

Jose Lorenzo Rodriguez 12 years ago
parent
commit
4d80011ef8

+ 1 - 1
src/Collection/CollectionTrait.php

@@ -19,10 +19,10 @@ use ArrayObject;
 use Cake\Collection\Collection;
 use Cake\Collection\Iterator\ExtractIterator;
 use Cake\Collection\Iterator\FilterIterator;
+use Cake\Collection\Iterator\InsertIterator;
 use Cake\Collection\Iterator\MapReduce;
 use Cake\Collection\Iterator\ReplaceIterator;
 use Cake\Collection\Iterator\SortIterator;
-use Cake\Collection\Iterator\InsertIterator;
 use LimitIterator;
 
 /**

+ 2 - 2
src/ORM/Association.php

@@ -435,7 +435,7 @@ abstract class Association {
 		$joinOptions = ['table' => 1, 'conditions' => 1, 'type' => 1];
 		$options['conditions']->add($dummy->clause('where') ?: []);
 		$query->join([$target->alias() => array_intersect_key($options, $joinOptions)]);
-	
+
 		$this->_appendFields($query, $dummy, $options);
 		$this->_formatAssociationResults($query, $dummy, $options);
 		$this->_bindNewAssociations($query, $dummy, $options);
@@ -540,7 +540,7 @@ abstract class Association {
 		if (!$formatters) {
 			return;
 		}
-		
+
 		$property = $options['propertyPath'];
 		$query->formatResults(function($results) use ($formatters, $property){
 			$extracted = $results->extract($property)->compile();

+ 1 - 2
tests/TestCase/ORM/Association/BelongsToManyTest.php

@@ -775,7 +775,7 @@ class BelongsToManyTest extends TestCase {
 		$this->article->primaryKey(['id', 'site_id']);
 		$this->tag->primaryKey(['id', 'site_id']);
 
-		$table= TableRegistry::get('ArticlesTags');
+		$table = TableRegistry::get('ArticlesTags');
 		$table->schema([
 			'article_id' => ['type' => 'integer'],
 			'tag_id' => ['type' => 'integer'],
@@ -1540,5 +1540,4 @@ class BelongsToManyTest extends TestCase {
 		}]);
 	}
 
-
 }

+ 3 - 3
tests/TestCase/ORM/EagerLoaderTest.php

@@ -358,17 +358,17 @@ class EagerLoaderTest extends TestCase {
 		$this->assertEquals('clients', $normalized['clients']['aliasPath']);
 		$this->assertEquals('client', $normalized['clients']['propertyPath']);
 
-		$assocs =  $normalized['clients']['associations'];
+		$assocs = $normalized['clients']['associations'];
 		$this->assertEquals('clients.orders', $assocs['orders']['aliasPath']);
 		$this->assertEquals('client.order', $assocs['orders']['propertyPath']);
 
-		$assocs =  $assocs['orders']['associations'];
+		$assocs = $assocs['orders']['associations'];
 		$this->assertEquals('clients.orders.orderTypes', $assocs['orderTypes']['aliasPath']);
 		$this->assertEquals('client.order.order_type', $assocs['orderTypes']['propertyPath']);
 		$this->assertEquals('clients.orders.stuff', $assocs['stuff']['aliasPath']);
 		$this->assertEquals('client.order.stuff', $assocs['stuff']['propertyPath']);
 
-		$assocs =  $assocs['stuff']['associations'];
+		$assocs = $assocs['stuff']['associations'];
 		$this->assertEquals(
 			'clients.orders.stuff.stuffTypes',
 			$assocs['stuffTypes']['aliasPath']

+ 1 - 1
tests/TestCase/ORM/QueryTest.php

@@ -1606,7 +1606,7 @@ class QueryTest extends TestCase {
 						});
 					});
 			}]);
-	
+
 		$query->formatResults(function($results) {
 			return $results->combine('id', 'author.idCopy');
 		});

+ 1 - 1
tests/TestCase/View/Helper/PaginatorHelperTest.php

@@ -755,7 +755,7 @@ class PaginatorHelperTest extends TestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'li' => array('class' => 'next'),
-			'a'  => array('rel' => 'next', 'href' => '/articles/index?page=2'),
+			'a' => array('rel' => 'next', 'href' => '/articles/index?page=2'),
 			'Next',
 			'/a',
 			'/li'