spiral / framework

src/Router/src/Loader/Configurator/RouteConfigurator.php

Spacing +9 added lines, -9 removed lines

@@ -35,12 +35,12 @@ 
         private readonly string $name,
         private readonly string $pattern,
         private readonly RouteCollection $collection
-    ) {
+    ){
     }
 
     public function __destruct()
     {
-        if ($this->target === null) {
+        if ($this->target === null){
             throw new TargetException(
                 \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`,
                     `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name)
@@ -91,21 +91,21 @@ 
         return $this;
     }
 
-    public function action(string $controller, string|array $action, int $options = 0): self
+    public function action(string $controller, string | array $action, int $options = 0): self
     {
         $this->target = new Action($controller, $action, $options);
 
         return $this;
     }
 
-    public function callable(array|\Closure $callable): self
+    public function callable(array | \Closure $callable): self
     {
         $this->target = $callable;
 
         return $this;
     }
 
-    public function handler(TargetInterface|string $target): self
+    public function handler(TargetInterface | string $target): self
     {
         $this->target = $target;
 
@@ -140,9 +140,9 @@ 
         return $this;
     }
 
-    public function middleware(MiddlewareInterface|string|array $middleware): self
+    public function middleware(MiddlewareInterface | string | array $middleware): self
     {
-        if (!\is_array($middleware)) {
+        if (!\is_array($middleware)){
             $middleware = [$middleware];
         }
 
@@ -151,9 +151,9 @@ 
         return $this;
     }
 
-    public function methods(string|array $methods): self
+    public function methods(string | array $methods): self
     {
-        $this->methods = (array) $methods;
+        $this->methods = (array)$methods;
 
         return $this;
     }

Braces +4 added lines, -2 removed lines

@@ -40,7 +40,8 @@ 
 
     public function __destruct()
     {
-        if ($this->target === null) {
+        if ($this->target === null)
+        {
             throw new TargetException(
                 \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`,
                     `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name)
@@ -142,7 +143,8 @@ 
 
     public function middleware(MiddlewareInterface|string|array $middleware): self
     {
-        if (!\is_array($middleware)) {
+        if (!\is_array($middleware))
+        {
             $middleware = [$middleware];
         }
 

src/Router/src/Loader/DelegatingLoader.php

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
 {
     public function __construct(
         private readonly LoaderRegistryInterface $registry
-    ) {
+    ){
     }
 
     public function load(mixed $resource, string $type = null): mixed
     {
-        if (false === $loader = $this->registry->resolve($resource, $type)) {
+        if (false === $loader = $this->registry->resolve($resource, $type)){
             throw new LoaderLoadException(\sprintf('Loader for type [%s] not found.', $type ?? ''));
         }
 

Braces +2 added lines, -1 removed lines

@@ -15,7 +15,8 @@
 
     public function load(mixed $resource, string $type = null): mixed
     {
-        if (false === $loader = $this->registry->resolve($resource, $type)) {
+        if (false === $loader = $this->registry->resolve($resource, $type))
+        {
             throw new LoaderLoadException(\sprintf('Loader for type [%s] not found.', $type ?? ''));
         }
 

src/Router/src/AbstractRoute.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
     public function __construct(
         protected string $pattern,
         array $defaults = []
-    ) {
+    ){
         $this->defaults = $defaults;
     }
 
@@ -56,12 +56,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

@@ -56,12 +56,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 +25 added lines, -25 removed lines

@@ -52,9 +52,9 @@ 
         private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
         ?TracerInterface $tracer = null,
-    ) {
+    ){
         $this->tracer = $tracer ?? new NullTracer();
-        $this->basePath = '/' . \ltrim($basePath, '/');
+        $this->basePath = '/'.\ltrim($basePath, '/');
     }
 
     /**
@@ -68,13 +68,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());
                 }
@@ -109,7 +109,7 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -118,7 +118,7 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -127,9 +127,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);
@@ -141,29 +141,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);
             }
         }
@@ -174,17 +174,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);
         }
 
@@ -197,14 +197,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;
         }
 
@@ -227,7 +227,7 @@ 
                 $route,
                 $matches
             )
-        ) {
+        ){
             throw new UndefinedRouteException(
                 "Unable to locate route or use default route with 'name/controller:action' pattern"
             );
@@ -236,11 +236,11 @@ 
         /**
          * @var Matches $matches
          */
-        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 +51 added lines, -23 removed lines

@@ -67,14 +67,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());
                 }
@@ -109,7 +114,8 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name]))
+        {
             return $this->routes[$name];
         }
 
@@ -118,7 +124,8 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default))
+        {
             return $this->routes + [null => $this->default];
         }
 
@@ -127,9 +134,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);
@@ -141,29 +151,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);
             }
         }
@@ -174,17 +190,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);
         }
 
@@ -197,14 +216,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;
         }
 
@@ -236,11 +259,16 @@ 
         /**
          * @var Matches $matches
          */
