php85

Author: dominikzogg

.github/workflows/ci.yml

@@ -6,36 +6,36 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  php82:
-    name: PHP 8.2
+  php83:
+    name: PHP 8.3
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php82:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php83:
-    name: PHP 8.3
+  php84:
+    name: PHP 8.4
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php84:
-    name: PHP 8.4
+  php85:
+    name: PHP 8.5
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php85:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.php-cs-fixer.php

@@ -13,6 +13,7 @@
 $config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
 
 return (new PhpCsFixer\Config)
+    ->setUnsupportedPhpVersionAllowed(true)
     ->setIndent($config['indent'])
     ->setLineEnding($config['lineEnding'])
     ->setRules($config['rules'])

README.md

@@ -26,8 +26,8 @@ A minimal static file middleware for PSR 15.
 
 ## Requirements
 
- * php: ^8.2
- * [psr/http-factory][2]: ^1.0.2
+ * php: ^8.3
+ * [psr/http-factory][2]: ^1.1
  * [psr/http-message][3]: ^1.1|^2.0
  * [psr/http-server-handler][4]: ^1.0.2
  * [psr/http-server-middleware][5]: ^1.0.2
@@ -37,7 +37,7 @@ A minimal static file middleware for PSR 15.
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-static-file][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-static-file "^1.4"
+composer require chubbyphp/chubbyphp-static-file "^1.5"
 ```
 
 ## Usage

composer.json

@@ -14,20 +14,20 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "psr/http-factory": "^1.1",
         "psr/http-message": "^1.1|^2.0",
         "psr/http-server-handler": "^1.0.2",
         "psr/http-server-middleware": "^1.0.2"
     },
     "require-dev": {
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-mock": "^2.0",
-        "infection/infection": "^0.29.12",
-        "php-coveralls/php-coveralls": "^2.7.0",
+        "chubbyphp/chubbyphp-mock": "^2.0.1",
+        "infection/infection": "^0.31.9",
+        "php-coveralls/php-coveralls": "^2.9",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.6",
-        "phpunit/phpunit": "^11.5.9"
+        "phpstan/phpstan": "^2.1.32",
+        "phpunit/phpunit": "^12.4.5"
     },
     "autoload": {
         "psr-4": { "Chubbyphp\\StaticFile\\": "src/" }
@@ -44,11 +44,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-master": "1.5-dev"
         }
     },
     "scripts": {
-        "fix:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
+        "fix:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
         "test": [
             "@test:lint",
             "@test:unit",
@@ -57,7 +57,7 @@
             "@test:static-analysis",
             "@test:cs"
         ],
-        "test:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
+        "test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
         "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=90 --verbose --coverage=build/phpunit",
         "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-directory=build/phpunit",
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",

src/StaticFileMiddleware.php

@@ -34,7 +34,7 @@ public function __construct(
             throw new \LogicException(\sprintf('Invalid or not supported hash algorithm: "%s"', $hashAlgorithm));
         }
         $this->hashAlgorithm = $hashAlgorithm;
-        $this->mimetypes = $mimetypes ?? (array) require __DIR__.'/mimetypes.php';
+        $this->mimetypes = $mimetypes ?? require __DIR__.'/mimetypes.php';
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

tests/Unit/StaticFileMiddlewareTest.php

@@ -8,6 +8,7 @@
 use Chubbyphp\Mock\MockMethod\WithReturnSelf;
 use Chubbyphp\Mock\MockObjectBuilder;
 use Chubbyphp\StaticFile\StaticFileMiddleware;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -54,7 +55,7 @@ public function testIsNotReadable(): void
         self::assertSame($response, $middleware->process($request, $handler));
     }
 
-    public function testInvalidHashAlgorythm(): void
+    public function testInvalidHashAlgorithm(): void
     {
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Invalid or not supported hash algorithm: "unknown"');
@@ -73,9 +74,7 @@ public function testInvalidHashAlgorythm(): void
         new StaticFileMiddleware($responseFactory, $streamFactory, $publicDirectory, $hashAlgorithm);
     }
 
-    /**
-     * @dataProvider provideFiles
-     */
+    #[DataProvider('provideFiles')]
     public function testIfMatch(string $body, string $contentLength, ?string $contentType, string $extension): void
     {
         $publicDirectory = sys_get_temp_dir();
@@ -126,9 +125,7 @@ public function testIfMatch(string $body, string $contentLength, ?string $conten
         self::assertSame($response, $middleware->process($request, $handler));
     }
 
-    /**
-     * @dataProvider provideFiles
-     */
+    #[DataProvider('provideFiles')]
     public function testIfMatchWithDefaultHashAlgorithm(
         string $body,
         string $contentLength,
@@ -182,9 +179,7 @@ public function testIfMatchWithDefaultHashAlgorithm(
         self::assertSame($response, $middleware->process($request, $handler));
     }
 
-    /**
-     * @dataProvider provideFiles
-     */
+    #[DataProvider('provideFiles')]
     public function testIfNoneMatch(string $body, string $contentLength, ?string $contentType, string $extension): void
     {
         $publicDirectory = sys_get_temp_dir();