I-5 Fix codestyle and phpstan

Author: DEVizzent

src/Client/MockServer.php

@@ -35,6 +35,18 @@ public function verify(string $expectationId, ?int $times = null): void
         );
     }
 
+    /**
+     * @return array<int, array{
+     *     method: string,
+     *     path: string,
+     *     headers:array<string, string>,
+     *     keepAlive: bool,
+     *     secure: bool,
+     *     protocol: string,
+     *     body?: string
+     * }>
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     */
     public function getNotMatchedRequests(): array
     {
         $notMatchedRequests = [];
@@ -49,6 +61,7 @@ public function getNotMatchedRequests(): array
         }
         return $notMatchedRequests;
     }
+
     public function create(string $json): void
     {
         $request = new Request(
@@ -64,6 +77,7 @@ public function create(string $json): void
             $response->getBody()->getContents()
         );
     }
+
     public function removeById(string $mockRequestId): void
     {
         $body = json_encode([
@@ -78,6 +92,7 @@ public function removeById(string $mockRequestId): void
             $response->getBody()->getContents()
         );
     }
+
     public function removeAllExpectations(): void
     {
         $request = new Request('PUT', '/mockserver/clear?type=expectations');

src/MockServerHelper.php

@@ -91,12 +91,13 @@ public function seeMockRequestWasCalled(string $expectationId, ?int $times = nul
         } catch (AssertionFailedError $exception) {
             //throw $exception;
             preg_match('#(.|\n)* expected:<(?<expected>\{(.|\n)*\})> but was:<(.|\n)*>#', $exception->getMessage(), $matches);
-            if (empty($matches)) {
+            if (!isset($matches['expected'])) {
                 throw $exception;
             }
             $expected = json_decode($matches['expected'], true);
             $notMatchedRequests = $this->mockserver->getNotMatchedRequests();
             $currentSimilityRatio = 0;
+            $bestDiff = '';
             $expectedFormatted = $this->formatMockServerRequest($expected);
             foreach ($notMatchedRequests as $notMatchedRequest) {
                 $diff = DiffHelper::calculate($expectedFormatted, $this->formatMockServerRequest($notMatchedRequest));
@@ -107,7 +108,7 @@ public function seeMockRequestWasCalled(string $expectationId, ?int $times = nul
                     $bestDiff = $diff;
                 }
             }
-            throw new AssertionFailedError('Impossible match request: '. PHP_EOL . $bestDiff);
+            throw new AssertionFailedError('Impossible match request: ' . PHP_EOL . $bestDiff);
         }
     }
 
@@ -163,9 +164,11 @@ public function createMockRequestFromJsonFile(string $expectationFile): void
         $this->createMockRequest($expectationJson);
     }
 
+    /** @param array<string, mixed> $mockServerRequest */
     public function formatMockServerRequest(array $mockServerRequest): string
     {
         ksort($mockServerRequest);
-        return json_encode($mockServerRequest, JSON_PRETTY_PRINT);
+        $requestFormatted = json_encode($mockServerRequest, JSON_PRETTY_PRINT);
+        return is_string($requestFormatted) ? $requestFormatted : '';
     }
 }

tests/Integration/SeeMockRequestWasCalledTest.php

@@ -60,10 +60,14 @@ public function testExpectationNotWasCalledThrowException2(): void
 
     public function testExpectationWasCalledButWasNotWithGoodRecomendation(): void
     {
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors'=>false]);
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors'=>false]);
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/5', ['http_errors'=>false, 'headers' => ['randomHeader' => 'value']]);
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/users/3/albums', ['http_errors'=>false]);
+        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors' => false]);
+        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors' => false]);
+        $this->client->request(
+            'GET',
+            'https://jsonplaceholder.typicode.com/posts/5',
+            ['http_errors' => false, 'headers' => ['randomHeader' => 'value']]
+        );
+        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/users/3/albums', ['http_errors' => false]);
 
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessageMatches('#.*"path": "\\\/users\\\/3\\\/albums".*#');
@@ -72,10 +76,14 @@ public function testExpectationWasCalledButWasNotWithGoodRecomendation(): void
 
     public function testExpectationWasCalledButWasNotWithGoodRecomendation2(): void
     {
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors'=>false]);
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors'=>false]);
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/5', ['http_errors'=>false]);
-        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/users/3/albums', ['http_errors'=>false, 'headers' => ['randomHeader' => 'value']]);
+        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors' => false]);
+        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/2', ['http_errors' => false]);
+        $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/5', ['http_errors' => false]);
+        $this->client->request(
+            'GET',
+            'https://jsonplaceholder.typicode.com/users/3/albums',
+            ['http_errors' => false, 'headers' => ['randomHeader' => 'value']]
+        );
 
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessageMatches('#.*"path": "\\\/posts\\\/5".*#');