Alias Symfony clients

Author: nicolas-grekas

.github/workflows/unit-tests.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.1'
+          - '7.2'
           - '8.1'
         psr7:
           - guzzlehttp/psr7
@@ -40,13 +40,13 @@ jobs:
           - php: '8.1'
             client: php-http/guzzle7-adapter
             psr7: guzzlehttp/psr7
-          - php: '7.1'
+          - php: '7.2'
             client: php-http/guzzle6-adapter
-            psr7: guzzlehttp/psr7
+            psr7: guzzlehttp/psr7:^1.9
           - php: '8.1'
             client: php-http/react-adapter
             psr7: nyholm/psr7
-          - php: '7.1'
+          - php: '7.2'
             client: php-http/react-adapter
             psr7: nyholm/psr7
       fail-fast: false

composer.json

@@ -18,13 +18,14 @@
         "psr/http-message-implementation": "*"
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "composer-plugin-api": "^2.1",
         "composer-runtime-api": "^2.1"
     },
     "require-dev": {
         "composer/composer": "^2.1",
         "nyholm/psr7": "^1",
+        "php-http/discovery": "^1",
         "php-http/httplug": "^1|^2",
         "psr/http-client": "^1",
         "psr/http-factory": "^1",
@@ -42,7 +43,7 @@
         "laminas/laminas-diactoros": "<2",
         "php-http/curl-client": "<2",
         "php-http/react-adapter": "<3",
-        "symfony/http-client": "<4.4"
+        "symfony/http-client": "<5.4"
     },
     "config": {
         "sort-packages": true

src/Internal/ComposerPlugin.php

@@ -238,6 +238,20 @@ public function getMissingRequires(InstalledRepositoryInterface $repo, array $re
             }
         }
 
+        if (!isset($allPackages['nyholm/psr7'])) {
+            foreach ($missingRequires as $dev => $abstractions) {
+                if (\in_array('nyholm/psr7', $missingRequires[$dev]['psr/http-factory-implementation'] ?? [], true)) {
+                    continue;
+                }
+                foreach ($abstractions as $abstraction => $deps) {
+                    if (\in_array('symfony/http-client', $deps, true)) {
+                        $missingRequires[$dev][$abstraction][] = 'php-http/discovery';
+                        continue 2;
+                    }
+                }
+            }
+        }
+
         $missingRequires[1] = array_diff_key($missingRequires[1], $missingRequires[0]);
 
         return $missingRequires;

src/Internal/Symfony/SymfonyHttplugClient.php

@@ -9,33 +9,21 @@
 
 namespace FriendsOfPHP\WellKnownImplementations\Internal\Symfony;
 
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr17Factory;
-use Http\Client\HttpAsyncClient;
-use Http\Client\HttpClient;
-use Http\Promise\Promise;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpClient\HttplugClient;
 
 /**
  * @internal
  */
-class SymfonyHttplugClient implements HttpClient, HttpAsyncClient
-{
-    private $client;
+class_alias(HttplugClient::class, SymfonyHttplugClient::class);
 
-    public function __construct()
+if (false) {
+    /**
+     * @internal
+     */
+    class SymfonyHttplugClient extends HttplugClient
     {
-        $this->client = new HttplugClient(null, new WellKnownPsr17Factory());
-    }
-
-    public function sendRequest(RequestInterface $request): ResponseInterface
-    {
-        return $this->client->sendRequest($request);
-    }
-
-    public function sendAsyncRequest(RequestInterface $request): Promise
-    {
-        return $this->client->sendAsyncRequest($request);
+        public function __construct()
+        {
+        }
     }
 }

src/Internal/Symfony/SymfonyPsr18Client.php

@@ -9,26 +9,21 @@
 
 namespace FriendsOfPHP\WellKnownImplementations\Internal\Symfony;
 
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr17Factory;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpClient\Psr18Client;
 
 /**
  * @internal
  */
-class SymfonyPsr18Client implements ClientInterface
-{
-    private $client;
+class_alias(Psr18Client::class, SymfonyPsr18Client::class);
 
-    public function __construct()
+if (false) {
+    /**
+     * @internal
+     */
+    class SymfonyPsr18Client extends Psr18Client
     {
-        $this->client = new Psr18Client(null, new WellKnownPsr17Factory());
-    }
-
-    public function sendRequest(RequestInterface $request): ResponseInterface
-    {
-        return $this->client->sendRequest($request);
+        public function __construct()
+        {
+        }
     }
 }