Merge pull request #1207: Apply Spiral Code Style

composer.json

@@ -35,12 +35,12 @@
     "require": {
         "php": ">=8.1",
         "ext-json": "*",
-        "spiral/core": "^3.14.10",
-        "spiral/hmvc": "^3.14.10",
-        "spiral/http": "^3.14.10",
-        "spiral/interceptors": "^3.14.10",
+        "spiral/core": "^3.15",
+        "spiral/hmvc": "^3.15",
+        "spiral/http": "^3.15",
+        "spiral/interceptors": "^3.15",
         "cocur/slugify": "^3.2 || ^4.0",
-        "spiral/telemetry": "^3.14.10",
+        "spiral/telemetry": "^3.15",
         "doctrine/inflector": "^1.4|^2.0",
         "psr/event-dispatcher": "^1.0"
     },

src/AbstractRoute.php

@@ -30,7 +30,7 @@ abstract class AbstractRoute implements RouteInterface
 
     public function __construct(
         protected string $pattern,
-        array $defaults = []
+        array $defaults = [],
     ) {
         $this->defaults = $defaults;
     }
@@ -80,7 +80,7 @@ public function uri(iterable $parameters = []): UriInterface
     {
         return $this->uriHandler->uri(
             $parameters,
-            \array_merge($this->defaults, $this->matches ?? [])
+            \array_merge($this->defaults, $this->matches ?? []),
         );
     }
 }

src/Autofill.php

@@ -7,9 +7,8 @@
 final class Autofill implements \Stringable
 {
     public function __construct(
-        private readonly string $value
-    ) {
-    }
+        private readonly string $value,
+    ) {}
 
     public function __toString(): string
     {

src/CoreHandler.php

@@ -6,6 +6,7 @@
 
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
 use Spiral\Core\CoreInterface;
@@ -35,10 +36,13 @@ final class CoreHandler implements RequestHandlerInterface
 
     /** @readonly */
     private ?string $controller = null;
+
     /** @readonly */
     private ?string $action = null;
+
     /** @readonly */
     private ?bool $verbActions = null;
+
     /** @readonly */
     private ?array $parameters = null;
 
@@ -48,7 +52,7 @@ public function __construct(
         private readonly HandlerInterface|CoreInterface $core,
         private readonly ScopeInterface $scope,
         private readonly ResponseFactoryInterface $responseFactory,
-        ?TracerInterface $tracer = null
+        ?TracerInterface $tracer = null,
     ) {
         $this->tracer = $tracer ?? new NullTracer($scope);
         $this->isLegacyPipeline = !$core instanceof HandlerInterface;
@@ -112,26 +116,29 @@ public function handle(Request $request): Response
                     name: 'http-request',
                     bindings: [Request::class => $request, Response::class => $response, $controller => $controller],
                 ),
-                fn (): mixed => $this->tracer->trace(
+                fn(): mixed => $this->tracer->trace(
                     name: 'Controller [' . $controller . ':' . $action . ']',
                     callback: $this->isLegacyPipeline
-                        ? fn (): mixed => $this->core->callAction(
+                        ? fn(): mixed => $this->core->callAction(
                             controller: $controller,
                             action: $action,
                             parameters: $parameters,
                         )
-                        : fn (): mixed => $this->core->handle(
+                        : fn(): mixed => $this->core->handle(
                             new CallContext(
                                 Target::fromPair($controller, $action),
                                 $parameters,
+                                [
+                                    ServerRequestInterface::class => $request,
+                                ],
                             ),
                         ),
                     attributes: [
                         'route.controller' => $this->controller,
                         'route.action' => $action,
                         'route.parameters' => \array_keys($parameters),
-                    ]
-                )
+                    ],
+                ),
             );
         } catch (TargetCallException $e) {
             \ob_get_clean();
@@ -176,7 +183,7 @@ private function wrapResponse(Response $response, mixed $result = null, string $
         if (\is_array($result) || $result instanceof \JsonSerializable) {
             $response = $this->writeJson($response, $result);
         } else {
-            $response->getBody()->write((string)$result);
+            $response->getBody()->write((string) $result);
         }
 
         //Always glue buffered output

src/Event/RouteMatched.php

@@ -12,6 +12,5 @@ final class RouteMatched
     public function __construct(
         public readonly ServerRequestInterface $request,
         public readonly RouteInterface $route,
-    ) {
-    }
+    ) {}
 }

src/Event/RouteNotFound.php

@@ -9,7 +9,6 @@
 final class RouteNotFound
 {
     public function __construct(
-        public readonly ServerRequestInterface $request
-    ) {
-    }
+        public readonly ServerRequestInterface $request,
+    ) {}
 }

src/Event/Routing.php

@@ -9,7 +9,6 @@
 final class Routing
 {
     public function __construct(
-        public readonly ServerRequestInterface $request
-    ) {
-    }
+        public readonly ServerRequestInterface $request,
+    ) {}
 }

src/Exception/ConstrainException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class ConstrainException extends RouteException
-{
-}
+class ConstrainException extends RouteException {}

src/Exception/HandlerException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class HandlerException extends \RuntimeException
-{
-}
+class HandlerException extends \RuntimeException {}

src/Exception/LoaderLoadException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class LoaderLoadException extends \RuntimeException
-{
-}
+class LoaderLoadException extends \RuntimeException {}

