add more tests to get msi to 100%, thanks to opencode (gpt-5.2-codex)

Author: dominikzogg

composer.json

@@ -58,7 +58,7 @@
             "@test:infection"
         ],
         "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:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --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",
         "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=9 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",

tests/Unit/StaticFileMiddlewareTest.php

@@ -237,6 +237,131 @@ public function testIfNoneMatch(string $body, string $contentLength, ?string $co
         self::assertSame($response, $middleware->process($request, $handler));
     }
 
+    #[DataProvider('provideFiles')]
+    public function testIfNoneMatchWithDifferentEtag(
+        string $body,
+        string $contentLength,
+        ?string $contentType,
+        string $extension
+    ): void {
+        $publicDirectory = sys_get_temp_dir();
+        $requestTarget = '/'.uniqid().uniqid().'.'.$extension;
+        $filename = $publicDirectory.$requestTarget;
+        $hashAlgorithm = 'adler32';
+
+        file_put_contents($filename, $body);
+
+        $hash = hash_file($hashAlgorithm, $filename);
+
+        $builder = new MockObjectBuilder();
+
+        /** @var ServerRequestInterface $request */
+        $request = $builder->create(ServerRequestInterface::class, [
+            new WithReturn('getRequestTarget', [], $requestTarget),
+            new WithReturn('getHeaderLine', ['If-None-Match'], $hash.'-different'),
+        ]);
+
+        /** @var StreamInterface $responseBody */
+        $responseBody = $builder->create(StreamInterface::class, []);
+
+        if (null !== $contentType) {
+            /** @var ResponseInterface $response */
+            $response = $builder->create(ResponseInterface::class, [
+                new WithReturnSelf('withHeader', ['Content-Length', $contentLength]),
+                new WithReturnSelf('withHeader', ['Content-Type', $contentType]),
+                new WithReturnSelf('withHeader', ['ETag', $hash]),
+                new WithReturnSelf('withBody', [$responseBody]),
+            ]);
+        } else {
+            /** @var ResponseInterface $response */
+            $response = $builder->create(ResponseInterface::class, [
+                new WithReturnSelf('withHeader', ['Content-Length', $contentLength]),
+                new WithReturnSelf('withHeader', ['ETag', $hash]),
+                new WithReturnSelf('withBody', [$responseBody]),
+            ]);
+        }
+
+        /** @var RequestHandlerInterface $handler */
+        $handler = $builder->create(RequestHandlerInterface::class, []);
+
+        /** @var ResponseFactoryInterface $responseFactory */
+        $responseFactory = $builder->create(ResponseFactoryInterface::class, [
+            new WithReturn('createResponse', [200, ''], $response),
+        ]);
+
+        /** @var StreamFactoryInterface $streamFactory */
+        $streamFactory = $builder->create(StreamFactoryInterface::class, [
+            new WithReturn('createStreamFromFile', [$filename, 'r'], $responseBody),
+        ]);
+
+        $middleware = new StaticFileMiddleware($responseFactory, $streamFactory, $publicDirectory, $hashAlgorithm);
+
+        self::assertSame($response, $middleware->process($request, $handler));
+    }
+
+    #[DataProvider('provideFiles')]
+    public function testUsesCustomMimetypes(
+        string $body,
+        string $contentLength,
+        ?string $contentType,
+        string $extension
+    ): void {
+        $publicDirectory = sys_get_temp_dir();
+        $requestTarget = '/'.uniqid().uniqid().'.'.$extension;
+        $filename = $publicDirectory.$requestTarget;
+        $hashAlgorithm = 'adler32';
+        $customContentType = 'application/custom-'.$extension;
+        $mimetypes = null !== $contentType ? [$extension => $customContentType] : [];
+
+        file_put_contents($filename, $body);
+
+        $hash = hash_file($hashAlgorithm, $filename);
+
+        $builder = new MockObjectBuilder();
+
+        /** @var ServerRequestInterface $request */
+        $request = $builder->create(ServerRequestInterface::class, [
+            new WithReturn('getRequestTarget', [], $requestTarget),
+            new WithReturn('getHeaderLine', ['If-None-Match'], $hash),
+        ]);
+
+        if (null !== $contentType) {
+            /** @var ResponseInterface $response */
+            $response = $builder->create(ResponseInterface::class, [
+                new WithReturnSelf('withHeader', ['Content-Length', $contentLength]),
+                new WithReturnSelf('withHeader', ['Content-Type', $customContentType]),
+                new WithReturnSelf('withHeader', ['ETag', $hash]),
+            ]);
+        } else {
+            /** @var ResponseInterface $response */
+            $response = $builder->create(ResponseInterface::class, [
+                new WithReturnSelf('withHeader', ['Content-Length', $contentLength]),
+                new WithReturnSelf('withHeader', ['ETag', $hash]),
+            ]);
+        }
+
+        /** @var RequestHandlerInterface $handler */
+        $handler = $builder->create(RequestHandlerInterface::class, []);
+
+        /** @var ResponseFactoryInterface $responseFactory */
+        $responseFactory = $builder->create(ResponseFactoryInterface::class, [
+            new WithReturn('createResponse', [304, ''], $response),
+        ]);
+
+        /** @var StreamFactoryInterface $streamFactory */
+        $streamFactory = $builder->create(StreamFactoryInterface::class, []);
+
+        $middleware = new StaticFileMiddleware(
+            $responseFactory,
+            $streamFactory,
+            $publicDirectory,
+            $hashAlgorithm,
+            $mimetypes
+        );
+
+        self::assertSame($response, $middleware->process($request, $handler));
+    }
+
     public static function provideFiles(): iterable
     {
         return [