Upgrade to PHP 8.1 (#6)

* Updated PHP requirements to >=8.0

* Removed Scrutinizer integration

* Updated Codeception to ^5 and replaced `zendframework/zend-diactoros` with `nyholm/psr7`

* Updated `mindplay/middleman` to ^4

* Replaced Travis with Github Actions

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+name: Codeception tests
+
+on: [push]
+
+jobs:
+  build:
+    name: ${{matrix.operating-system}}, PHP ${{ matrix.php }}
+
+    runs-on: ${{ matrix.operating-system }}
+
+    strategy:
+      matrix:
+        operating-system: [ ubuntu-latest, ubuntu-20.04 ]
+        php: [ '8.0', '8.1' ]
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Setup PHP
+        uses: nanasess/setup-php@master
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Run tests
+        run: php vendor/bin/codecept run

.gitignore

@@ -3,4 +3,3 @@
 /vendor
 /tests/_output/
 /tests/_support/_generated/**/*
-/tests/*.suite.yml

README.md

@@ -1,7 +1,7 @@
 kodus/chrome-logger
 ===================
 
-[![PHP Version](https://img.shields.io/badge/php-7.0%2B-blue.svg)](https://packagist.org/packages/kodus/chrome-logger)
+[![PHP Version](https://img.shields.io/badge/php-8.0%2B-blue.svg)](https://packagist.org/packages/kodus/chrome-logger)
 [![Build Status](https://travis-ci.org/kodus/chrome-logger.svg?branch=master)](https://travis-ci.org/kodus/chrome-logger)
 [![Code Coverage](https://scrutinizer-ci.com/g/kodus/chrome-logger/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/kodus/chrome-logger/?branch=master)
 

codeception.dist.yml → codeception.yml

@@ -1,13 +1,11 @@
 actor: Tester
 paths:
     tests: tests
-    log: tests/_output
+    output: tests/_output
     data: tests/_data
     support: tests/_support
     envs: tests/_envs
 settings:
-    bootstrap: _bootstrap.php
-    colors: false
     memory_limit: 1024M
 extensions:
     enabled:

composer.json

@@ -16,16 +16,17 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": ">=8.0",
         "psr/log": "^1",
         "psr/http-message": "^1",
         "psr/http-server-middleware": "^1"
     },
     "require-dev": {
-        "codeception/codeception": "^2",
-        "mockery/mockery": "^0.9",
-        "zendframework/zend-diactoros": "^1.8.5",
-        "mindplay/middleman": "^3.0.3"
+        "codeception/codeception": "^5",
+        "codeception/module-asserts": "^3",
+        "mockery/mockery": "^1.5",
+        "nyholm/psr7": "^1.5",
+        "mindplay/middleman": "^4"
     },
     "autoload": {
         "psr-4": {
@@ -38,4 +39,4 @@
             "Kodus\\Logging\\Test\\Unit\\": "tests/unit/"
         }
     }
-}
+}

tests/Fixtures/Bar.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Kodus\Logging\Test\Fixtures;
+
+class Bar extends Foo
+{
+    public $bat = "BAT";
+}

tests/Fixtures/Baz.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Kodus\Logging\Test\Fixtures;
+
+class Baz
+{
+    public $foo;
+    public $bar;
+    public $baz;
+
+    public function __construct()
+    {
+        $this->foo = new Foo();
+        $this->bar = new Bar();
+        $this->baz = $this;
+    }
+}

tests/Fixtures/Foo.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Kodus\Logging\Test\Fixtures;
+
+class Foo
+{
+    public $foo = "FOO";
+    protected $bar = "BAR";
+    private $baz = "BAZ";
+}

tests/Mocks/MockMiddleware.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Kodus\Logging\Test\Mocks;
+
+use Kodus\Logging\ChromeLogger;
+use Nyholm\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class MockMiddleware implements MiddlewareInterface
+{
+    /**
+     * @var ChromeLogger
+     */
+    private $logger;
+
+    public function __construct(ChromeLogger $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $this->logger->notice("running mock middleware");
+
+        return new Response(headers: ['Content-Type' => 'text/plain'], body: "Hello");
+    }
+}

tests/example.php

@@ -1,12 +1,13 @@
 <?php
 
 use Kodus\Logging\ChromeLogger;
+use Kodus\Logging\Test\Fixtures\Baz;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 // ChromeLogger output example - run on a web-server and open in a browser.
 
-function foo()
+function foo(): void
 {
     bar();
 }
@@ -16,32 +17,6 @@ function bar()
     throw new RuntimeException("ouch!"); // for stack-trace test!
 }
 
