spiral / framework

src/Hmvc/src/InterceptorPipeline.php

Spacing +2 added lines, -2 removed lines

@@ -56,12 +56,12 @@
      */
     public function callAction(string $controller, string $action, array $parameters = [])
     {
-        if ($this->core === null) {
+        if ($this->core === null){
             throw new InterceptorException('Unable to invoke pipeline without assigned core');
         }
 
         $position = $this->position++;
-        if (isset($this->interceptors[$position])) {
+        if (isset($this->interceptors[$position])){
             return $this->interceptors[$position]->process($controller, $action, $parameters, $this);
         }
 

Braces +4 added lines, -2 removed lines

@@ -56,12 +56,14 @@
      */
     public function callAction(string $controller, string $action, array $parameters = [])
     {
-        if ($this->core === null) {
+        if ($this->core === null)
+        {
             throw new InterceptorException('Unable to invoke pipeline without assigned core');
         }
 
         $position = $this->position++;
-        if (isset($this->interceptors[$position])) {
+        if (isset($this->interceptors[$position]))
+        {
             return $this->interceptors[$position]->process($controller, $action, $parameters, $this);
         }
 

src/Hmvc/src/AbstractCore.php

Spacing +6 added lines, -6 removed lines

@@ -45,9 +45,9 @@ 
      */
     public function callAction(string $controller, string $action, array $parameters = [])
     {
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ControllerException(
                 "Invalid action `{$controller}`->`{$action}`",
                 ControllerException::BAD_ACTION,
@@ -55,22 +55,22 @@ 
             );
         }
 
-        if ($method->isStatic() || !$method->isPublic()) {
+        if ($method->isStatic() || !$method->isPublic()){
             throw new ControllerException(
                 "Invalid action `{$controller}`->`{$action}`",
                 ControllerException::BAD_ACTION
             );
         }
 
-        try {
+        try{
             // getting the set of arguments should be sent to requested method
             $args = $this->resolver->resolveArguments($method, $parameters);
-        } catch (ArgumentException $e) {
+        }catch (ArgumentException $e){
             throw new ControllerException(
                 "Missing/invalid parameter '{$e->getParameter()->name}' of  `{$controller}`->`{$action}`",
                 ControllerException::BAD_ARGUMENT
             );
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new ControllerException(
                 $e->getMessage(),
                 ControllerException::ERROR,

Braces +17 added lines, -7 removed lines

@@ -45,9 +45,12 @@ 
      */
     public function callAction(string $controller, string $action, array $parameters = [])
     {
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ControllerException(
                 "Invalid action `{$controller}`->`{$action}`",
                 ControllerException::BAD_ACTION,
@@ -55,22 +58,28 @@ 
             );
         }
 
-        if ($method->isStatic() || !$method->isPublic()) {
+        if ($method->isStatic() || !$method->isPublic())
+        {
             throw new ControllerException(
                 "Invalid action `{$controller}`->`{$action}`",
                 ControllerException::BAD_ACTION
             );
         }
 
-        try {
+        try
+        {
             // getting the set of arguments should be sent to requested method
             $args = $this->resolver->resolveArguments($method, $parameters);
-        } catch (ArgumentException $e) {
+        }
+        catch (ArgumentException $e)
+        {
             throw new ControllerException(
                 "Missing/invalid parameter '{$e->getParameter()->name}' of  `{$controller}`->`{$action}`",
                 ControllerException::BAD_ARGUMENT
             );
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new ControllerException(
                 $e->getMessage(),
                 ControllerException::ERROR,
@@ -78,7 +87,8 @@ 
             );
         }
 
-        return ContainerScope::runScope($this->container, function () use ($controller, $method, $args) {
+        return ContainerScope::runScope($this->container, function () use ($controller, $method, $args)
+        {
             return $method->invokeArgs($this->container->get($controller), $args);
         });
     }

src/Router/tests/SingleActionTest.php

Spacing +2 added lines, -2 removed lines

@@ -103,9 +103,9 @@
         $this->assertSame('echoed', (string)$response->getBody());
 
         $e = null;
-        try {
+        try{
             $router->handle(new ServerRequest([], [], new Uri('/test')));
-        } catch (UndefinedRouteException $e) {
+        }catch (UndefinedRouteException $e){
         }
 
         $this->assertNotNull($e, 'Autofill not fired');

Braces +5 added lines, -2 removed lines

@@ -103,9 +103,12 @@
         $this->assertSame('echoed', (string)$response->getBody());
 
         $e = null;
-        try {
+        try
+        {
             $router->handle(new ServerRequest([], [], new Uri('/test')));
-        } catch (UndefinedRouteException $e) {
+        }
+        catch (UndefinedRouteException $e)
+        {
         }
 
         $this->assertNotNull($e, 'Autofill not fired');

src/Router/tests/Diactoros/ResponseFactory.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $response = new Response('php://memory', $code, []);
         $response = $response->withStatus($code, $reasonPhrase);
 
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
+        foreach ($this->config->getBaseHeaders() as $header => $value){
             $response = $response->withAddedHeader($header, $value);
         }
 

Braces +2 added lines, -1 removed lines

@@ -37,7 +37,8 @@
         $response = new Response('php://memory', $code, []);
         $response = $response->withStatus($code, $reasonPhrase);
 
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
+        foreach ($this->config->getBaseHeaders() as $header => $value)
+        {
             $response = $response->withAddedHeader($header, $value);
         }
 

src/Router/tests/Diactoros/UploadedFileFactory.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         string $clientFilename = null,
         string $clientMediaType = null
     ): UploadedFileInterface {
-        if ($size === null) {
+        if ($size === null){
             $size = $stream->getSize();
         }
 

Braces +2 added lines, -1 removed lines

@@ -26,7 +26,8 @@
         string $clientFilename = null,
         string $clientMediaType = null
     ): UploadedFileInterface {
-        if ($size === null) {
+        if ($size === null)
+        {
             $size = $stream->getSize();
         }
 

src/Router/tests/CallableTest.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $router = $this->makeRouter();
         $router->setRoute(
             'action',
-            new Route('/something', function () {
+            new Route('/something', function (){
                 return 'hello world';
             })
         );

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
         $router = $this->makeRouter();
         $router->setRoute(
             'action',
-            new Route('/something', function () {
+            new Route('/something', function ()
+            {
                 return 'hello world';
             })
         );

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/Route.php

Spacing +15 added lines, -15 removed lines

@@ -59,9 +59,9 @@ 
      */
     public function __construct(string $pattern, $target, array $defaults = [])
     {
-        if ($target instanceof TargetInterface) {
+        if ($target instanceof TargetInterface){
             parent::__construct($pattern, array_merge($target->getDefaults(), $defaults));
-        } else {
+        }else{
             parent::__construct($pattern, $defaults);
         }
 
@@ -76,7 +76,7 @@ 
     {
         /** @var self $route */
         $route = parent::withUriHandler($uriHandler);
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface){
             $route->uriHandler = $route->uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults
@@ -97,7 +97,7 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface){
             $route->target = clone $route->target;
         }
 
@@ -114,7 +114,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler)){
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -131,30 +131,30 @@ 
      */
     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{
                 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 {
-            if (is_object($this->target) || is_array($this->target)) {
+        try{
+            if (is_object($this->target) || is_array($this->target)){
                 $target = $this->target;
-            } else {
+            }else{
                 $target = $this->container->get($this->target);
             }
 
-            if ($target instanceof RequestHandlerInterface) {
+            if ($target instanceof RequestHandlerInterface){
                 return $target;
             }
 
@@ -162,7 +162,7 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +34 added lines, -15 removed lines

@@ -59,9 +59,12 @@ 
      */
     public function __construct(string $pattern, $target, array $defaults = [])
     {
-        if ($target instanceof TargetInterface) {
+        if ($target instanceof TargetInterface)
+        {
             parent::__construct($pattern, array_merge($target->getDefaults(), $defaults));
-        } else {
+        }
+        else
+        {
             parent::__construct($pattern, $defaults);
         }
 
@@ -76,7 +79,8 @@ 
     {
         /** @var self $route */
         $route = parent::withUriHandler($uriHandler);
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface)
+        {
             $route->uriHandler = $route->uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults
@@ -97,7 +101,8 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface)
+        {
             $route->target = clone $route->target;
         }
 
@@ -114,7 +119,8 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler))
+        {
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -131,30 +137,41 @@ 
      */
     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
+            {
                 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 {
-            if (is_object($this->target) || is_array($this->target)) {
+        try
+        {
+            if (is_object($this->target) || is_array($this->target))
+            {
                 $target = $this->target;
-            } else {
+            }
+            else
+            {
                 $target = $this->container->get($this->target);
             }
 
-            if ($target instanceof RequestHandlerInterface) {
+            if ($target instanceof RequestHandlerInterface)
+            {
                 return $target;
             }
 
@@ -162,7 +179,9 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

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;
         }