HttpClient PHPStan fix

Author: TavoNiievez

src/Codeception/Module/Symfony/HttpClientAssertionsTrait.php

@@ -7,6 +7,7 @@
 use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
 use Symfony\Component\VarDumper\Cloner\Data;
 use function array_change_key_case;
+use function array_filter;
 use function array_intersect_key;
 use function array_key_exists;
 use function in_array;
@@ -43,45 +44,29 @@ public function assertHttpClientRequest(
         array             $expectedHeaders = [],
         string            $httpClientId = 'http_client',
     ): void {
-        $traces = $this->getHttpClientTraces($httpClientId, __FUNCTION__);
-        $requestFound = false;
-
-        foreach ($traces as $trace) {
-            if (!$this->matchesUrlAndMethod($trace, $expectedUrl, $expectedMethod)) {
-                continue;
-            }
-
-            $rawOptions = $trace['options'] ?? [];
-
-            if ($expectedBody !== null) {
-                $actualBody = $this->extractValue(
-                    $rawOptions['body'] ?? $rawOptions['json'] ?? null
-                );
-                if ($expectedBody !== $actualBody) {
-                    continue;
+        $matchingRequests = array_filter(
+            $this->getHttpClientTraces($httpClientId, __FUNCTION__),
+            function (array $trace) use ($expectedUrl, $expectedMethod, $expectedBody, $expectedHeaders): bool {
+                if (!$this->matchesUrlAndMethod($trace, $expectedUrl, $expectedMethod)) {
+                    return false;
                 }
-            }
 
-            if ($expectedHeaders !== []) {
-                $rawHeaders    = $rawOptions['headers'] ?? [];
-                $actualHeaders = $this->extractValue($rawHeaders);
-                if (!is_array($actualHeaders)) {
-                    continue;
-                }
+                $options     = $trace['options'] ?? [];
+                $actualBody  = $this->extractValue($options['body'] ?? $options['json'] ?? null);
+                $bodyMatches = $expectedBody === null || $expectedBody === $actualBody;
 
-                $expected = array_change_key_case($expectedHeaders);
-                $actual   = array_change_key_case($actualHeaders);
-                if ($expected !== array_intersect_key($actual, $expected)) {
-                    continue;
-                }
-            }
+                $headersMatch = $expectedHeaders === [] || (
+                        is_array($headerValues = $this->extractValue($options['headers'] ?? []))
+                        && ($normalizedExpected = array_change_key_case($expectedHeaders))
+                        === array_intersect_key(array_change_key_case($headerValues), $normalizedExpected)
+                    );
 
-            $requestFound = true;
-            break;
-        }
+                return $bodyMatches && $headersMatch;
+            },
+        );
 
-        $this->assertTrue(
-            $requestFound,
+        $this->assertNotEmpty(
+            $matchingRequests,
             sprintf('The expected request has not been called: "%s" - "%s"', $expectedMethod, $expectedUrl)
         );
     }
@@ -97,8 +82,7 @@ public function assertHttpClientRequest(
      */
     public function assertHttpClientRequestCount(int $count, string $httpClientId = 'http_client'): void
     {
-        $traces = $this->getHttpClientTraces($httpClientId, __FUNCTION__);
-        $this->assertCount($count, $traces);
+        $this->assertCount($count, $this->getHttpClientTraces($httpClientId, __FUNCTION__));
     }
 
     /**
@@ -111,18 +95,18 @@ public function assertHttpClientRequestCount(int $count, string $httpClientId =
      */
     public function assertNotHttpClientRequest(
         string $unexpectedUrl,
-        string $expectedMethod = 'GET',
+        string $unexpectedMethod = 'GET',
         string $httpClientId = 'http_client',
     ): void {
-        $traces = $this->getHttpClientTraces($httpClientId, __FUNCTION__);
-
-        foreach ($traces as $trace) {
-            if ($this->matchesUrlAndMethod($trace, $unexpectedUrl, $expectedMethod)) {
-                $this->fail(sprintf('Unexpected URL called: "%s" - "%s"', $expectedMethod, $unexpectedUrl));
-            }
-        }
+        $matchingRequests = array_filter(
+            $this->getHttpClientTraces($httpClientId, __FUNCTION__),
+            fn(array $trace): bool => $this->matchesUrlAndMethod($trace, $unexpectedUrl, $unexpectedMethod)
+        );
 
-        $this->assertTrue(true, 'The unexpected request was not made.');
+        $this->assertEmpty(
+            $matchingRequests,
+            sprintf('Unexpected URL was called: "%s" - "%s"', $unexpectedMethod, $unexpectedUrl)
+        );
     }
 
     /**