spiral / framework

src/Router/src/Loader/Configurator/RouteConfigurator.php

Spacing +9 added lines, -9 removed lines

@@ -31,12 +31,12 @@ 
         private readonly string $name,
         private readonly string $pattern,
         private readonly RouteCollection $collection
-    ) {
+    ){
     }
 
     public function __destruct()
     {
-        if ($this->target === null) {
+        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)
@@ -87,21 +87,21 @@ 
         return $this;
     }
 
-    public function action(string $controller, string|array $action, int $options = 0): self
+    public function action(string $controller, string | array $action, int $options = 0): self
     {
         $this->target = new Action($controller, $action, $options);
 
         return $this;
     }
 
-    public function callable(array|\Closure $callable): self
+    public function callable(array | \Closure $callable): self
     {
         $this->target = $callable;
 
         return $this;
     }
 
-    public function handler(TargetInterface|string $target): self
+    public function handler(TargetInterface | string $target): self
     {
         $this->target = $target;
 
@@ -136,9 +136,9 @@ 
         return $this;
     }
 
-    public function middleware(MiddlewareInterface|string|array $middleware): self
+    public function middleware(MiddlewareInterface | string | array $middleware): self
     {
-        if (!\is_array($middleware)) {
+        if (!\is_array($middleware)){
             $middleware = [$middleware];
         }
 
@@ -147,9 +147,9 @@ 
         return $this;
     }
 
-    public function methods(string|array $methods): self
+    public function methods(string | array $methods): self
     {
-        $this->methods = (array) $methods;
+        $this->methods = (array)$methods;
 
         return $this;
     }

Braces +4 added lines, -2 removed lines

@@ -36,7 +36,8 @@ 
 
     public function __destruct()
     {
-        if ($this->target === null) {
+        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)
@@ -138,7 +139,8 @@ 
 
     public function middleware(MiddlewareInterface|string|array $middleware): self
     {
-        if (!\is_array($middleware)) {
+        if (!\is_array($middleware))
+        {
             $middleware = [$middleware];
         }
 

src/Router/src/Loader/DelegatingLoader.php

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
 {
     public function __construct(
         private readonly LoaderRegistryInterface $registry
-    ) {
+    ){
     }
 
     public function load(mixed $resource, string $type = null): mixed
     {
-        if (false === $loader = $this->registry->resolve($resource, $type)) {
+        if (false === $loader = $this->registry->resolve($resource, $type)){
             throw new LoaderLoadException(\sprintf('Loader for type [%s] not found.', $type));
         }
 

Braces +2 added lines, -1 removed lines

@@ -15,7 +15,8 @@
 
     public function load(mixed $resource, string $type = null): mixed
     {
-        if (false === $loader = $this->registry->resolve($resource, $type)) {
+        if (false === $loader = $this->registry->resolve($resource, $type))
+        {
             throw new LoaderLoadException(\sprintf('Loader for type [%s] not found.', $type));
         }
 

src/Router/src/Loader/LoaderRegistryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
      *
      * @param string|null $type The resource type or null if unknown
      */
-    public function resolve(mixed $resource, string $type = null): LoaderInterface|false;
+    public function resolve(mixed $resource, string $type = null): LoaderInterface | false;
 }

src/Router/src/Loader/LoaderRegistry.php

Spacing +4 added lines, -4 removed lines

@@ -16,15 +16,15 @@
      */
     public function __construct(array $loaders = [])
     {
-        foreach ($loaders as $loader) {
+        foreach ($loaders as $loader){
             $this->addLoader($loader);
         }
     }
 
-    public function resolve(mixed $resource, string $type = null): LoaderInterface|false
+    public function resolve(mixed $resource, string $type = null): LoaderInterface | false
     {
-        foreach ($this->loaders as $loader) {
-            if ($loader->supports($resource, $type)) {
+        foreach ($this->loaders as $loader){
+            if ($loader->supports($resource, $type)){
                 return $loader;
             }
         }

Braces +6 added lines, -3 removed lines

@@ -16,15 +16,18 @@
      */
     public function __construct(array $loaders = [])
     {
-        foreach ($loaders as $loader) {
+        foreach ($loaders as $loader)
+        {
             $this->addLoader($loader);
         }
     }
 
     public function resolve(mixed $resource, string $type = null): LoaderInterface|false
     {
-        foreach ($this->loaders as $loader) {
-            if ($loader->supports($resource, $type)) {
+        foreach ($this->loaders as $loader)
+        {
+            if ($loader->supports($resource, $type))
+            {
                 return $loader;
             }
         }

src/Router/src/Loader/PhpFileLoader.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct(
         private readonly FactoryInterface $factory,
         private readonly ResolverInterface $resolver,
-    ) {
+    ){
     }
 
     /**
@@ -24,11 +24,11 @@ 
      */
     public function load(mixed $resource, string $type = null): RouteCollection
     {
-        if (!\file_exists($resource)) {
+        if (!\file_exists($resource)){
             throw new LoaderLoadException(\sprintf('File [%s] does not exist.', $resource));
         }
 
-        $load = static function (string $path) {
+        $load = static function (string $path){
             return include $path;
         };
 

Braces +4 added lines, -2 removed lines

@@ -24,11 +24,13 @@
      */
     public function load(mixed $resource, string $type = null): RouteCollection
     {
-        if (!\file_exists($resource)) {
+        if (!\file_exists($resource))
+        {
             throw new LoaderLoadException(\sprintf('File [%s] does not exist.', $resource));
         }
 
-        $load = static function (string $path) {
+        $load = static function (string $path)
+        {
             return include $path;
         };
 

src/Router/src/PipelineFactory.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
     public function __construct(
         private readonly ContainerInterface $container,
         private readonly FactoryInterface $factory
-    ) {
+    ){
     }
 
     /**
@@ -26,27 +26,27 @@ 
      */
     public function createWithMiddleware(array $middleware): Pipeline
     {
-        if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline) {
+        if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline){
             return $middleware[0];
         }
 
         $pipeline = $this->factory->make(Pipeline::class);
         \assert($pipeline instanceof Pipeline);
 
-        foreach ($middleware as $item) {
-            if ($item instanceof MiddlewareInterface) {
+        foreach ($middleware as $item){
+            if ($item instanceof MiddlewareInterface){
                 $pipeline->pushMiddleware($item);
-            } elseif (\is_string($item)) {
+            } elseif (\is_string($item)){
                 $item = $this->container->get($item);
                 \assert($item instanceof MiddlewareInterface);
 
                 $pipeline->pushMiddleware($item);
-            } elseif ($item instanceof Autowire) {
+            } elseif ($item instanceof Autowire){
                 $item = $item->resolve($this->factory);
                 \assert($item instanceof MiddlewareInterface);
 
                 $pipeline->pushMiddleware($item);
-            } else {
+            }else{
                 $name = get_debug_type($item);
                 throw new RouteException(\sprintf('Invalid middleware `%s`', $name));
             }

Braces +15 added lines, -6 removed lines

@@ -26,27 +26,36 @@
      */
     public function createWithMiddleware(array $middleware): Pipeline
     {
-        if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline) {
+        if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline)
+        {
             return $middleware[0];
         }
 
         $pipeline = $this->factory->make(Pipeline::class);
         \assert($pipeline instanceof Pipeline);
 
-        foreach ($middleware as $item) {
-            if ($item instanceof MiddlewareInterface) {
+        foreach ($middleware as $item)
+        {
+            if ($item instanceof MiddlewareInterface)
+            {
                 $pipeline->pushMiddleware($item);
-            } elseif (\is_string($item)) {
+            }
+            elseif (\is_string($item))
+            {
                 $item = $this->container->get($item);
                 \assert($item instanceof MiddlewareInterface);
 
                 $pipeline->pushMiddleware($item);
-            } elseif ($item instanceof Autowire) {
+            }
+            elseif ($item instanceof Autowire)
+            {
                 $item = $item->resolve($this->factory);
                 \assert($item instanceof MiddlewareInterface);
 
                 $pipeline->pushMiddleware($item);
-            } else {
+            }
+            else
+            {
                 $name = get_debug_type($item);
                 throw new RouteException(\sprintf('Invalid middleware `%s`', $name));
             }

src/Router/src/AbstractRoute.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
     public function __construct(
         protected string $pattern,
         array $defaults = []
-    ) {
+    ){
         $this->defaults = $defaults;
     }
 
@@ -39,12 +39,12 @@ 
 
     public function match(Request $request): ?static
     {
-        if (!\in_array(\strtoupper($request->getMethod()), $this->getVerbs(), true)) {
+        if (!\in_array(\strtoupper($request->getMethod()), $this->getVerbs(), true)){
             return null;
         }
 
         $matches = $this->uriHandler->match($request->getUri(), $this->defaults);
-        if ($matches === null) {
+        if ($matches === null){
             return null;
         }
 

Braces +4 added lines, -2 removed lines

@@ -39,12 +39,14 @@
 
     public function match(Request $request): ?static
     {
-        if (!\in_array(\strtoupper($request->getMethod()), $this->getVerbs(), true)) {
+        if (!\in_array(\strtoupper($request->getMethod()), $this->getVerbs(), true))
+        {
             return null;
         }
 
         $matches = $this->uriHandler->match($request->getUri(), $this->defaults);
-        if ($matches === null) {
+        if ($matches === null)
+        {
             return null;
         }
 

src/Router/src/Route.php

Spacing +13 added lines, -13 removed lines

@@ -50,9 +50,9 @@ 
      */
     public function __construct(
         string $pattern,
-        string|callable|RequestHandlerInterface|TargetInterface $target,
+        string | callable | RequestHandlerInterface | TargetInterface $target,
         array $defaults = []
-    ) {
+    ){
         parent::__construct(
             $pattern,
             $target instanceof TargetInterface
@@ -66,7 +66,7 @@ 
     public function withUriHandler(UriHandler $uriHandler): static
     {
         $route = parent::withUriHandler($uriHandler);
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface){
             $route->uriHandler = $route->uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults
@@ -84,7 +84,7 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface){
             $route->target = clone $route->target;
         }
 
@@ -111,7 +111,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler)){
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -126,28 +126,28 @@ 
      */
     protected function requestHandler(): RequestHandlerInterface
     {
-        if (!$this->hasContainer()) {
+        if (!$this->hasContainer()){
             throw new RouteException('Unable to configure route pipeline without associated container');
         }
 
-        if ($this->target instanceof TargetInterface) {
-            try {
+        if ($this->target instanceof TargetInterface){
+            try{
                 return $this->target->getHandler($this->container, $this->matches);
-            } catch (TargetException $e) {
+            }catch (TargetException $e){
                 throw new RouteException('Invalid target resolution', $e->getCode(), $e);
             }
         }
 
-        if ($this->target instanceof RequestHandlerInterface) {
+        if ($this->target instanceof RequestHandlerInterface){
             return $this->target;
         }
 
-        try {
+        try{
             $target = \is_string($this->target)
                 ? $this->container->get($this->target)
                 : $this->target;
 
-            if ($target instanceof RequestHandlerInterface) {
+            if ($target instanceof RequestHandlerInterface){
                 return $target;
             }
 
@@ -155,7 +155,7 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +24 added lines, -11 removed lines

@@ -66,7 +66,8 @@ 
     public function withUriHandler(UriHandler $uriHandler): static
     {
         $route = parent::withUriHandler($uriHandler);
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface)
+        {
             $route->uriHandler = $route->uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults
@@ -84,7 +85,8 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface)
+        {
             $route->target = clone $route->target;
         }
 
@@ -111,7 +113,8 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler))
+        {
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -126,28 +129,36 @@ 
      */
     protected function requestHandler(): RequestHandlerInterface
     {
-        if (!$this->hasContainer()) {
+        if (!$this->hasContainer())
+        {
             throw new RouteException('Unable to configure route pipeline without associated container');
         }
 
-        if ($this->target instanceof TargetInterface) {
-            try {
+        if ($this->target instanceof TargetInterface)
+        {
+            try
+            {
                 return $this->target->getHandler($this->container, $this->matches);
-            } catch (TargetException $e) {
+            }
+            catch (TargetException $e)
+            {
                 throw new RouteException('Invalid target resolution', $e->getCode(), $e);
             }
         }
 
-        if ($this->target instanceof RequestHandlerInterface) {
+        if ($this->target instanceof RequestHandlerInterface)
+        {
             return $this->target;
         }
 
-        try {
+        try
+        {
             $target = \is_string($this->target)
                 ? $this->container->get($this->target)
                 : $this->target;
 
-            if ($target instanceof RequestHandlerInterface) {
+            if ($target instanceof RequestHandlerInterface)
+            {
                 return $target;
             }
 
@@ -155,7 +166,9 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

src/Router/src/Exception/RouteNotFoundException.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
         private readonly UriInterface $uri,
         int $code = 0,
         \Throwable $previous = null
-    ) {
-        parent::__construct(\sprintf('Unable to route `%s`.', (string) $uri), $code, $previous);
+    ){
+        parent::__construct(\sprintf('Unable to route `%s`.', (string)$uri), $code, $previous);
     }
 
     public function getUri(): UriInterface