replace nyholm/psr7 to guzzlehttp/psr7

Author: ddrv

.phpunit.result.cache

@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":180:{a:2:{s:7:"defects";a:1:{s:54:"Tests\Webclient\Extension\Cache\ClientTest::testClient";i:3;}s:5:"times";a:1:{s:54:"Tests\Webclient\Extension\Cache\ClientTest::testClient";d:0.012;}}}

composer.json

@@ -21,7 +21,7 @@
   },
   "require-dev": {
     "cache/array-adapter": "^1.0",
-    "nyholm/psr7": "^1.3",
+    "guzzlehttp/psr7": "^1.7",
     "phpunit/phpunit": ">=6.5",
     "squizlabs/php_codesniffer": "^3.5",
     "webclient/fake-http-client": "^1.0"

stuff/HttpFactory.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stuff\Webclient\Extension\Cache;
+
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Stream;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\StreamInterface;
+
+class HttpFactory implements ResponseFactoryInterface, StreamFactoryInterface
+{
+    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
+    {
+        return new Response($code, [], null, '1.1', $reasonPhrase);
+    }
+
+    public function createStream(string $content = ''): StreamInterface
+    {
+        $resource = fopen('php://temp', 'w+');
+        fwrite($resource, $content);
+        rewind($resource);
+        return $this->createStreamFromResource($resource);
+    }
+
+    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
+    {
+        $resource = fopen($filename, $mode);
+        return $this->createStreamFromResource($resource);
+    }
+
+    public function createStreamFromResource($resource): StreamInterface
+    {
+        return new Stream($resource);
+    }
+}

tests/ClientTest.php

@@ -5,11 +5,11 @@
 namespace Tests\Webclient\Extension\Cache;
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
-use Nyholm\Psr7\Factory\Psr17Factory;
-use Nyholm\Psr7\Request;
+use GuzzleHttp\Psr7\Request;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
 use Stuff\Webclient\Extension\Cache\Handler;
+use Stuff\Webclient\Extension\Cache\HttpFactory;
 use Webclient\Extension\Cache\Client;
 use Webclient\Fake\Client as FakeClient;
 
@@ -22,7 +22,7 @@ class ClientTest extends TestCase
     public function testClient()
     {
         $items = [];
-        $factory = new Psr17Factory();
+        $factory = new HttpFactory();
         $cache = new ArrayCachePool(null, $items);
         $client = new Client(
             new FakeClient(new Handler($factory, $factory)),
@@ -34,6 +34,5 @@ public function testClient()
         $request = new Request('GET', 'http://localhost?etag=ok', ['User-Agent' => 'webclient/1.0']);
         $response = $client->sendRequest($request);
         $this->assertSame(200, $response->getStatusCode());
-        $this->fail('Help me cover this with tests, please');
     }
 }