spiral / framework

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));
         }
 

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

src/Router/src/RouteCollection.php

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 
     public function __clone()
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route){
             $this->routes[$name] = clone $route;
         }
     }
@@ -72,16 +72,16 @@ 
      *
      * @param string|string[] $name The route name or an array of route names
      */
-    public function remove(string|array $name)
+    public function remove(string | array $name)
     {
-        foreach ((array) $name as $n) {
+        foreach ((array)$name as $n){
             unset($this->routes[$n]);
         }
     }
 
     public function addCollection(self $collection)
     {
-        foreach ($collection->all() as $name => $route) {
+        foreach ($collection->all() as $name => $route){
             $this->routes[$name] = $route;
         }
     }
@@ -91,7 +91,7 @@ 
      */
     public function group(string $group)
     {
-        foreach ($this->routes as $route) {
+        foreach ($this->routes as $route){
             $route->group($group);
         }
     }

Braces +8 added lines, -4 removed lines

@@ -13,7 +13,8 @@ 
 
     public function __clone()
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route)
+        {
             $this->routes[$name] = clone $route;
         }
     }
@@ -74,14 +75,16 @@ 
      */
     public function remove(string|array $name)
     {
-        foreach ((array) $name as $n) {
+        foreach ((array) $name as $n)
+        {
             unset($this->routes[$n]);
         }
     }
 
     public function addCollection(self $collection)
     {
-        foreach ($collection->all() as $name => $route) {
+        foreach ($collection->all() as $name => $route)
+        {
             $this->routes[$name] = $route;
         }
     }
@@ -91,7 +94,8 @@ 
      */
     public function group(string $group)
     {
-        foreach ($this->routes as $route) {
+        foreach ($this->routes as $route)
+        {
             $route->group($group);
         }
     }

src/Router/src/Traits/VerbsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
      */
     public function withVerbs(string ...$verbs): RouteInterface
     {
-        foreach ($verbs as &$verb) {
+        foreach ($verbs as &$verb){
             $verb = \strtoupper($verb);
-            if (!\in_array($verb, RouteInterface::VERBS, true)) {
+            if (!\in_array($verb, RouteInterface::VERBS, true)){
                 throw new RouteException(\sprintf('Invalid HTTP verb `%s`', $verb));
             }
 

Braces +4 added lines, -2 removed lines

@@ -19,9 +19,11 @@
      */
     public function withVerbs(string ...$verbs): RouteInterface
     {
-        foreach ($verbs as &$verb) {
+        foreach ($verbs as &$verb)
+        {
             $verb = \strtoupper($verb);
-            if (!\in_array($verb, RouteInterface::VERBS, true)) {
+            if (!\in_array($verb, RouteInterface::VERBS, true))
+            {
                 throw new RouteException(\sprintf('Invalid HTTP verb `%s`', $verb));
             }
 

src/Router/src/Traits/PipelineTrait.php

Spacing +5 added lines, -5 removed lines

@@ -42,16 +42,16 @@ 
         $route = clone $this;
 
         // array fallback
-        if (\count($middleware) === 1 && \is_array($middleware[0])) {
+        if (\count($middleware) === 1 && \is_array($middleware[0])){
             $middleware = $middleware[0];
         }
 
         /** @var MiddlewareType[] $middleware */
-        foreach ($middleware as $item) {
+        foreach ($middleware as $item){
             $route->middleware[] = $item;
         }
 
-        if ($route->pipeline !== null) {
+        if ($route->pipeline !== null){
             $route->pipeline = $route->makePipeline();
         }
 
@@ -75,11 +75,11 @@ 
      */
     protected function makePipeline(): Pipeline
     {
-        try {
+        try{
             return $this->container
                 ->get(PipelineFactory::class)
                 ->createWithMiddleware($this->middleware);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +11 added lines, -5 removed lines

@@ -42,16 +42,19 @@ 
         $route = clone $this;
 
         // array fallback
-        if (\count($middleware) === 1 && \is_array($middleware[0])) {
+        if (\count($middleware) === 1 && \is_array($middleware[0]))
+        {
             $middleware = $middleware[0];
         }
 
         /** @var MiddlewareType[] $middleware */
-        foreach ($middleware as $item) {
+        foreach ($middleware as $item)
+        {
             $route->middleware[] = $item;
         }
 
-        if ($route->pipeline !== null) {
+        if ($route->pipeline !== null)
+        {
             $route->pipeline = $route->makePipeline();
         }
 
@@ -75,11 +78,14 @@ 
      */
     protected function makePipeline(): Pipeline
     {
-        try {
+        try
+        {
             return $this->container
                 ->get(PipelineFactory::class)
                 ->createWithMiddleware($this->middleware);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

src/Router/src/Event/Routing.php

Spacing +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
 {
     public function __construct(
         public readonly ServerRequestInterface $request
-    ) {
+    ){
     }
 }

src/Router/src/Event/RouteMatched.php

Spacing +1 added lines, -1 removed lines

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