fix: Raise phpstan level to 6

Author: pl-github

.github/workflows/build.yml

@@ -7,7 +7,6 @@ on:
   push:
     branches:
       - "master"
-      - "fix/composer-devtools"
 
 jobs:
   tests:

composer.json

@@ -21,7 +21,7 @@
         "jangregor/phpstan-prophecy": "^1.0",
         "mikey179/vfsstream": "^1.6.11",
         "monolog/monolog": "^2.3|^3.0",
-        "phpstan/phpstan": "^1.2",
+        "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^10.5",

phpstan.neon.dist

@@ -1,5 +1,5 @@
 parameters:
-    level: 1
+    level: 6
     paths:
         - src
         - tests
@@ -18,6 +18,7 @@ parameters:
         - '#Method Brainbits\\FunctionalTestHelpers\\Tests\\Uuid\\UuidTraitTest::.*\(\) is protected, but since the containing class is final, it can be private#'
         - '#Method Brainbits\\FunctionalTestHelpers\\Tests\\ZipContents\\ZipContentsTraitTest::.*\(\) is protected, but since the containing class is final, it can be private#'
         - '#Safe\\DateTimeImmutable#'
+        - '#SchemaBuilder::foo\(\)#'
     ergebnis:
         noNullableReturnTypeDeclaration:
             enabled: false

src/HttpClientMock/MockRequestBuilder.php

@@ -54,27 +54,27 @@ final class MockRequestBuilder
     /** @var array<string,string>  */
     private array $uriParams = [];
 
-    /** @var mixed[] */
+    /** @var mixed[]|null */
     private array|null $headers = null;
 
-    /** @var mixed[] */
+    /** @var mixed[]|null */
     private array|null $queryParams = null;
 
     private string|null $content = null;
 
-    /** @var mixed[] */
+    /** @var mixed[]|null */
     private array|null $multiparts = null;
 
-    /** @var callable(MockRequestBuilder $expectation, MockRequestBuilder $realRequest): ?string */
+    /** @var callable(MockRequestBuilder $expectation, MockRequestBuilder $realRequest): ?string|null */
     private mixed $that = null;
 
     private MockResponseCollection $responses;
 
     /** @var self[] */
     private array $calls = [];
 
-    /** @var callable */
-    public $onMatch;
+    /** @var callable|null */
+    public mixed $onMatch = null;
 
     public function __construct()
     {
@@ -127,13 +127,12 @@ public function hasHeaders(): bool
         return $this->headers !== null;
     }
 
-    /** @return mixed[] */
+    /** @return mixed[]|null */
     public function getHeaders(): array|null
     {
         return $this->headers;
     }
 
-    /** @return mixed */
     public function hasHeader(string $key): bool
     {
         return array_key_exists($key, $this->headers);
@@ -201,7 +200,6 @@ public function getJson(): array|null
         return json_decode($this->content, true);
     }
 
-    /** @param mixed[] $data */
     public function xml(string $data): self
     {
         if (!$this->isXmlString($data)) {
@@ -299,7 +297,7 @@ public function multipartFileFromFile(string $name, File $file): self
         return $this;
     }
 
-    /** @return mixed[] */
+    /** @return mixed[]|null */
     public function getMultiparts(): array|null
     {
         return $this->multiparts;

src/HttpClientMock/MockRequestBuilderCollection.php

@@ -33,7 +33,7 @@ public function __invoke(string $method, string $url, array $options): ResponseI
         $requestBuilder = ($this->requestResolver)($this, $realRequest);
         $requestBuilder->called($realRequest);
 
-        if ($requestBuilder->onMatch && is_callable($requestBuilder->onMatch)) {
+        if ($requestBuilder->onMatch && is_callable($requestBuilder->onMatch)) { // @phpstan-ignore-line
             ($requestBuilder->onMatch)($realRequest);
         }
 

src/HttpClientMock/MockRequestBuilderFactory.php

@@ -10,6 +10,7 @@
 use function array_key_exists;
 use function assert;
 use function explode;
+use function is_array;
 use function is_callable;
 use function is_string;
 use function Safe\fopen;
@@ -60,22 +61,31 @@ private function processBody(
 
         // application/json; charset=utf-8
         if (strpos($contentType, 'application/json') === 0) {
-            $mockRequestBuilder->json(json_decode($body, true));
+            if (is_string($body)) {
+                $mockRequestBuilder->json(json_decode($body, true));
+            } elseif (is_callable($body)) {
+                $mockRequestBuilder->json(json_decode((string) $body(), true));
+            } elseif (is_array($body)) {
+                $mockRequestBuilder->json($body);
+            } else {
+                throw UnprocessableBody::create();
+            }
 
             return;
         }
 
-        if (
-            strpos($contentType, 'application/x-www-form-urlencoded') === 0
-            && preg_match('/[^=]+=[^=]*(&[^=]+=[^=]*)*/', (string) $body)
-        ) {
-            foreach (explode('&', $body) as $keyValue) {
-                [$key, $value] = explode('=', $keyValue);
+        if (strpos($contentType, 'application/x-www-form-urlencoded') === 0) {
+            assert(is_string($body));
 
-                $mockRequestBuilder->requestParam(urldecode($key), urldecode($value));
-            }
+            if (preg_match('/[^=]+=[^=]*(&[^=]+=[^=]*)*/', $body)) {
+                foreach (explode('&', $body) as $keyValue) {
+                    [$key, $value] = explode('=', $keyValue);
 
-            return;
+                    $mockRequestBuilder->requestParam(urldecode($key), urldecode($value));
+                }
+
+                return;
+            }
         }
 
         // multipart/form-data; charset=utf-8; boundary=__X_PAW_BOUNDARY__
@@ -114,6 +124,18 @@ private function processBody(
             return;
         }
 
-        $mockRequestBuilder->content($body);
+        if (is_string($body)) {
+            $mockRequestBuilder->content($body);
+
+            return;
+        }
+
+        if (is_callable($body)) {
+            $mockRequestBuilder->content((string) $body());
+
+            return;
+        }
+
+        throw UnprocessableBody::create();
     }
 }

src/HttpClientMock/MockRequestMatch.php

@@ -130,7 +130,6 @@ public static function mismatchingMultiparts(array $multiparts, array|null $othe
         );
     }
 
-    /** @param mixed $value */
     public static function missingHeader(string $key, string $value): self
     {
         return new self(

src/HttpClientMock/MockRequestMatcher.php

@@ -150,10 +150,7 @@ public function __invoke(MockRequestBuilder $expectation, MockRequestBuilder $re
             $match->matchesContent($expectation->getContent());
         }
 
-        if (
-            $expectation->getMultiparts() !== null
-            && ($this->compare)($expectation->getMultiparts(), $realRequest->getMultiparts())
-        ) {
+        if ($expectation->getMultiparts() !== null) {
             $match->matchesMultiparts($expectation->getMultiparts());
         }
 

src/HttpClientMock/MockRequestResolver.php

@@ -18,7 +18,6 @@ public function __construct()
         $this->matcher = new MockRequestMatcher();
     }
 
-    /** @param mixed[] $options */
     public function __invoke(
         MockRequestBuilderCollection $requestBuilders,
         MockRequestBuilder $realRequest,

src/HttpClientMock/MockResponseFactory.php

@@ -8,6 +8,5 @@
 
 interface MockResponseFactory
 {
-    /** @return mixed */
     public function fromRequestBuilder(MockRequestBuilder $requestBuilder): MockResponse;
 }