spiral / framework

src/Router/src/UriHandler.php

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
         'integer' => '\d+',
         'uuid'    => '[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}',
     ];
-    private const URI_FIXERS       = [
+    private const URI_FIXERS = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -50,7 +50,7 @@ 
     public function __construct(
         private readonly UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->slugify = $slugify ?? new Slugify();
     }
 
@@ -90,7 +90,7 @@ 
 
     public function withBasePath(string $basePath): self
     {
-        if (!\str_ends_with($basePath, '/')) {
+        if (!\str_ends_with($basePath, '/')){
             $basePath .= '/';
         }
 
@@ -127,12 +127,12 @@ 
      */
     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 +149,7 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -159,8 +159,8 @@ 
             $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));
             }
         }
@@ -169,7 +169,7 @@ 
         $path = $this->interpolate($this->template, $parameters);
 
         //Uri with added base path and prefix
-        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->basePath) . \trim($path, '/'));
+        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->basePath).\trim($path, '/'));
 
         return empty($query) ? $uri : $uri->withQuery(\http_build_query($query));
     }
@@ -184,18 +184,18 @@ 
         $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 +213,15 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
-            $path = '/' . $path;
+        if (empty($path) || $path[0] !== '/'){
+            $path = '/'.$path;
         }
 
-        if ($this->matchHost) {
-            $uriString = $uri->getHost() . $path;
-        } else {
+        if ($this->matchHost){
+            $uriString = $uri->getHost().$path;
+        }else{
             $uriString = \substr($path, \strlen($this->basePath));
-            if ($uriString === false) {
+            if ($uriString === false){
                 $uriString = '';
             }
         }
@@ -234,23 +234,23 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
         $options = [];
         $replaces = [];
-        $pattern = \rtrim(\ltrim($this->getPrefix() . '/' . $this->pattern, ':/'), '/');
+        $pattern = \rtrim(\ltrim($this->getPrefix().'/'.$this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (\str_starts_with($pattern, '[/')) {
-            $pattern = '[' . \substr($pattern, 2);
+        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 +260,13 @@ 
         $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>`.',
@@ -277,7 +277,7 @@ 
             }
         }
 
-        $this->compiled = '/^' . \strtr($template, $replaces + self::PATTERN_REPLACES) . '$/iu';
+        $this->compiled = '/^'.\strtr($template, $replaces + self::PATTERN_REPLACES).'$/iu';
         $this->template = \stripslashes(\str_replace('?', '', $template));
         $this->options = $options;
     }
@@ -288,9 +288,9 @@ 
     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,
+                $value instanceof \Stringable || \is_scalar($value) => (string)$value,
                 default => '',
             };
         }

src/Router/src/Router.php

Spacing +25 added lines, -25 removed lines

@@ -49,8 +49,8 @@ 
         private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
         private readonly ?TracerInterface $tracer = new NullTracer(),
-    ) {
-        $this->basePath = '/' . \ltrim($basePath, '/');
+    ){
+        $this->basePath = '/'.\ltrim($basePath, '/');
     }
 
     /**
@@ -64,13 +64,13 @@ 
         return $this->tracer->trace(
             name: 'Routing',
             callback: function (SpanInterface $span) use ($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());
                 }
@@ -105,7 +105,7 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -114,7 +114,7 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -123,9 +123,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);
@@ -137,29 +137,29 @@ 
         /** @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 +170,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);
         }
 
@@ -193,14 +193,14 @@ 
      */
     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;
         }
 
@@ -223,17 +223,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));
         }
 

src/Router/src/Loader/Configurator/ImportConfigurator.php

Spacing +11 added lines, -11 removed lines

@@ -13,7 +13,7 @@ 
     public function __construct(
         private readonly RouteCollection $parent,
         private readonly RouteCollection $routes
-    ) {
+    ){
     }
 
     public function __destruct()
@@ -23,17 +23,17 @@ 
 
     public function __sleep(): array
     {
-        throw new \BadMethodCallException('Cannot unserialize ' . self::class);
+        throw new \BadMethodCallException('Cannot unserialize '.self::class);
     }
 
     public function __wakeup()
     {
-        throw new \BadMethodCallException('Cannot unserialize ' . self::class);
+        throw new \BadMethodCallException('Cannot unserialize '.self::class);
     }
 
     public function defaults(array $defaults): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator){
             $configurator->defaults($defaults);
         }
 
@@ -45,7 +45,7 @@ 
      */
     public function group(string $group): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator){
             $configurator->group($group);
         }
 
@@ -57,7 +57,7 @@ 
      */
     public function prefix(string $prefix): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator){
             $configurator->prefix($prefix);
         }
 
@@ -69,8 +69,8 @@ 
      */
     public function namePrefix(string $prefix): self
     {
-        foreach ($this->routes->all() as $name => $configurator) {
-            $this->routes->add($prefix . $name, $configurator);
+        foreach ($this->routes->all() as $name => $configurator){
+            $this->routes->add($prefix.$name, $configurator);
             $this->routes->remove($name);
         }
 
@@ -79,16 +79,16 @@ 
 
     public function core(CoreInterface $core): self
     {
-        foreach ($this->routes->all() as $configurator) {
+        foreach ($this->routes->all() as $configurator){
             $configurator->core($core);
         }
 
         return $this;
     }
 
-    public function middleware(MiddlewareInterface|string|array $middleware): self
+    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/Annotation/Route.php

Spacing +2 added lines, -2 removed lines

@@ -41,11 +41,11 @@
     public function __construct(
         public readonly string $route,
         public readonly ?string $name = null,
-        public readonly array|string $methods = \Spiral\Router\Route::VERBS,
+        public readonly array | string $methods = \Spiral\Router\Route::VERBS,
         public readonly array $defaults = [],
         public readonly ?string $group = null,
         public readonly array $middleware = [],
         public readonly int $priority = 0
-    ) {
+    ){
     }
 }

src/AnnotatedRoutes/src/RouteLocatorListener.php

Spacing +5 added lines, -5 removed lines

@@ -19,15 +19,15 @@ 
     public function __construct(
         private readonly ReaderInterface $reader,
         private readonly GroupRegistry $groups
-    ) {
+    ){
     }
 
     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 +40,7 @@ 
         $defaultGroup = $this->groups->getDefaultGroup();
 
         $routes = [];
-        foreach ($this->attributes as $classes) {
+        foreach ($this->attributes as $classes){
             [$method, $route] = $classes;
             $class = $method->getDeclaringClass();
 
@@ -64,7 +64,7 @@ 
 
     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

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         $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/Framework/Command/Router/ListCommand.php

Spacing +12 added lines, -12 removed lines

@@ -27,8 +27,8 @@ 
     {
         $grid = $this->table(['Name:', 'Verbs:', 'Pattern:', 'Target:', 'Group:']);
 
-        foreach ($router->getRoutes() as $name => $route) {
-            if ($route instanceof Route) {
+        foreach ($router->getRoutes() as $name => $route){
+            if ($route instanceof Route){
                 $grid->addRow(
                     [
                         $name,
@@ -52,8 +52,8 @@ 
     private function getRouteGroups(GroupRegistry $registry, string $routeName): array
     {
         $groups = [];
-        foreach ($registry as $groupName => $group) {
-            if ($group->hasRoute($routeName)) {
+        foreach ($registry as $groupName => $group){
+            if ($group->hasRoute($routeName)){
                 $groups[] = $groupName;
             }
         }
@@ -63,12 +63,12 @@ 
 
     private function getVerbs(Route $route): string
     {
-        if ($route->getVerbs() === Route::VERBS) {
+        if ($route->getVerbs() === Route::VERBS){
             return '*';
         }
 
         $result = [];
-        foreach ($route->getVerbs() as $verb) {
+        foreach ($route->getVerbs() as $verb){
             $result[] = match (\strtolower($verb)) {
                 'get' => '<fg=green>GET</>',
                 'post' => '<fg=blue>POST</>',
@@ -93,7 +93,7 @@ 
         return \preg_replace_callback(
             '/<([^>]*)>/',
             static fn ($m) => \sprintf('<fg=magenta>%s</>', $m[0]),
-            !empty($prefix) ? $prefix . '/' .  \trim($pattern, '/') : $pattern
+            !empty($prefix) ? $prefix.'/'.\trim($pattern, '/') : $pattern
         );
     }
 
@@ -104,7 +104,7 @@ 
     private function getTarget(Route $route, KernelInterface $kernel): string
     {
         $target = $this->getValue($route, 'target');
-        switch (true) {
+        switch (true){
             case $target instanceof \Closure:
                 $reflection = new \ReflectionFunction($target);
 
@@ -129,7 +129,7 @@ 
 
             case $target instanceof Group:
                 $result = [];
-                foreach ($this->getValue($target, 'controllers') as $alias => $class) {
+                foreach ($this->getValue($target, 'controllers') as $alias => $class){
                     $result[] = \sprintf('%s => %s', $alias, $this->relativeClass($class, $kernel));
                 }
 
@@ -148,10 +148,10 @@ 
 
     private function getValue(object $object, string $property): mixed
     {
-        try {
+        try{
             $r = new \ReflectionObject($object);
             $prop = $r->getProperty($property);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             return $e->getMessage();
         }
 
@@ -162,7 +162,7 @@ 
     {
         $r = new \ReflectionObject($kernel);
 
-        if (\str_starts_with($class, $r->getNamespaceName())) {
+        if (\str_starts_with($class, $r->getNamespaceName())){
             return \substr($class, \strlen($r->getNamespaceName()) + 1);
         }
 

src/Router/src/RouteGroup.php

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
         private readonly RouterInterface $router,
         private readonly UriHandler $handler,
         private readonly ?string $name = null
-    ) {
+    ){
     }
 
     /**
@@ -70,9 +70,9 @@ 
         return $this;
     }
 
-    public function setCore(Autowire|CoreInterface|string $core): self
+    public function setCore(Autowire | CoreInterface | string $core): self
     {
-        if (!$core instanceof CoreInterface) {
+        if (!$core instanceof CoreInterface){
             $core = $this->container->get($core);
         }
         $this->core = $core;
@@ -86,13 +86,13 @@ 
     /**
      * @param MiddlewareInterface|Autowire|class-string<MiddlewareInterface>|non-empty-string $middleware
      */
-    public function addMiddleware(MiddlewareInterface|Autowire|string $middleware): self
+    public function addMiddleware(MiddlewareInterface | Autowire | string $middleware): self
     {
         $this->middleware[] = $middleware;
 
-        if ($this->container instanceof BinderInterface && $this->name !== null) {
+        if ($this->container instanceof BinderInterface && $this->name !== null){
             $this->container->bind(
-                'middleware:' . $this->name,
+                'middleware:'.$this->name,
                 function (PipelineFactory $factory): Pipeline {
                     return $factory->createWithMiddleware($this->middleware);
                 }
@@ -112,7 +112,7 @@ 
      */
     public function flushRoutes(): void
     {
-        foreach ($this->routes as $name) {
+        foreach ($this->routes as $name){
             $this->router->setRoute($name, $this->applyGroupParams($this->router->getRoute($name)));
         }
     }
@@ -122,30 +122,30 @@ 
      */
     public function addRoute(string $name, Route $route): self
     {
-        if ($this->name !== null && $this->middleware !== []) {
-            $route = $route->withMiddleware('middleware:' . $this->name);
+        if ($this->name !== null && $this->middleware !== []){
+            $route = $route->withMiddleware('middleware:'.$this->name);
         }
 
-        $this->routes[] = $this->namePrefix . $name;
+        $this->routes[] = $this->namePrefix.$name;
 
-        $this->router->setRoute($this->namePrefix . $name, $this->applyGroupParams($route));
+        $this->router->setRoute($this->namePrefix.$name, $this->applyGroupParams($route));
 
         return $this;
     }
 
     private function applyGroupParams(Route $route): Route
     {
-        if ($this->core !== null) {
+        if ($this->core !== null){
             $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 = $this->handler;
         }
 

src/Router/src/GroupRegistry.php

Spacing +2 added lines, -2 removed lines

@@ -18,12 +18,12 @@
 
     public function __construct(
         private readonly FactoryInterface $factory
-    ) {
+    ){
     }
 
     public function getGroup(string $name): RouteGroup
     {
-        if (!isset($this->groups[$name])) {
+        if (!isset($this->groups[$name])){
             $this->groups[$name] = $this->factory->make(RouteGroup::class, ['name' => $name]);
         }