Merge remote-tracking branch 'origin/5.x' into 5.next

# Conflicts:
#	composer.json

Author: dereuromark

.github/workflows/ci.yml

@@ -3,9 +3,9 @@ name: CI
 on:
   push:
     branches:
-      - '4.x'
-      - '4.next'
       - '5.x'
+      - '5.next'
+      - '6.x'
   pull_request:
     branches:
       - '*'
@@ -16,18 +16,15 @@ permissions:
 
 jobs:
   testsuite:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.3']
-        dependencies: ['highest']
         include:
           - php-version: '8.1'
             dependencies: 'lowest'
           - php-version: '8.4'
             dependencies: 'highest'
-            composer-options: '--ignore-platform-req=php'
 
     steps:
     - uses: actions/checkout@v4
@@ -56,7 +53,7 @@ jobs:
 
   coding-standard:
     name: Coding Standard & Static Analysis
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4

composer.json

@@ -16,7 +16,7 @@
         "cakephp/cakephp-codesniffer": "^5.0",
         "cakephp/debug_kit": "^5.0.0",
         "josegonzalez/dotenv": "^4.0",
-        "phpunit/phpunit": "^10.5.5 || ^11.1.3"
+        "phpunit/phpunit": "^10.5.5 || ^11.1.3 || ^12.1"
     },
     "suggest": {
         "cakephp/repl": "Console tools for a REPL interface for CakePHP applications.",

config/paths.php

@@ -20,7 +20,7 @@
 }
 
 /*
- * These defines should only be edited if you have cake installed in
+ * These definitions should only be edited if you have cake installed in
  * a directory layout other than the way it is distributed.
  * When using custom settings be sure to use the DS and do not add a trailing DS.
  */

config/schema/sessions.sql

@@ -12,4 +12,4 @@ CREATE TABLE `sessions` (
   `data` blob DEFAULT NULL, -- for PostgreSQL use bytea instead of blob
   `expires` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

src/Application.php

@@ -51,7 +51,7 @@ public function bootstrap(): void
         if (PHP_SAPI !== 'cli') {
             FactoryLocator::add(
                 'Table',
-                (new TableLocator())->allowFallbackClass(false)
+                (new TableLocator())->allowFallbackClass(false),
             );
         }
     }

src/Console/Installer.php

@@ -130,7 +130,7 @@ public static function setFolderPermissions(string $dir, IOInterface $io): void
                 '<info>Set Folder Permissions ? (Default to Y)</info> [<comment>Y,n</comment>]? ',
                 $validator,
                 10,
-                'Y'
+                'Y',
             );
 
             if (in_array($setFolderPermissions, ['n', 'N'])) {

src/Controller/ErrorController.php

@@ -32,7 +32,7 @@ class ErrorController extends AppController
      */
     public function initialize(): void
     {
-        // Only add parent::initialize() if you are confident your appcontroller is safe.
+        // Only add parent::initialize() if you are confident your `AppController` is safe.
     }
 
     /**