Skip to content

Commit

Permalink
Fix a few coding standards errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Aug 30, 2013
1 parent ca9a960 commit 8f18f0b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
8 changes: 4 additions & 4 deletions lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php
Expand Up @@ -67,22 +67,22 @@ public function testAllWithModelName() {
$this->Shell->Model = $this->getMock(
'Cake\Console\Command\Task\ModelTask',
[],
[&$this->Dispatcher]
[$this->Dispatcher]
);
$this->Shell->Controller = $this->getMock(
'Cake\Console\Command\Task\ControllerTask',
[],
[&$this->Dispatcher]
[$this->Dispatcher]
);
$this->Shell->View = $this->getMock(
'Cake\Console\Command\Task\ModelTask',
[],
[&$this->Dispatcher]
[$this->Dispatcher]
);
$this->Shell->DbConfig = $this->getMock(
'Cake\Console\Command\Task\DbConfigTask',
[],
[&$this->Dispatcher]
[$this->Dispatcher]
);

$this->Shell->DbConfig->expects($this->once())
Expand Down
32 changes: 21 additions & 11 deletions lib/Cake/Test/TestCase/ORM/QueryTest.php
Expand Up @@ -17,9 +17,9 @@
namespace Cake\Test\TestCase\ORM;

use Cake\Core\Configure;
use Cake\Database\ConnectionManager;
use Cake\Database\Expression\OrderByExpression;
use Cake\Database\Expression\QueryExpression;
use Cake\Database\ConnectionManager;
use Cake\ORM\Query;
use Cake\ORM\ResultSet;
use Cake\ORM\Table;
Expand Down Expand Up @@ -909,8 +909,10 @@ public function testApplyOptions() {
* @return void
*/
public function testMapReduceOnlyMapper() {
$mapper1 = function() {};
$mapper2 = function() {};
$mapper1 = function() {
};
$mapper2 = function() {
};
$query = new Query($this->connection, $this->table);
$this->assertSame($query, $query->mapReduce($mapper1));
$this->assertEquals(
Expand All @@ -935,10 +937,14 @@ public function testMapReduceOnlyMapper() {
* @return void
*/
public function testMapReduceBothMethods() {
$mapper1 = function() {};
$mapper2 = function() {};
$reducer1 = function() {};
$reducer2 = function() {};
$mapper1 = function() {
};
$mapper2 = function() {
};
$reducer1 = function() {
};
$reducer2 = function() {
};
$query = new Query($this->connection, $this->table);
$this->assertSame($query, $query->mapReduce($mapper1, $reducer1));
$this->assertEquals(
Expand All @@ -962,10 +968,14 @@ public function testMapReduceBothMethods() {
* @return void
*/
public function testOverwriteMapReduce() {
$mapper1 = function() {};
$mapper2 = function() {};
$reducer1 = function() {};
$reducer2 = function() {};
$mapper1 = function() {
};
$mapper2 = function() {
};
$reducer1 = function() {
};
$reducer2 = function() {
};
$query = new Query($this->connection, $this->table);
$this->assertEquals($query, $query->mapReduce($mapper1, $reducer1));
$this->assertEquals(
Expand Down

0 comments on commit 8f18f0b

Please sign in to comment.