rename Client to CookieClientDecorator; update dev deps

Author: ddrv

README.md

@@ -12,7 +12,7 @@ Cookie 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-cookie:^1.0
+composer require webclient/ext-cookie:^2.0
 ```
 
 # Using
@@ -22,14 +22,14 @@ composer require webclient/ext-cookie:^1.0
 
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
-use Webclient\Extension\Cookie\Client;
+use Webclient\Extension\Cookie\CookieClientDecorator;
 use Webclient\Extension\Cookie\Cookie\Storage;
 
 /** 
  * @var ClientInterface $client Your PSR-18 HTTP Client
  * @var Storage $storage Cookies storage. You may extends this class for implements your storage
  */
-$http = new Client($client, $storage);
+$http = new CookieClientDecorator($client, $storage);
 
 /** @var RequestInterface $request */
 $response = $http->sendRequest($request);

composer.json

@@ -12,16 +12,16 @@
     }
   ],
   "require": {
-    "php": ">=7.0",
+    "php": "^7.4 || ^8.0",
     "ext-json": "*",
     "ext-mbstring": "*",
     "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/Cookie/ArrayStorage.php

@@ -6,7 +6,6 @@
 
 final class ArrayStorage extends Storage
 {
-
     public function save()
     {
     }

src/Cookie/NetscapeCookieFile.php

@@ -25,11 +25,7 @@
 
 final class NetscapeCookieFile extends Storage
 {
-
-    /**
-     * @var string
-     */
-    private $file;
+    private string $file;
 
     public function __construct(string $file)
     {

src/Cookie/Storage.php

@@ -6,28 +6,10 @@
 
 use Psr\Http\Message\UriInterface;
 
-use function array_key_exists;
-use function ltrim;
-use function mb_strlen;
-use function mb_strpos;
-use function mb_strtolower;
-use function mb_substr;
-use function rtrim;
-use function str_pad;
-use function time;
-use function trim;
-
 abstract class Storage
 {
+    private array $cookies = [];
 
-    /**
-     * @var array
-     */
-    private $cookies = [];
-
-    /**
-     * @inheritDoc
-     */
     final public function get(UriInterface $uri): array
     {
         $cookies = [];
@@ -62,9 +44,6 @@ final public function get(UriInterface $uri): array
         return $cookies;
     }
 
-    /**
-     * @inheritDoc
-     */
     final public function set(
         string $name,
         string $value,
@@ -97,7 +76,7 @@ final public function set(
         }
         $this->cookies[$scheme][$domain][$name] = [
             'value' => $value,
-            'expired' => $expire > 0 ? $expire : 0,
+            'expired' => max($expire, 0),
             'path' => '/' . ltrim($path, '/'),
         ];
     }

src/Client.php renamed to src/CookieClientDecorator.php

@@ -9,24 +9,10 @@
 use Psr\Http\Message\ResponseInterface;
 use Webclient\Extension\Cookie\Cookie\Storage;
 
-use function array_replace;
-use function explode;
-use function strtolower;
-use function strtotime;
-use function trim;
-
-final class Client implements ClientInterface
+final class CookieClientDecorator implements ClientInterface
 {
-
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @var Storage
-     */
-    private $storage;
+    private ClientInterface $client;
+    private Storage $storage;
 
     public function __construct(ClientInterface $client, Storage $storage)
     {
@@ -94,14 +80,14 @@ private function setCookieFromHeader(string $header, string $domain)
                     }
                     break;
                 case 'path':
-                    $path = $value ? $value : '/';
+                    $path = $value ?: '/';
                     break;
                 case 'secure':
                     $secure = true;
                     break;
                 case 'expires':
                     $timestamp = strtotime($value);
-                    $expires = $timestamp > 0 ? $timestamp : 0;
+                    $expires = max($timestamp, 0);
                     break;
                 case 'httponly':
                     break;

stuff/Handler.php

@@ -4,20 +4,13 @@
 
 namespace Stuff\Webclient\Extension\Cookie;
 
-use GuzzleHttp\Psr7\Response;
+use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function array_key_exists;
-use function date;
-use function implode;
-use function is_array;
-use function time;
-
 class Handler implements RequestHandlerInterface
 {
-
     /**
      * @param ServerRequestInterface $request
      * @return ResponseInterface

stuff/Storage.php

@@ -8,7 +8,6 @@
 
 class Storage extends BaseStorage
 {
-
     public function getItems(): array
     {
         $result = [];

tests/CookieClientTest.php

@@ -4,17 +4,16 @@
 
 namespace Tests\Webclient\Extension\Cookie;
 
-use GuzzleHttp\Psr7\Request;
+use Nyholm\Psr7\Request;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
 use Stuff\Webclient\Extension\Cookie\Handler;
 use Stuff\Webclient\Extension\Cookie\Storage;
-use Webclient\Extension\Cookie\Client;
-use Webclient\Fake\Client as FakeClient;
+use Webclient\Extension\Cookie\CookieClientDecorator;
+use Webclient\Fake\FakeHttpClient;
 
 class CookieClientTest extends TestCase
 {
-
     /**
      * @param bool $secure
      * @param string $host
@@ -29,7 +28,7 @@ public function testSetToStorage(bool $secure, string $host, string $path)
 
         $storage = new Storage();
 
-        $client = new Client(new FakeClient(new Handler()), $storage);
+        $client = new CookieClientDecorator(new FakeHttpClient(new Handler()), $storage);
 
         $set = [
             'cookie' => [
@@ -44,13 +43,15 @@ public function testSetToStorage(bool $secure, string $host, string $path)
         $request = new Request('GET', $uri, ['Accept' => 'text/plain']);
         $client->sendRequest($request);
 
-        $path = $path ? $path : '/';
+        if ($path === '') {
+            $path = '/';
+        }
         $cookies = $storage->getItems();
         foreach ($set['cookie'] as $name => $value) {
             $this->assertArrayHasKey($name, $cookies);
             $domain = in_array($name, $set['subdomain']) ? '.' . $host : $host;
             $temp = in_array($name, $set['temp']);
-            $this->assertStoredCookie($cookies[$name], $value, $domain, $path, true, $secure, $temp);
+            $this->assertStoredCookie($cookies[$name], $value, $domain, $path, $secure, $temp);
         }
     }
 
@@ -129,7 +130,7 @@ public function testGetFromStorage(string $uri, array $expected)
         }
 
 
-        $client = new Client(new FakeClient(new Handler()), $storage);
+        $client = new CookieClientDecorator(new FakeHttpClient(new Handler()), $storage);
         $request = new Request('GET', $uri, ['Accept' => 'text/plain']);
         $response = $client->sendRequest($request);
         $json = $response->getBody()->__toString();
@@ -166,14 +167,13 @@ private function assertStoredCookie(
         string $value,
         string $domain,
         string $path,
-        bool $httpOnly,
         bool $secure,
         bool $temporary
     ) {
         $this->assertSame($value, $cookie['value']);
         $this->assertSame($domain, $cookie['domain']);
         $this->assertSame($path, $cookie['path']);
-        $this->assertSame($httpOnly, $cookie['httpOnly']);
+        $this->assertSame(true, $cookie['httpOnly']);
         $this->assertSame($secure, $cookie['secure']);
         $this->assertSame($temporary, $cookie['expired'] === 0);
     }