Browse Source

Merge pull request #14801 from cakephp/update-psalm

Updated psalm to 3.12.2
Mark Story 5 years ago
parent
commit
4f635e709a

+ 1 - 1
composer.json

@@ -112,7 +112,7 @@
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 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.12.2 && mv composer.backup composer.json"
     },
     "config": {
         "sort-packages": true,

+ 1 - 0
src/Collection/CollectionTrait.php

@@ -626,6 +626,7 @@ trait CollectionTrait
             }
             if (empty($key) || !isset($parents[$key])) {
                 foreach ($values as $id) {
+                    /** @psalm-suppress PossiblyInvalidArgument */
                     $parents[$id] = $isObject ? $parents[$id] : new ArrayIterator($parents[$id], 1);
                     $mapReduce->emit($parents[$id]);
                 }

+ 1 - 1
src/Database/Type/ExpressionTypeCasterTrait.php

@@ -49,7 +49,7 @@ trait ExpressionTypeCasterTrait
         $multi = $type !== $baseType;
 
         if ($multi) {
-            /** @psalm-suppress InvalidArgument */
+            /** @psalm-var \Cake\Database\Type\ExpressionTypeInterface $converter */
             return array_map([$converter, 'toExpression'], $value);
         }
 

+ 1 - 0
src/ORM/Behavior/Translate/EavStrategy.php

@@ -380,6 +380,7 @@ class EavStrategy implements TranslateStrategyInterface
 
             $row['_locale'] = $locale;
             if ($hydrated) {
+                /** @psalm-suppress PossiblyInvalidMethodCall */
                 $row->clean();
             }
 

+ 1 - 0
src/ORM/Behavior/Translate/ShadowTableStrategy.php

@@ -483,6 +483,7 @@ class ShadowTableStrategy implements TranslateStrategyInterface
             unset($row['translation']);
 
             if ($hydrated) {
+                /** @psalm-suppress PossiblyInvalidMethodCall */
                 $row->clean();
             }
 

+ 1 - 0
src/TestSuite/Constraint/Response/StatusCodeBase.php

@@ -67,6 +67,7 @@ abstract class StatusCodeBase extends ResponseBase
      */
     protected function failureDescription($other): string
     {
+        /** @psalm-suppress InternalMethod */
         return $this->toString();
     }
 }

+ 1 - 0
src/TestSuite/IntegrationTestTrait.php

@@ -692,6 +692,7 @@ trait IntegrationTestTrait
     {
         foreach ($data as $key => $value) {
             if (is_scalar($value)) {
+                /** @psalm-suppress RedundantCondition */
                 $data[$key] = $value === false ? '0' : (string)$value;
 
                 continue;