Add support for PHP 8.4

Author: odan

.github/workflows/build.yml

@@ -3,39 +3,57 @@ name: build
 on: [ push, pull_request ]
 
 jobs:
-    run:
-        runs-on: ${{ matrix.operating-system }}
-        strategy:
-            matrix:
-                operating-system: [ ubuntu-latest ]
-                php-versions: [ '8.1', '8.2' ]
-        name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v1
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php-versions }}
-                    extensions: mbstring, intl, zip
-                    coverage: none
-
-            -   name: Check PHP Version
-                run: php -v
-
-            -   name: Check Composer Version
-                run: composer -V
-
-            -   name: Check PHP Extensions
-                run: php -m
-
-            -   name: Validate composer.json and composer.lock
-                run: composer validate
-
-            -   name: Install dependencies
-                run: composer install --prefer-dist --no-progress --no-suggest
-
-            -   name: Run test suite
-                run: composer test:all
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ ubuntu-latest ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
+    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, intl, zip
+          coverage: none
+
+      - name: Check PHP Version
+        run: php -v
+
+      - name: Check Composer Version
+        run: composer -V
+
+      - name: Check PHP Extensions
+        run: php -m
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Run PHP CodeSniffer
+        run: composer sniffer:check
+
+      - name: Run PHPStan
+        run: composer stan
+
+      - name: Run tests
+        if: ${{ matrix.php-versions != '8.4' }}
+        run: composer test
+
+      - name: Run tests with coverage
+        if: ${{ matrix.php-versions == '8.4' }}
+        run: composer test:coverage
+
+      - name: Upload coverage
+        if: ${{ matrix.php-versions == '8.4' }}
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/coverage/clover.xml

README.md

@@ -5,11 +5,9 @@ A URL base path detector for Slim 4.
 [![Latest Version on Packagist](https://img.shields.io/github/release/selective-php/basepath.svg)](https://packagist.org/packages/selective/basepath)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
 [![Build Status](https://github.com/selective-php/basepath/workflows/build/badge.svg)](https://github.com/selective-php/basepath/actions)
-[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/selective-php/basepath.svg)](https://scrutinizer-ci.com/g/selective-php/basepath/code-structure)
 [![Quality Score](https://img.shields.io/scrutinizer/quality/g/selective-php/basepath.svg)](https://scrutinizer-ci.com/g/selective-php/basepath/?branch=master)
 [![Total Downloads](https://img.shields.io/packagist/dt/selective/basepath.svg)](https://packagist.org/packages/selective/basepath/stats)
 
-
 ## Features
 
 * Support for Apache and the PHP built-in webserver
@@ -24,7 +22,7 @@ A URL base path detector for Slim 4.
 
 ## Requirements
 
-* PHP 7.2+ or 8.1+
+* PHP 8.2+
 
 ## Installation
 

composer.json

@@ -10,12 +10,12 @@
     ],
     "homepage": "https://github.com/selective-php/basepath",
     "require": {
-        "php": "^8.1",
+        "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*",
         "psr/http-server-middleware": "^1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
-        "phpstan/phpstan": "^1",
+        "phpstan/phpstan": "^1 || ^2",
         "phpunit/phpunit": "^10",
         "slim/psr7": "^1",
         "slim/slim": "^4",

src/BasePathMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace Selective\BasePath;
 
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -14,19 +15,19 @@
 final class BasePathMiddleware implements MiddlewareInterface
 {
     /**
-     * @var App The slim app
+     * @var App<ContainerInterface> The slim app
      */
-    private $app;
+    private App $app;
 
     /**
      * @var string|null
      */
-    private $phpSapi;
+    private ?string $phpSapi;
 
     /**
      * The constructor.
      *
-     * @param App $app The slim app
+     * @param App<ContainerInterface> $app The slim app
      * @param string|null $phpSapi The PHP_SAPI value
      */
     public function __construct(App $app, ?string $phpSapi = null)