Skip to content

Commit

Permalink
Fixed CS errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Dec 28, 2013
1 parent 8196d66 commit 015e8af
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Cake/Collection/ExtractTrait.php
Expand Up @@ -19,7 +19,7 @@
* from an array or object.
*/
trait ExtractTrait {

/**
* Returns a callable that can be used to extract a property or column from
* an array or object based on a dot separated path.
Expand Down Expand Up @@ -61,4 +61,3 @@ protected function _extract($data, $path) {
}

}

2 changes: 1 addition & 1 deletion Cake/ORM/Query.php
Expand Up @@ -16,11 +16,11 @@
*/
namespace Cake\ORM;

use Cake\Collection\Iterator\MapReduce;
use Cake\Database\Query as DatabaseQuery;
use Cake\Database\Statement\BufferedStatement;
use Cake\Database\Statement\CallbackStatement;
use Cake\Event\Event;
use Cake\Collection\Iterator\MapReduce;

/**
* Extends the base Query class to provide new methods related to association
Expand Down
Expand Up @@ -31,7 +31,7 @@ class ExtractIteratorTest extends TestCase {
*/
public function testExtractFromArrayShallow() {
$items = [
['a' => 1, 'b' =>2],
['a' => 1, 'b' => 2],
['a' => 3, 'b' => 4]
];
$extractor = new ExtractIterator($items, 'a');
Expand All @@ -51,7 +51,7 @@ public function testExtractFromArrayShallow() {
*/
public function testExtractFromObjectShallow() {
$items = [
new ArrayObject(['a' => 1, 'b' =>2]),
new ArrayObject(['a' => 1, 'b' => 2]),
new ArrayObject(['a' => 3, 'b' => 4])
];
$extractor = new ExtractIterator($items, 'a');
Expand All @@ -71,10 +71,10 @@ public function testExtractFromObjectShallow() {
*/
public function testExtractFromArrayDeep() {
$items = [
['a' => ['b' => ['c' => 10]], 'b' =>2],
['a' => ['b' => ['c' => 10]], 'b' => 2],
['a' => ['b' => ['d' => 15]], 'b' => 4],
['a' => ['x' => ['z' => 20]], 'b' => 4],
['a' => ['b' => ['c' => 25]], 'b' =>2],
['a' => ['b' => ['c' => 25]], 'b' => 2],
];
$extractor = new ExtractIterator($items, 'a.b.c');
$this->assertEquals([10, null, null, 25], iterator_to_array($extractor));
Expand Down
Expand Up @@ -96,7 +96,6 @@ public function testSortComplexNumeric() {
$this->assertEquals($expected, iterator_to_array($sorted));
}


/**
* Tests sorting a complex structure with natural sort
*
Expand Down
2 changes: 1 addition & 1 deletion Cake/Test/TestCase/View/Helper/StringTemplateTraitTest.php
Expand Up @@ -14,9 +14,9 @@
*/
namespace Cake\Test\TestCase\View\Helper;

use Cake\TestSuite\TestCase;
use Cake\View\Helper\StringTemplate;
use Cake\View\Helper\StringTemplateTrait;
use Cake\TestSuite\TestCase;

/**
* StringTemplateTraitTest class
Expand Down

0 comments on commit 015e8af

Please sign in to comment.