Upgrade PHPStan to v0.12

lcobucci · lcobucci · commit 087d56fd35fb · 2020-02-26T22:51:27.000+01:00
diff --git a/composer.json b/composer.json
@@ -23,10 +23,10 @@
         "infection/infection": "^0.13",
         "laminas/laminas-diactoros": "^2.2",
         "lcobucci/coding-standard": "^3.0",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-deprecation-rules": "^0.11",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpstan/phpstan-strict-rules": "^0.11",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan-strict-rules": "^0.12",
         "phpunit/phpunit": "^8.2",
         "squizlabs/php_codesniffer": "^3.4"
     },
diff --git a/src/DebugInfoStrategy/NoTrace.php b/src/DebugInfoStrategy/NoTrace.php
@@ -26,6 +26,9 @@ public function extractDebugInfo(Throwable $error): ?array
         return $debugInfo;
     }
 
+    /**
+     * @return Generator<array<string, string|int>>
+     */
     private function streamStack(?Throwable $previous): Generator
     {
         if ($previous === null) {
diff --git a/src/StatusCodeExtractionStrategy/ClassMap.php b/src/StatusCodeExtractionStrategy/ClassMap.php
@@ -42,6 +42,8 @@ public function extractStatusCode(Throwable $error): int
             }
         }
 
-        return $error->getCode() ?: StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR;
+        $code = $error->getCode();
+
+        return $code !== 0 ? $code : StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR;
     }
 }
diff --git a/tests/ErrorConversionMiddlewareTest.php b/tests/ErrorConversionMiddlewareTest.php
@@ -94,7 +94,7 @@ public function processShouldConvertTheExceptionIntoAnUnformattedResponseWithThe
     }
 
     /**
-     * @return array<string, array<Throwable|array<string, mixed>>>
+     * @return array<string, array<Throwable|int|array<string, mixed>>>
      */
     public function possibleConversions(): iterable
     {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ public function extractDebugInfo(Throwable $error): ?array`
`26`	`26`	`return $debugInfo;`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ /**`
	`30`	`+ * @return Generator<array<string, string\|int>>`
	`31`	`+ */`
`29`	`32`	`private function streamStack(?Throwable $previous): Generator`
`30`	`33`	`{`
`31`	`34`	`if ($previous === null) {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public function extractStatusCode(Throwable $error): int`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- return $error->getCode() ?: StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR;`
	`45`	`+ $code = $error->getCode();`
	`46`	`+`
	`47`	`+ return $code !== 0 ? $code : StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR;`
`46`	`48`	`}`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function processShouldConvertTheExceptionIntoAnUnformattedResponseWithThe`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/**`
`97`		`- * @return array<string, array<Throwable\|array<string, mixed>>>`
	`97`	`+ * @return array<string, array<Throwable\|int\|array<string, mixed>>>`
`98`	`98`	`*/`
`99`	`99`	`public function possibleConversions(): iterable`
`100`	`100`	`{`