spiral / framework

src/Router/src/Target/Action.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function __construct(string $controller, $action, int $options = 0)
     {
-        if (!is_string($action) && !is_array($action)) {
+        if (!is_string($action) && !is_array($action)){
             throw new InvalidArgumentException(
                 sprintf(
                     'Action parameter must type string or array, `%s` given',
@@ -51,13 +51,13 @@ 
         $this->controller = $controller;
         $this->action = $action;
 
-        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],
@@ -80,7 +80,7 @@ 
     protected function resolveAction(array $matches): string
     {
         $action = $this->action;
-        if (is_string($action)) {
+        if (is_string($action)){
             return $action;
         }
 

Braces +9 added lines, -4 removed lines

@@ -39,7 +39,8 @@ 
      */
     public function __construct(string $controller, $action, int $options = 0)
     {
-        if (!is_string($action) && !is_array($action)) {
+        if (!is_string($action) && !is_array($action))
+        {
             throw new InvalidArgumentException(
                 sprintf(
                     'Action parameter must type string or array, `%s` given',
@@ -51,13 +52,16 @@ 
         $this->controller = $controller;
         $this->action = $action;
 
-        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],
@@ -80,7 +84,8 @@ 
     protected function resolveAction(array $matches): string
     {
         $action = $this->action;
-        if (is_string($action)) {
+        if (is_string($action))
+        {
             return $action;
         }
 

src/Router/src/Target/Namespaced.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         string $postfix = 'Controller',
         int $options = 0,
         string $defaultAction = 'index'
-    ) {
+    ){
         $this->namespace = rtrim($namespace, '\\');
         $this->postfix = ucfirst($postfix);
 
@@ -58,7 +58,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

@@ -58,7 +58,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/AbstractTarget.php

Spacing +3 added lines, -3 removed lines

@@ -105,11 +105,11 @@ 
      */
     protected function coreHandler(ContainerInterface $container): CoreHandler
     {
-        if ($this->handler !== null) {
+        if ($this->handler !== null){
             return $this->handler;
         }
 
-        try {
+        try{
             // construct on demand
             $this->handler = new CoreHandler(
                 $this->core ?? $container->get(CoreInterface::class),
@@ -118,7 +118,7 @@ 
             );
 
             return $this->handler;
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new TargetException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +7 added lines, -3 removed lines

@@ -105,11 +105,13 @@ 
      */
     protected function coreHandler(ContainerInterface $container): CoreHandler
     {
-        if ($this->handler !== null) {
+        if ($this->handler !== null)
+        {
             return $this->handler;
         }
 
-        try {
+        try
+        {
             // construct on demand
             $this->handler = new CoreHandler(
                 $this->core ?? $container->get(CoreInterface::class),
@@ -118,7 +120,9 @@ 
             );
 
             return $this->handler;
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new TargetException($e->getMessage(), $e->getCode(), $e);
         }
     }

src/Router/src/Router.php

Spacing +16 added lines, -16 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function __construct(string $basePath, UriHandler $uriHandler, ContainerInterface $container)
     {
-        $this->basePath = '/' . ltrim($basePath, '/');
+        $this->basePath = '/'.ltrim($basePath, '/');
         $this->uriHandler = $uriHandler;
         $this->container = $container;
     }
@@ -69,13 +69,13 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        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){
             throw new RouteNotFoundException($request->getUri());
         }
 
@@ -120,7 +120,7 @@ 
      */
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -132,7 +132,7 @@ 
      */
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -144,9 +144,9 @@ 
      */
     public function uri(string $route, $parameters = []): UriInterface
     {
-        try {
+        try{
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException $e) {
+        }catch (UndefinedRouteException $e){
             //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);
@@ -161,17 +161,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);
         }
 
@@ -187,7 +187,7 @@ 
      */
     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);
         }
@@ -214,17 +214,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("Unable to locate route candidate for `{$route}`");
         }
 

Braces +32 added lines, -14 removed lines

@@ -69,13 +69,17 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        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)
+        {
             throw new RouteNotFoundException($request->getUri());
         }
 
@@ -120,7 +124,8 @@ 
      */
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name]))
+        {
             return $this->routes[$name];
         }
 
@@ -132,7 +137,8 @@ 
      */
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default))
+        {
             return $this->routes + [null => $this->default];
         }
 
@@ -144,9 +150,12 @@ 
      */
     public function uri(string $route, $parameters = []): UriInterface
     {
-        try {
+        try
+        {
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException $e) {
+        }
+        catch (UndefinedRouteException $e)
+        {
             //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);
@@ -161,17 +170,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);
         }
 
@@ -187,7 +199,8 @@ 
      */
     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);
         }
@@ -220,11 +233,16 @@ 
             );
         }
 
-        if (!empty($matches['name'])) {
+        if (!empty($matches['name']))
+        {
             $routeObject = $this->getRoute($matches['name']);
-        } elseif ($this->default !== null) {
+        }
+        elseif ($this->default !== null)
+        {
             $routeObject = $this->default;
-        } else {
+        }
+        else
+        {
             throw new UndefinedRouteException("Unable to locate route candidate for `{$route}`");
         }
 

src/Router/src/Traits/PipelineTrait.php

Spacing +12 added lines, -12 removed lines

@@ -46,15 +46,15 @@ 
         $route = clone $this;
 
         // array fallback
-        if (count($middleware) === 1 && is_array($middleware[0])) {
+        if (count($middleware) === 1 && is_array($middleware[0])){
             $middleware = $middleware[0];
         }
 
-        foreach ($middleware as $item) {
-            if (!is_string($item) && !$item instanceof MiddlewareInterface) {
-                if (is_object($item)) {
+        foreach ($middleware as $item){
+            if (!is_string($item) && !$item instanceof MiddlewareInterface){
+                if (is_object($item)){
                     $name = get_class($item);
-                } else {
+                }else{
                     $name = gettype($item);
                 }
 
@@ -64,7 +64,7 @@ 
             $route->middleware[] = $item;
         }
 
-        if ($route->pipeline !== null) {
+        if ($route->pipeline !== null){
             $route->pipeline = $route->makePipeline();
         }
 
@@ -81,22 +81,22 @@ 
     protected function makePipeline(): Pipeline
     {
         // pre-aggregated
-        if (count($this->middleware) === 1 && $this->middleware[0] instanceof Pipeline) {
+        if (count($this->middleware) === 1 && $this->middleware[0] instanceof Pipeline){
             return $this->middleware[0];
         }
 
-        try {
+        try{
             $pipeline = $this->container->get(Pipeline::class);
 
-            foreach ($this->middleware as $middleware) {
-                if ($middleware instanceof MiddlewareInterface) {
+            foreach ($this->middleware as $middleware){
+                if ($middleware instanceof MiddlewareInterface){
                     $pipeline->pushMiddleware($middleware);
-                } else {
+                }else{
                     // dynamically resolved
                     $pipeline->pushMiddleware($this->container->get($middleware));
                 }
             }
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
 

Braces +27 added lines, -12 removed lines

@@ -46,15 +46,21 @@ 
         $route = clone $this;
 
         // array fallback
-        if (count($middleware) === 1 && is_array($middleware[0])) {
+        if (count($middleware) === 1 && is_array($middleware[0]))
+        {
             $middleware = $middleware[0];
         }
 
-        foreach ($middleware as $item) {
-            if (!is_string($item) && !$item instanceof MiddlewareInterface) {
-                if (is_object($item)) {
+        foreach ($middleware as $item)
+        {
+            if (!is_string($item) && !$item instanceof MiddlewareInterface)
+            {
+                if (is_object($item))
+                {
                     $name = get_class($item);
-                } else {
+                }
+                else
+                {
                     $name = gettype($item);
                 }
 
@@ -64,7 +70,8 @@ 
             $route->middleware[] = $item;
         }
 
-        if ($route->pipeline !== null) {
+        if ($route->pipeline !== null)
+        {
             $route->pipeline = $route->makePipeline();
         }
 
@@ -81,22 +88,30 @@ 
     protected function makePipeline(): Pipeline
     {
         // pre-aggregated
-        if (count($this->middleware) === 1 && $this->middleware[0] instanceof Pipeline) {
+        if (count($this->middleware) === 1 && $this->middleware[0] instanceof Pipeline)
+        {
             return $this->middleware[0];
         }
 
-        try {
+        try
+        {
             $pipeline = $this->container->get(Pipeline::class);
 
-            foreach ($this->middleware as $middleware) {
-                if ($middleware instanceof MiddlewareInterface) {
+            foreach ($this->middleware as $middleware)
+            {
+                if ($middleware instanceof MiddlewareInterface)
+                {
                     $pipeline->pushMiddleware($middleware);
-                } else {
+                }
+                else
+                {
                     // dynamically resolved
                     $pipeline->pushMiddleware($this->container->get($middleware));
                 }
             }
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
 

src/Router/src/Traits/VerbsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,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("Invalid HTTP verb `{$verb}`");
             }
 

Braces +4 added lines, -2 removed lines

@@ -30,9 +30,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("Invalid HTTP verb `{$verb}`");
             }
 

src/Router/src/AbstractRoute.php

Spacing +2 added lines, -2 removed lines

@@ -65,12 +65,12 @@
      */
     public function match(Request $request): ?RouteInterface
     {
-        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

@@ -65,12 +65,14 @@
      */
     public function match(Request $request): ?RouteInterface
     {
-        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/CoreHandler.php

Spacing +16 added lines, -16 removed lines

@@ -60,7 +60,7 @@ 
         CoreInterface $core,
         ScopeInterface $scope,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->core = $core;
         $this->scope = $scope;
         $this->responseFactory = $responseFactory;
@@ -103,7 +103,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');
         }
 
@@ -113,7 +113,7 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -128,22 +128,22 @@ 
                     );
                 }
             );
-        } 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
         );
     }
 
@@ -153,8 +153,8 @@ 
      */
     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;
@@ -170,17 +170,17 @@ 
      */
     private function wrapResponse(Response $response, $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 (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);
         }
 
@@ -198,7 +198,7 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode()){
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

Braces +30 added lines, -13 removed lines

@@ -103,7 +103,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');
         }
 
@@ -113,14 +114,16 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
                     Request::class  => $request,
                     Response::class => $response,
                 ],
-                function () use ($request) {
+                function () use ($request)
+                {
                     return $this->core->callAction(
                         $this->controller,
                         $this->getAction($request),
@@ -128,14 +131,21 @@ 
                     );
                 }
             );
-        } 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;
             }
         }
@@ -153,7 +163,8 @@ 
      */
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
+        if ($this->verbActions)
+        {
             return strtolower($request->getMethod()) . ucfirst($this->action);
         }
 
@@ -170,17 +181,22 @@ 
      */
     private function wrapResponse(Response $response, $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 (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);
         }
 
@@ -198,7 +214,8 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode())
+        {
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

src/Router/src/UriHandler.php

Braces +50 added lines, -24 removed lines

@@ -167,12 +167,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;
         }
 
@@ -190,7 +192,8 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -200,8 +203,10 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $values) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $values)
+        {
+            if (empty($parameters[$key]))
+            {
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -227,18 +232,23 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter)
+        {
+            if (is_numeric($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;
             }
@@ -259,15 +269,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 = '';
             }
         }
@@ -280,7 +295,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -288,14 +304,17 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
+        if (strpos($pattern, '[/') === 0)
+        {
             $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["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -305,13 +324,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>`.',
@@ -337,7 +359,8 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -354,15 +377,18 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== '')
+        {
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name]))
+        {
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name]))
+        {
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);

Spacing +31 added lines, -31 removed lines

@@ -32,7 +32,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 = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -78,7 +78,7 @@ 
     public function __construct(
         UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->uriFactory = $uriFactory;
         $this->slugify = $slugify ?? new Slugify();
     }
@@ -167,12 +167,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;
         }
 
@@ -190,7 +190,7 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -200,8 +200,8 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $values) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $values){
+            if (empty($parameters[$key])){
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -210,7 +210,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));
     }
@@ -227,18 +227,18 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter){
+            if (is_numeric($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;
             }
@@ -259,15 +259,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 = '';
             }
         }
@@ -280,7 +280,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -288,14 +288,14 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
-            $pattern = '[' . substr($pattern, 2);
+        if (strpos($pattern, '[/') === 0){
+            $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["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -305,13 +305,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>`.',
@@ -322,7 +322,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;
     }
@@ -337,7 +337,7 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value){
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -354,15 +354,15 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== ''){
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name])){
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name])){
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);