Merge pull request #1207: Apply Spiral Code Style

spiral · Jan 24, 2025 · fdacb1c · fdacb1c
1 parent 57e57e5
commit fdacb1c
Show file tree

Hide file tree

Showing 78 changed files with 518 additions and 588 deletions.
diff --git a/composer.json b/composer.json
@@ -34,13 +34,13 @@
     ],
     "require": {
         "php": ">=8.1",
-        "spiral/core": "^3.14.10",
-        "spiral/files": "^3.14.10",
-        "spiral/config": "^3.14.10",
-        "spiral/debug": "^3.14.10",
-        "spiral/exceptions": "^3.14.10",
+        "spiral/core": "^3.15",
+        "spiral/files": "^3.15",
+        "spiral/config": "^3.15",
+        "spiral/debug": "^3.15",
+        "spiral/exceptions": "^3.15",
         "spiral/attributes": "^2.8|^3.0",
-        "spiral/events": "^3.14.10"
+        "spiral/events": "^3.15"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.1",

diff --git a/src/AbstractKernel.php b/src/AbstractKernel.php
@@ -4,7 +4,6 @@
 
 namespace Spiral\Boot;
 
-use Closure;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Spiral\Attribute\DispatcherScope;
 use Spiral\Boot\Bootloader\BootloaderRegistry;
@@ -57,16 +56,16 @@ abstract class AbstractKernel implements KernelInterface
      */
     protected array $dispatchers = [];
 
-    /** @var array<Closure> */
+    /** @var array<\Closure> */
     private array $runningCallbacks = [];
 
-    /** @var array<Closure> */
+    /** @var array<\Closure> */
     private array $bootingCallbacks = [];
 
-    /** @var array<Closure> */
+    /** @var array<\Closure> */
     private array $bootedCallbacks = [];
 
-    /** @var array<Closure>  */
+    /** @var array<\Closure>  */
     private array $bootstrappedCallbacks = [];
 
     /**
@@ -76,7 +75,7 @@ protected function __construct(
         protected readonly Container $container,
         protected readonly ExceptionHandlerInterface $exceptionHandler,
         protected readonly BootloadManagerInterface $bootloader,
-        array $directories
+        array $directories,
     ) {
         $container->bindSingleton(ExceptionHandlerInterface::class, $exceptionHandler);
         $container->bindSingleton(ExceptionRendererInterface::class, $exceptionHandler);
@@ -89,21 +88,13 @@ protected function __construct(
 
         $container->bindSingleton(
             DirectoriesInterface::class,
-            new Directories($this->mapDirectories($directories))
+            new Directories($this->mapDirectories($directories)),
         );
 
         $this->finalizer = new Finalizer();
         $container->bindSingleton(FinalizerInterface::class, $this->finalizer);
     }
 
-    /**
-     * Terminate the application.
-     */
-    public function __destruct()
-    {
-        $this->finalizer->finalize(true);
-    }
-
     /**
      * Create an application instance.
      *
@@ -116,7 +107,7 @@ final public static function create(
         bool $handleErrors = true,
         ExceptionHandlerInterface|string|null $exceptionHandler = null,
         Container $container = new Container(),
-        BootloadManagerInterface|Autowire|null $bootloadManager = null
+        BootloadManagerInterface|Autowire|null $bootloadManager = null,
     ): static {
         $exceptionHandler ??= ExceptionHandler::class;
 
@@ -151,21 +142,20 @@ final public static function create(
             $container,
             $exceptionHandler,
             $bootloadManager,
-            $directories
+            $directories,
         );
     }
 
     /**
      * Run the application with given Environment
      *
-     * $app = App::create([...]);
-     * $app->booting(...);
-     * $app->booted(...);
-     * $app->bootstrapped(...);
-     * $app->run(new Environment([
-     *     'APP_ENV' => 'production'
-     * ]));
-     *
+     *      $app = App::create([...]);
+     *      $app->booting(...);
+     *      $app->booted(...);
+     *      $app->bootstrapped(...);
+     *      $app->run(new Environment([
+     *          'APP_ENV' => 'production'
+     *      ]));
      */
     public function run(?EnvironmentInterface $environment = null): ?self
     {
@@ -187,7 +177,7 @@ function (Container $container): void {
                     $this->bootstrap();
 
                     $this->fireCallbacks($this->bootstrappedCallbacks);
-                }
+                },
             );
         } catch (\Throwable $e) {
             $this->exceptionHandler->handleGlobalException($e);
@@ -208,7 +198,7 @@ function (Container $container): void {
      *     $kernel->getContainer()->...
      * });
      */
