Merge pull request #97 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 13, 2022 · 12d71c1 · 12d71c1
2 parents 095b57e + 2d858c6
commit 12d71c1
Show file tree

Hide file tree

Showing 52 changed files with 161 additions and 239 deletions.
diff --git a/src/Event/HotCodeReloaderWorkerStartListener.php b/src/Event/HotCodeReloaderWorkerStartListener.php
@@ -39,7 +39,7 @@ public function __invoke(WorkerStartEvent $event): void
         $fileWatcher = $this->fileWatcher;
         $logger      = $this->logger;
 
-        $server->tick($this->interval, function () use ($server, $fileWatcher, $logger) {
+        $server->tick($this->interval, static function () use ($server, $fileWatcher, $logger): void {
             $changedFilePaths = $fileWatcher->readChangedFilePaths();
             if (! $changedFilePaths) {
                 return;

diff --git a/src/Event/RequestHandlerRequestListener.php b/src/Event/RequestHandlerRequestListener.php
@@ -78,25 +78,22 @@ public function __construct(
         // Factories are cast as Closures to ensure return type safety.
         /** @psalm-suppress MixedInferredReturnType */
         $this->serverRequestFactory
-            = static function (SwooleHttpRequest $request) use ($serverRequestFactory): ServerRequestInterface {
+            = static fn(SwooleHttpRequest $request): ServerRequestInterface =>
                 /** @psalm-suppress MixedReturnStatement */
-                return $serverRequestFactory($request);
-            };
+                $serverRequestFactory($request);
 
         /** @psalm-suppress MixedInferredReturnType */
         $this->serverRequestErrorResponseGenerator
-            = static function (Throwable $exception) use ($serverRequestErrorResponseGenerator): ResponseInterface {
+            = static fn(Throwable $exception): ResponseInterface =>
                 /** @psalm-suppress MixedReturnStatement */
-                return $serverRequestErrorResponseGenerator($exception);
-            };
+                $serverRequestErrorResponseGenerator($exception);
 
         if ($emitterFactory) {
             /** @psalm-suppress MixedInferredReturnType */
             $this->emitterFactory
-                = static function (SwooleHttpResponse $response) use ($emitterFactory): SwooleEmitter {
+                = static fn(SwooleHttpResponse $response): SwooleEmitter =>
                     /** @psalm-suppress MixedReturnStatement */
-                    return $emitterFactory($response);
-                };
+                    $emitterFactory($response);
         }
     }
 

diff --git a/src/HotCodeReload/FileWatcher/InotifyFileWatcher.php b/src/HotCodeReload/FileWatcher/InotifyFileWatcher.php
@@ -13,7 +13,6 @@
 use Mezzio\Swoole\HotCodeReload\FileWatcherInterface;
 use Webmozart\Assert\Assert;
 
-use function array_merge;
 use function array_values;
 use function extension_loaded;
 use function in_array;
@@ -112,7 +111,7 @@ private function listSubdirectoriesRecursively(string $path): array
                 continue;
             }
 
-            $paths = array_merge($paths, $this->listSubdirectoriesRecursively($filename));
+            $paths = [...$paths, ...$this->listSubdirectoriesRecursively($filename)];
         }
 
         Assert::allStringNotEmpty($paths);

diff --git a/src/Log/StrftimeToICUFormatMap.php b/src/Log/StrftimeToICUFormatMap.php
@@ -39,7 +39,7 @@ public static function mapStrftimeToICU(string $format, DateTimeInterface $reque
     private static function generateMapCallback(DateTimeInterface $requestTime): callable
     {
         /** @psalm-param array<array-key, string> */
-        return function (array $matches) use ($requestTime): string {
+        return static function (array $matches) use ($requestTime): string {
             Assert::keyExists($matches, 'token');
             switch (true) {
                 case $matches['token'] === '%a':

diff --git a/src/ServerRequestSwooleFactory.php b/src/ServerRequestSwooleFactory.php
@@ -35,7 +35,7 @@ public function __invoke(ContainerInterface $container): callable
             ? $container->get(FilterServerRequestInterface::class)
             : FilterUsingXForwardedHeaders::trustReservedSubnets();
 
-        $stripXForwardedHeaders = function (array $headers): array {
+        $stripXForwardedHeaders = static function (array $headers): array {
             /** @psalm-var list<string> */
             static $disallowedHeaders = [
                 'X-FORWARDED-FOR',

diff --git a/src/StaticResourceHandler/CacheControlMiddleware.php b/src/StaticResourceHandler/CacheControlMiddleware.php
@@ -82,7 +82,7 @@ private function validateCacheControlDirectives(array $cacheControlDirectives):
                 ));
             }
 
-            array_walk($directives, function ($directive) use ($regex) {
+            array_walk($directives, function ($directive) use ($regex): void {
                 if (! is_string($directive)) {
                     throw new Exception\InvalidArgumentException(sprintf(
                         'One or more Cache-Control directives associated with the regex "%s" are invalid;'

diff --git a/src/StaticResourceHandler/FileLocationRepository.php b/src/StaticResourceHandler/FileLocationRepository.php
@@ -124,7 +124,7 @@ public function findFile(string $filename): ?string
     {
         foreach ($this->mappedDocRoots as $prefix => $directories) {
             foreach ($directories as $directory) {
-                if (stripos($filename, $prefix) === 0) {
+                if (stripos($filename, (string) $prefix) === 0) {
                     $mappedFileName = $directory . substr($filename, strlen($prefix));
                     if (file_exists($mappedFileName)) {
                         return $mappedFileName;

diff --git a/src/StaticResourceHandler/StaticResourceResponse.php b/src/StaticResourceHandler/StaticResourceResponse.php
@@ -17,8 +17,7 @@
 
 class StaticResourceResponse
 {
-    /** @var int */
-    private $contentLength = 0;
+    private int $contentLength = 0;
 
     /** @psalm-var array<string, string> */
     private array $headers = [];

diff --git a/src/StaticResourceHandler/ValidateRegexTrait.php b/src/StaticResourceHandler/ValidateRegexTrait.php
@@ -21,9 +21,7 @@ trait ValidateRegexTrait
 {
     private function isValidRegex(string $regex): bool
     {
-        set_error_handler(static function ($errno) {
-            return $errno === E_WARNING;
-        });
+        set_error_handler(static fn($errno) => $errno === E_WARNING);
         $isValid = preg_match($regex, '') !== false;
         restore_error_handler();
         return $isValid;

diff --git a/src/SwooleEmitter.php b/src/SwooleEmitter.php
@@ -27,7 +27,7 @@ class SwooleEmitter implements EmitterInterface
     /**
      * @see https://www.swoole.co.uk/docs/modules/swoole-http-server/methods-properties#swoole-http-response-write
      */
-    public const CHUNK_SIZE = 2097152; // 2 MB
+    public const CHUNK_SIZE = 2_097_152; // 2 MB
 
     private SwooleHttpResponse $swooleResponse;
 

diff --git a/test/Command/ReloadCommandTest.php b/test/Command/ReloadCommandTest.php
@@ -146,9 +146,7 @@ public function testExecuteEndsWithErrorWhenStopCommandFails(): void
         $stopCommand
             ->method('run')
             ->with(
-                $this->callback(static function (ArrayInput $arg) {
-                    return 'stop' === (string) $arg;
-                }),
+                $this->callback(static fn(ArrayInput $arg) => 'stop' === (string) $arg),
                 $this->output
             )
             ->willReturn(1);
@@ -190,9 +188,7 @@ public function testExecuteEndsWithErrorWhenStartCommandFails(): void
         $stopCommand
             ->method('run')
             ->with(
-                $this->callback(static function (ArrayInput $arg) {
-                    return 'stop' === (string) $arg;
-                }),
+                $this->callback(static fn(ArrayInput $arg) => 'stop' === (string) $arg),
                 $this->output
             )
             ->willReturn(0);
@@ -201,9 +197,7 @@ public function testExecuteEndsWithErrorWhenStartCommandFails(): void
         $startCommand
             ->method('run')
             ->with(
-                $this->callback(static function (ArrayInput $arg) {
-                    return 'start --daemonize=1 --num-workers=5' === (string) $arg;
-                }),
+                $this->callback(static fn(ArrayInput $arg) => 'start --daemonize=1 --num-workers=5' === (string) $arg),
                 $this->output
             )
             ->willReturn(1);
@@ -269,9 +263,7 @@ public function testExecuteEndsWithSuccessWhenBothStopAndStartCommandsSucceed():
         $stopCommand
             ->method('run')
             ->with(
-                $this->callback(static function (ArrayInput $arg) {
-                    return 'stop' === (string) $arg;
-                }),
+                $this->callback(static fn(ArrayInput $arg) => 'stop' === (string) $arg),
                 $this->output
             )
             ->willReturn(0);
@@ -280,9 +272,10 @@ public function testExecuteEndsWithSuccessWhenBothStopAndStartCommandsSucceed():
         $startCommand
             ->method('run')
             ->with(
-                $this->callback(static function (ArrayInput $arg) {
-                    return 'start --daemonize=1 --num-workers=5 --num-task-workers=2' === (string) $arg;
-                }),
+                $this->callback(
+                    static fn(ArrayInput $arg)
+                        => 'start --daemonize=1 --num-workers=5 --num-task-workers=2' === (string) $arg
+                ),
                 $this->output
             )
             ->willReturn(0);

diff --git a/test/Command/StartCommandTest.php b/test/Command/StartCommandTest.php
@@ -48,8 +48,7 @@ class StartCommandTest extends TestCase
      */
     private $input;
 
-    /** @var string */
-    private $originalIncludePath;
+    private string $originalIncludePath;
 
     /**
      * @var OutputInterface|MockObject
@@ -192,7 +191,7 @@ public function testExecuteReturnsErrorIfServerIsRunningInBaseMode(): void
 
     public function testExecuteReturnsErrorIfServerIsRunningInProcessMode(): void
     {
-        $this->pidManager->method('read')->willReturn([1000000, getmypid()]);
+        $this->pidManager->method('read')->willReturn([1_000_000, getmypid()]);
         $this->container->method('get')->with(PidManager::class)->willReturn($this->pidManager);
 
         $command = new StartCommand($this->container);
@@ -210,8 +209,8 @@ public function noRunningProcesses(): iterable
     {
         yield 'empty'        => [[]];
         yield 'null-all'     => [[null, null]];
-        yield 'base-mode'    => [[1000000, null]];
-        yield 'process-mode' => [[1000000, 1000001]];
+        yield 'base-mode'    => [[1_000_000, null]];
+        yield 'process-mode' => [[1_000_000, 1_000_001]];
     }
 
     /**
@@ -236,14 +235,12 @@ public function testExecuteRunsApplicationIfServerIsNotCurrentlyRunning(array $p
         $httpServer
             ->expects($this->once())
             ->method('set')
-            ->with($this->callback(static function (array $options) {
-                return array_key_exists('daemonize', $options)
-                    && array_key_exists('worker_num', $options)
-                    && array_key_exists('task_worker_num', $options)
-                    && true === $options['daemonize']
-                    && 6 === $options['worker_num']
-                    && 4 === $options['task_worker_num'];
-            }));
+            ->with($this->callback(static fn(array $options) => array_key_exists('daemonize', $options)
+                && array_key_exists('worker_num', $options)
+                && array_key_exists('task_worker_num', $options)
+                && true === $options['daemonize']
+                && 6 === $options['worker_num']
+                && 4 === $options['task_worker_num']));
 
         $application->expects($this->once())->method('run');
 

diff --git a/test/Command/StatusCommandTest.php b/test/Command/StatusCommandTest.php
@@ -70,7 +70,7 @@ public function testStatusCommandIsASymfonyConsoleCommand(StatusCommand $command
     public function runningProcesses(): iterable
     {
         yield 'base-mode'    => [[getmypid(), null]];
-        yield 'process-mode' => [[1000000, getmypid()]];
+        yield 'process-mode' => [[1_000_000, getmypid()]];
     }
 
     /**
@@ -104,8 +104,8 @@ public function noRunningProcesses(): iterable
     {
         yield 'empty'        => [[]];
         yield 'null-all'     => [[null, null]];
-        yield 'base-mode'    => [[1000000, null]];
-        yield 'process-mode' => [[1000000, 1000001]];
+        yield 'base-mode'    => [[1_000_000, null]];
+        yield 'process-mode' => [[1_000_000, 1_000_001]];
     }
 
     /**

diff --git a/test/Command/StopCommandTest.php b/test/Command/StopCommandTest.php
@@ -71,8 +71,8 @@ public function noRunningProcesses(): iterable
     {
         yield 'empty'        => [[]];
         yield 'null-all'     => [[null, null]];
-        yield 'base-mode'    => [[1000000, null]];
-        yield 'process-mode' => [[1000000, 1000001]];
+        yield 'base-mode'    => [[1_000_000, null]];
+        yield 'process-mode' => [[1_000_000, 1_000_001]];
     }
 
     /**
@@ -105,7 +105,7 @@ public function testExecuteReturnsSuccessWhenServerIsNotCurrentlyRunning(array $
     public function runningProcesses(): iterable
     {
         yield 'base-mode'    => [[getmypid(), null]];
-        yield 'process-mode' => [[1000000, getmypid()]];
+        yield 'process-mode' => [[1_000_000, getmypid()]];
     }
 
     /**

diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -14,8 +14,7 @@
 
 class ConfigProviderTest extends TestCase
 {
-    /** @var ConfigProvider */
-    private $provider;
+    private ConfigProvider $provider;
 
     protected function setUp(): void
     {

diff --git a/test/Event/EventDispatcherTest.php b/test/Event/EventDispatcherTest.php
@@ -44,7 +44,7 @@ public function testDispatchNotifiesAllRelevantListenersAndReturnsEventWhenNoErr
 
         $listeners = [];
         for ($i = 0; $i < 5; $i += 1) {
-            $listeners[] = function (object $event) use ($spy): void {
+            $listeners[] = static function (object $event) use ($spy): void {
                 $spy->caught += 1;
             };
         }
@@ -98,7 +98,7 @@ public function isPropagationStopped(): bool
 
         $listeners = [];
         for ($i = 0; $i < 5; $i += 1) {
-            $listeners[] = function (object $event) use ($spy): void {
+            $listeners[] = static function (object $event) use ($spy): void {
                 $spy->caught += 1;
             };
         }

diff --git a/test/Event/RequestHandlerRequestListenerFactoryTest.php b/test/Event/RequestHandlerRequestListenerFactoryTest.php
@@ -24,12 +24,9 @@ class RequestHandlerRequestListenerFactoryTest extends TestCase
     public function testFactoryProducesListenerUsingServicesFromContainer(): void
     {
         $pipeline             = $this->createMock(RequestHandlerInterface::class);
-        $requestFactory       = function (SwooleHttpRequest $request): ServerRequestInterface {
-            return $this->createMock(ServerRequestInterface::class);
-        };
-        $errorResponseFactory = function (Throwable $e): ResponseInterface {
-            return $this->createMock(ResponseInterface::class);
-        };
+        $requestFactory       = fn(SwooleHttpRequest $request): ServerRequestInterface
+            => $this->createMock(ServerRequestInterface::class);
+        $errorResponseFactory = fn(Throwable $e): ResponseInterface => $this->createMock(ResponseInterface::class);
         $logger               = $this->createMock(AccessLogInterface::class);
         $container            = $this->createMock(ContainerInterface::class);
         $container

diff --git a/test/Event/RequestHandlerRequestListenerTest.php b/test/Event/RequestHandlerRequestListenerTest.php
@@ -71,9 +71,7 @@ public function setUp(): void
         };
 
         $this->emitter  = $emitter = $this->createMock(SwooleEmitter::class);
-        $emitterFactory = function (SwooleHttpResponse $response) use ($emitter): SwooleEmitter {
-            return $emitter;
-        };
+        $emitterFactory = static fn(SwooleHttpResponse $response): SwooleEmitter => $emitter;
 
         $this->requestHandler = $this->createMock(RequestHandlerInterface::class);
         $this->logger         = $this->createMock(AccessLogInterface::class);

diff --git a/test/Event/ServerStartListenerTest.php b/test/Event/ServerStartListenerTest.php
@@ -41,7 +41,7 @@ public function testListenerUpdatesPidManagerChangesPWDSetsProcessNameAndLogsSer
         $processName    = 'alternate-process-name';
         $masterPid      = random_int(1, 10000);
         $managerPid     = random_int(1, 10000);
-        $setProcessName = function (string $name) use ($processName): void {
+        $setProcessName = static function (string $name) use ($processName): void {
             TestCase::assertSame($processName . '-master', $name);
         };
         $pidManager     = $this->createMock(PidManager::class);

diff --git a/test/Event/SwooleListenerProviderFactoryTest.php b/test/Event/SwooleListenerProviderFactoryTest.php
@@ -134,7 +134,7 @@ public function testFactoryRaisesErrorForNonCallableListenerService(): void
 
     public function testFactoryProducesProviderWithConfiguredListeners(): void
     {
-        $listener = function (stdClass $event): void {
+        $listener = static function (stdClass $event): void {
         };
 
         $config    = [

diff --git a/test/Event/SwooleListenerProviderTest.php b/test/Event/SwooleListenerProviderTest.php
@@ -18,9 +18,9 @@ class SwooleListenerProviderTest extends TestCase
 {
     public function testProviderAllowsListenerRegistrationAndReturnsListenersBasedOnEventType(): void
     {
-        $listenerForTestEvent = function (TestAsset\TestEvent $e): void {
+        $listenerForTestEvent = static function (TestAsset\TestEvent $e): void {
         };
-        $listenerForStdclass  = function (stdClass $e): void {
+        $listenerForStdclass  = static function (stdClass $e): void {
         };
 
         $provider = new SwooleListenerProvider();
@@ -40,7 +40,7 @@ public function testProviderAllowsListenerRegistrationAndReturnsListenersBasedOn
 
     public function testProviderDoesNotAllowDuplicateRegistration(): void
     {
-        $listenerForTestEvent = function (TestAsset\TestEvent $e): void {
+        $listenerForTestEvent = static function (TestAsset\TestEvent $e): void {
         };
 
         $provider = new SwooleListenerProvider();

diff --git a/test/Event/WorkerStartListenerTest.php b/test/Event/WorkerStartListenerTest.php
@@ -49,7 +49,7 @@ public function testListenerSwitchesToConfiguredDirectorySetsWorkerNameAndLogs()
         $workerId                      = random_int(0, 3);
         $listener                      = new WorkerStartListener($logger, $cwd, $processName);
         $event                         = new WorkerStartEvent($server, $workerId);
-        $listener::$setProcessName     = function (string $name) use ($processName, $workerId): void {
+        $listener::$setProcessName     = static function (string $name) use ($processName, $workerId): void {
             TestCase::assertSame($processName . '-worker-' . $workerId, $name);
         };
 
@@ -82,7 +82,7 @@ public function testListenerSwitchesToConfiguredDirectorySetsTaskWorkerNameAndLo
         $workerId                      = random_int(4, 7);
         $listener                      = new WorkerStartListener($logger, $cwd, $processName);
         $event                         = new WorkerStartEvent($server, $workerId);
-        $listener::$setProcessName     = function (string $name) use ($processName, $workerId): void {
+        $listener::$setProcessName     = static function (string $name) use ($processName, $workerId): void {
             TestCase::assertSame($processName . '-task-worker-' . $workerId, $name);
         };