Replace dev-requirement nyholm/psr7 to pluf/http2 for support php 7.0

Author: ddrv

composer.json

@@ -16,7 +16,7 @@
     "psr/http-client": "^1.0"
   },
   "require-dev": {
-    "nyholm/psr7": "^1.3",
+    "pluf/http2": "^7.0",
     "phpunit/phpunit": ">=6.5",
     "squizlabs/php_codesniffer": "^3.5",
     "webclient/fake-http-client": "^1.0"

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php" colors="true" cacheResult="false">
     <testsuites>
         <testsuite name="all">
             <directory>tests</directory>

stuff/Handler.php

@@ -4,7 +4,7 @@
 
 namespace Stuff\Webclient\Extension\Redirect;
 
-use Nyholm\Psr7\Response;
+use Pluf\Http\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -40,6 +40,11 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $headers['Location'] = $request->getUri()->withQuery($get)->__toString();
             $status = 302;
         }
-        return new Response($status, $headers, (string)$visit, '1.1');
+        $response = new Response($status);
+        foreach ($headers as $header => $value) {
+            $response = $response->withHeader($header, $value);
+        }
+        $response->getBody()->write((string)$visit);
+        return $response->withProtocolVersion('1.1');
     }
 }

tests/RedirectClientTest.php

@@ -4,8 +4,11 @@
 
 namespace Tests\Webclient\Extension\Redirect;
 
+use Pluf\Http\Headers;
+use Pluf\Http\Stream;
+use Pluf\Http\Uri;
 use Stuff\Webclient\Extension\Redirect\Handler;
-use Nyholm\Psr7\Request;
+use Pluf\Http\Request;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
 use Webclient\Extension\Redirect\Client;
@@ -28,10 +31,14 @@ public function testRedirects(int $maxRedirects, int $needRedirects, int $expect
 
         $client = new Client(new FakeClient(new Handler()), $maxRedirects);
 
-        $request = new Request('GET', 'http://localhost?redirects=' . $needRedirects, ['Accept' => 'text/plain']);
+        $headers = new Headers(['Accept' => 'text/plain']);
+        $uri = new Uri('http', 'localhost', 80, '/', 'redirects=' . $needRedirects);
+        $resource = fopen('php://temp', 'w+');
+        $body = new Stream($resource);
+        $request = new Request('GET', $uri, $headers, [], [], $body);
 
         $response = $client->sendRequest($request);
-
+        fclose($resource);
         $this->assertSame($expectRedirects, (int)$response->getBody()->__toString());
     }