rename Client to ProtocolClientDecorator

Author: ddrv

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: "https://www.paypal.me/ddrv"
+custom: "https://www.paypal.me/ddrv"
+patreon: ddrv

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
+        php: [7.4, 8.0, 8.1]
 
     steps:
       - name: Checkout code

README.md

@@ -12,22 +12,22 @@ Auto change protocol version extension for PSR-18 HTTP client.
 Install this package and your favorite [psr-18 implementation](https://packagist.org/providers/psr/http-client-implementation).
 
 ```bash
-composer require webclient/ext-protocol-version:^1.0
+composer require webclient/ext-protocol-version:^2.0
 ```
 
 # Using
 
 ```php
 <?php
 
-use Webclient\Extension\ProtocolVersion\Client;
+use Webclient\Extension\ProtocolVersion\ProtocolClientDecorator;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 
 /** 
  * @var ClientInterface $client Your PSR-18 HTTP Client
  */
-$http = new Client($client);
+$http = new ProtocolClientDecorator($client);
 
 /** @var RequestInterface $request */
 $response = $http->sendRequest($request);

composer.json

@@ -12,14 +12,14 @@
     }
   ],
   "require": {
-    "php": ">=7.0",
+    "php": "^7.4 || ^8.0",
     "psr/http-client": "^1.0"
   },
   "require-dev": {
-    "guzzlehttp/psr7": "^1.7",
-    "phpunit/phpunit": ">=6.5",
-    "squizlabs/php_codesniffer": "^3.5",
-    "webclient/fake-http-client": "^1.0"
+    "nyholm/psr7": "^1.5",
+    "phpunit/phpunit": "^6.5 || ^7.5 || ^8.5 || ^9.5",
+    "squizlabs/php_codesniffer": "^3.7",
+    "webclient/fake-http-client": "^2.0"
   },
   "provide": {
     "psr/http-client-implementation": "1.0"

phpcs.xml.dist

@@ -8,9 +8,7 @@
     <arg name="colors"/>
 
     <!-- inherit rules from: -->
-    <rule ref="PSR12">
-        <exclude name="PSR12.Properties.ConstantVisibility.NotFound"/>
-    </rule>
+    <rule ref="PSR12"/>
 
     <!-- Paths to check -->
     <file>src</file>

src/Client.php src/ProtocolClientDecorator.php

@@ -8,13 +8,9 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-final class Client implements ClientInterface
+final class ProtocolClientDecorator implements ClientInterface
 {
-
-    /**
-     * @var ClientInterface
-     */
-    private $client;
+    private ClientInterface $client;
 
     public function __construct(ClientInterface $client)
     {

stuff/Handler.php

@@ -4,18 +4,17 @@
 
 namespace Stuff\Webclient\Extension\ProtocolVersion;
 
-use GuzzleHttp\Psr7\Response;
+use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 class Handler implements RequestHandlerInterface
 {
-
     /**
      * @var string[]
      */
-    private $versions;
+    private array $versions;
 
     public function __construct(string $defaultVersion, string ...$supportedVersions)
     {

tests/ClientTest.php tests/ProtocolClientDecoratorTest.php

@@ -4,16 +4,15 @@
 
 namespace Tests\Webclient\Extension\ProtocolVersion;
 
+use Nyholm\Psr7\Request;
 use Stuff\Webclient\Extension\ProtocolVersion\Handler;
-use GuzzleHttp\Psr7\Request;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
-use Webclient\Extension\ProtocolVersion\Client;
-use Webclient\Fake\Client as FakeClient;
+use Webclient\Extension\ProtocolVersion\ProtocolClientDecorator;
+use Webclient\Fake\FakeHttpClient;
 
-class ClientTest extends TestCase
+class ProtocolClientDecoratorTest extends TestCase
 {
-
     /**
      * @param string $requestVersion
      * @param string $responseVersion
@@ -25,7 +24,7 @@ class ClientTest extends TestCase
      */
     public function testProtocol(string $requestVersion, string $responseVersion, array $supportedVersions)
     {
-        $client = new Client(new FakeClient(new Handler(...$supportedVersions)));
+        $client = new ProtocolClientDecorator(new FakeHttpClient(new Handler(...$supportedVersions)));
             $request = new Request('GET', '/', ['Accept' => 'text/plain'], null, $requestVersion);
             $response = $client->sendRequest($request);
             $this->assertSame($responseVersion, $response->getProtocolVersion());