-    public function running(Closure ...$callbacks): void
+    public function running(\Closure ...$callbacks): void
     {
         foreach ($callbacks as $callback) {
             $this->runningCallbacks[] = $callback;
@@ -223,7 +213,7 @@ public function running(Closure ...$callbacks): void
      *     $kernel->getContainer()->...
      * });
      */
-    public function booting(Closure ...$callbacks): void
+    public function booting(\Closure ...$callbacks): void
     {
         foreach ($callbacks as $callback) {
             $this->bootingCallbacks[] = $callback;
@@ -238,14 +228,13 @@ public function booting(Closure ...$callbacks): void
      *     $kernel->getContainer()->...
      * });
      */
-    public function booted(Closure ...$callbacks): void
+    public function booted(\Closure ...$callbacks): void
     {
         foreach ($callbacks as $callback) {
             $this->bootedCallbacks[] = $callback;
         }
     }
 
-
     /**
      * Register a new callback, that will be fired after framework bootstrapped.
      * (Before serving)
@@ -254,7 +243,7 @@ public function booted(Closure ...$callbacks): void
      *     $kernel->getContainer()->...
      * });
      */
-    public function bootstrapped(Closure ...$callbacks): void
+    public function bootstrapped(\Closure ...$callbacks): void
     {
         foreach ($callbacks as $callback) {
             $this->bootstrappedCallbacks[] = $callback;
@@ -314,10 +303,18 @@ public function serve(): mixed
             static function (DispatcherInterface $dispatcher) use ($eventDispatcher): mixed {
                 $eventDispatcher?->dispatch(new DispatcherFound($dispatcher));
                 return $dispatcher->serve();
-            }
+            },
         );
     }
 
+    /**
+     * Terminate the application.
+     */
+    public function __destruct()
+    {
+        $this->finalizer->finalize(true);
+    }
+
     /**
      * Bootstrap application. Must be executed before serve method.
      */
@@ -376,7 +373,7 @@ private function bootload(array $bootloaders = []): void
                 static function () use ($self): void {
                     $self->fireCallbacks($self->bootingCallbacks);
                 },
-            ]
+            ],
         );
 
         $this->fireCallbacks($this->bootedCallbacks);

diff --git a/src/Attribute/BootloadConfig.php b/src/Attribute/BootloadConfig.php
@@ -15,6 +15,5 @@ public function __construct(
         public array $allowEnv = [],
         public array $denyEnv = [],
         public bool $override = true,
-    ) {
-    }
+    ) {}
 }
diff --git a/src/BootloadManager/AbstractBootloadManager.php b/src/BootloadManager/AbstractBootloadManager.php
@@ -16,9 +16,8 @@ abstract class AbstractBootloadManager implements BootloadManagerInterface
 {
     public function __construct(
         private readonly ScopeInterface $scope,
-        protected readonly InitializerInterface $initializer
-    ) {
-    }
+        protected readonly InitializerInterface $initializer,
+    ) {}
 
     public function getClasses(): array
     {
@@ -29,14 +28,14 @@ public function bootload(
         array $classes,
         array $bootingCallbacks = [],
         array $bootedCallbacks = [],
-        bool $useConfig = true
+        bool $useConfig = true,
     ): void {
         $this->scope->runScope(
             [self::class => $this],
             function () use ($classes, $bootingCallbacks, $bootedCallbacks, $useConfig): void {
                 /** @psalm-suppress TooManyArguments */
                 $this->boot($classes, $bootingCallbacks, $bootedCallbacks, $useConfig);
-            }
+            },
         );
     }
 