-        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
@@ -68,7 +68,7 @@ 
      */
     public function withUriHandler(UriHandler $uriHandler): static
     {
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface){
             $uriHandler = $uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults,
@@ -86,7 +86,7 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface){
             $route->target = clone $route->target;
         }
 
@@ -113,7 +113,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler)){
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -129,29 +129,29 @@ 
      */
     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{
                 \assert($this->matches !== null);
                 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;
             }
 
@@ -159,7 +159,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

@@ -68,7 +68,8 @@ 
      */
     public function withUriHandler(UriHandler $uriHandler): static
     {
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface)
+        {
             $uriHandler = $uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults,
@@ -86,7 +87,8 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface)
+        {
             $route->target = clone $route->target;
         }
 
@@ -113,7 +115,8 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler))
+        {
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -129,29 +132,37 @@ 
      */
     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
+            {
                 \assert($this->matches !== null);
                 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;
             }
 
@@ -159,7 +170,9 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

src/Router/src/Traits/PipelineTrait.php

Spacing +5 added lines, -5 removed lines

@@ -43,16 +43,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();
         }
 
@@ -77,11 +77,11 @@ 
     protected function makePipeline(): Pipeline
     {
         \assert($this->container !== null);
-        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

@@ -43,16 +43,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();
         }
 
@@ -77,11 +80,14 @@ 
     protected function makePipeline(): Pipeline
     {
         \assert($this->container !== null);
-        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/Registry/DefaultPatternRegistry.php

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
      * @param non-empty-string $name
      * @param non-empty-string|\Stringable $pattern
      */
-    public function register(string $name, string|\Stringable $pattern): void
+    public function register(string $name, string | \Stringable $pattern): void
     {
-        $pattern = (string) $pattern;
+        $pattern = (string)$pattern;
         \assert($pattern !== '');
         $this->patterns[$name] = $pattern;
     }

src/Router/src/RouteGroup.php

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
     /** @var array<MiddlewareType> */
     private array $middleware = [];
 
-    private Autowire|CoreInterface|string|null $core = null;
+    private Autowire | CoreInterface | string | null $core = null;
 
     public function __construct(
         /** @deprecated since v3.3.0 */
@@ -36,7 +36,7 @@ 
         private readonly ?RouterInterface $router = null,
         /** @deprecated since v3.3.0 */
         private readonly ?UriHandler $handler = null
-    ) {
+    ){
     }
 
     /**
@@ -67,7 +67,7 @@ 
         return $this;
     }
 
-    public function setCore(Autowire|CoreInterface|string $core): self
+    public function setCore(Autowire | CoreInterface | string $core): self
     {
         $this->core = $core;
 
@@ -77,7 +77,7 @@ 
     /**
      * @param MiddlewareType $middleware
      */
-    public function addMiddleware(MiddlewareInterface|Autowire|string $middleware): self
+    public function addMiddleware(MiddlewareInterface | Autowire | string $middleware): self
     {
         $this->middleware[] = $middleware;
 
@@ -91,21 +91,21 @@ 
      */
     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);
             }
 
@@ -129,7 +129,7 @@ 
     {
         \assert($route instanceof Route);
 
-        $this->routes[$this->namePrefix . $name] = $route;
+        $this->routes[$this->namePrefix.$name] = $route;
 
         return $this;
     }

src/Router/src/UriHandler.php

Spacing +29 added lines, -29 removed lines

@@ -53,7 +53,7 @@ 
         private readonly UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null,
         ?RoutePatternRegistryInterface $patternRegistry = null,
-    ) {
+    ){
         $this->patternRegistry = $patternRegistry ?? new DefaultPatternRegistry();
         $this->slugify = $slugify ?? new Slugify();
     }
@@ -103,7 +103,7 @@ 
      */
     public function withBasePath(string $basePath): self
     {
-        if (!\str_ends_with($basePath, '/')) {
+        if (!\str_ends_with($basePath, '/')){
             $basePath .= '/';
         }
 
@@ -154,12 +154,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;
         }
 
@@ -176,7 +176,7 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -186,8 +186,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));
             }
         }
@@ -196,7 +196,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));
     }
@@ -211,18 +211,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;
             }
@@ -240,15 +240,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 = '';
             }
         }
@@ -264,23 +264,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;
@@ -290,13 +290,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>`.',
@@ -307,7 +307,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;
     }
@@ -318,7 +318,7 @@ 
     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 => '',

Braces +46 added lines, -22 removed lines

@@ -103,7 +103,8 @@ 
      */
     public function withBasePath(string $basePath): self
     {
-        if (!\str_ends_with($basePath, '/')) {
+        if (!\str_ends_with($basePath, '/'))
+        {
             $basePath .= '/';
         }
 
@@ -154,12 +155,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;
         }
 
@@ -176,7 +179,8 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -186,8 +190,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));
             }
         }
@@ -211,18 +217,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;
             }
@@ -240,15 +251,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 = '';
             }
         }
@@ -264,7 +280,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -273,14 +290,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;
@@ -290,13 +310,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>`.',
@@ -318,7 +341,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 => '',