Merge pull request #14 from php-middleware/php8

snapshotpl · web-flow · commit 834119a311e5 · 2020-12-08T01:15:44.000+01:00
Allow install php8
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ composer.lock
 tmp/
 phpunit-coverage-clover.xml
 .idea
-
+.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 env:
   - DEPS=lowest
diff --git a/README.md b/README.md
@@ -1,9 +1,6 @@
 # Request ID middleware for PHP
 
 [![Build Status](https://travis-ci.org/php-middleware/request-id.svg?branch=master)](https://travis-ci.org/php-middleware/request-id)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/php-middleware/request-id/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/php-middleware/request-id/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/php-middleware/request-id/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/php-middleware/request-id/?branch=master)
-[![Build Status](https://scrutinizer-ci.com/g/php-middleware/request-id/badges/build.png?b=master)](https://scrutinizer-ci.com/g/php-middleware/request-id/build-status/master)
 
 PSR-7 Request ID middleware
 
@@ -23,7 +20,7 @@ must create a new `RequestIdProviderInterface` object. We provide `RequestIdProv
 ```php
 $generator = new PhpMiddleware\RequestId\Generator\PhpUniqidGenerator();
 $requestIdProvider = new PhpMiddleware\RequestId\RequestIdProviderFactory($generator);
-$requestIdMiddleware = new PhpMiddleware\LogHttpMessages\RequestIdMiddleware($requestIdProvider);
+$requestIdMiddleware = new PhpMiddleware\RequestId\RequestIdMiddleware($requestIdProvider);
 
 $app = new MiddlewareRunner();
 $app->add($requestIdMiddleware);
diff --git a/composer.json b/composer.json
@@ -10,15 +10,15 @@
         "request-id"
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 | ^8.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "ramsey/uuid": "^3.0",
-        "zendframework/zend-diactoros": "^2.0",
-        "phpunit/phpunit": "^7.5.13"
+        "ramsey/uuid": "^3.9.3",
+        "laminas/laminas-diactoros": "^2.2.1",
+        "phpunit/phpunit": "^7.5.20 | ^8.5.8 | ^9.4.2"
     },
     "suggest": {
         "ramsey/uuid": "To use Ramsey\\Uuid 3.0 generator"
diff --git a/phpunit.xml b/phpunit.xml
@@ -2,7 +2,7 @@
 
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="Unit tests">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
diff --git a/test/Generator/Md5GeneratorTest.php b/test/Generator/Md5GeneratorTest.php
@@ -10,7 +10,7 @@ class Md5GeneratorTest extends TestCase
 {
     protected $generator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $decoratedGenerator = $this->createMock(GeneratorInterface::class);
         $decoratedGenerator->method('generateRequestId')->willReturn('boo');
diff --git a/test/Generator/PhpUniqidGeneratorTest.php b/test/Generator/PhpUniqidGeneratorTest.php
@@ -9,7 +9,7 @@ class PhpUniqidGeneratorTest extends TestCase
 {
     protected $generator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->generator = new PhpUniqidGenerator();
     }
diff --git a/test/Generator/PrefixedGeneratorTest.php b/test/Generator/PrefixedGeneratorTest.php
@@ -10,7 +10,7 @@ class PrefixedGeneratorTest extends TestCase
 {
     protected $decoratedGenerator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->decoratedGenerator = $this->createMock(GeneratorInterface::class);
         $this->decoratedGenerator->method('generateRequestId')->willReturn('boo');
@@ -27,4 +27,4 @@ public function getGenerator($prefix)
     {
         return new PrefixedGenerator($prefix, $this->decoratedGenerator);
     }
-}
+}
diff --git a/test/Generator/RamseyFactoryUuidGeneratorTest.php b/test/Generator/RamseyFactoryUuidGeneratorTest.php
@@ -15,7 +15,7 @@ class RamseyFactoryUuidGeneratorTest extends TestCase
     protected $factory;
     protected $uuid;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->factory = $this->createMock(UuidFactoryInterface::class);
 
diff --git a/test/Generator/RamseyUuid4StaticGeneratorTest.php b/test/Generator/RamseyUuid4StaticGeneratorTest.php
@@ -11,8 +11,7 @@ class RamseyUuid4StaticGeneratorTest extends TestCase
 {
     protected $generator;
 
-
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->generator = new RamseyUuid4StaticGenerator();
     }
diff --git a/test/MonologProcessorTest.php b/test/MonologProcessorTest.php
@@ -34,7 +34,7 @@ public function testIsMissingRequestIdExceptionHandledProperly()
         $this->assertNull($newRecord['extra'][MonologProcessor::KEY]);
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->requestIdProvider = $this->createMock(RequestIdProviderInterface::class);
         $this->processor         = new MonologProcessor($this->requestIdProvider);
diff --git a/test/RequestDecoratorTest.php b/test/RequestDecoratorTest.php
@@ -13,7 +13,7 @@ class RequestDecoratorTest extends TestCase
 
     protected $decorator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $requestIdProvider = $this->createMock(RequestIdProviderInterface::class);
         $requestIdProvider->expects($this->once())->method('getRequestId')->willReturn('boo');
diff --git a/test/RequestIdProviderTest.php b/test/RequestIdProviderTest.php
@@ -14,7 +14,7 @@ class RequestIdProviderTest extends TestCase
 {
     protected $generator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->generator = $this->createMock(GeneratorInterface::class);
     }

-Original file line number
+Diff line change
   - 7.2
   - 7.3
   - 7.4
 +  - 8.0
 env:
   - DEPS=lowest
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class Md5GeneratorTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`protected $generator;`
`12`	`12`
`13`		`- protected function setUp()`
	`13`	`+ protected function setUp(): void`
`14`	`14`	`{`
`15`	`15`	`$decoratedGenerator = $this->createMock(GeneratorInterface::class);`
`16`	`16`	`$decoratedGenerator->method('generateRequestId')->willReturn('boo');`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class PhpUniqidGeneratorTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`protected $generator;`
`11`	`11`
`12`		`- protected function setUp()`
	`12`	`+ protected function setUp(): void`
`13`	`13`	`{`
`14`	`14`	`$this->generator = new PhpUniqidGenerator();`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class PrefixedGeneratorTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`protected $decoratedGenerator;`
`12`	`12`
`13`		`- protected function setUp()`
	`13`	`+ protected function setUp(): void`
`14`	`14`	`{`
`15`	`15`	`$this->decoratedGenerator = $this->createMock(GeneratorInterface::class);`
`16`	`16`	`$this->decoratedGenerator->method('generateRequestId')->willReturn('boo');`
`@@ -27,4 +27,4 @@ public function getGenerator($prefix)`
`27`	`27`	`{`
`28`	`28`	`return new PrefixedGenerator($prefix, $this->decoratedGenerator);`
`29`	`29`	`}`
`30`		`-}`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class RamseyFactoryUuidGeneratorTest extends TestCase`
`15`	`15`	`protected $factory;`
`16`	`16`	`protected $uuid;`
`17`	`17`
`18`		`- protected function setUp()`
	`18`	`+ protected function setUp(): void`
`19`	`19`	`{`
`20`	`20`	`$this->factory = $this->createMock(UuidFactoryInterface::class);`
`21`	`21`