Browse Source

Fix errors reported by pslam

ADmad 6 years ago
parent
commit
4d9d722a2f

+ 1 - 1
psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.5.0@f8b8f35c031e2fad6754a961a9fad2708649d8da">
+<files psalm-version="3.5.2@648dda67ed7aca1d4ea243258f0ee7f2844ac60a">
   <file src="src/Command/CompletionCommand.php">
     <DeprecatedClass occurrences="1">
       <code>\Cake\Console\Shell</code>

+ 1 - 1
src/Cache/Engine/NullEngine.php

@@ -60,7 +60,7 @@ class NullEngine extends CacheEngine
     /**
      * @inheritDoc
      */
-    public function getMultiple($keys, $default = null): array
+    public function getMultiple($keys, $default = null): iterable
     {
         return [];
     }

+ 0 - 1
src/Controller/Component/SecurityComponent.php

@@ -424,7 +424,6 @@ class SecurityComponent extends Component
     protected function _debugPostTokenNotMatching(Controller $controller, array $hashParts): string
     {
         $messages = [];
-        /** @psalm-suppress PossiblyInvalidArgument */
         $expectedParts = json_decode(urldecode($controller->getRequest()->getData('_Token.debug')), true);
         if (!is_array($expectedParts) || count($expectedParts) !== 3) {
             return 'Invalid security debug token.';

+ 0 - 2
src/Database/Dialect/SqlserverDialectTrait.php

@@ -295,7 +295,6 @@ trait SqlserverDialectTrait
                     return $params[$key];
                 };
 
-                /** @psalm-suppress EmptyArrayAccess */
                 $expression
                     ->setName('DATEADD')
                     ->setConjunction(',')
@@ -313,7 +312,6 @@ trait SqlserverDialectTrait
                 $expression->setName('SUBSTRING');
                 if (count($expression) < 4) {
                     $params = [];
-                    /** @psalm-suppress EmptyArrayAccess */
                     $expression
                         ->iterateParts(function ($p) use (&$params) {
                             return $params[] = $p;

+ 0 - 1
src/Http/ServerRequest.php

@@ -1526,7 +1526,6 @@ class ServerRequest implements ServerRequestInterface
      * @param array|object|null $data The deserialized body data. This will
      *     typically be in an array or object.
      * @return static
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function withParsedBody($data)
     {

+ 1 - 0
src/ORM/Marshaller.php

@@ -648,6 +648,7 @@ class Marshaller
             ->toArray();
 
         $new = $indexed[null] ?? [];
+        /** @psalm-suppress PossiblyNullArrayOffset */
         unset($indexed[null]);
         $output = [];
 

+ 0 - 1
src/Utility/Hash.php

@@ -512,7 +512,6 @@ class Hash
                         /** @psalm-suppress PossiblyNullArrayOffset */
                         $out[$group[$i]] = [];
                     }
-                    /** @psalm-suppress PossiblyNullArrayOffset */
                     $out[$group[$i]][$keys[$i]] = $vals[$i];
                 }