Skip to content

Commit

Permalink
Fixed CS errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Feb 2, 2014
1 parent 4bfe93d commit 296473a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 19 deletions.
2 changes: 1 addition & 1 deletion tests/TestCase/Database/Expression/TupleComparisonTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
*/
namespace Cake\Test\TestCase\Database\Expression;

use Cake\Database\Expression\TupleComparison;
use Cake\Database\Expression\QueryExpression;
use Cake\Database\Expression\TupleComparison;
use Cake\Database\ValueBinder;
use Cake\TestSuite\TestCase;

Expand Down
1 change: 0 additions & 1 deletion tests/TestCase/Database/QueryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,6 @@ public function testInValueCast() {
$this->assertCount(1, $result);
$this->assertEquals(['id' => 1], $result->fetch('assoc'));


$query = new Query($this->connection);
$result = $query
->select(['id'])
Expand Down
10 changes: 5 additions & 5 deletions tests/TestCase/ORM/Association/BelongsToManyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public function testEagerLoader() {

$this->assertSame($q, $callable($q));
return $query;
}));
}));

$query->hydrate(false);

Expand Down Expand Up @@ -520,7 +520,7 @@ public function testEagerLoaderWithDefaults() {

$this->assertSame($q, $callable($q));
return $query;
}));
}));

$query->expects($this->at(0))->method('where')
->with(['Tags.name' => 'foo'])
Expand Down Expand Up @@ -581,7 +581,7 @@ public function testEagerLoaderWithOverrides() {

$this->assertSame($q, $callable($q));
return $query;
}));
}));

$query->expects($this->at(0))->method('where')
->with(['Tags.name' => 'foo'])
Expand Down Expand Up @@ -728,7 +728,7 @@ public function testEagerLoaderSubquery() {

$this->assertSame($q, $callable($q));
return $query;
}));
}));

$callable = $association->eagerLoader([
'query' => $parent, 'strategy' => BelongsToMany::STRATEGY_SUBQUERY,
Expand Down Expand Up @@ -799,7 +799,7 @@ public function testEagerLoaderWithQueryBuilder() {

$this->assertSame($q, $callable($q));
return $query;
}));
}));

$query->hydrate(false);

Expand Down
18 changes: 9 additions & 9 deletions tests/TestCase/ORM/CompositeKeysTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public function testOneGenerateBelongsToManyEntitiesFromIds() {
$data = [
'title' => 'Haz tags',
'body' => 'Some content here',
'tags' => ['_ids' => [[1,1], [2, 2], [3, 1]]]
'tags' => ['_ids' => [[1, 1], [2, 2], [3, 1]]]
];
$marshall = new Marshaller($articles);
$result = $marshall->one($data, ['SiteTags']);
Expand Down Expand Up @@ -414,14 +414,14 @@ public function testFindThreadedCompositeKeys() {
);

$items = new \Cake\ORM\ResultSetDecorator([
['id' => 1, 'name' => 'a', 'site_id' => 1, 'parent_id' => null],
['id' => 2, 'name' => 'a', 'site_id' => 2, 'parent_id' => null],
['id' => 3, 'name' => 'a', 'site_id' => 1, 'parent_id' => 1],
['id' => 4, 'name' => 'a', 'site_id' => 2, 'parent_id' => 2],
['id' => 5, 'name' => 'a', 'site_id' => 2, 'parent_id' => 4],
['id' => 6, 'name' => 'a', 'site_id' => 1, 'parent_id' => 2],
['id' => 7, 'name' => 'a', 'site_id' => 1, 'parent_id' => 3],
['id' => 8, 'name' => 'a', 'site_id' => 2, 'parent_id' => 4],
['id' => 1, 'name' => 'a', 'site_id' => 1, 'parent_id' => null],
['id' => 2, 'name' => 'a', 'site_id' => 2, 'parent_id' => null],
['id' => 3, 'name' => 'a', 'site_id' => 1, 'parent_id' => 1],
['id' => 4, 'name' => 'a', 'site_id' => 2, 'parent_id' => 2],
['id' => 5, 'name' => 'a', 'site_id' => 2, 'parent_id' => 4],
['id' => 6, 'name' => 'a', 'site_id' => 1, 'parent_id' => 2],
['id' => 7, 'name' => 'a', 'site_id' => 1, 'parent_id' => 3],
['id' => 8, 'name' => 'a', 'site_id' => 2, 'parent_id' => 4],
]);
$query->find('threaded', ['parentField' => ['parent_id', 'site_id']]);
$formatter = $query->formatResults()[0];
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/View/Input/DateTimeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function testRenderSelectedInvalid($selected) {
$now = new \DateTime();
$format = '<option value="%s" selected="selected">%s</option>';
$this->assertContains(
sprintf($format, $now->format('Y'), $now->format('Y')),
sprintf($format, $now->format('Y'), $now->format('Y')),
$result
);
}
Expand Down
2 changes: 0 additions & 2 deletions tests/TestCase/View/Input/SelectBoxTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ public function testRenderComplex() {
$this->assertTags($result, $expected);
}


/**
* test rendering with a selected value
*
Expand Down Expand Up @@ -323,7 +322,6 @@ public function testRenderOptionGroupsWithAttributes() {
$this->assertTags($result, $expected);
}


/**
* test rendering with option groups with traversable nodes
*
Expand Down

0 comments on commit 296473a

Please sign in to comment.