Bump minimal PHP version to 8.1 (#104)

vjik · web-flow · commit e59b05f4a543 · 2026-01-09T12:24:57.000+03:00
diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1']
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4']
diff --git a/.gitignore b/.gitignore
@@ -23,13 +23,7 @@ composer.phar
 # Mac DS_Store Files
 .DS_Store
 
-# phpunit itself is not needed
-phpunit.phar
-# local phpunit config
+# PhpUnit
+/phpunit.phar
 /phpunit.xml
-# phpunit cache
-.phpunit.result.cache
-
-# Phan
-analysis.txt
-
+/.phpunit.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## 3.2.2 under development
 
-- no changes in this release.
+- Chg #104: Bump minimal PHP version to 8.1 (@vjik)
+- Enh #104: Explicitly mark readonly properties (@vjik)
 
 ## 3.2.1 December 17, 2025
 
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ a [PSR-15](https://www.php-fig.org/psr/psr-15/) middleware to authenticate an id
 
 ## Requirements
 
-- PHP 8.0 - 8.5.
+- PHP 8.1 - 8.5.
 
 ## Installation
 
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         }
     ],
     "require": {
-        "php": "8.0 - 8.5",
+        "php": "8.1 - 8.5",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0 || ^2.0",
         "psr/http-server-handler": "^1.0",
@@ -37,14 +37,14 @@
     },
     "require-dev": {
         "jetbrains/phpstorm-attributes": "^1.2",
-        "maglnet/composer-require-checker": "^4.4",
+        "maglnet/composer-require-checker": "^4.7.1",
         "nyholm/psr7": "^1.8.2",
-        "phpunit/phpunit": "^9.6.22",
-        "rector/rector": "^2.0.9",
-        "roave/infection-static-analysis-plugin": "^1.25",
-        "spatie/phpunit-watcher": "^1.23.6",
-        "vimeo/psalm": "^4.30 || ^5.26.1 || ^6.10",
-        "yiisoft/yii-debug": "dev-master || dev-php80"
+        "phpunit/phpunit": "^10.5.60",
+        "rector/rector": "^2.3.0",
+        "roave/infection-static-analysis-plugin": "^1.35",
+        "spatie/phpunit-watcher": "^1.24.4",
+        "vimeo/psalm": "^5.26.1 || ^6.10",
+        "yiisoft/yii-debug": "dev-master"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true"
-         verbose="true"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         executionOrder="random"
          failOnRisky="true"
          failOnWarning="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
+         failOnDeprecation="true"
          stopOnFailure="false"
-         executionOrder="random"
-         resolveDependencies="true">
+         colors="true"
+         displayDetailsOnPhpunitDeprecations="true"
+>
     <php>
         <ini name="error_reporting" value="-1"/>
     </php>
@@ -23,9 +24,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory>./src</directory>
+            <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/rector.php b/rector.php
@@ -10,7 +10,7 @@
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ])
-    ->withPhpSets(php80: true)
+    ->withPhpSets(php81: true)
     ->withRules([
         InlineConstructorDefaultToPropertyRector::class,
     ]);
diff --git a/src/Debug/AuthenticationMethodInterfaceProxy.php b/src/Debug/AuthenticationMethodInterfaceProxy.php
@@ -11,7 +11,7 @@
 
 final class AuthenticationMethodInterfaceProxy implements AuthenticationMethodInterface
 {
-    public function __construct(private AuthenticationMethodInterface $decorated, private IdentityCollector $collector)
+    public function __construct(private readonly AuthenticationMethodInterface $decorated, private readonly IdentityCollector $collector)
     {
     }
 
diff --git a/src/Handler/AuthenticationFailureHandler.php b/src/Handler/AuthenticationFailureHandler.php
@@ -15,8 +15,9 @@
  */
 final class AuthenticationFailureHandler implements RequestHandlerInterface
 {
-    public function __construct(private ResponseFactoryInterface $responseFactory)
-    {
+    public function __construct(
+        private readonly ResponseFactoryInterface $responseFactory,
+    ) {
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
diff --git a/src/Method/Composite.php b/src/Method/Composite.php
@@ -17,8 +17,9 @@ final class Composite implements AuthenticationMethodInterface
     /**
      * @param AuthenticationMethodInterface[] $methods
      */
-    public function __construct(private array $methods)
-    {
+    public function __construct(
+        private readonly array $methods,
+    ) {
     }
 
     public function authenticate(ServerRequestInterface $request): ?IdentityInterface
diff --git a/tests/AuthenticationMiddlewareTest.php b/tests/AuthenticationMiddlewareTest.php
@@ -6,6 +6,7 @@
 
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\ServerRequest;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseFactoryInterface;
@@ -56,17 +57,15 @@ function (ServerRequestInterface $request) use ($identity) {
         $auth->process($request, $handler);
     }
 
-    public function skipDataProvider(): array
+    public static function dataShouldSkipCheckForOptionalPath(): array
     {
         return [
             'ascii' => ['/optional'],
             'utf' => ['/опциональный'],
         ];
     }
 
-    /**
-     * @dataProvider skipDataProvider
-     */
+    #[DataProvider('dataShouldSkipCheckForOptionalPath')]
     public function testShouldSkipCheckForOptionalPath(string $path): void
     {
         $request = new ServerRequest('GET', $path);
@@ -164,8 +163,10 @@ public function testImmutability(): void
     private function createAuthenticationFailureHandler(string $failureResponse): RequestHandlerInterface
     {
         return new class ($failureResponse, new Psr17Factory()) implements RequestHandlerInterface {
-            public function __construct(private string $failureResponse, private ResponseFactoryInterface $responseFactory)
-            {
+            public function __construct(
+                private readonly string $failureResponse,
+                private readonly ResponseFactoryInterface $responseFactory,
+            ) {
             }
 
             public function handle(ServerRequestInterface $request): ResponseInterface
diff --git a/tests/Stub/FakeIdentity.php b/tests/Stub/FakeIdentity.php
@@ -8,8 +8,9 @@
 
 final class FakeIdentity implements IdentityInterface
 {
-    public function __construct(private ?string $id)
-    {
+    public function __construct(
+        private readonly ?string $id,
+    ) {
     }
 
     public function getId(): ?string
diff --git a/tests/Stub/FakeIdentityRepository.php b/tests/Stub/FakeIdentityRepository.php
@@ -11,8 +11,9 @@ final class FakeIdentityRepository implements IdentityWithTokenRepositoryInterfa
 {
     private array $callParams = [];
 
-    public function __construct(private ?IdentityInterface $returnIdentity)
-    {
+    public function __construct(
+        private readonly ?IdentityInterface $returnIdentity,
+    ) {
     }
 
     public function findIdentity(string $id): ?IdentityInterface

-Original file line number
+Diff line change
       os: >-
         ['ubuntu-latest']
       php: >-
 -        ['8.0']
 +        ['8.1']