Fixed Psalm errors and added discovery process for http related implementations

Author: loevgaard

composer.json

@@ -12,22 +12,24 @@
     "require": {
         "php": ">=8.1",
         "ext-json": "*",
-        "composer-runtime-api": "^2.0",
         "facebook/php-business-sdk": "^22.0",
+        "php-http/discovery": "^1.20",
         "psr/http-client": "^1.0",
+        "psr/http-client-implementation": "*",
         "psr/http-factory": "^1.0",
+        "psr/http-factory-implementation": "*",
         "psr/http-message": "^1.0 || ^2.0",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
         "infection/infection": "^0.26.21",
-        "kriswallsmith/buzz": "^1.3",
         "nyholm/psr7": "^1.8",
         "phpunit/phpunit": "^9.6",
         "psalm/plugin-phpunit": "^0.19",
         "setono/code-quality-pack": "^2.9",
-        "shipmonk/composer-dependency-analyser": "^1.8.2"
+        "shipmonk/composer-dependency-analyser": "^1.8.2",
+        "symfony/http-client": "^6.4 || ^7.0"
     },
     "prefer-stable": true,
     "autoload": {
@@ -44,7 +46,8 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": false,
             "ergebnis/composer-normalize": true,
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "php-http/discovery": false
         },
         "sort-packages": true
     },

src/Client/Client.php

@@ -4,9 +4,9 @@
 
 namespace Setono\MetaConversionsApi\Client;
 
-use Buzz\Client\Curl;
 use FacebookAds\ApiConfig;
-use Nyholm\Psr7\Factory\Psr17Factory;
+use Http\Discovery\Psr17FactoryDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface as HttpClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
@@ -76,14 +76,7 @@ public function sendEvent(Event $event): void
     private function getHttpClient(): HttpClientInterface
     {
         if (null === $this->httpClient) {
-            if (!class_exists(Curl::class)) {
-                throw ClientException::missingDependency(
-                    Curl::class,
-                    sprintf('Either set the http client with %s or run composer require kriswallsmith/buzz', self::class . '::setHttpClient()'),
-                );
-            }
-
-            $this->httpClient = new Curl($this->getResponseFactory());
+            $this->httpClient = Psr18ClientDiscovery::find();
         }
 
         return $this->httpClient;
@@ -97,14 +90,7 @@ public function setHttpClient(HttpClientInterface $httpClient): void
     private function getRequestFactory(): RequestFactoryInterface
     {
         if (null === $this->requestFactory) {
-            if (!class_exists(Psr17Factory::class)) {
-                throw ClientException::missingDependency(
-                    Psr17Factory::class,
-                    sprintf('Either set the request factory with %s or run composer require nyholm/psr7', self::class . '::setRequestFactory()'),
-                );
-            }
-
-            $this->requestFactory = new Psr17Factory();
+            $this->requestFactory = Psr17FactoryDiscovery::findRequestFactory();
         }
 
         return $this->requestFactory;
@@ -118,14 +104,7 @@ public function setRequestFactory(RequestFactoryInterface $requestFactory): void
     private function getResponseFactory(): ResponseFactoryInterface
     {
         if (null === $this->responseFactory) {
-            if (!class_exists(Psr17Factory::class)) {
-                throw ClientException::missingDependency(
-                    Psr17Factory::class,
-                    sprintf('Either set the response factory with %s or run composer require nyholm/psr7', self::class . '::setResponseFactory()'),
-                );
-            }
-
-            $this->responseFactory = new Psr17Factory();
+            $this->responseFactory = Psr17FactoryDiscovery::findResponseFactory();
         }
 
         return $this->responseFactory;
@@ -139,14 +118,7 @@ public function setResponseFactory(ResponseFactoryInterface $responseFactory): v
     private function getStreamFactory(): StreamFactoryInterface
     {
         if (null === $this->streamFactory) {
-            if (!class_exists(Psr17Factory::class)) {
-                throw ClientException::missingDependency(
-                    Psr17Factory::class,
-                    sprintf('Either set the stream factory with %s or run composer require nyholm/psr7', self::class . '::setStreamFactory()'),
-                );
-            }
-
-            $this->streamFactory = new Psr17Factory();
+            $this->streamFactory = Psr17FactoryDiscovery::findStreamFactory();
         }
 
         return $this->streamFactory;

tests/Client/ClientTest.php

@@ -97,6 +97,9 @@ public function log($level, string|\Stringable $message, array $context = []): v
         $this->messages[] = $message;
     }
 
+    /**
+     * @param non-empty-string $regexp
+     */
     public function hasMessageMatching(string $regexp): bool
     {
         foreach ($this->messages as $message) {

tests/ValueObject/FbcTest.php

@@ -62,14 +62,12 @@ public function it_handles_wrong_input(string $input): void
     }
 
     /**
-     * @return list<list<string>>
+     * @return \Generator<array-key, array{string}>
      */
-    public function wrongInputs(): array
+    public function wrongInputs(): \Generator
     {
-        return [
-            ['wrong input'],
-            ['afb.1.1657051589577.IwAR0rmfgHgxjdKoEopat9y2SPzyjGgfHm9AhdqygToWvarP59nPq15T07MiA'],
-            ['fb.1.1657051589577.IwAR0rmfgHgxjdKoEopat9y2SPzyjGgfHm9AhdqygToWvarP59nPq15T07MiA_'],
-        ];
+        yield ['wrong input'];
+        yield ['afb.1.1657051589577.IwAR0rmfgHgxjdKoEopat9y2SPzyjGgfHm9AhdqygToWvarP59nPq15T07MiA'];
+        yield ['fb.1.1657051589577.IwAR0rmfgHgxjdKoEopat9y2SPzyjGgfHm9AhdqygToWvarP59nPq15T07MiA_'];
     }
 }

tests/ValueObject/FbpTest.php

@@ -55,14 +55,12 @@ public function it_handles_wrong_input(string $input): void
     }
 
     /**
-     * @return list<list<string>>
+     * @return \Generator<array-key, array{string}>
      */
-    public function wrongInputs(): array
+    public function wrongInputs(): \Generator
     {
-        return [
-            ['wrong input'],
-            ['fb.1.1656874832584.1088522659a'],
-            ['afb.1.1656874832584.1088522659'],
-        ];
+        yield ['wrong input'];
+        yield ['fb.1.1656874832584.1088522659a'];
+        yield ['afb.1.1656874832584.1088522659'];
     }
 }