spiral / framework

src/Router/src/Loader/Configurator/RoutingConfigurator.php

Spacing +4 added lines, -4 removed lines

@@ -14,19 +14,19 @@
     public function __construct(
         private readonly RouteCollection $collection,
         private readonly LoaderInterface $loader
-    ) {
+    ){
     }
 
-    public function import(string|array $resource, string $type = null): ImportConfigurator
+    public function import(string | array $resource, string $type = null): ImportConfigurator
     {
         $imported = $this->loader->load($resource, $type) ?: [];
 
-        if (!\is_array($imported)) {
+        if (!\is_array($imported)){
             return new ImportConfigurator($this->collection, $imported);
         }
 
         $mergedCollection = new RouteCollection();
-        foreach ($imported as $subCollection) {
+        foreach ($imported as $subCollection){
             $mergedCollection->addCollection($subCollection);
         }
 

Braces +4 added lines, -2 removed lines

@@ -21,12 +21,14 @@
     {
         $imported = $this->loader->load($resource, $type) ?: [];
 
-        if (!\is_array($imported)) {
+        if (!\is_array($imported))
+        {
             return new ImportConfigurator($this->collection, $imported);
         }
 
         $mergedCollection = new RouteCollection();
-        foreach ($imported as $subCollection) {
+        foreach ($imported as $subCollection)
+        {
             $mergedCollection->addCollection($subCollection);
         }
 

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/Router.php

Spacing +24 added lines, -24 removed lines

@@ -45,8 +45,8 @@ 
         private readonly UriHandler $uriHandler,
         private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $eventDispatcher = null
-    ) {
-        $this->basePath = '/' . \ltrim($basePath, '/');
+    ){
+        $this->basePath = '/'.\ltrim($basePath, '/');
     }
 
     /**
@@ -57,13 +57,13 @@ 
     {
         $this->eventDispatcher?->dispatch(new Routing($request));
 
-        try {
+        try{
             $route = $this->matchRoute($request, $routeName);
-        } catch (RouteException $e) {
+        }catch (RouteException $e){
             throw new RouterException('Invalid route definition', $e->getCode(), $e);
         }
 
-        if ($route === null) {
+        if ($route === null){
             $this->eventDispatcher?->dispatch(new RouteNotFound($request));
             throw new RouteNotFoundException($request->getUri());
         }
@@ -91,7 +91,7 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -100,7 +100,7 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -109,9 +109,9 @@ 
 
     public function uri(string $route, iterable $parameters = []): UriInterface
     {
-        try {
+        try{
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException) {
+        }catch (UndefinedRouteException){
             //In some cases route name can be provided as controller:action pair, we can try to
             //generate such route automatically based on our default/fallback route
             return $this->castRoute($route)->uri($parameters);
@@ -123,31 +123,31 @@ 
         /** @var GroupRegistry $groups */
         $groups = $this->container->get(GroupRegistry::class);
 
-        foreach ($routes->getCollection() as $name => $configurator) {
+        foreach ($routes->getCollection() as $name => $configurator){
             $target = $configurator->target;
-            if ($configurator->core !== null && $target instanceof AbstractTarget) {
+            if ($configurator->core !== null && $target instanceof AbstractTarget){
                 $target = $target->withCore($configurator->core);
             }
 
             $route = new Route(
-                $configurator->prefix . '/' . \ltrim($configurator->pattern, '/'),
+                $configurator->prefix.'/'.\ltrim($configurator->pattern, '/'),
                 $target,
                 $configurator->defaults
             );
 
-            if ($configurator->middleware !== null) {
+            if ($configurator->middleware !== null){
                 $route = $route->withMiddleware(...$configurator->middleware);
             }
 
-            if ($configurator->methods !== null) {
+            if ($configurator->methods !== null){
                 $route = $route->withVerbs(...$configurator->methods);
             }
 
-            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME){
                 $groups->getGroup($configurator->group ?? $groups->getDefaultGroup())->addRoute($name, $route);
             }
 
-            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME){
                 $this->setDefault($route);
             }
         }
@@ -158,17 +158,17 @@ 
      */
     protected function matchRoute(ServerRequestInterface $request, string &$routeName = null): ?RouteInterface
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route){
             // Matched route will return new route instance with matched parameters
             $matched = $route->match($request);
 
-            if ($matched !== null) {
+            if ($matched !== null){
                 $routeName = $name;
                 return $matched;
             }
         }
 
-        if ($this->default !== null) {
+        if ($this->default !== null){
             return $this->default->match($request);
         }
 
@@ -181,7 +181,7 @@ 
      */
     protected function configure(RouteInterface $route): RouteInterface
     {
-        if ($route instanceof ContainerizedInterface && !$route->hasContainer()) {
+        if ($route instanceof ContainerizedInterface && !$route->hasContainer()){
             // isolating route in a given container
             $route = $route->withContainer($this->container);
         }
@@ -205,17 +205,17 @@ 
                 $route,
                 $matches
             )
-        ) {
+        ){
             throw new UndefinedRouteException(
                 "Unable to locate route or use default route with 'name/controller:action' pattern"
             );
         }
 
-        if (!empty($matches['name'])) {
+        if (!empty($matches['name'])){
             $routeObject = $this->getRoute($matches['name']);
-        } elseif ($this->default !== null) {
+        } elseif ($this->default !== null){
             $routeObject = $this->default;
-        } else {
+        }else{
             throw new UndefinedRouteException(\sprintf('Unable to locate route candidate for `%s`', $route));
         }
 

Braces +44 added lines, -20 removed lines

@@ -57,13 +57,17 @@ 
     {
         $this->eventDispatcher?->dispatch(new Routing($request));
 
-        try {
+        try
+        {
             $route = $this->matchRoute($request, $routeName);
-        } catch (RouteException $e) {
+        }
+        catch (RouteException $e)
+        {
             throw new RouterException('Invalid route definition', $e->getCode(), $e);
         }
 
-        if ($route === null) {
+        if ($route === null)
+        {
             $this->eventDispatcher?->dispatch(new RouteNotFound($request));
             throw new RouteNotFoundException($request->getUri());
         }
@@ -91,7 +95,8 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name]))
+        {
             return $this->routes[$name];
         }
 
@@ -100,7 +105,8 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default))
+        {
             return $this->routes + [null => $this->default];
         }
 
@@ -109,9 +115,12 @@ 
 
     public function uri(string $route, iterable $parameters = []): UriInterface
     {
-        try {
+        try
+        {
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException) {
+        }
+        catch (UndefinedRouteException)
+        {
             //In some cases route name can be provided as controller:action pair, we can try to
             //generate such route automatically based on our default/fallback route
             return $this->castRoute($route)->uri($parameters);
@@ -123,9 +132,11 @@ 
         /** @var GroupRegistry $groups */
         $groups = $this->container->get(GroupRegistry::class);
 
-        foreach ($routes->getCollection() as $name => $configurator) {
+        foreach ($routes->getCollection() as $name => $configurator)
+        {
             $target = $configurator->target;
-            if ($configurator->core !== null && $target instanceof AbstractTarget) {
+            if ($configurator->core !== null && $target instanceof AbstractTarget)
+            {
                 $target = $target->withCore($configurator->core);
             }
 
@@ -135,19 +146,23 @@ 
                 $configurator->defaults
             );
 
-            if ($configurator->middleware !== null) {
+            if ($configurator->middleware !== null)
+            {
                 $route = $route->withMiddleware(...$configurator->middleware);
             }
 
-            if ($configurator->methods !== null) {
+            if ($configurator->methods !== null)
+            {
                 $route = $route->withVerbs(...$configurator->methods);
             }
 
-            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME)
+            {
                 $groups->getGroup($configurator->group ?? $groups->getDefaultGroup())->addRoute($name, $route);
             }
 
-            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME)
+            {
                 $this->setDefault($route);
             }
         }
@@ -158,17 +173,20 @@ 
      */
     protected function matchRoute(ServerRequestInterface $request, string &$routeName = null): ?RouteInterface
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route)
+        {
             // Matched route will return new route instance with matched parameters
             $matched = $route->match($request);
 
-            if ($matched !== null) {
+            if ($matched !== null)
+            {
                 $routeName = $name;
                 return $matched;
             }
         }
 
-        if ($this->default !== null) {
+        if ($this->default !== null)
+        {
             return $this->default->match($request);
         }
 
@@ -181,7 +199,8 @@ 
      */
     protected function configure(RouteInterface $route): RouteInterface
     {
-        if ($route instanceof ContainerizedInterface && !$route->hasContainer()) {
+        if ($route instanceof ContainerizedInterface && !$route->hasContainer())
+        {
             // isolating route in a given container
             $route = $route->withContainer($this->container);
         }
@@ -211,11 +230,16 @@ 
             );
         }
 
-        if (!empty($matches['name'])) {
+        if (!empty($matches['name']))
+        {
             $routeObject = $this->getRoute($matches['name']);
-        } elseif ($this->default !== null) {
+        }
+        elseif ($this->default !== null)
+        {
             $routeObject = $this->default;
-        } else {
+        }
+        else
+        {
             throw new UndefinedRouteException(\sprintf('Unable to locate route candidate for `%s`', $route));
         }