spiral / framework

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],

src/Router/src/Target/Group.php

Spacing +1 added lines, -1 removed lines

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

src/Router/src/Target/Namespaced.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
         string $namespace,
         string $postfix = 'Controller',
         int $options = 0
-    ) {
+    ){
         $this->namespace = \rtrim($namespace, '\\');
         $this->postfix = \ucfirst($postfix);
 
@@ -38,7 +38,7 @@ 
 
     protected function resolveController(array $matches): string
     {
-        if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) {
+        if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])){
             throw new TargetException('Invalid namespace target, controller name not allowed.');
         }
 

Braces +2 added lines, -1 removed lines

@@ -38,7 +38,8 @@
 
     protected function resolveController(array $matches): string
     {
-        if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) {
+        if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller']))
+        {
             throw new TargetException('Invalid namespace target, controller name not allowed.');
         }
 

src/Router/src/Target/Action.php

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
      */
     public function __construct(
         private readonly string $controller,
-        private readonly string|array $action,
+        private readonly string | array $action,
         int $options = 0
-    ) {
-        if (\is_string($action)) {
+    ){
+        if (\is_string($action)){
             parent::__construct(
                 ['action' => $action],
                 ['action' => new Autofill($action)],
                 $options
             );
-        } else {
+        }else{
             parent::__construct(
                 ['action' => null],
                 ['action' => $action],
@@ -49,7 +49,7 @@ 
     protected function resolveAction(array $matches): string
     {
         $action = $this->action;
-        if (\is_string($action)) {
+        if (\is_string($action)){
             return $action;
         }
 

Braces +7 added lines, -3 removed lines

@@ -26,13 +26,16 @@ 
         private readonly string|array $action,
         int $options = 0
     ) {
-        if (\is_string($action)) {
+        if (\is_string($action))
+        {
             parent::__construct(
                 ['action' => $action],
                 ['action' => new Autofill($action)],
                 $options
             );
-        } else {
+        }
+        else
+        {
             parent::__construct(
                 ['action' => null],
                 ['action' => $action],
@@ -49,7 +52,8 @@ 
     protected function resolveAction(array $matches): string
     {
         $action = $this->action;
-        if (\is_string($action)) {
+        if (\is_string($action))
+        {
             return $action;
         }
 

src/Router/src/CoreHandler.php

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
         private readonly CoreInterface $core,
         private readonly ScopeInterface $scope,
         private readonly ResponseFactoryInterface $responseFactory
-    ) {
+    ){
     }
 
     public function withContext(string $controller, string $action, array $parameters): CoreHandler
@@ -63,7 +63,7 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null){
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -73,7 +73,7 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -86,29 +86,29 @@ 
                     $this->parameters
                 )
             );
-        } catch (ControllerException $e) {
+        }catch (ControllerException $e){
             \ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             \ob_get_clean();
             throw $e;
-        } finally {
-            while (\ob_get_level() > $outputLevel + 1) {
-                $output = \ob_get_clean() . $output;
+        }finally{
+            while (\ob_get_level() > $outputLevel + 1){
+                $output = \ob_get_clean().$output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            \ob_get_clean() . $output
+            \ob_get_clean().$output
         );
     }
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
-            return \strtolower($request->getMethod()) . \ucfirst($this->action);
+        if ($this->verbActions){
+            return \strtolower($request->getMethod()).\ucfirst($this->action);
         }
 
         return $this->action;
@@ -123,21 +123,21 @@ 
      */
     private function wrapResponse(Response $response, mixed $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if ($output !== '' && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof \Generator) {
+        if ($result instanceof \Generator){
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof \JsonSerializable) {
+        if (\is_array($result) || $result instanceof \JsonSerializable){
             $response = $this->writeJson($response, $result);
-        } else {
+        }else{
             $response->getBody()->write((string)$result);
         }
 

Braces +28 added lines, -12 removed lines

@@ -63,7 +63,8 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null)
+        {
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -73,7 +74,8 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -86,14 +88,21 @@ 
                     $this->parameters
                 )
             );
-        } catch (ControllerException $e) {
+        }
+        catch (ControllerException $e)
+        {
             \ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             \ob_get_clean();
             throw $e;
-        } finally {
-            while (\ob_get_level() > $outputLevel + 1) {
+        }
+        finally
+        {
+            while (\ob_get_level() > $outputLevel + 1)
+            {
                 $output = \ob_get_clean() . $output;
             }
         }
@@ -107,7 +116,8 @@ 
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
+        if ($this->verbActions)
+        {
             return \strtolower($request->getMethod()) . \ucfirst($this->action);
         }
 
@@ -123,21 +133,27 @@ 
      */
     private function wrapResponse(Response $response, mixed $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response)
+        {
+            if ($output !== '' && $result->getBody()->isWritable())
+            {
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof \Generator) {
+        if ($result instanceof \Generator)
+        {
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof \JsonSerializable) {
+        if (\is_array($result) || $result instanceof \JsonSerializable)
+        {
             $response = $this->writeJson($response, $result);
-        } else {
+        }
+        else
+        {
             $response->getBody()->write((string)$result);
         }
 

src/Auth/src/Event/Logout.php

Spacing +1 added lines, -1 removed lines

@@ -9,6 +9,6 @@
     public function __construct(
         public readonly ?object $actor,
         public readonly ?string $transport = null
-    ) {
+    ){
     }
 }

src/Auth/src/Event/Authenticated.php

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
     public function __construct(
         public readonly TokenInterface $token,
         public readonly ?string $transport = null
-    ) {
+    ){
     }
 }