change Request and Response classes in tests to guzzlehttp/psr7 package

Author: ddrv

stuff/Handler.php

@@ -5,7 +5,7 @@
 namespace Stuff\Webclient\Extension\Log;
 
 use Exception;
-use Nyholm\Psr7\Response;
+use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;

tests/LoggedClientTest.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Webclient\Extension\Log;
 
-use Nyholm\Psr7\Request;
+use GuzzleHttp\Psr7\Request;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Log\LogLevel;
@@ -35,14 +35,6 @@ class LoggedClientTest extends TestCase
      */
     private $generator;
 
-    public function setUp()
-    {
-        parent::setUp();
-        $this->logger = new Logger();
-        $this->generator = new StuffIdGenerator($this->getIdGenerator());
-        $this->formatter = $this->getFormatter();
-    }
-
     /**
      * @param int $status
      * @param string $requestLevel
@@ -54,6 +46,7 @@ public function setUp()
      */
     public function testLogging(int $status, string $requestLevel, string $responseLevel)
     {
+        $this->init();
         $levels = $this->getFreeLevels([$requestLevel, $responseLevel]);
         $otherLevel = $levels[0];
         $params = [
@@ -89,6 +82,7 @@ public function testLogging(int $status, string $requestLevel, string $responseL
      */
     public function testExceptionHandling(string $requestLevel, string $errorLevel)
     {
+        $this->init();
         $levels = $this->getFreeLevels([$requestLevel, $errorLevel]);
         $otherLevel = $levels[0];
         $params = [
@@ -240,4 +234,12 @@ private function getFreeLevels(array $allowed): array
         }
         return array_keys($levels);
     }
+
+    private function init()
+    {
+        // this code moved from setUp() method for support older phpunit versions
+        $this->logger = new Logger();
+        $this->generator = new StuffIdGenerator($this->getIdGenerator());
+        $this->formatter = $this->getFormatter();
+    }
 }

tests/RawHttpFormatterTest.php

@@ -4,8 +4,8 @@
 
 namespace Tests\Webclient\Extension\Log;
 
-use Nyholm\Psr7\Request;
-use Nyholm\Psr7\Response;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 use Stuff\Webclient\Extension\Log\Error;
 use Webclient\Extension\Log\Formatter\RawHttpFormatter;
@@ -23,13 +23,6 @@ class RawHttpFormatterTest extends TestCase
      */
     private $formatter;
 
-    public function setUp()
-    {
-        parent::setUp();
-        $this->id = 'r1';
-        $this->formatter = new RawHttpFormatter();
-    }
-
     /**
      * @param string $method
      * @param string $uri
@@ -41,6 +34,7 @@ public function setUp()
      */
     public function testRequest(string $method, string $uri, array $headers, string $body, string $protocolVersion)
     {
+        $this->init();
         $request = new Request($method, $uri, $headers, $body, $protocolVersion);
         $expected = 'Request ' . $this->id . PHP_EOL;
         $expected .= $method . ' ' . $uri . ' HTTP/' . $protocolVersion . PHP_EOL;
@@ -65,6 +59,7 @@ public function testRequest(string $method, string $uri, array $headers, string
      */
     public function testResponse(int $status, string $phrase, array $headers, string $body, string $protocolVersion)
     {
+        $this->init();
         $response = new Response($status, $headers, $body, $protocolVersion, $phrase);
         $expected = 'Response ' . $this->id . PHP_EOL;
         $expected .= 'HTTP/' . $protocolVersion . ' ' . $status . ' ' . $phrase . PHP_EOL;
@@ -82,6 +77,7 @@ public function testResponse(int $status, string $phrase, array $headers, string
      */
     public function testError(string $message)
     {
+        $this->init();
         $error = new Error($message);
         $expected = 'Connection ' . $this->id . PHP_EOL;
         $expected .= 'Error: ' . $message;
@@ -115,4 +111,10 @@ public function provideError(): array
             ['Network error'],
         ];
     }
+
+    private function init()
+    {
+        $this->id = 'r1';
+        $this->formatter = new RawHttpFormatter();
+    }
 }