From 8f18f0be22a1eed2f2b29225e381e22ab1577434 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 30 Aug 2013 13:36:24 -0400
Subject: [PATCH] Fix a few coding standards errors.

---
 .../Console/Command/BakeShellTest.php         |  8 ++---
 lib/Cake/Test/TestCase/ORM/QueryTest.php      | 32 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php b/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php
index f6b60f92621..d4510ad35dd 100644
--- a/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php
+++ b/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php
@@ -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())
diff --git a/lib/Cake/Test/TestCase/ORM/QueryTest.php b/lib/Cake/Test/TestCase/ORM/QueryTest.php
index 196c645a0b4..1c6f19c2a72 100644
--- a/lib/Cake/Test/TestCase/ORM/QueryTest.php
+++ b/lib/Cake/Test/TestCase/ORM/QueryTest.php
@@ -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;
@@ -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(
@@ -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(
@@ -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(