Merge pull request #53 from packagist/t/psr-18

PSR: replace php-http/client-implementation with psr/http-client-implementation

Author: glaubinix

.php-cs-fixer.php

@@ -12,6 +12,7 @@
     ->setRiskyAllowed(true)
     ->setRules(array(
         '@PSR2' => true,
+        'no_unused_imports' => true,
     ))
     ->setFinder($finder)
 ;

README.md

@@ -121,10 +121,10 @@
 Via Composer:
 
 ```bash
-$ composer require private-packagist/api-client php-http/guzzle6-adapter
+$ composer require private-packagist/api-client guzzlehttp/guzzle
 ```
 
-Why do you need to require `php-http/guzzle6-adapter`? We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io/), so you can pick an HTTP client of your choice, guzzle is merely a recommendation.
+Why do you need to require `guzzlehttp/guzzle`? We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io/), so you can pick an HTTP client of your choice, guzzle is merely a recommendation.
 
 ## Basic usage of `private-packagist/api-client` client
 

composer.json

@@ -15,16 +15,14 @@
         "psr/http-message": "^1.0",
         "php-http/httplug": "^1.1 || ^2.0",
         "php-http/discovery": "^1.0",
-        "php-http/client-implementation": "^1.0",
+        "psr/http-client-implementation": "^1.0",
         "php-http/client-common": "^1.9 || ^2.0",
         "composer-runtime-api": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0 || ^9.0",
-        "php-http/guzzle6-adapter": "^1.0 || ^2.0",
+        "guzzlehttp/guzzle": "^7",
         "php-http/mock-client": "^1.0",
-        "guzzlehttp/psr7": "^1.2",
-        "cache/array-adapter": "^1.1.0",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/phpstan": "^1.2"
     },

src/Api/Projects.php

@@ -9,8 +9,6 @@
 
 namespace PrivatePackagist\ApiClient\Api;
 
-use PrivatePackagist\ApiClient\Exception\InvalidArgumentException;
-
 /**
  * @deprecated Use the Subrepositories API instead
  */

src/HttpClient/HttpPluginClientBuilder.php

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

tests/HttpClient/Message/ResponseMediatorTest.php

@@ -28,7 +28,7 @@ public function testGetContent()
         $response = new Response(
             200,
             ['Content-Type' => 'application/json'],
-            \GuzzleHttp\Psr7\stream_for(json_encode($body))
+            json_encode($body)
         );
         $this->assertSame($body, $this->responseMediator->getContent($response));
     }
@@ -39,7 +39,7 @@ public function testGetContentNotJson()
         $response = new Response(
             200,
             [],
-            \GuzzleHttp\Psr7\stream_for($body)
+            $body
         );
         $this->assertSame($body, $this->responseMediator->getContent($response));
     }
@@ -50,7 +50,7 @@ public function testGetContentInvalidJson()
         $response = new Response(
             200,
             ['Content-Type' => 'application/json'],
-            \GuzzleHttp\Psr7\stream_for($body)
+            $body
         );
         $this->assertEquals($body, $this->responseMediator->getContent($response));
     }