Upgrade HTTPlug from Legacy to Psr17/18 Discovery Factories

Author: zanbaldwin

composer.json

@@ -12,20 +12,20 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "psr/http-message": "^1.0",
-        "php-http/httplug": "^1.1 || ^2.0",
+        "ext-json": "*",
+        "php-http/client-common": "^1.9 || ^2.0",
         "php-http/discovery": "^1.0",
         "psr/http-client-implementation": "^1.0",
-        "php-http/client-common": "^1.9 || ^2.0",
         "php-http/message-factory": "^1.0",
+        "psr/http-message-implementation": "^1.0",
         "composer-runtime-api": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0 || ^9.0",
-        "guzzlehttp/guzzle": "^7",
-        "php-http/mock-client": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpstan/phpstan": "^1.2"
+        "php-http/guzzle7-adapter": "^1.0",
+        "php-http/mock-client": "^1.0",
+        "phpstan/phpstan": "^1.2",
+        "phpunit/phpunit": "^8.0 || ^9.0"
     },
     "autoload": {
         "psr-4": { "PrivatePackagist\\ApiClient\\": "src/" }

src/Client.php

@@ -10,7 +10,7 @@
 namespace PrivatePackagist\ApiClient;
 
 use Http\Client\Common\Plugin;
-use Http\Discovery\UriFactoryDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use PrivatePackagist\ApiClient\HttpClient\HttpPluginClientBuilder;
 use PrivatePackagist\ApiClient\HttpClient\Message\ResponseMediator;
 use PrivatePackagist\ApiClient\HttpClient\Plugin\ExceptionThrower;
@@ -31,7 +31,7 @@ public function __construct(HttpPluginClientBuilder $httpClientBuilder = null, $
         $privatePackagistUrl = $privatePackagistUrl ? : 'https://packagist.com';
         $this->responseMediator = $responseMediator ? : new ResponseMediator();
 
-        $builder->addPlugin(new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri($privatePackagistUrl)));
+        $builder->addPlugin(new Plugin\AddHostPlugin(Psr17FactoryDiscovery::findUriFactory()->createUri($privatePackagistUrl)));
         $builder->addPlugin(new PathPrepend('/api'));
         $builder->addPlugin(new Plugin\RedirectPlugin());
         $headers = [

src/HttpClient/HttpPluginClientBuilder.php

@@ -12,26 +12,26 @@
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\Plugin;
 use Http\Client\Common\PluginClient;
-use Http\Discovery\HttpClientDiscovery;
-use Http\Discovery\MessageFactoryDiscovery;
-use Http\Message\RequestFactory;
+use Http\Discovery\Psr17FactoryDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 
 class HttpPluginClientBuilder
 {
     /** @var ClientInterface */
     private $httpClient;
     /** @var HttpMethodsClient|null */
     private $pluginClient;
-    /** @var RequestFactory */
+    /** @var RequestFactoryInterface */
     private $requestFactory;
     /** @var Plugin[] */
     private $plugins = [];
 
-    public function __construct(ClientInterface $httpClient = null, RequestFactory $requestFactory = null)
+    public function __construct(ClientInterface $httpClient = null, RequestFactoryInterface $requestFactory = null)
     {
-        $this->httpClient = $httpClient ?: HttpClientDiscovery::find();
-        $this->requestFactory = $requestFactory ?: MessageFactoryDiscovery::find();
+        $this->httpClient = $httpClient ?: Psr18ClientDiscovery::find();
+        $this->requestFactory = $requestFactory ?: Psr17FactoryDiscovery::findRequestFactory();
     }
 
     public function addPlugin(Plugin $plugin)