spiral / framework

src/Filters/src/ErrorMapper.php

Spacing +4 added lines, -4 removed lines

@@ -37,8 +37,8 @@ 
     {
         //De-mapping
         $mapped = [];
-        foreach ($errors as $field => $message) {
-            if (!isset($this->schema[$field])) {
+        foreach ($errors as $field => $message){
+            if (!isset($this->schema[$field])){
                 $mapped[$field] = $message;
                 continue;
             }
@@ -60,14 +60,14 @@ 
      */
     private function mount(array &$array, string $path, $message): void
     {
-        if ($path === '.') {
+        if ($path === '.'){
             throw new SchemaException(
                 "Unable to mount error `{$message}` to `{$path}` (root path is forbidden)"
             );
         }
 
         $step = explode('.', $path);
-        while ($name = array_shift($step)) {
+        while ($name = array_shift($step)){
             $array = &$array[$name];
         }
 

Braces +8 added lines, -4 removed lines

@@ -37,8 +37,10 @@ 
     {
         //De-mapping
         $mapped = [];
-        foreach ($errors as $field => $message) {
-            if (!isset($this->schema[$field])) {
+        foreach ($errors as $field => $message)
+        {
+            if (!isset($this->schema[$field]))
+            {
                 $mapped[$field] = $message;
                 continue;
             }
@@ -60,14 +62,16 @@ 
      */
     private function mount(array &$array, string $path, $message): void
     {
-        if ($path === '.') {
+        if ($path === '.')
+        {
             throw new SchemaException(
                 "Unable to mount error `{$message}` to `{$path}` (root path is forbidden)"
             );
         }
 
         $step = explode('.', $path);
-        while ($name = array_shift($step)) {
+        while ($name = array_shift($step))
+        {
             $array = &$array[$name];
         }
 

src/Filters/src/ArrayInput.php

Spacing +9 added lines, -9 removed lines

@@ -38,10 +38,10 @@ 
     public function withPrefix(string $prefix, bool $add = true): InputInterface
     {
         $input = clone $this;
-        if ($add) {
-            $input->prefix .= '.' . $prefix;
+        if ($add){
+            $input->prefix .= '.'.$prefix;
             $input->prefix = trim($input->prefix, '.');
-        } else {
+        }else{
             $input->prefix = $prefix;
         }
         return $input;
@@ -52,9 +52,9 @@ 
      */
     public function getValue(string $source, string $name = null)
     {
-        try {
+        try{
             return $this->dotGet($name);
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             return null;
         }
     }
@@ -72,14 +72,14 @@ 
         $data = $this->data;
 
         //Generating path relative to a given name and prefix
-        $path = (!empty($this->prefix) ? $this->prefix . '.' : '') . $name;
-        if (empty($path)) {
+        $path = (!empty($this->prefix) ? $this->prefix.'.' : '').$name;
+        if (empty($path)){
             return $data;
         }
 
         $path = explode('.', rtrim($path, '.'));
-        foreach ($path as $step) {
-            if (!is_array($data) || !array_key_exists($step, $data)) {
+        foreach ($path as $step){
+            if (!is_array($data) || !array_key_exists($step, $data)){
                 throw new DotNotFoundException("Unable to find requested element '{$name}'");
             }
             $data = &$data[$step];

Braces +16 added lines, -7 removed lines

@@ -38,10 +38,13 @@ 
     public function withPrefix(string $prefix, bool $add = true): InputInterface
     {
         $input = clone $this;
-        if ($add) {
+        if ($add)
+        {
             $input->prefix .= '.' . $prefix;
             $input->prefix = trim($input->prefix, '.');
-        } else {
+        }
+        else
+        {
             $input->prefix = $prefix;
         }
         return $input;
@@ -52,9 +55,12 @@ 
      */
     public function getValue(string $source, string $name = null)
     {
-        try {
+        try
+        {
             return $this->dotGet($name);
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             return null;
         }
     }
@@ -73,13 +79,16 @@ 
 
         //Generating path relative to a given name and prefix
         $path = (!empty($this->prefix) ? $this->prefix . '.' : '') . $name;
-        if (empty($path)) {
+        if (empty($path))
+        {
             return $data;
         }
 
         $path = explode('.', rtrim($path, '.'));
-        foreach ($path as $step) {
-            if (!is_array($data) || !array_key_exists($step, $data)) {
+        foreach ($path as $step)
+        {
+            if (!is_array($data) || !array_key_exists($step, $data))
+            {
                 throw new DotNotFoundException("Unable to find requested element '{$name}'");
             }
             $data = &$data[$step];

src/Filters/src/Filter.php

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
         array $schema,
         ValidatorInterface $validator,
         ErrorMapper $errorMapper
-    ) {
+    ){
         parent::__construct($data, $schema);
         $this->validator = $validator;
         $this->errorMapper = $errorMapper;
@@ -155,10 +155,10 @@ 
      */
     public function getErrors(): array
     {
-        if ($this->errors === null) {
+        if ($this->errors === null){
             $this->errors = [];
-            foreach ($this->validator->withData($this)->getErrors() as $field => $error) {
-                if (is_string($error) && Translator::isMessage($error)) {
+            foreach ($this->validator->withData($this)->getErrors() as $field => $error){
+                if (is_string($error) && Translator::isMessage($error)){
                     // translate error message
                     $error = $this->say($error);
                 }
@@ -190,21 +190,21 @@ 
      */
     protected function validateNested(array $errors): array
     {
-        foreach ($this->getFields(false) as $index => $value) {
-            if (isset($errors[$index])) {
+        foreach ($this->getFields(false) as $index => $value){
+            if (isset($errors[$index])){
                 //Invalid on parent level
                 continue;
             }
 
-            if ($value instanceof FilterInterface && !$value->isValid()) {
+            if ($value instanceof FilterInterface && !$value->isValid()){
                 $errors[$index] = $value->getErrors();
                 continue;
             }
 
             //Array of nested entities for validation
-            if (is_iterable($value)) {
-                foreach ($value as $nIndex => $nValue) {
-                    if ($nValue instanceof FilterInterface && !$nValue->isValid()) {
+            if (is_iterable($value)){
+                foreach ($value as $nIndex => $nValue){
+                    if ($nValue instanceof FilterInterface && !$nValue->isValid()){
                         $errors[$index][$nIndex] = $nValue->getErrors();
                     }
                 }

Braces +18 added lines, -9 removed lines

@@ -155,10 +155,13 @@ 
      */
     public function getErrors(): array
     {
-        if ($this->errors === null) {
+        if ($this->errors === null)
+        {
             $this->errors = [];
-            foreach ($this->validator->withData($this)->getErrors() as $field => $error) {
-                if (is_string($error) && Translator::isMessage($error)) {
+            foreach ($this->validator->withData($this)->getErrors() as $field => $error)
+            {
+                if (is_string($error) && Translator::isMessage($error))
+                {
                     // translate error message
                     $error = $this->say($error);
                 }
@@ -190,21 +193,27 @@ 
      */
     protected function validateNested(array $errors): array
     {
-        foreach ($this->getFields(false) as $index => $value) {
-            if (isset($errors[$index])) {
+        foreach ($this->getFields(false) as $index => $value)
+        {
+            if (isset($errors[$index]))
+            {
                 //Invalid on parent level
                 continue;
             }
 
-            if ($value instanceof FilterInterface && !$value->isValid()) {
+            if ($value instanceof FilterInterface && !$value->isValid())
+            {
                 $errors[$index] = $value->getErrors();
                 continue;
             }
 
             //Array of nested entities for validation
-            if (is_iterable($value)) {
-                foreach ($value as $nIndex => $nValue) {
-                    if ($nValue instanceof FilterInterface && !$nValue->isValid()) {
+            if (is_iterable($value))
+            {
+                foreach ($value as $nIndex => $nValue)
+                {
+                    if ($nValue instanceof FilterInterface && !$nValue->isValid())
+                    {
                         $errors[$index][$nIndex] = $nValue->getErrors();
                     }
                 }

src/Filters/src/FilterProvider.php

Spacing +14 added lines, -14 removed lines

@@ -91,18 +91,18 @@ 
     public function initValues(array $mappingSchema, InputInterface $input): array
     {
         $result = [];
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[self::FILTER])) {
+        foreach ($mappingSchema as $field => $map){
+            if (empty($map[self::FILTER])){
                 $value = $input->getValue($map[self::SOURCE], $map[self::ORIGIN]);
 
-                if ($value !== null) {
+                if ($value !== null){
                     $result[$field] = $value;
                 }
                 continue;
             }
 
             $nested = $map[self::FILTER];
-            if (empty($map[self::ARRAY])) {
+            if (empty($map[self::ARRAY])){
                 // slicing down
                 $result[$field] = $this->createFilter($nested, $input->withPrefix($map[self::ORIGIN]));
                 continue;
@@ -111,7 +111,7 @@ 
             $values = [];
 
             // List of "key" => "location in request"
-            foreach ($this->iterate($map, $input) as $index => $origin) {
+            foreach ($this->iterate($map, $input) as $index => $origin){
                 $values[$index] = $this->createFilter($nested, $input->withPrefix($origin));
             }
 
@@ -131,12 +131,12 @@ 
     private function iterate(array $schema, InputInterface $input): Generator
     {
         $values = $input->getValue($schema[self::ITERATE_SOURCE], $schema[self::ITERATE_ORIGIN]);
-        if (empty($values) || !is_array($values)) {
+        if (empty($values) || !is_array($values)){
             return [];
         }
 
-        foreach (array_keys($values) as $key) {
-            yield $key => $schema[self::ORIGIN] . '.' . $key;
+        foreach (array_keys($values) as $key){
+            yield $key => $schema[self::ORIGIN].'.'.$key;
         }
     }
 
@@ -146,7 +146,7 @@ 
      */
     private function getErrorMapper(string $filter): ErrorMapper
     {
-        if (isset($this->errorMappers[$filter])) {
+        if (isset($this->errorMappers[$filter])){
             return $this->errorMappers[$filter];
         }
 
@@ -162,7 +162,7 @@ 
      */
     private function getValidator(string $filter): ValidatorInterface
     {
-        if (isset($this->validators[$filter])) {
+        if (isset($this->validators[$filter])){
             return $this->validators[$filter];
         }
 
@@ -180,18 +180,18 @@ 
      */
     private function getSchema(string $filter): array
     {
-        if (isset($this->cache[$filter])) {
+        if (isset($this->cache[$filter])){
             return $this->cache[$filter];
         }
 
-        try {
+        try{
             $reflection = new ReflectionEntity($filter);
-            if (!$reflection->getReflection()->isSubclassOf(Filter::class)) {
+            if (!$reflection->getReflection()->isSubclassOf(Filter::class)){
                 throw new SchemaException('Invalid filter class, must be subclass of Filter');
             }
 
             $builder = new SchemaBuilder(new ReflectionEntity($filter));
-        } catch (ReflectionException $e) {
+        }catch (ReflectionException $e){
             throw new SchemaException('Invalid filter schema', $e->getCode(), $e);
         }
 

Braces +27 added lines, -13 removed lines

@@ -91,18 +91,22 @@ 
     public function initValues(array $mappingSchema, InputInterface $input): array
     {
         $result = [];
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[self::FILTER])) {
+        foreach ($mappingSchema as $field => $map)
+        {
+            if (empty($map[self::FILTER]))
+            {
                 $value = $input->getValue($map[self::SOURCE], $map[self::ORIGIN]);
 
-                if ($value !== null) {
+                if ($value !== null)
+                {
                     $result[$field] = $value;
                 }
                 continue;
             }
 
             $nested = $map[self::FILTER];
-            if (empty($map[self::ARRAY])) {
+            if (empty($map[self::ARRAY]))
+            {
                 // slicing down
                 $result[$field] = $this->createFilter($nested, $input->withPrefix($map[self::ORIGIN]));
                 continue;
@@ -111,7 +115,8 @@ 
             $values = [];
 
             // List of "key" => "location in request"
-            foreach ($this->iterate($map, $input) as $index => $origin) {
+            foreach ($this->iterate($map, $input) as $index => $origin)
+            {
                 $values[$index] = $this->createFilter($nested, $input->withPrefix($origin));
             }
 
@@ -131,11 +136,13 @@ 
     private function iterate(array $schema, InputInterface $input): Generator
     {
         $values = $input->getValue($schema[self::ITERATE_SOURCE], $schema[self::ITERATE_ORIGIN]);
-        if (empty($values) || !is_array($values)) {
+        if (empty($values) || !is_array($values))
+        {
             return [];
         }
 
-        foreach (array_keys($values) as $key) {
+        foreach (array_keys($values) as $key)
+        {
             yield $key => $schema[self::ORIGIN] . '.' . $key;
         }
     }
@@ -146,7 +153,8 @@ 
      */
     private function getErrorMapper(string $filter): ErrorMapper
     {
-        if (isset($this->errorMappers[$filter])) {
+        if (isset($this->errorMappers[$filter]))
+        {
             return $this->errorMappers[$filter];
         }
 
@@ -162,7 +170,8 @@ 
      */
     private function getValidator(string $filter): ValidatorInterface
     {
-        if (isset($this->validators[$filter])) {
+        if (isset($this->validators[$filter]))
+        {
             return $this->validators[$filter];
         }
 
@@ -180,18 +189,23 @@ 
      */
     private function getSchema(string $filter): array
     {
-        if (isset($this->cache[$filter])) {
+        if (isset($this->cache[$filter]))
+        {
             return $this->cache[$filter];
         }
 
-        try {
+        try
+        {
             $reflection = new ReflectionEntity($filter);
-            if (!$reflection->getReflection()->isSubclassOf(Filter::class)) {
+            if (!$reflection->getReflection()->isSubclassOf(Filter::class))
+            {
                 throw new SchemaException('Invalid filter class, must be subclass of Filter');
             }
 
             $builder = new SchemaBuilder(new ReflectionEntity($filter));
-        } catch (ReflectionException $e) {
+        }
+        catch (ReflectionException $e)
+        {
             throw new SchemaException('Invalid filter schema', $e->getCode(), $e);
         }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     public const SOURCE         = 'source';
     public const ORIGIN         = 'origin';
     public const FILTER         = 'filter';
-    public const ARRAY          = 'array';
+    public const array          = 'array';
     public const ITERATE_SOURCE = 'iterate_source';
     public const ITERATE_ORIGIN = 'iterate_origin';
 
@@ -102,7 +102,7 @@ 
             }
 
             $nested = $map[self::FILTER];
-            if (empty($map[self::ARRAY])) {
+            if (empty($map[self::array])) {
                 // slicing down
                 $result[$field] = $this->createFilter($nested, $input->withPrefix($map[self::ORIGIN]));
                 continue;

src/Hmvc/tests/DemoInterceptor.php

Spacing +1 added lines, -1 removed lines

@@ -18,6 +18,6 @@
 {
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
-        return '?' . $core->callAction($controller, $action, $parameters) . '!';
+        return '?'.$core->callAction($controller, $action, $parameters).'!';
     }
 }

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