src/Exception/RouteException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class RouteException extends RouterException
-{
-}
+class RouteException extends RouterException {}

src/Exception/RouteNotFoundException.php

@@ -11,7 +11,7 @@ class RouteNotFoundException extends UndefinedRouteException
     public function __construct(
         private readonly UriInterface $uri,
         int $code = 0,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ) {
         parent::__construct(\sprintf('Unable to route `%s`.', (string) $uri), $code, $previous);
     }

src/Exception/RouterException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class RouterException extends \RuntimeException
-{
-}
+class RouterException extends \RuntimeException {}

src/Exception/TargetException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class TargetException extends \RuntimeException
-{
-}
+class TargetException extends \RuntimeException {}

src/Exception/UndefinedRouteException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class UndefinedRouteException extends RouterException
-{
-}
+class UndefinedRouteException extends RouterException {}

src/Exception/UriHandlerException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Router\Exception;
 
-class UriHandlerException extends \RuntimeException
-{
-}
+class UriHandlerException extends \RuntimeException {}

src/GroupRegistry.php

@@ -20,9 +20,8 @@ final class GroupRegistry implements \IteratorAggregate
     private array $groups = [];
 
     public function __construct(
-        private readonly FactoryInterface $factory
-    ) {
-    }
+        private readonly FactoryInterface $factory,
+    ) {}
 
     /**
      * @param non-empty-string $name

src/Loader/Configurator/ImportConfigurator.php

@@ -13,24 +13,8 @@ final class ImportConfigurator
 {
     public function __construct(
         private readonly RouteCollection $parent,
-        private readonly RouteCollection $routes
-    ) {
-    }
-
-    public function __destruct()
-    {
-        $this->parent->addCollection($this->routes);
-    }
-
-    public function __sleep(): array
-    {
-        throw new \BadMethodCallException('Cannot unserialize ' . self::class);
-    }
-
-    public function __wakeup()
-    {
-        throw new \BadMethodCallException('Cannot unserialize ' . self::class);
-    }
+        private readonly RouteCollection $routes,
+    ) {}
 
     public function defaults(array $defaults): self
     {
@@ -95,4 +79,19 @@ public function middleware(MiddlewareInterface|string|array $middleware): self
 
         return $this;
     }
+
+    public function __sleep(): array
+    {
+        throw new \BadMethodCallException('Cannot unserialize ' . self::class);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize ' . self::class);
+    }
+
+    public function __destruct()
+    {
+        $this->parent->addCollection($this->routes);
+    }
 }

src/Loader/Configurator/RouteConfigurator.php

@@ -35,41 +35,8 @@ final class RouteConfigurator
     public function __construct(
         private readonly string $name,
         private readonly string $pattern,
-        private readonly RouteCollection $collection
-    ) {
-    }
-
-    public function __destruct()
-    {
-        if ($this->target === null) {
-            throw new TargetException(
-                \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`,
-                    `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name)
-            );
-        }
-
-        $this->collection->add($this->name, $this);
-    }
-
-    /**
-     * @internal
-     *
-     * Don't use this method. For internal use only.
-     */
-    public function __get(string $name): mixed
-    {
-        return match ($name) {
-            'core' => $this->core,
-            'target' => $this->target,
-            'defaults' => $this->defaults,
-            'group' => $this->group,
-            'middleware' => $this->middleware,
-            'methods' => $this->methods,
-            'pattern' => $this->pattern,
-            'prefix' => \trim($this->prefix, '/'),
-            default => throw new \BadMethodCallException(\sprintf('Unable to access %s.', $name))
-        };
-    }
+        private readonly RouteCollection $collection,
+    ) {}
 
     public function controller(string $controller, int $options = 0, string $defaultAction = 'index'): self
     {
@@ -158,4 +125,36 @@ public function methods(string|array $methods): self
 
         return $this;
     }
+
+    /**
+     * @internal
+     *
+     * Don't use this method. For internal use only.
+     */
+    public function __get(string $name): mixed
+    {
+        return match ($name) {
+            'core' => $this->core,
+            'target' => $this->target,
+            'defaults' => $this->defaults,
+            'group' => $this->group,
+            'middleware' => $this->middleware,
+            'methods' => $this->methods,
+            'pattern' => $this->pattern,
+            'prefix' => \trim($this->prefix, '/'),
+            default => throw new \BadMethodCallException(\sprintf('Unable to access %s.', $name)),
+        };
+    }
+
+    public function __destruct()
+    {
+        if ($this->target === null) {
+            throw new TargetException(
+                \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`,
+                    `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name),
+            );
+        }
+
+        $this->collection->add($this->name, $this);
+    }
 }

src/Loader/Configurator/RoutingConfigurator.php

@@ -13,9 +13,8 @@ final class RoutingConfigurator
 
     public function __construct(
         private readonly RouteCollection $collection,
-        private readonly LoaderInterface $loader
-    ) {
-    }
+        private readonly LoaderInterface $loader,
+    ) {}
 
     public function import(string|array $resource, ?string $type = null): ImportConfigurator
     {

src/Loader/DelegatingLoader.php

@@ -9,9 +9,8 @@
 final class DelegatingLoader implements LoaderInterface
 {
     public function __construct(
-        private readonly LoaderRegistryInterface $registry
-    ) {
-    }
+        private readonly LoaderRegistryInterface $registry,
+    ) {}
 
     public function load(mixed $resource, ?string $type = null): mixed
     {