Merge pull request #55 from jbboehr/php80

Test against PHP 8.0

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 before_script:
   - composer self-update
   - composer install

composer.json

@@ -22,11 +22,11 @@
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^6.0",
+        "doctrine/coding-standard": "^8.2",
         "friendsofphp/php-cs-fixer": "^3.0",
         "laminas/laminas-diactoros": "~2.2",
         "phpstan/phpstan": "^0.12.14",
-        "phpunit/phpunit": "~7.0",
+        "phpunit/phpunit": "~7.0 || ~8.5",
         "roave/security-advisories": "dev-master",
         "vimeo/psalm": "^4.7"
     },

phpcs.xml

@@ -19,5 +19,8 @@
         <exclude name="SlevomatCodingStandard.Functions.StaticClosure.ClosureNotStatic"/>
         <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/>
         <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint"/>
     </rule>
 </ruleset>

src/Relay.php

@@ -4,17 +4,15 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+
 use function reset;
 
 /**
  * A reusable PSR-15 request handler.
  */
 class Relay extends RequestHandler
 {
-    /**
-     * @inheritdoc
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
+    public function handle(ServerRequestInterface $request): ResponseInterface
     {
         reset($this->queue);
         $runner = new Runner($this->queue, $this->resolver);

src/RelayBuilder.php

@@ -18,7 +18,7 @@ public function __construct(callable $resolver = null)
     /**
      * @param iterable<mixed> $queue A queue of middleware entries.
      */
-    public function newInstance($queue) : Relay
+    public function newInstance($queue): Relay
     {
         return new Relay($queue, $this->resolver);
     }

src/RequestHandler.php

@@ -7,6 +7,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use TypeError;
+
 use function is_array;
 use function is_iterable;
 use function iterator_to_array;
@@ -53,5 +54,5 @@ public function __construct($queue, callable $resolver = null)
     /**
      * Handles the current entry in the middleware queue and advances.
      */
-    abstract public function handle(ServerRequestInterface $request) : ResponseInterface;
+    abstract public function handle(ServerRequestInterface $request): ResponseInterface;
 }

src/Runner.php

@@ -7,6 +7,7 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use RuntimeException;
+
 use function call_user_func;
 use function current;
 use function is_callable;
@@ -18,10 +19,7 @@
  */
 class Runner extends RequestHandler
 {
-    /**
-     * @inheritdoc
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
+    public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $entry      = current($this->queue);
         $middleware = call_user_func($this->resolver, $entry);
@@ -48,7 +46,7 @@ public function handle(ServerRequestInterface $request) : ResponseInterface
         );
     }
 
-    public function __invoke(ServerRequestInterface $request) : ResponseInterface
+    public function __invoke(ServerRequestInterface $request): ResponseInterface
     {
         return $this->handle($request);
     }

tests/FakeMiddleware.php

@@ -6,6 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+
 use function sprintf;
 
 class FakeMiddleware implements MiddlewareInterface
@@ -16,7 +17,7 @@ class FakeMiddleware implements MiddlewareInterface
     public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler
-    ) : ResponseInterface {
+    ): ResponseInterface {
         $n        = ++ static::$count;
         $response = $handler->handle($request);
         $response->getBody()->write(sprintf('<%s', $n));

tests/FakeResolver.php

@@ -3,6 +3,7 @@
 namespace Relay;
 
 use Psr\Http\Server\MiddlewareInterface;
+
 use function is_string;
 
 class FakeResolver

tests/RelayBuilderTest.php

@@ -3,6 +3,7 @@
 namespace Relay;
 
 use ArrayObject;
+use Generator;
 use InvalidArgumentException;
 use IteratorAggregate;
 use PHPUnit\Framework\TestCase;
@@ -12,7 +13,7 @@ class RelayBuilderTest extends TestCase
     /** @var RelayBuilder */
     protected $relayBuilder;
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         $this->relayBuilder = new RelayBuilder();
     }
@@ -34,7 +35,7 @@ public function testArrayObject()
     public function testTraversable()
     {
         $queue = new class implements IteratorAggregate {
-            public function getIterator()
+            public function getIterator(): Generator
             {
                 yield new FakeMiddleware();
             }

tests/RelayTest.php

@@ -3,6 +3,7 @@
 namespace Relay;
 
 use Closure;
+use Generator;
 use InvalidArgumentException;
 use IteratorAggregate;
 use Laminas\Diactoros\Response;
@@ -18,7 +19,7 @@ class RelayTest extends TestCase
     /** @var Closure */
     protected $responder;
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         $this->responder = function ($request, $next) {
             return new Response();
@@ -55,7 +56,7 @@ public function testArrayQueue()
     public function testTraversableQueue()
     {
         $queue = new class implements IteratorAggregate {
-            public function getIterator()
+            public function getIterator(): Generator
             {
                 yield new FakeMiddleware();
                 yield new FakeMiddleware();
@@ -129,7 +130,7 @@ public function testCallableMiddleware()
             function (
                 ServerRequestInterface $request,
                 callable $next
-            ) : ResponseInterface {
+            ): ResponseInterface {
                 $response = $next($request);
 
                 $response->getBody()->write('Hello, callable world!');