update depends

Author: 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,23 +12,23 @@ Redirect 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-redirect:^1.0
+composer require webclient/ext-redirect:^2.0
 ```
 
 # Using
 
 ```php
 <?php
 
-use Webclient\Extension\Redirect\Client;
+use Webclient\Extension\Redirect\RedirectClientDecorator;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 
 /** 
  * @var ClientInterface $client Your PSR-18 HTTP Client
  * @var int $maxRedirects Max follow redirects
  */
-$http = new Client($client, $maxRedirects);
+$http = new RedirectClientDecorator($client, $maxRedirects);
 
 /** @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"

src/Client.php renamed to src/RedirectClientDecorator.php

@@ -8,28 +8,15 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-use function array_key_exists;
-use function array_replace;
-use function in_array;
-use function parse_url;
-
-final class Client implements ClientInterface
+final class RedirectClientDecorator implements ClientInterface
 {
-
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @var int
-     */
-    private $maxRedirects;
+    private ClientInterface $client;
+    private int $maxRedirects;
 
     public function __construct(ClientInterface $client, int $maxRedirects = 10)
     {
         $this->client = $client;
-        $this->maxRedirects = $maxRedirects > 0 ? $maxRedirects : 0;
+        $this->maxRedirects = max($maxRedirects, 0);
     }
 
     /**

stuff/Handler.php

@@ -4,14 +4,13 @@
 
 namespace Stuff\Webclient\Extension\Redirect;
 
-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
 {
-
     /**
      * @param ServerRequestInterface $request
      * @return ResponseInterface

tests/RedirectClientTest.php renamed to tests/RedirectClientDecoratorTest.php

@@ -4,16 +4,15 @@
 
 namespace Tests\Webclient\Extension\Redirect;
 
-use GuzzleHttp\Psr7\Request;
+use Nyholm\Psr7\Request;
 use Stuff\Webclient\Extension\Redirect\Handler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
-use Webclient\Extension\Redirect\Client;
-use Webclient\Fake\Client as FakeClient;
+use Webclient\Extension\Redirect\RedirectClientDecorator;
+use Webclient\Fake\FakeHttpClient;
 
-class RedirectClientTest extends TestCase
+class RedirectClientDecoratorTest extends TestCase
 {
-
     /**
      * @param int $maxRedirects
      * @param int $needRedirects
@@ -26,7 +25,7 @@ class RedirectClientTest extends TestCase
     public function testRedirects(int $maxRedirects, int $needRedirects, int $expectRedirects)
     {
 
-        $client = new Client(new FakeClient(new Handler()), $maxRedirects);
+        $client = new RedirectClientDecorator(new FakeHttpClient(new Handler()), $maxRedirects);
 
         $request = new Request('GET', 'http://localhost/?redirects=' . $needRedirects, ['Accept' => 'text/plain']);