spiral / framework

src/Router/src/UriHandler.php

Braces +46 added lines, -22 removed lines

@@ -90,7 +90,8 @@ 
 
     public function withBasePath(string $basePath): self
     {
-        if (!\str_ends_with($basePath, '/')) {
+        if (!\str_ends_with($basePath, '/'))
+        {
             $basePath .= '/';
         }
 
@@ -127,12 +128,14 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
         $matches = [];
-        if (!\preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!\preg_match($this->compiled, $this->fetchTarget($uri), $matches))
+        {
             return null;
         }
 
@@ -149,7 +152,8 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -159,8 +163,10 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_)
+        {
+            if (empty($parameters[$key]))
+            {
                 throw new UriHandlerException(\sprintf('Unable to generate Uri, parameter `%s` is missing', $key));
             }
         }
@@ -184,18 +190,23 @@ 
         $allowed = \array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (\is_int($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter)
+        {
+            if (\is_int($key) && isset($allowed[$key]))
+            {
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!\array_key_exists($key, $this->options) && \is_array($parameters)) {
+            }
+            elseif (!\array_key_exists($key, $this->options) && \is_array($parameters))
+            {
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (\is_string($parameter) && !\preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (\is_string($parameter) && !\preg_match('/^[a-z\-_0-9]+$/i', $parameter))
+            {
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -213,15 +224,20 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
+        if (empty($path) || $path[0] !== '/')
+        {
             $path = '/' . $path;
         }
 
-        if ($this->matchHost) {
+        if ($this->matchHost)
+        {
             $uriString = $uri->getHost() . $path;
-        } else {
+        }
+        else
+        {
             $uriString = \substr($path, \strlen($this->basePath));
-            if ($uriString === false) {
+            if ($uriString === false)
+            {
                 $uriString = '';
             }
         }
@@ -234,7 +250,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -243,14 +260,17 @@ 
         $pattern = \rtrim(\ltrim($this->getPrefix() . '/' . $this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (\str_starts_with($pattern, '[/')) {
+        if (\str_starts_with($pattern, '[/'))
+        {
             $pattern = '[' . \substr($pattern, 2);
         }
 
-        if (\preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (\preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches))
+        {
             $variables = \array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment)
+            {
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces[\sprintf('<%s>', $key)] = \sprintf('(?P<%s>%s)', $key, $segment);
                 $options[] = $key;
@@ -260,13 +280,16 @@ 
         $template = \preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = \array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value)
+        {
+            if ($value instanceof Autofill)
+            {
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!\array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!\array_key_exists($key, $options) && !isset($this->defaults[$key]))
+            {
                 throw new ConstrainException(
                     \sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -288,7 +311,8 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $replaces[\sprintf('<%s>', $key)] = match (true) {
                 $value instanceof \Stringable || \is_scalar($value) => (string) $value,
                 default => '',

src/Router/src/Router.php

Braces +51 added lines, -23 removed lines

@@ -63,14 +63,19 @@ 
 
         return $this->tracer->trace(
             name: 'Routing',
-            callback: function (SpanInterface $span) use ($request) {
-                try {
+            callback: function (SpanInterface $span) use ($request)
+            {
+                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());
                 }
@@ -105,7 +110,8 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name]))
+        {
             return $this->routes[$name];
         }
 
@@ -114,7 +120,8 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default))
+        {
             return $this->routes + [null => $this->default];
         }
 
@@ -123,9 +130,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);
@@ -137,29 +147,35 @@ 
         /** @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(\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)
+            {
                 $group = $groups->getGroup($configurator->group ?? $groups->getDefaultGroup());
                 $group->setPrefix($configurator->prefix);
                 $group->addRoute($name, $route);
             }
 
-            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME)
+            {
                 $this->setDefault($route);
             }
         }
@@ -170,17 +186,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);
         }
 
@@ -193,14 +212,18 @@ 
      */
     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);
         }
 
-        try {
+        try
+        {
             $uriHandler = $route->getUriHandler();
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             $uriHandler = $this->uriHandler;
         }
 
@@ -229,11 +252,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/Loader/Configurator/ImportConfigurator.php

Braces +12 added lines, -6 removed lines

@@ -33,7 +33,8 @@ 
 
     public function defaults(array $defaults): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator)
+        {
             $configurator->defaults($defaults);
         }
 
@@ -45,7 +46,8 @@ 
      */
     public function group(string $group): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator)
+        {
             $configurator->group($group);
         }
 
@@ -57,7 +59,8 @@ 
      */
     public function prefix(string $prefix): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator)
+        {
             $configurator->prefix($prefix);
         }
 
@@ -69,7 +72,8 @@ 
      */
     public function namePrefix(string $prefix): self
     {
-        foreach ($this->routes->all() as $name => $configurator) {
+        foreach ($this->routes->all() as $name => $configurator)
+        {
             $this->routes->add($prefix . $name, $configurator);
             $this->routes->remove($name);
         }
@@ -79,7 +83,8 @@ 
 
     public function core(CoreInterface $core): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator)
+        {
             $configurator->core($core);
         }
 
@@ -88,7 +93,8 @@ 
 
     public function middleware(MiddlewareInterface|string|array $middleware): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator)
+        {
             $configurator->middleware($middleware);
         }
 

src/AnnotatedRoutes/src/RouteLocatorListener.php

Braces +8 added lines, -4 removed lines

@@ -24,10 +24,12 @@ 
 
     public function listen(ReflectionClass $class): void
     {
-        foreach ($class->getMethods() as $method) {
+        foreach ($class->getMethods() as $method)
+        {
             $route = $this->reader->firstFunctionMetadata($method, Route::class);
 
-            if ($route === null) {
+            if ($route === null)
+            {
                 continue;
             }
 
@@ -40,7 +42,8 @@ 
         $defaultGroup = $this->groups->getDefaultGroup();
 
         $routes = [];
-        foreach ($this->attributes as $classes) {
+        foreach ($this->attributes as $classes)
+        {
             [$method, $route] = $classes;
             $class = $method->getDeclaringClass();
 
@@ -64,7 +67,8 @@ 
 
     private function configureRoutes(array $routes): void
     {
-        foreach ($routes as $name => $schema) {
+        foreach ($routes as $name => $schema)
+        {
             $route = new \Spiral\Router\Route(
                 $schema['pattern'],
                 new Action($schema['controller'], $schema['action']),

src/AnnotatedRoutes/tests/RouteLocatorListenerTest.php

Braces +2 added lines, -1 removed lines

@@ -53,7 +53,8 @@
         $this->container = new Container();
 
         $this->container->bindSingleton(UriFactoryInterface::class, new Psr17Factory());
-        $this->container->bindSingleton(RouterInterface::class, static function (UriHandler $handler, Container $container) {
+        $this->container->bindSingleton(RouterInterface::class, static function (UriHandler $handler, Container $container)
+        {
             return new Router('/', $handler, $container);
         });
         $this->container->bindSingleton(GroupRegistry::class, new GroupRegistry($this->container));

src/Router/src/RouteGroup.php

Braces +13 added lines, -6 removed lines

@@ -89,21 +89,28 @@
      */
     public function register(RouterInterface $router, FactoryInterface $factory): void
     {
-        foreach ($this->routes as $name => $route) {
-            if ($this->core !== null) {
-                if (!$this->core instanceof CoreInterface) {
+        foreach ($this->routes as $name => $route)
+        {
+            if ($this->core !== null)
+            {
+                if (!$this->core instanceof CoreInterface)
+                {
                     $this->core = $factory->make($this->core);
                 }
 
                 $target = $route->getTarget();
-                if ($target instanceof AbstractTarget) {
+                if ($target instanceof AbstractTarget)
+                {
                     $route = $route->withTarget($target->withCore($this->core));
                 }
             }
 
-            try {
+            try
+            {
                 $uriHandler = $route->getUriHandler();
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 $uriHandler = $factory->make(UriHandler::class);
             }
 

src/Router/src/GroupRegistry.php

Braces +4 added lines, -2 removed lines

@@ -23,7 +23,8 @@ 
 
     public function getGroup(string $name): RouteGroup
     {
-        if (!isset($this->groups[$name])) {
+        if (!isset($this->groups[$name]))
+        {
             $this->groups[$name] = $this->factory->make(RouteGroup::class);
         }
 
@@ -49,7 +50,8 @@ 
      */
     public function registerRoutes(RouterInterface $router): void
     {
-        foreach ($this->groups as $group) {
+        foreach ($this->groups as $group)
+        {
             $group->register($router, $this->factory);
         }
     }

src/Framework/Bootloader/Http/RouterBootloader.php

Braces +7 added lines, -3 removed lines

@@ -62,10 +62,13 @@ 
             $groups->registerRoutes($router);
         };
 
-        if ($kernel instanceof Kernel) {
+        if ($kernel instanceof Kernel)
+        {
             $kernel->appBooted($configuratorCallback);
             $kernel->appBooted($groupsCallback);
-        } else {
+        }
+        else
+        {
             $kernel->booted($configuratorCallback);
             $kernel->booted($groupsCallback);
         }
@@ -95,7 +98,8 @@ 
     private function route(ServerRequestInterface $request): RouteInterface
     {
         $route = $request->getAttribute(Router::ROUTE_ATTRIBUTE, null);
-        if ($route === null) {
+        if ($route === null)
+        {
             throw new ScopeException('Unable to resolve Route, invalid request scope');
         }