Merge pull request #2 from ddrv-fork/master

Added github actions CI configuration

Author: ddrv

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-interaction --no-suggest
+
+      - name: Check code style
+        run: vendor/bin/phpcs
+
+      - name: Run test suite
+        run: vendor/bin/phpunit

composer.json

@@ -17,8 +17,8 @@
     "psr/log": "^1.0"
   },
   "require-dev": {
-    "nyholm/psr7": "^1.3",
-    "phpunit/phpunit": "^6.5",
+    "guzzlehttp/psr7": "^1.7",
+    "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

@@ -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();
+    }
 }