Merge pull request #966 from cakephp/4.next-cake-4_5

4.next: require CakePHP 4.5

Author: markstory

composer.json

@@ -24,7 +24,7 @@
     },
     "require": {
         "php": ">=7.4",
-        "cakephp/cakephp": "^4.4.0",
+        "cakephp/cakephp": "^4.5.0",
         "cakephp/chronos": "^2.0",
         "composer/composer": "^1.3 | ^2.0",
         "doctrine/sql-formatter": "^1.1.3"

src/DebugSql.php

@@ -80,7 +80,7 @@ public static function sql(Query $query, $showValues = true, $showHtml = null, $
         }
 
         /** @var array $trace */
-        $trace = Debugger::trace(['start' => 1, 'depth' => $stackDepth + 2, 'format' => 'array']);
+        $trace = Debugger::trace(['start' => 0, 'depth' => $stackDepth + 2, 'format' => 'array']);
         $file = isset($trace[$stackDepth]) ? $trace[$stackDepth]['file'] : 'n/a';
         $line = isset($trace[$stackDepth]) ? $trace[$stackDepth]['line'] : 0;
         $lineInfo = '';

src/Model/Table/RequestsTable.php

@@ -118,14 +118,12 @@ public function gc()
                 return;
             }
 
-            $query = $this->Panels->query()
-                ->delete()
+            $query = $this->Panels->deleteQuery()
                 ->where(['request_id NOT IN' => $noPurge]);
             $statement = $query->execute();
             $statement->closeCursor();
 
-            $query = $this->query()
-                ->delete()
+            $query = $this->deleteQuery()
                 ->where(['id NOT IN' => $noPurge]);
 
             $statement = $query->execute();

tests/TestCase/DebugSqlTest.php

@@ -135,6 +135,6 @@ public function testSqlPlain()
      */
     private function newQuery()
     {
-        return $this->getTableLocator()->get('panels')->query();
+        return $this->getTableLocator()->get('panels')->selectQuery();
     }
 }

tests/TestCase/Panel/VariablesPanelTest.php

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