spiral / framework

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,
-    ) {
+    ){
     }
 }

src/Router/src/Autofill.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     public function __construct(
         private readonly string $value
-    ) {
+    ){
     }
 
     public function __toString(): string

src/Router/src/RouteGroup.php

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
         private readonly ContainerInterface $container,
         private readonly RouterInterface $router,
         private readonly UriHandler $handler
-    ) {
+    ){
     }
 
     /**
@@ -54,9 +54,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;
@@ -70,7 +70,7 @@ 
     /**
      * @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;
 
@@ -87,7 +87,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)));
         }
     }
@@ -106,10 +106,10 @@ 
 
     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));
             }
         }

Braces +8 added lines, -4 removed lines

@@ -56,7 +56,8 @@ 
 
     public function setCore(Autowire|CoreInterface|string $core): self
     {
-        if (!$core instanceof CoreInterface) {
+        if (!$core instanceof CoreInterface)
+        {
             $core = $this->container->get($core);
         }
         $this->core = $core;
@@ -87,7 +88,8 @@ 
      */
     public function flushRoutes(): void
     {
-        foreach ($this->routes as $name) {
+        foreach ($this->routes as $name)
+        {
             $this->router->setRoute($name, $this->applyGroupParams($this->router->getRoute($name)));
         }
     }
@@ -106,10 +108,12 @@ 
 
     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));
             }
         }

src/Router/src/UriHandler.php

Spacing +29 added lines, -29 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 = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -49,7 +49,7 @@ 
     public function __construct(
         private readonly UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->slugify = $slugify ?? new Slugify();
     }
 
@@ -108,13 +108,13 @@ 
      */
     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;
         }
 
@@ -128,7 +128,7 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -138,8 +138,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));
             }
         }
@@ -148,7 +148,7 @@ 
         $path = $this->interpolate($this->template, $parameters);
 
         //Uri with added prefix
-        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix) . trim($path, '/'));
+        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix).trim($path, '/'));
 
         return empty($query) ? $uri : $uri->withQuery(\http_build_query($query));
     }
@@ -163,18 +163,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;
             }
@@ -192,15 +192,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->prefix));
-            if ($uriString === false) {
+            if ($uriString === false){
                 $uriString = '';
             }
         }
@@ -213,7 +213,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -222,14 +222,14 @@ 
         $pattern = \rtrim(\ltrim($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;
@@ -239,13 +239,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>`.',
@@ -256,7 +256,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;
     }
@@ -267,9 +267,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 => '',
             };
         }

Braces +44 added lines, -21 removed lines

@@ -108,13 +108,15 @@ 
      */
     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;
         }
 
@@ -128,7 +130,8 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -138,8 +141,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));
             }
         }
@@ -163,18 +168,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;
             }
@@ -192,15 +202,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->prefix));
-            if ($uriString === false) {
+            if ($uriString === false)
+            {
                 $uriString = '';
             }
         }
@@ -213,7 +228,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -222,14 +238,17 @@ 
         $pattern = \rtrim(\ltrim($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;
@@ -239,13 +258,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>`.',
@@ -267,7 +289,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/Target/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         private readonly string $controller,
         int $options = 0,
         string $defaultAction = 'index'
-    ) {
+    ){
         parent::__construct(
             ['action' => null],
             ['action' => null],