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

Author: ddrv

composer.json

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

stuff/Handler.php

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

tests/RedirectClientTest.php

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