diff --git a/src/BootloadManager/BootloadManager.php b/src/BootloadManager/BootloadManager.php
@@ -20,12 +20,12 @@ public function __construct(
         private readonly InvokerInterface $invoker,
         private readonly ResolverInterface $resolver,
         InitializerInterface $initializer,
-        ?InvokerStrategyInterface $invokerStrategy = null
+        ?InvokerStrategyInterface $invokerStrategy = null,
     ) {
         parent::__construct($scope, $initializer);
 
         $this->invokerStrategy = $invokerStrategy ?? new DefaultInvokerStrategy(...$this->resolver->resolveArguments(
-            (new \ReflectionClass(DefaultInvokerStrategy::class))->getConstructor()
+            (new \ReflectionClass(DefaultInvokerStrategy::class))->getConstructor(),
         ));
     }
 

diff --git a/src/BootloadManager/Checker/BootloaderChecker.php b/src/BootloadManager/Checker/BootloaderChecker.php
@@ -11,8 +11,7 @@ final class BootloaderChecker implements BootloaderCheckerInterface
 {
     public function __construct(
         private readonly CheckerRegistryInterface $registry = new CheckerRegistry(),
-    ) {
-    }
+    ) {}
 
     public function canInitialize(BootloaderInterface|string $bootloader, ?BootloadConfig $config = null): bool
     {

diff --git a/src/BootloadManager/Checker/CanBootedChecker.php b/src/BootloadManager/Checker/CanBootedChecker.php
@@ -12,8 +12,7 @@ final class CanBootedChecker implements BootloaderCheckerInterface
 {
     public function __construct(
         private readonly ClassesRegistry $bootloaders,
-    ) {
-    }
+    ) {}
 
     public function canInitialize(BootloaderInterface|string $bootloader, ?BootloadConfig $config = null): bool
     {

diff --git a/src/BootloadManager/Checker/ConfigChecker.php b/src/BootloadManager/Checker/ConfigChecker.php
@@ -12,8 +12,7 @@ final class ConfigChecker implements BootloaderCheckerInterface
 {
     public function __construct(
         private readonly EnvironmentInterface $environment,
-    ) {
-    }
+    ) {}
 
     public function canInitialize(BootloaderInterface|string $bootloader, ?BootloadConfig $config = null): bool
     {

diff --git a/src/BootloadManager/DefaultInvokerStrategy.php b/src/BootloadManager/DefaultInvokerStrategy.php
@@ -13,15 +13,14 @@ final class DefaultInvokerStrategy implements InvokerStrategyInterface
     public function __construct(
         private readonly InitializerInterface $initializer,
         private readonly InvokerInterface $invoker,
-        private readonly ResolverInterface $resolver
-    ) {
-    }
+        private readonly ResolverInterface $resolver,
+    ) {}
 
     public function invokeBootloaders(
         array $classes,
         array $bootingCallbacks,
         array $bootedCallbacks,
-        bool $useConfig = true
+        bool $useConfig = true,
     ): void {
         /** @psalm-suppress TooManyArguments */
         $bootloaders = \iterator_to_array($this->initializer->init($classes, $useConfig));

diff --git a/src/BootloadManager/Initializer.php b/src/BootloadManager/Initializer.php
@@ -34,8 +34,7 @@ public function __construct(
         protected readonly BinderInterface $binder,
         protected readonly ClassesRegistry $bootloaders = new ClassesRegistry(),
         ?BootloaderCheckerInterface $checker = null,
-    ) {
-    }
+    ) {}
 
     /**
      * Instantiate bootloader objects and resolve dependencies
@@ -89,7 +88,7 @@ protected function initBootloader(BootloaderInterface $bootloader): iterable
 
         $this->initBindings(
             $bootloader->defineBindings(),
-            $bootloader->defineSingletons()
+            $bootloader->defineSingletons(),
         );
     }
 
@@ -121,7 +120,7 @@ protected function getDependencies(DependedInterface $bootloader): array
         foreach (Methods::cases() as $method) {
             if ($reflectionClass->hasMethod($method->value)) {
                 $methodsDeps[] = $this->findBootloaderClassesInMethod(
-                    $reflectionClass->getMethod($method->value)
+                    $reflectionClass->getMethod($method->value),
                 );
             }
         }
@@ -177,7 +176,7 @@ protected function initDefaultChecker(): BootloaderCheckerInterface
      */
     private function getBootloadConfig(
         string|BootloaderInterface $bootloader,
-        array|callable|BootloadConfig $config
+        array|callable|BootloadConfig $config,
     ): BootloadConfig {
         if ($config instanceof \Closure) {
             $config = $this->container instanceof ResolverInterface
@@ -186,7 +185,7 @@ private function getBootloadConfig(
         }
         $attr = $this->getBootloadConfigAttribute($bootloader);
 
-        $getArgument = static fn (string $key, bool $override, mixed $default = []): mixed => match (true) {
+        $getArgument = static fn(string $key, bool $override, mixed $default = []): mixed => match (true) {
             $config instanceof BootloadConfig && $override => $config->{$key},
             $config instanceof BootloadConfig && !$override && \is_array($default) =>
                 $config->{$key} + ($attr->{$key} ?? []),

diff --git a/src/BootloadManager/StrategyBasedBootloadManager.php b/src/BootloadManager/StrategyBasedBootloadManager.php
@@ -11,7 +11,7 @@ final class StrategyBasedBootloadManager extends AbstractBootloadManager
     public function __construct(
         private readonly InvokerStrategyInterface $invoker,
         ScopeInterface $scope,
-        InitializerInterface $initializer
+        InitializerInterface $initializer,
     ) {
         parent::__construct($scope, $initializer);
     }
@@ -27,7 +27,7 @@ protected function boot(
         array $classes,
         array $bootingCallbacks,
         array $bootedCallbacks,
-        bool $useConfig = true
+        bool $useConfig = true,
     ): void {
         /** @psalm-suppress TooManyArguments */
         $this->invoker->invokeBootloaders($classes, $bootingCallbacks, $bootedCallbacks, $useConfig);

diff --git a/src/BootloadManagerInterface.php b/src/BootloadManagerInterface.php
@@ -4,7 +4,6 @@
 
 namespace Spiral\Boot;
 
-use Closure;
 use Spiral\Boot\Bootloader\BootloaderInterface;
 
 /**
@@ -29,8 +28,8 @@ public function getClasses(): array;
      * ]
      *
      * @param TClass[]|array<TClass, array<string,mixed>> $classes
-     * @param array<Closure> $bootingCallbacks
-     * @param array<Closure> $bootedCallbacks
+     * @param array<\Closure> $bootingCallbacks
+     * @param array<\Closure> $bootedCallbacks
      *
      * @throws \Throwable
      */

diff --git a/src/Bootloader/Bootloader.php b/src/Bootloader/Bootloader.php
@@ -22,11 +22,13 @@ abstract class Bootloader implements BootloaderInterface, DependedInterface
      * @psalm-var TConstantBinding
      */
     protected const BINDINGS = [];
+
     /**
      * @var array<string, class-string|callable>
      * @psalm-var TConstantBinding
      */
     protected const SINGLETONS = [];
+
     /** @var class-string<BootloaderInterface>[]|class-string<DependedInterface>[] */
     protected const DEPENDENCIES = [];
-Original file line number
+Diff line change
@@ Expand Up @@
     {
         public function __construct(
             private readonly CheckerRegistryInterface $registry = new CheckerRegistry(),
-        ) {
-        }
+        ) {}
         public function canInitialize(BootloaderInterface|string $bootloader, ?BootloadConfig $config = null): bool
         {
@@ Expand Down @@