change guzzle/psr7 to nyholm/psr7

Author: ddrv

README.md

@@ -12,7 +12,7 @@ Mock for PSR-18 HTTP client
 Add package to project
 
 ```bash
-composer require --dev webclient/fake-http-client:^1.0
+composer require --dev webclient/fake-http-client:^2.0
 ```
 
 Set autoload
@@ -28,15 +28,15 @@ include 'vendor/autoload.php';
 ```php
 <?php
 
-use Webclient\Fake\Client;
+use Webclient\Fake\FakeHttpClient;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 /** 
  * @var RequestHandlerInterface $handler your mock handler 
  * @var RequestInterface $request your tested request
  */
-$client = new Client($handler);
+$client = new FakeHttpClient($handler);
 
 $response = $client->sendRequest($request);
 ```
@@ -48,7 +48,7 @@ This package provides simple routing.
 ```php
 <?php
 
-use Webclient\Fake\Client;
+use Webclient\Fake\FakeHttpClient;
 use Webclient\Fake\Handler\SimpleRoutingHandler;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -70,7 +70,7 @@ $handler
     ->route(['POST'], '/entities', $entityCreatedHandler)
     ->route(['DELETED'], '/entities/2', $entityDeletedHandler)
 ;
-$client = new Client($handler);
+$client = new FakeHttpClient($handler);
 
 $response1 = $client->sendRequest($errorRequest); // returns error 404
 $response2 = $client->sendRequest($entityCreatingRequest); // returns success response 201
@@ -86,15 +86,15 @@ If you pass the `\Psr\Http\Message\ServerRequestInterface` object to client and
 ```php
 <?php
 
-use Webclient\Fake\Client;
+use Webclient\Fake\FakeHttpClient;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 /** 
  * @var RequestHandlerInterface $handler your mock handler 
  * @var ServerRequestInterface $request your tested request
  */
-$client = new Client($handler);
+$client = new FakeHttpClient($handler);
 
-$response = $client->sendRequest($request->withAttribute(Client::NO_REPLACE_ATTRIBUTE, true));
+$response = $client->sendRequest($request->withAttribute(FakeHttpClient::NO_REPLACE_ATTRIBUTE, true));
 ```

composer.json

@@ -12,16 +12,16 @@
     }
   ],
   "require": {
-    "php": ">=7.0",
+    "php": "^7.4 || ^8.0",
     "ext-json": "*",
     "psr/http-client": "^1.0",
     "psr/http-message": "^1.0",
     "psr/http-server-handler": "^1.0"
   },
   "require-dev": {
     "psr/http-factory": "^1.0",
-    "guzzlehttp/psr7": "^1.7",
-    "phpunit/phpunit": ">=6.5",
+    "nyholm/psr7": "^1.5",
+    "phpunit/phpunit": "^6.5 || ^7.5 || 8.5 || 9.5",
     "squizlabs/php_codesniffer": "^3.5"
   },
   "provide": {

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/Exception/NetworkError.php

@@ -11,11 +11,7 @@
 
 class NetworkError extends Exception implements NetworkExceptionInterface
 {
-
-    /**
-     * @var RequestInterface
-     */
-    private $request;
+    private RequestInterface $request;
 
     public function __construct(RequestInterface $request, Throwable $previous = null)
     {

src/Client.php renamed to src/FakeHttpClient.php

@@ -14,20 +14,12 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
 
-final class Client implements ClientInterface
+final class FakeHttpClient implements ClientInterface
 {
+    public const NO_REPLACE_ATTRIBUTE = 'webclient-fake-http-client-request-no-replace';
 
-    const NO_REPLACE_ATTRIBUTE = 'webclient-fake-http-client-request-no-replace';
-
-    /**
-     * @var RequestHandlerInterface
-     */
-    private $handler;
-
-    /**
-     * @var array
-     */
-    private $server;
+    private RequestHandlerInterface $handler;
+    private array $server;
 
     public function __construct(RequestHandlerInterface $handler, array $server = [])
     {

src/Handler/SimpleRoutingHandler.php

@@ -10,11 +10,8 @@
 
 class SimpleRoutingHandler implements RequestHandlerInterface
 {
-
-    /**
-     * @var RequestHandlerInterface[]
-     */
-    private $handlers = [];
+    /** @var RequestHandlerInterface[] */
+    private array $handlers = [];
 
     public function __construct(RequestHandlerInterface $defaultHandler)
     {