Merge branch 'master' into 4.next

composer.json

@@ -111,7 +111,7 @@
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.39 psalm/phar:~3.14.2 && mv composer.backup composer.json"
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.39 psalm/phar:~3.15 && mv composer.backup composer.json"
     },
     "config": {
         "sort-packages": true,

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.14.2@3538fe1955d47f6ee926c0769d71af6db08aa488">
+<files psalm-version="3.15@de6e7f324f44dde540ebe7ebd4eb481b97c86f30">
   <file src="src/Collection/CollectionTrait.php">
     <ArgumentTypeCoercion occurrences="4">
       <code>$iterator</code>
@@ -18,6 +18,11 @@
       <code>\Cake\Console\Shell</code>
     </DeprecatedClass>
   </file>
+  <file src="src/Console/Command/HelpCommand.php">
+    <NullableReturnStatement occurrences="1">
+      <code>array_shift($names)</code>
+    </NullableReturnStatement>
+  </file>
   <file src="src/Console/CommandCollection.php">
     <DeprecatedClass occurrences="4">
       <code>string|\Cake\Console\Shell|\Cake\Console\CommandInterface</code>
@@ -68,6 +73,12 @@
       <code>$request</code>
     </ArgumentTypeCoercion>
   </file>
+  <file src="src/Database/Driver.php">
+    <InvalidScalarArgument occurrences="2">
+      <code>$value</code>
+      <code>$value</code>
+    </InvalidScalarArgument>
+  </file>
   <file src="src/Datasource/ModelAwareTrait.php">
     <DeprecatedClass occurrences="1">
       <code>$this</code>
@@ -115,6 +126,11 @@
       <code>translate</code>
     </InternalMethod>
   </file>
+  <file src="src/ORM/Association/BelongsToMany.php">
+    <InvalidArgument occurrences="1">
+      <code>$e</code>
+    </InvalidArgument>
+  </file>
   <file src="src/ORM/Locator/LocatorAwareTrait.php">
     <DeprecatedClass occurrences="1">
       <code>$this</code>

src/Collection/CollectionTrait.php

@@ -930,7 +930,6 @@ trait CollectionTrait
         $changeIndex = $lastIndex;
 
         while (!($changeIndex === 0 && $currentIndexes[0] === $collectionArraysCounts[0])) {
-            /** @psalm-suppress ArgumentTypeCoercion */
             $currentCombination = array_map(function ($value, $keys, $index) {
                 return $value[$keys[$index]];
             }, $collectionArrays, $collectionArraysKeys, $currentIndexes);

src/ORM/Behavior/Translate/EavStrategy.php

@@ -282,7 +282,6 @@ class EavStrategy implements TranslateStrategyInterface
 
         $preexistent = [];
         if ($key) {
-            /** @psalm-suppress UndefinedClass */
             $preexistent = $this->translationTable->find()
                 ->select(['id', 'field'])
                 ->where([