spiral / framework

src/Router/tests/TestCore.php

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
 
     public function callAction(string $controller, string $action = null, array $parameters = [])
     {
-        return '@wrapped.' . $this->core->callAction($controller, $action, $parameters);
+        return '@wrapped.'.$this->core->callAction($controller, $action, $parameters);
     }
 }

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

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.');
         }
 

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         string $namespace,
         string $postfix = 'Controller',
         int $options = 0
-    ) {
+    ){
         $this->namespace = rtrim($namespace, '\\');
         $this->postfix = ucfirst($postfix);
 
@@ -51,7 +51,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.');
         }
 

src/Router/src/Router.php

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}`");
         }
 

Spacing +16 added lines, -16 removed lines

@@ -51,7 +51,7 @@ 
 
     public function __construct(string $basePath, UriHandler $uriHandler, ContainerInterface $container)
     {
-        $this->basePath = '/' . ltrim($basePath, '/');
+        $this->basePath = '/'.ltrim($basePath, '/');
         $this->uriHandler = $uriHandler;
         $this->container = $container;
     }
@@ -64,13 +64,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());
         }
 
@@ -115,7 +115,7 @@ 
      */
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -127,7 +127,7 @@ 
      */
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -139,9 +139,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);
@@ -153,17 +153,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);
         }
 
@@ -176,7 +176,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);
         }
@@ -201,17 +201,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}`");
         }
 

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/Session/tests/FactoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 {
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             session_abort();
         }
     }

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
 {
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             session_abort();
         }
     }

src/Session/tests/SessionTest.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             session_abort();
         }
     }
@@ -125,7 +125,7 @@ 
         $this->assertSame('default', $section->getName());
 
         $section->set('key', 'value');
-        foreach ($section as $key => $value) {
+        foreach ($section as $key => $value){
             $this->assertSame('key', $key);
             $this->assertSame('value', $value);
         }

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
 
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             session_abort();
         }
     }
@@ -125,7 +126,8 @@ 
         $this->assertSame('default', $section->getName());
 
         $section->set('key', 'value');
-        foreach ($section as $key => $value) {
+        foreach ($section as $key => $value)
+        {
             $this->assertSame('key', $key);
             $this->assertSame('value', $value);
         }