Merge branch '3.x' into 3.next

Author: LordSimal

.github/workflows/deploy_docs_2x.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/deploy_docs_3x.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.0" installed="2.1.0" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
 </phive>

composer.json

@@ -31,7 +31,7 @@
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^5.0.0",
         "cakephp/debug_kit": "^5.0.0",
-        "phpunit/phpunit": "^10.5.5 || ^11.1.3"
+        "phpunit/phpunit": "^10.5.40 || ^11.5.20 || ^12.2.4"
     },
     "autoload": {
         "psr-4": {
@@ -61,12 +61,7 @@
         "cs-check": "phpcs --parallel=16 -p src/ tests/",
         "cs-fix": "phpcbf --parallel=16 -p src/ tests/",
         "phpstan": "tools/phpstan analyse",
-        "psalm": "tools/psalm --show-info=false",
-        "psalm-baseline": "tools/psalm --set-baseline=psalm-baseline.xml",
-        "stan": [
-            "@phpstan",
-            "@psalm"
-        ],
+        "stan": "@phpstan",
         "stan-baseline": "tools/phpstan --generate-baseline",
         "stan-setup": "phive install",
         "test": "phpunit",

docs/en/development.rst

@@ -129,7 +129,7 @@ looks like this::
         /**
         * Hook method for defining this command's option parser.
         *
-        * @see https://book.cakephp.org/5/en/console-commands/commands.html#defining-arguments-and-options
+        * @link https://book.cakephp.org/5/en/console-commands/commands.html#defining-arguments-and-options
         * @param \Cake\Console\ConsoleOptionParser $parser The parser to be defined
         * @return \Cake\Console\ConsoleOptionParser The built parser.
         */
@@ -172,7 +172,7 @@ And the resultant baked class (**src/Command/FooCommand.php**) looks like this::
         /**
         * Hook method for defining this command's option parser.
         *
-        * @see https://book.cakephp.org/5/en/console-commands/commands.html#defining-arguments-and-options
+        * @link https://book.cakephp.org/5/en/console-commands/commands.html#defining-arguments-and-options
         * @param \Cake\Console\ConsoleOptionParser $parser The parser to be defined
         * @return \Cake\Console\ConsoleOptionParser The built parser.
         */

docs/fr/development.rst

@@ -137,7 +137,7 @@ ressemble à ceci::
         /**
         * Méthode hook pour définir le parseur d'option de cette commande.
         *
-        * @see https://book.cakephp.org/5/fr/console-commands/commands.html#defining-arguments-and-options
+        * @link https://book.cakephp.org/5/fr/console-commands/commands.html#defining-arguments-and-options
         * @param \Cake\Console\ConsoleOptionParser $parser Le parseur à définir
         * @return \Cake\Console\ConsoleOptionParser Le parseur construit.
         */
@@ -181,7 +181,7 @@ ressemble à ceci::
         /**
         * Méthode hook pour définir le parseur d'option de cette commande.
         *
-        * @see https://book.cakephp.org/5/fr/console-commands/commands.html#defining-arguments-and-options
+        * @link https://book.cakephp.org/5/fr/console-commands/commands.html#defining-arguments-and-options
         * @param \Cake\Console\ConsoleOptionParser $parser Le parseur à définir
         * @return \Cake\Console\ConsoleOptionParser Le parseur construit.
         */