Merge pull request #14692 from cakephp/phpstan

Update phpstan config.

Author: dereuromark

composer.json

@@ -105,13 +105,13 @@
         "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover=clover.xml",
-        "phpstan": "phpstan.phar analyse src/",
+        "phpstan": "phpstan.phar analyse",
         "psalm": "psalm.phar --show-info=false",
         "stan": [
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.25 psalm/phar:~3.11.2 && mv composer.backup composer.json"
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:~3.11.2 && mv composer.backup composer.json"
     },
     "config": {
         "sort-packages": true,

phpstan-baseline.neon

@@ -20,16 +20,6 @@ parameters:
 			count: 1
 			path: src/Auth/Storage/SessionStorage.php
 
-		-
-			message: "#^Return type \\(\\$this\\(Cake\\\\Auth\\\\Storage\\\\SessionStorage\\)\\) of method Cake\\\\Auth\\\\Storage\\\\SessionStorage\\:\\:setConfig\\(\\) should be compatible with return type \\(\\$this\\(Cake\\\\Core\\\\InstanceConfigTrait\\)\\) of method Cake\\\\Core\\\\InstanceConfigTrait\\:\\:setConfig\\(\\)$#"
-			count: 1
-			path: src/Auth/Storage/SessionStorage.php
-
-		-
-			message: "#^Return type \\(\\$this\\(Cake\\\\Auth\\\\Storage\\\\SessionStorage\\)\\) of method Cake\\\\Auth\\\\Storage\\\\SessionStorage\\:\\:configShallow\\(\\) should be compatible with return type \\(\\$this\\(Cake\\\\Core\\\\InstanceConfigTrait\\)\\) of method Cake\\\\Core\\\\InstanceConfigTrait\\:\\:configShallow\\(\\)$#"
-			count: 1
-			path: src/Auth/Storage/SessionStorage.php
-
 		-
 			message: "#^Access to undefined constant Memcached\\:\\:OPT_CLIENT_MODE\\.$#"
 			count: 1
@@ -266,14 +256,19 @@ parameters:
 			path: src/Database/Log/LoggingStatement.php
 
 		-
-			message: "#^Access to undefined constant PDO\\:\\:SQLSRV_ENCODING_BINARY\\.$#"
+			message: "#^Result of && is always false\\.$#"
 			count: 1
-			path: src/Database/Statement/SqlserverStatement.php
+			path: src/Datasource/QueryCacher.php
 
 		-
-			message: "#^Result of && is always false\\.$#"
+			message: "#^Property Cake\\\\ORM\\\\Query\\:\\:\\$_repository \\(Cake\\\\ORM\\\\Table\\) does not accept Cake\\\\Datasource\\\\RepositoryInterface\\.$#"
 			count: 1
-			path: src/Datasource/QueryCacher.php
+			path: src/ORM/Query.php
+
+		-
+			message: "#^Method Cake\\\\ORM\\\\Query\\:\\:find\\(\\) should return static\\(Cake\\\\ORM\\\\Query\\) but returns Cake\\\\ORM\\\\Query\\.$#"
+			count: 1
+			path: src/ORM/Query.php
 
 		-
 			message: "#^Parameter \\#1 \\$rules of method Cake\\\\ORM\\\\Table\\:\\:buildRules\\(\\) expects Cake\\\\ORM\\\\RulesChecker, Cake\\\\Datasource\\\\RulesChecker given\\.$#"
@@ -435,21 +430,6 @@ parameters:
 			count: 1
 			path: src/ORM/Marshaller.php
 
-		-
-			message: "#^Parameter \\#1 \\$table of method Cake\\\\ORM\\\\Query\\:\\:addDefaultTypes\\(\\) expects Cake\\\\ORM\\\\Table, Cake\\\\Datasource\\\\RepositoryInterface given\\.$#"
-			count: 1
-			path: src/ORM/Query.php
-
-		-
-			message: "#^Parameter \\#1 \\$table of method Cake\\\\ORM\\\\Query\\:\\:_addAssociationsToTypeMap\\(\\) expects Cake\\\\ORM\\\\Table, Cake\\\\Datasource\\\\RepositoryInterface given\\.$#"
-			count: 5
-			path: src/ORM/Query.php
-
-		-
-			message: "#^Method Cake\\\\ORM\\\\Query\\:\\:find\\(\\) should return static\\(Cake\\\\ORM\\\\Query\\) but returns Cake\\\\ORM\\\\Query\\.$#"
-			count: 1
-			path: src/ORM/Query.php
-
 		-
 			message: "#^Parameter \\#2 \\$callback of function array_filter expects callable\\(mixed, mixed\\)\\: bool, 'strlen' given\\.$#"
 			count: 1

phpstan.neon

@@ -6,8 +6,10 @@ parameters:
     checkMissingIterableValueType: false
     checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
-    autoload_files:
+    bootstrapFiles:
         - tests/bootstrap.php
+    paths:
+        - src
     earlyTerminatingMethodCalls:
         Cake\Console\Shell:
             - abort

src/Controller/Controller.php

@@ -637,7 +637,7 @@ public function redirect($url, int $status = 302): ?Response
      *
      * @param string $action The new action to be 'redirected' to.
      *   Any other parameters passed to this method will be passed as parameters to the new action.
-     * @param array ...$args Arguments passed to the action
+     * @param mixed ...$args Arguments passed to the action
      * @return mixed Returns the return value of the called action
      */
     public function setAction(string $action, ...$args)

src/Core/StaticConfigTrait.php

@@ -155,7 +155,6 @@ public static function drop(string $config): bool
         if (!isset(static::$_config[$config])) {
             return false;
         }
-        /** @psalm-suppress UndefinedPropertyFetch */
         if (isset(static::$_registry)) {
             static::$_registry->unload($config);
         }

src/Database/Query.php

@@ -1380,7 +1380,6 @@ public function page(int $num, ?int $limit = null)
      *
      * @param int|\Cake\Database\ExpressionInterface|null $num number of records to be returned
      * @return $this
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function limit($num)
     {
@@ -1410,7 +1409,6 @@ public function limit($num)
      *
      * @param int|\Cake\Database\ExpressionInterface|null $num number of records to be skipped
      * @return $this
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function offset($num)
     {

src/Http/ServerRequest.php

@@ -613,7 +613,7 @@ public function __call(string $name, array $params)
      *
      * @param string|string[] $type The type of request you want to check. If an array
      *   this method will return true if the request matches any type.
-     * @param array ...$args List of arguments
+     * @param string ...$args List of arguments
      * @return bool Whether or not the request is the type you are checking.
      */
     public function is($type, ...$args): bool
@@ -1424,7 +1424,7 @@ public function getData(?string $name = null, $default = null)
      * @param callable|null $callback A decoding callback that will convert the string data to another
      *     representation. Leave empty to access the raw input data. You can also
      *     supply additional parameters for the decoding callback using var args, see above.
-     * @param array ...$args The additional arguments
+     * @param mixed ...$args The additional arguments
      * @return mixed The decoded/processed request data.
      */
     public function input(?callable $callback = null, ...$args)

src/ORM/Query.php

@@ -39,6 +39,9 @@
  * required.
  *
  * @see \Cake\Collection\CollectionInterface For a full description of the collection methods supported by this class
+ * @property \Cake\ORM\Table $_repository Instance of a table object this query is bound to.
+ * @method \Cake\ORM\Table getRepository() Returns the default table object that will be used by this query,
+ *   that is, the table that will appear in the from clause.
  * @method \Cake\Collection\CollectionInterface each(callable $c) Passes each of the query results to the callable
  * @method \Cake\Collection\CollectionInterface sortBy($callback, int $dir, int $type) Sorts the query with the callback
  * @method \Cake\Collection\CollectionInterface filter(callable $c = null) Keeps the results using passing the callable test
@@ -214,7 +217,6 @@ public function __construct(Connection $connection, Table $table)
      * to be added to the list.
      * @param bool $overwrite whether to reset fields with passed list or not
      * @return $this
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function select($fields = [], bool $overwrite = false)
     {

src/View/Form/EntityContext.php

@@ -659,7 +659,6 @@ protected function _getTable($parts, $fallback = true): ?Table
         foreach ($normalized as $part) {
             if ($part === '_joinData') {
                 if ($assoc !== null) {
-                    /** @psalm-suppress UndefinedMagicMethod */
                     $table = $assoc->junction();
                     $assoc = null;
                     continue;