merge 5.x => 5.next

Author: LordSimal

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
             dependencies: 'highest'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

README.md

@@ -34,6 +34,11 @@ bin/cake server -p 8765
 
 Then visit `http://localhost:8765` to see the welcome page.
 
+## Demo app
+
+Check out the [5.x-demo branch](https://github.com/cakephp/app/tree/5.x-demo), which contains demo migrations and a seeder.
+See the [README](https://github.com/cakephp/app/blob/5.x-demo/README.md) on how to get it running.
+
 ## Update
 
 Since this skeleton is a starting point for your application and various files

src/Controller/ErrorController.php

@@ -41,7 +41,7 @@ public function initialize(): void
      * @param \Cake\Event\EventInterface<\Cake\Controller\Controller> $event Event.
      * @return void
      */
-    public function beforeFilter(EventInterface $event)
+    public function beforeFilter(EventInterface $event): void
     {
     }
 
@@ -51,7 +51,7 @@ public function beforeFilter(EventInterface $event)
      * @param \Cake\Event\EventInterface<\Cake\Controller\Controller> $event Event.
      * @return void
      */
-    public function beforeRender(EventInterface $event)
+    public function beforeRender(EventInterface $event): void
     {
         parent::beforeRender($event);
 
@@ -64,7 +64,7 @@ public function beforeRender(EventInterface $event)
      * @param \Cake\Event\EventInterface<\Cake\Controller\Controller> $event Event.
      * @return void
      */
-    public function afterFilter(EventInterface $event)
+    public function afterFilter(EventInterface $event): void
     {
     }
 }