chore: add support for PHP 8.4

BREAKING CHANGE: drop support for PHP < 8.1, requires psr/http-message ^2.0

Author: dirx

.github/workflows/ci.yml

@@ -16,11 +16,10 @@ jobs:
         os:
           - ubuntu-latest
         php:
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     steps:
       - name: Checkout
@@ -38,7 +37,7 @@ jobs:
           echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer cache directory
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}

CHANGELOG.md

@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### Added
+
+- Add support for PHP 8.4
+
+### Changed
+
+- Drop support for PHP < 8.1
+
 ## [2.0.1] - 2021-03-14
 
 ### Fixed

README.md

@@ -1,10 +1,12 @@
 # PHP Middleware Stack
+
 [![Build Status](https://github.com/idealo/php-middleware-stack/workflows/CI/badge.svg)](https://github.com/idealo/php-middleware-stack/actions?query=workflow%3Aci)
 [![Maintainability](https://api.codeclimate.com/v1/badges/254d91c39447f58c7d44/maintainability)](https://codeclimate.com/github/idealo/php-middleware-stack/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/254d91c39447f58c7d44/test_coverage)](https://codeclimate.com/github/idealo/php-middleware-stack/test_coverage)
 [![Packagist](https://img.shields.io/packagist/v/idealo/php-middleware-stack)](https://packagist.org/packages/idealo/php-middleware-stack)
 
-This is an implementation of [PSR-15](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-15-request-handlers.md) using the proposed Interface packages [psr/http-server-middleware](https://github.com/php-fig/http-server-middleware) and [psr/http-server-handler](https://github.com/php-fig/http-server-handler) for PHP7+ runtime environment.
+This is an implementation of [PSR-15](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-15-request-handlers.md) using the proposed Interface packages [psr/http-server-middleware](https://github.com/php-fig/http-server-middleware)
+and [psr/http-server-handler](https://github.com/php-fig/http-server-handler) for PHP ^8.1 runtime environment.
 
 It enables a sequential execution of middlewares that use a PSR-7 conform Response/Request implementation.
 
@@ -14,9 +16,10 @@ It enables a sequential execution of middlewares that use a PSR-7 conform Respon
 composer require idealo/php-middleware-stack
 ```
 
-Note: use Version ^1.0 for PHP < 7.3
+Note: use Version ^2.0 for PHP < 8.1
 
 ## How to
+
 ```php
 use Idealo\Middleware\Stack;
 
@@ -31,14 +34,19 @@ $stackResponse = $stack->handle($request);
 ```
 
 ## Usage
-**idealo/php-middleware-stack** provides the ```Idealo\Middleware\Stack``` class. All it has to know in order to be instantiable is:
+
+**idealo/php-middleware-stack** provides the ```Idealo\Middleware\Stack``` class. All it has to know in order to be
+instantiable is:
+
 * an instance of ```Psr\Http\Message\ResponseInterface``` as the default response
 * and middlewares, that implement the ```Psr\Http\Server\MiddlewareInterface```
 
 To perform a sequential processing of injected middlewares you have to call stack's ```handle``` method with:
+
 * an instance of ```Psr\Http\Message\ServerRequestInterface```.
 
-By default stack's ```handle``` method returns the injected response object. If any middleware decides to answer on it's own, than the response object of this certain middleware is returned.
+By default stack's ```handle``` method returns the injected response object. If any middleware decides to answer on it's
+own, than the response object of this certain middleware is returned.
 
 Stack implements ```Psr\Http\Server\RequestHandlerInterface```.
 

composer.json

@@ -23,13 +23,13 @@
     }
   ],
   "require": {
-    "php": ">=7.3",
-    "psr/http-message": "^1.0",
+    "php": "^8.1",
+    "psr/http-message": "^2.0",
     "psr/http-server-middleware": "^1.0",
     "psr/http-server-handler": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5"
+    "phpunit/phpunit": "^11.4"
   },
   "autoload": {
     "psr-4": {

src/Stack.php

@@ -4,22 +4,19 @@
 
 namespace Idealo\Middleware;
 
-use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 class Stack implements RequestHandlerInterface
 {
     /**
      * @var MiddlewareInterface[]
      */
-    protected $middlewares = [];
+    protected array $middlewares = [];
 
-    /**
-     * @var ResponseInterface
-     */
-    protected $defaultResponse;
+    protected ResponseInterface $defaultResponse;
 
     public function __construct(ResponseInterface $response, MiddlewareInterface ...$middlewares)
     {

tests/StackTest.php

@@ -106,7 +106,7 @@ public function testServerMiddlewareHandlingOrder()
     /**
      * @return MockObject|ResponseInterface
      */
-    private function getResponseMock()
+    private function getResponseMock(): MockObject|ResponseInterface
     {
         return $this->getMockBuilder(ResponseInterface::class)
             ->getMock();
@@ -115,7 +115,7 @@ private function getResponseMock()
     /**
      * @return MockObject|MiddlewareInterface
      */
-    private function getMiddlewareMock()
+    private function getMiddlewareMock(): MiddlewareInterface|MockObject
     {
         return $this->getMockBuilder(MiddlewareInterface::class)
             ->onlyMethods([
@@ -127,7 +127,7 @@ private function getMiddlewareMock()
     /**
      * @return MockObject|ServerRequestInterface
      */
-    private function getServerRequestMock()
+    private function getServerRequestMock(): MockObject|ServerRequestInterface
     {
         return $this->getMockBuilder(ServerRequestInterface::class)
             ->onlyMethods([