Remove query as an argument to result formatter methods.

The Query argument is not always passed consistently, and is a bit unnecessary as one can always close over the query argument if it is needed. Refs #5689
cakephp · Jan 19, 2015 · c87168b · c87168b
1 parent 5460105
commit c87168b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Datasource/QueryTrait.php b/src/Datasource/QueryTrait.php
@@ -432,7 +432,7 @@ protected function _decorateResults($result)
         }
 
         foreach ($this->_formatters as $formatter) {
-            $result = $formatter($result, $this);
+            $result = $formatter($result);
         }
 
         if (!empty($this->_formatters) && !($result instanceof $decorator)) {

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -1815,8 +1815,7 @@ public function testQueryWithFormatter()
     {
         $table = TableRegistry::get('authors');
         $query = new Query($this->connection, $table);
-        $query->select()->formatResults(function ($results, $q) use ($query) {
-            $this->assertSame($query, $q);
+        $query->select()->formatResults(function ($results) {
             $this->assertInstanceOf('Cake\ORM\ResultSet', $results);
             return $results->indexBy('id');
         });
@@ -1832,8 +1831,7 @@ public function testQueryWithStackedFormatters()
     {
         $table = TableRegistry::get('authors');
         $query = new Query($this->connection, $table);
-        $query->select()->formatResults(function ($results, $q) use ($query) {
-            $this->assertSame($query, $q);
+        $query->select()->formatResults(function ($results) {
             $this->assertInstanceOf('Cake\ORM\ResultSet', $results);
             return $results->indexBy('id');
         });