Merge pull request #969 from cakephp/5.x-merge

merge 4.x => 5.x

README.md

@@ -45,6 +45,8 @@ working correctly. Some common problems are:
 2. Your hostname needs to be added to the `DebugKit.safeTld`. If your local
    domain isn't a known development environment name, DebugKit will disable
    itself to protect a potentially non-development environment.
+3. If you are using the [Authorization Plugin](https://github.com/cakephp/authorization)
+   you need to set `DebugKit.ignoreAuthorization` to `true` in your config.
 
 ## Reporting Issues
 

tests/TestCase/DebugSqlTest.php

@@ -131,10 +131,10 @@ public function testSqlPlain()
     /**
      * Creates a Query object for testing.
      *
-     * @return \Cake\ORM\Query
+     * @return \Cake\ORM\Query\SelectQuery
      */
     private function newQuery()
     {
-        return $this->fetchTable('panels')->query();
+        return $this->fetchTable('panels')->selectQuery();
     }
 }

tests/TestCase/Panel/VariablesPanelTest.php

@@ -64,10 +64,8 @@ public function testShutdown()
         $requests = $this->getTableLocator()->get('Requests');
         $query = $requests->find('all');
         $result = $requests->find()->all();
-        $unbufferedQuery = $requests->find('all');
-        $unbufferedQuery->toArray(); //toArray call would normally happen somewhere in View, usually implicitly
         $update = $requests->updateQuery();
-        $debugInfoException = $requests->query()->contain('NonExistentAssociation');
+        $debugInfoException = $requests->selectQuery()->contain('NonExistentAssociation');
 
         $unserializable = new stdClass();
         $unserializable->pdo = new PDO('sqlite::memory:');
@@ -91,7 +89,6 @@ public function testShutdown()
             'debugInfoException' => $debugInfoException,
             'updateQuery' => $update,
             'query' => $query,
-            'unbufferedQuery' => $unbufferedQuery,
             'result set' => $result,
             'string' => 'yes',
             'array' => ['some' => 'key'],