update to PHPStan 1.5

composer.json

@@ -114,7 +114,8 @@
             "@psalm"
         ],
         "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.4.0 psalm/phar:~4.22.0 && mv composer.backup composer.json",
+        "stan-baseline": "phpstan.phar --generate-baseline",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.5.0 psalm/phar:~4.22.0 && mv composer.backup composer.json",
         "lowest": "validate-prefer-lowest",
         "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
         "test": "phpunit",

phpstan-baseline.neon

@@ -251,11 +251,6 @@ parameters:
 			path: src/Database/Statement/PDOStatement.php
 
 		-
-			message: "#^Property PDOStatement\\:\\:\\$queryString \\(string\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: src/Database/Statement/PDOStatement.php
-
-		-
 			message: "#^Static property Cake\\\\Datasource\\\\ConnectionManager\\:\\:\\$_registry \\(Cake\\\\Datasource\\\\ConnectionRegistry\\) in isset\\(\\) is not nullable\\.$#"
 			count: 2
 			path: src/Datasource/ConnectionManager.php
@@ -296,16 +291,6 @@ parameters:
 			path: src/Http/Client.php
 
 		-
-			message: "#^Parameter \\$ch of method Cake\\\\Http\\\\Client\\\\Adapter\\\\Curl\\:\\:exec\\(\\) has invalid type CurlHandle\\.$#"
-			count: 1
-			path: src/Http/Client/Adapter/Curl.php
-
-		-
-			message: "#^Parameter \\$handle of method Cake\\\\Http\\\\Client\\\\Adapter\\\\Curl\\:\\:createResponse\\(\\) has invalid type CurlHandle\\.$#"
-			count: 1
-			path: src/Http/Client/Adapter/Curl.php
-
-		-
 			message: "#^Constructor of class Cake\\\\Http\\\\Client\\\\Auth\\\\Digest has an unused parameter \\$options\\.$#"
 			count: 1
 			path: src/Http/Client/Auth/Digest.php

src/Datasource/QueryTrait.php

@@ -136,6 +136,7 @@ trait QueryTrait
      * @return \Cake\Datasource\ResultSetInterface
      * @psalm-suppress ImplementedReturnTypeMismatch
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return $this->all();

src/ORM/Table.php

@@ -2040,7 +2040,7 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
         $id = (array)$this->_newId($primary) + $keys;
 
         // Generate primary keys preferring values in $data.
-        $primary = array_combine($primary, $id) ?: [];
+        $primary = array_combine($primary, $id);
         $primary = array_intersect_key($data, $primary) + $primary;
 
         $filteredKeys = array_filter($primary, function ($v) {