-class Foo
-{
-    public $foo = "FOO";
-    protected $bar = "BAR";
-    private $baz = "BAZ";
-}
-
-class Bar extends Foo
-{
-    public $bat = "BAT";
-}
-
-class Baz
-{
-    public $foo;
-    public $bar;
-    public $baz;
-
-    public function __construct()
-    {
-        $this->foo = new Foo();
-        $this->bar = new Bar();
-        $this->baz = $this;
-    }
-}
-
 try {
     foo();
 } catch (RuntimeException $e) {

tests/unit.suite.dist.yml → tests/unit.suite.yml

@@ -1,4 +1,4 @@
-class_name: UnitTester
+actor: UnitTester
 modules:
     enabled:
         - Asserts

tests/unit/ChromeLoggerCest.php

@@ -3,45 +3,20 @@
 namespace Kodus\Logging\Test\Unit;
 
 use Codeception\Util\FileSystem;
-use function json_decode;
 use Kodus\Logging\ChromeLogger;
+use Kodus\Logging\Test\Fixtures\Bar;
+use Kodus\Logging\Test\Fixtures\Baz;
+use Kodus\Logging\Test\Fixtures\Foo;
 use Mockery;
 use Mockery\MockInterface;
+use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
-use function str_repeat;
 use UnitTester;
-use Zend\Diactoros\Response;
-
-class Foo
-{
-    public $foo = "FOO";
-    protected $bar = "BAR";
-    private $baz = "BAZ";
-}
-
-class Bar extends Foo
-{
-    public $bat = "BAT";
-}
-
-class Baz
-{
-    public $foo;
-    public $bar;
-    public $baz;
-
-    public function __construct()
-    {
-        $this->foo = new Foo();
-        $this->bar = new Bar();
-        $this->baz = $this;
-    }
-}
 
 class ChromeLoggerCest
 {
-    public function writeLogMessages(UnitTester $I)
+    public function writeLogMessages(UnitTester $I): void
     {
         $logger = new ChromeLogger();
 
@@ -73,7 +48,7 @@ public function writeLogMessages(UnitTester $I)
         );
     }
 
-    public function serializeContextValues(UnitTester $I)
+    public function serializeContextValues(UnitTester $I): void
     {
         $logger = new ChromeLogger();
 
@@ -129,7 +104,7 @@ public function serializeContextValues(UnitTester $I)
         fclose($resource);
     }
 
-    public function obtainStackTrace(UnitTester $I)
+    public function obtainStackTrace(UnitTester $I): void
     {
         try {
             $this->foo();
@@ -157,7 +132,7 @@ public function obtainStackTrace(UnitTester $I)
         ], $data["rows"]);
     }
 
-    public function renderTables(UnitTester $I)
+    public function renderTables(UnitTester $I): void
     {
         $logger = new ChromeLogger();
 
@@ -178,14 +153,14 @@ public function renderTables(UnitTester $I)
         ], $data["rows"]);
     }
 
-    public function truncateExcessiveLogData(UnitTester $I)
+    public function truncateExcessiveLogData(UnitTester $I): void
     {
         $logger = new ChromeLogger();
 
         $logger->setLimit(10*1024);
 
         for ($n=0; $n<200; $n++) {
-            $message = str_repeat("0123456789", rand(1,20)); // between 10 and 200 bytes
+            $message = str_repeat("0123456789", rand(1, 20)); // between 10 and 200 bytes
 
             $logger->debug($message);
         }
@@ -195,7 +170,7 @@ public function truncateExcessiveLogData(UnitTester $I)
         $I->assertEquals(ChromeLogger::LIMIT_WARNING, end($data["rows"])[0][0]);
     }
 
-    public function persistToLocalFiles(UnitTester $I)
+    public function persistToLocalFiles(UnitTester $I): void
     {
         $logger = new class extends ChromeLogger
         {
@@ -242,7 +217,7 @@ protected function getTime(): int
                 $logger->debug(str_repeat("0123456789", 20));
             }
 
-            $response = new Response(fopen("php://temp", "rw+"));
+            $response = new Response(body: fopen("php://temp", "rw+"));
 
             $response = $logger->writeToResponse($response);
 
@@ -278,7 +253,7 @@ protected function getTime(): int
             "previous {$num_files} log-files should be garbage-collected");
     }
 
-    public function allowMultipleLocationHeaders(UnitTester $I)
+    public function allowMultipleLocationHeaders(UnitTester $I): void
     {
         $logger = new ChromeLogger();
 
@@ -294,7 +269,7 @@ public function allowMultipleLocationHeaders(UnitTester $I)
 
         $logger->info("TEST");
 
-        $response = new Response(fopen("php://temp", "rw+"));
+        $response = new Response(body: fopen("php://temp", "rw+"));
 
         $response = $response->withHeader("X-ServerLog-Location", "/foo");
 
@@ -312,7 +287,7 @@ public function allowMultipleLocationHeaders(UnitTester $I)
      *
      * @return array
      */
-    private function extractResult(ChromeLogger $logger)
+    private function extractResult(ChromeLogger $logger): array
     {
         /**
          * @var MockInterface|ResponseInterface $response
@@ -336,7 +311,8 @@ private function extractResult(ChromeLogger $logger)
         return json_decode(base64_decode($calls[0][1]), true);
     }
 
-    private function foo() {
+    private function foo(): void
+    {
         $this->bar();
     }