fix: static analysis issues

Author: Scarbous

src/frankenphp-symfony/src/Exception/InvalidMiddlewareException.php

@@ -1,16 +1,13 @@
 <?php
 
-namespace Runtime\FrankenPhpSymfony\Exception;
+declare(strict_types=1);
 
-use Throwable;
+namespace Runtime\FrankenPhpSymfony\Exception;
 
 class InvalidMiddlewareException extends \Exception
 {
-    function __construct(
-        public string $className,
-        int $code = 0,
-        ?Throwable $previous = null
-    ) {
+    public function __construct(public string $className, int $code = 0, ?\Throwable $previous = null)
+    {
         parent::__construct(
             "The middleware class '$className' is invalid.",
             $code,

src/frankenphp-symfony/src/Middleware/MiddlewareInterface.php

@@ -6,5 +6,5 @@
 
 interface MiddlewareInterface
 {
-    function wrap(callable $handler, array $server): void;
+    public function wrap(callable $handler, array $server): void;
 }

src/frankenphp-symfony/src/Runtime.php

@@ -18,6 +18,7 @@ class Runtime extends SymfonyRuntime
     /**
      * @param array{
      *   frankenphp_loop_max?: int,
+     *   frankenphp_middlewares?: string
      * } $options
      */
     public function __construct(array $options = [])

src/frankenphp-symfony/tests/RunnerTest.php

@@ -4,7 +4,7 @@
 
 namespace Runtime\FrankenPhpSymfony\Tests;
 
-require_once __DIR__ . '/function-mock.php';
+require_once __DIR__.'/function-mock.php';
 
 use PHPUnit\Framework\TestCase;
 use Runtime\FrankenPhpSymfony\Exception\InvalidMiddlewareException;
@@ -25,16 +25,17 @@ interface TestAppInterface extends HttpKernelInterface, TerminableInterface
  */
 class RunnerTest extends TestCase
 {
-
-    static function runData(): iterable
+    public static function runData(): iterable
     {
         yield 'basic' => [];
+
         yield 'middleware' => [
-            'middleware' => TestMiddleware::class
+            'middleware' => TestMiddleware::class,
         ];
+
         yield 'Invalid middleware' => [
             'middleware' => InvalidMiddleware::class,
-            'expectException' => InvalidMiddlewareException::class
+            'expectException' => InvalidMiddlewareException::class,
         ];
     }
 
@@ -43,15 +44,11 @@ static function runData(): iterable
      */
     public function testRun(
         ?string $middleware = null,
-        ?string $expectException = null
+        ?string $expectException = null,
     ): void {
-        if ($expectException !== null) {
-            $this->expectException($expectException);
-        }
-
         $application = $this->createMock(TestAppInterface::class);
 
-        if ($expectException === null) {
+        if (null === $expectException) {
             $application
                 ->expects($this->once())
                 ->method('handle')
@@ -67,15 +64,15 @@ function (
                     }
                 );
             $application->expects($this->once())->method('terminate');
+        } else {
+            $this->expectException($expectException);
         }
 
         $_SERVER['FOO'] = 'bar';
 
-        $runner = new Runner($application, 500, array_filter([
-            $middleware
-        ]));
+        $runner = new Runner($application, 500, array_filter([$middleware]));
 
-        $assertMiddlewareInvoked = $expectException === null && $middleware && method_exists($middleware, 'isInvoked');
+        $assertMiddlewareInvoked = null === $expectException && $middleware && method_exists($middleware, 'isInvoked');
         if ($assertMiddlewareInvoked) {
             $this->assertFalse($middleware::isInvoked());
         }

src/frankenphp-symfony/tests/Support/InvalidMiddleware.php

@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Runtime\FrankenPhpSymfony\Tests\Support;
 
 class InvalidMiddleware
 {
-
 }

src/frankenphp-symfony/tests/Support/TestMiddleware.php

@@ -8,7 +8,7 @@
 
 class TestMiddleware implements MiddlewareInterface
 {
-    function __construct()
+    public function __construct()
     {
         self::$invoked = false;
     }