Merge pull request #29 from laminas/renovate/vimeo-psalm-5.x

Update dependency vimeo/psalm to v5

Author: Ocramius

composer.json

@@ -37,7 +37,7 @@
         "laminas/laminas-coding-standard": "^2.4.0",
         "phpunit/phpunit": "^9.5.26",
         "psalm/plugin-phpunit": "^0.18.0",
-        "vimeo/psalm": "^4.29.0"
+        "vimeo/psalm": "^5.0.0"
     },
     "conflict": {
         "laminas/laminas-stdlib": "<3.2.1"

composer.lock

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.0.0">
+<files psalm-version="5.1.0@4defa177c89397c5e14737a80fe4896584130674">
   <file src="src/Cache.php">
     <DocblockTypeContradiction occurrences="2">
       <code>! is_string($filename)</code>
@@ -101,9 +101,6 @@
     </PropertyNotSetInConstructor>
   </file>
   <file src="src/Response.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$e-&gt;getCode()</code>
-    </InvalidScalarArgument>
     <MissingConstructor occurrences="4">
       <code>$id</code>
       <code>$id</code>
@@ -157,12 +154,6 @@
       <code>Server</code>
       <code>self</code>
     </ImplementedReturnTypeMismatch>
-    <InvalidParamDefault occurrences="1">
-      <code>Request</code>
-    </InvalidParamDefault>
-    <InvalidScalarArgument occurrences="1">
-      <code>$e-&gt;getCode()</code>
-    </InvalidScalarArgument>
     <MissingClosureReturnType occurrences="1">
       <code>static function ($count, $param) {</code>
     </MissingClosureReturnType>
@@ -239,7 +230,8 @@
       <code>$fault</code>
       <code>$request</code>
     </MoreSpecificImplementedParamType>
-    <PossiblyInvalidArgument occurrences="1">
+    <PossiblyInvalidArgument occurrences="2">
+      <code>$e-&gt;getCode()</code>
       <code>$function</code>
     </PossiblyInvalidArgument>
     <PossiblyInvalidCast occurrences="1">
@@ -268,8 +260,7 @@
     <RedundantCastGivenDocblockType occurrences="1">
       <code>(bool) $flag</code>
     </RedundantCastGivenDocblockType>
-    <RedundantConditionGivenDocblockType occurrences="5">
-      <code>false !== $request</code>
+    <RedundantConditionGivenDocblockType occurrences="4">
       <code>gettype($function)</code>
       <code>null !== $this-&gt;smdMethods</code>
       <code>null !== ($id = $request-&gt;getId())</code>
@@ -394,17 +385,15 @@
     </InvalidArgument>
   </file>
   <file src="test/ErrorTest.php">
-    <InvalidArgument occurrences="2">
+    <InvalidArgument occurrences="4">
       <code>$code</code>
       <code>$message</code>
+      <code>$message</code>
+      <code>'-32700'</code>
     </InvalidArgument>
     <InvalidCast occurrences="1">
       <code>$message</code>
     </InvalidCast>
-    <InvalidScalarArgument occurrences="2">
-      <code>$message</code>
-      <code>'-32700'</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="2">
       <code>Json\Json::decode($json, Json\Json::TYPE_ARRAY)</code>
       <code>Json\Json::decode($json, Json\Json::TYPE_ARRAY)</code>
@@ -425,13 +414,13 @@
     </MixedAssignment>
   </file>
   <file src="test/ResponseTest.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$version</code>
-    </InvalidScalarArgument>
     <MixedArrayAccess occurrences="2">
       <code>$test['error']['code']</code>
       <code>$test['error']['message']</code>
     </MixedArrayAccess>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$version</code>
+    </PossiblyInvalidArgument>
     <PossiblyNullReference occurrences="3">
       <code>getCode</code>
       <code>getData</code>
@@ -484,13 +473,11 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="test/Smd/ServiceTest.php">
-    <InvalidArgument occurrences="2">
+    <InvalidArgument occurrences="3">
+      <code>123</code>
       <code>new stdClass()</code>
       <code>new stdClass()</code>
     </InvalidArgument>
-    <InvalidScalarArgument occurrences="1">
-      <code>123</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="5">
       <code>$params</code>
       <code>$params</code>

psalm-baseline.xml

@@ -177,7 +177,7 @@ public function fault($fault = null, $code = 404, $data = null)
     /**
      * Handle request.
      *
-     * @param  Request $request
+     * @param  Request|false $request
      * @return null|Response
      * @throws Exception\InvalidArgumentException
      */
@@ -563,7 +563,7 @@ protected function getSmdMethods()
     /**
      * Internal method for handling request.
      *
-     * @return Error|void
+     * @return Error|null
      */
     protected function handleRequest()
     {
@@ -606,6 +606,8 @@ protected function handleRequest()
         }
 
         $this->getResponse()->setResult($result);
+
+        return null;
     }
 
     /**