spiral / framework

src/Distribution/src/Internal/DateTimeIntervalFactory.php

Spacing +5 added lines, -5 removed lines

@@ -44,11 +44,11 @@ 
      */
     public function create($duration): DateInterval
     {
-        try {
+        try{
             return $this->createOrFail($duration);
-        } catch (InvalidArgumentException $e) {
+        }catch (InvalidArgumentException $e){
             throw $e;
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new InvalidArgumentException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -69,7 +69,7 @@ 
      */
     private function createOrFail($duration): DateInterval
     {
-        switch (true) {
+        switch (true){
             case $duration instanceof DateInterval:
                 return $duration;
 
@@ -80,7 +80,7 @@ 
                 return new DateInterval($duration);
 
             case \is_int($duration):
-                return new DateInterval('PT' . $duration . 'S');
+                return new DateInterval('PT'.$duration.'S');
 
             case $duration === null:
                 return new DateInterval('PT0S');

Braces +10 added lines, -4 removed lines

@@ -44,11 +44,16 @@ 
      */
     public function create($duration): DateInterval
     {
-        try {
+        try
+        {
             return $this->createOrFail($duration);
-        } catch (InvalidArgumentException $e) {
+        }
+        catch (InvalidArgumentException $e)
+        {
             throw $e;
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new InvalidArgumentException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -69,7 +74,8 @@ 
      */
     private function createOrFail($duration): DateInterval
     {
-        switch (true) {
+        switch (true)
+        {
             case $duration instanceof DateInterval:
                 return $duration;
 

src/Pagination/src/Paginator.php

Spacing +8 added lines, -8 removed lines

@@ -92,11 +92,11 @@ 
      */
     public function getPage(): int
     {
-        if ($this->pageNumber < 1) {
+        if ($this->pageNumber < 1){
             return 1;
         }
 
-        if ($this->pageNumber > $this->countPages) {
+        if ($this->pageNumber > $this->countPages){
             return $this->countPages;
         }
 
@@ -117,7 +117,7 @@ 
     public function paginate(PaginableInterface $target): PaginatorInterface
     {
         $paginator = clone $this;
-        if ($target instanceof Countable && $paginator->count === 0) {
+        if ($target instanceof Countable && $paginator->count === 0){
             $paginator->setCount($target->count());
         }
 
@@ -145,7 +145,7 @@ 
      */
     public function countDisplayed(): int
     {
-        if ($this->getPage() == $this->countPages) {
+        if ($this->getPage() == $this->countPages){
             return $this->count - $this->getOffset();
         }
 
@@ -165,7 +165,7 @@ 
      */
     public function nextPage()
     {
-        if ($this->getPage() != $this->countPages) {
+        if ($this->getPage() != $this->countPages){
             return $this->getPage() + 1;
         }
 
@@ -177,7 +177,7 @@ 
      */
     public function previousPage()
     {
-        if ($this->getPage() > 1) {
+        if ($this->getPage() > 1){
             return $this->getPage() - 1;
         }
 
@@ -192,9 +192,9 @@ 
     private function setCount(int $count): self
     {
         $this->count = max($count, 0);
-        if ($this->count > 0) {
+        if ($this->count > 0){
             $this->countPages = (int)ceil($this->count / $this->limit);
-        } else {
+        }else{
             $this->countPages = 1;
         }
 

Braces +17 added lines, -8 removed lines

@@ -92,11 +92,13 @@ 
      */
     public function getPage(): int
     {
-        if ($this->pageNumber < 1) {
+        if ($this->pageNumber < 1)
+        {
             return 1;
         }
 
-        if ($this->pageNumber > $this->countPages) {
+        if ($this->pageNumber > $this->countPages)
+        {
             return $this->countPages;
         }
 
@@ -117,7 +119,8 @@ 
     public function paginate(PaginableInterface $target): PaginatorInterface
     {
         $paginator = clone $this;
-        if ($target instanceof Countable && $paginator->count === 0) {
+        if ($target instanceof Countable && $paginator->count === 0)
+        {
             $paginator->setCount($target->count());
         }
 
@@ -145,7 +148,8 @@ 
      */
     public function countDisplayed(): int
     {
-        if ($this->getPage() == $this->countPages) {
+        if ($this->getPage() == $this->countPages)
+        {
             return $this->count - $this->getOffset();
         }
 
@@ -165,7 +169,8 @@ 
      */
     public function nextPage()
     {
-        if ($this->getPage() != $this->countPages) {
+        if ($this->getPage() != $this->countPages)
+        {
             return $this->getPage() + 1;
         }
 
@@ -177,7 +182,8 @@ 
      */
     public function previousPage()
     {
-        if ($this->getPage() > 1) {
+        if ($this->getPage() > 1)
+        {
             return $this->getPage() - 1;
         }
 
@@ -192,9 +198,12 @@ 
     private function setCount(int $count): self
     {
         $this->count = max($count, 0);
-        if ($this->count > 0) {
+        if ($this->count > 0)
+        {
             $this->countPages = (int)ceil($this->count / $this->limit);
-        } else {
+        }
+        else
+        {
             $this->countPages = 1;
         }
 

src/Tokenizer/src/AbstractLocator.php

Spacing +11 added lines, -11 removed lines

@@ -48,10 +48,10 @@ 
      */
     protected function availableReflections(): Generator
     {
-        foreach ($this->finder->getIterator() as $file) {
+        foreach ($this->finder->getIterator() as $file){
             $reflection = new ReflectionFile((string)$file);
 
-            if ($reflection->hasIncludes()) {
+            if ($reflection->hasIncludes()){
                 // We are not analyzing files which has includes, it's not safe to require such reflections
                 $this->getLogger()->warning(
                     sprintf('File `%s` has includes and excluded from analysis', $file),
@@ -77,8 +77,8 @@ 
      */
     protected function classReflection(string $class): ReflectionClass
     {
-        $loader = static function ($class) {
-            if ($class === LocatorException::class) {
+        $loader = static function ($class){
+            if ($class === LocatorException::class){
                 return;
             }
 
@@ -88,12 +88,12 @@ 
         //To suspend class dependency exception
         spl_autoload_register($loader);
 
-        try {
+        try{
             //In some cases reflection can thrown an exception if class invalid or can not be loaded,
             //we are going to handle such exception and convert it soft exception
             return new ReflectionClass($class);
-        } catch (Throwable $e) {
-            if ($e instanceof LocatorException && $e->getPrevious() != null) {
+        }catch (Throwable $e){
+            if ($e instanceof LocatorException && $e->getPrevious() != null){
                 $e = $e->getPrevious();
             }
 
@@ -109,7 +109,7 @@ 
             );
 
             throw new LocatorException($e->getMessage(), $e->getCode(), $e);
-        } finally {
+        }finally{
             spl_autoload_unregister($loader);
         }
     }
@@ -125,13 +125,13 @@ 
     {
         $traits = [];
 
-        do {
+        do{
             $traits = \array_merge(\class_uses($class), $traits);
             $class = \get_parent_class($class);
-        } while ($class !== false);
+        }while ($class !== false);
 
         //Traits from traits
-        foreach (\array_flip($traits) as $trait) {
+        foreach (\array_flip($traits) as $trait){
             $traits = \array_merge(\class_uses($trait), $traits);
         }
 

Braces +22 added lines, -10 removed lines

@@ -48,10 +48,12 @@ 
      */
     protected function availableReflections(): Generator
     {
-        foreach ($this->finder->getIterator() as $file) {
+        foreach ($this->finder->getIterator() as $file)
+        {
             $reflection = new ReflectionFile((string)$file);
 
-            if ($reflection->hasIncludes()) {
+            if ($reflection->hasIncludes())
+            {
                 // We are not analyzing files which has includes, it's not safe to require such reflections
                 $this->getLogger()->warning(
                     sprintf('File `%s` has includes and excluded from analysis', $file),
@@ -77,8 +79,10 @@ 
      */
     protected function classReflection(string $class): ReflectionClass
     {
-        $loader = static function ($class) {
-            if ($class === LocatorException::class) {
+        $loader = static function ($class)
+        {
+            if ($class === LocatorException::class)
+            {
                 return;
             }
 
@@ -88,12 +92,16 @@ 
         //To suspend class dependency exception
         spl_autoload_register($loader);
 
-        try {
+        try
+        {
             //In some cases reflection can thrown an exception if class invalid or can not be loaded,
             //we are going to handle such exception and convert it soft exception
             return new ReflectionClass($class);
-        } catch (Throwable $e) {
-            if ($e instanceof LocatorException && $e->getPrevious() != null) {
+        }
+        catch (Throwable $e)
+        {
+            if ($e instanceof LocatorException && $e->getPrevious() != null)
+            {
                 $e = $e->getPrevious();
             }
 
@@ -109,7 +117,9 @@ 
             );
 
             throw new LocatorException($e->getMessage(), $e->getCode(), $e);
-        } finally {
+        }
+        finally
+        {
             spl_autoload_unregister($loader);
         }
     }
@@ -125,13 +135,15 @@ 
     {
         $traits = [];
 
-        do {
+        do
+        {
             $traits = \array_merge(\class_uses($class), $traits);
             $class = \get_parent_class($class);
         } while ($class !== false);
 
         //Traits from traits
-        foreach (\array_flip($traits) as $trait) {
+        foreach (\array_flip($traits) as $trait)
+        {
             $traits = \array_merge(\class_uses($trait), $traits);
         }
 

src/Tokenizer/src/InvocationLocator.php

Spacing +9 added lines, -9 removed lines

@@ -32,8 +32,8 @@ 
     public function getInvocations(ReflectionFunctionAbstract $function): array
     {
         $result = [];
-        foreach ($this->availableInvocations($function->getName()) as $invocation) {
-            if ($this->isTargeted($invocation, $function)) {
+        foreach ($this->availableInvocations($function->getName()) as $invocation){
+            if ($this->isTargeted($invocation, $function)){
                 $result[] = $invocation;
             }
         }
@@ -50,12 +50,12 @@ 
     protected function availableInvocations(string $signature = ''): Generator
     {
         $signature = strtolower(trim($signature, '\\'));
-        foreach ($this->availableReflections() as $reflection) {
-            foreach ($reflection->getInvocations() as $invocation) {
+        foreach ($this->availableReflections() as $reflection){
+            foreach ($reflection->getInvocations() as $invocation){
                 if (
                     !empty($signature)
                     && strtolower(trim($invocation->getName(), '\\')) != $signature
-                ) {
+                ){
                     continue;
                 }
 
@@ -66,13 +66,13 @@ 
 
     protected function isTargeted(ReflectionInvocation $invocation, ReflectionFunctionAbstract $function): bool
     {
-        if ($function instanceof ReflectionFunction) {
+        if ($function instanceof ReflectionFunction){
             return !$invocation->isMethod();
         }
 
-        try {
+        try{
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
+        }catch (LocatorException $e){
             return false;
         }
 
@@ -81,7 +81,7 @@ 
          */
         $target = $function->getDeclaringClass();
 
-        if ($target->isTrait()) {
+        if ($target->isTrait()){
             //Let's compare traits
             return in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }

Braces +17 added lines, -8 removed lines

@@ -32,8 +32,10 @@ 
     public function getInvocations(ReflectionFunctionAbstract $function): array
     {
         $result = [];
-        foreach ($this->availableInvocations($function->getName()) as $invocation) {
-            if ($this->isTargeted($invocation, $function)) {
+        foreach ($this->availableInvocations($function->getName()) as $invocation)
+        {
+            if ($this->isTargeted($invocation, $function))
+            {
                 $result[] = $invocation;
             }
         }
@@ -50,8 +52,10 @@ 
     protected function availableInvocations(string $signature = ''): Generator
     {
         $signature = strtolower(trim($signature, '\\'));
-        foreach ($this->availableReflections() as $reflection) {
-            foreach ($reflection->getInvocations() as $invocation) {
+        foreach ($this->availableReflections() as $reflection)
+        {
+            foreach ($reflection->getInvocations() as $invocation)
+            {
                 if (
                     !empty($signature)
                     && strtolower(trim($invocation->getName(), '\\')) != $signature
@@ -66,13 +70,17 @@ 
 
     protected function isTargeted(ReflectionInvocation $invocation, ReflectionFunctionAbstract $function): bool
     {
-        if ($function instanceof ReflectionFunction) {
+        if ($function instanceof ReflectionFunction)
+        {
             return !$invocation->isMethod();
         }
 
-        try {
+        try
+        {
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
+        }
+        catch (LocatorException $e)
+        {
             return false;
         }
 
@@ -81,7 +89,8 @@ 
          */
         $target = $function->getDeclaringClass();
 
-        if ($target->isTrait()) {
+        if ($target->isTrait())
+        {
             //Let's compare traits
             return in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }

src/Tokenizer/src/ClassLocator.php

Spacing +8 added lines, -8 removed lines

@@ -24,20 +24,20 @@ 
      */
     public function getClasses($target = null): array
     {
-        if (!empty($target) && (is_object($target) || is_string($target))) {
+        if (!empty($target) && (is_object($target) || is_string($target))){
             $target = new ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableClasses() as $class) {
-            try {
+        foreach ($this->availableClasses() as $class){
+            try{
                 $reflection = $this->classReflection($class);
-            } catch (LocatorException $e) {
+            }catch (LocatorException $e){
                 //Ignoring
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()) {
+            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()){
                 continue;
             }
 
@@ -54,7 +54,7 @@ 
     {
         $classes = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection){
             $classes = array_merge($classes, $reflection->getClasses());
         }
 
@@ -68,11 +68,11 @@ 
      */
     protected function isTargeted(ReflectionClass $class, ReflectionClass $target = null): bool
     {
-        if (empty($target)) {
+        if (empty($target)){
             return true;
         }
 
-        if (!$target->isTrait()) {
+        if (!$target->isTrait()){
             //Target is interface or class
             return $class->isSubclassOf($target) || $class->getName() == $target->getName();
         }

Braces +17 added lines, -8 removed lines

@@ -24,20 +24,26 @@ 
      */
     public function getClasses($target = null): array
     {
-        if (!empty($target) && (is_object($target) || is_string($target))) {
+        if (!empty($target) && (is_object($target) || is_string($target)))
+        {
             $target = new ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableClasses() as $class) {
-            try {
+        foreach ($this->availableClasses() as $class)
+        {
+            try
+            {
                 $reflection = $this->classReflection($class);
-            } catch (LocatorException $e) {
+            }
+            catch (LocatorException $e)
+            {
                 //Ignoring
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()) {
+            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface())
+            {
                 continue;
             }
 
@@ -54,7 +60,8 @@ 
     {
         $classes = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection)
+        {
             $classes = array_merge($classes, $reflection->getClasses());
         }
 
@@ -68,11 +75,13 @@ 
      */
     protected function isTargeted(ReflectionClass $class, ReflectionClass $target = null): bool
     {
-        if (empty($target)) {
+        if (empty($target))
+        {
             return true;
         }
 
-        if (!$target->isTrait()) {
+        if (!$target->isTrait())
+        {
             //Target is interface or class
             return $class->isSubclassOf($target) || $class->getName() == $target->getName();
         }

src/Tokenizer/src/Reflection/ReflectionArgument.php

Spacing +14 added lines, -14 removed lines

@@ -21,8 +21,8 @@ 
     /**
      * Argument types.
      */
-    public const CONSTANT   = 'constant';   //Scalar constant and not variable.
-    public const VARIABLE   = 'variable';   //PHP variable
+    public const CONSTANT   = 'constant'; //Scalar constant and not variable.
+    public const VARIABLE   = 'variable'; //PHP variable
     public const EXPRESSION = 'expression'; //PHP code (expression).
     public const STRING     = 'string';
     private string $type;
@@ -59,7 +59,7 @@ 
      */
     public function stringValue(): string
     {
-        if ($this->type != self::STRING) {
+        if ($this->type != self::STRING){
             throw new ReflectionException(
                 "Unable to represent value as string, value type is '{$this->type}'"
             );
@@ -80,19 +80,19 @@ 
         $level = 0;
 
         $result = [];
-        foreach ($tokens as $token) {
-            if ($token[ReflectionFile::TOKEN_TYPE] == T_WHITESPACE) {
+        foreach ($tokens as $token){
+            if ($token[ReflectionFile::TOKEN_TYPE] == T_WHITESPACE){
                 continue;
             }
 
-            if (empty($definition)) {
+            if (empty($definition)){
                 $definition = ['type' => self::EXPRESSION, 'value' => '', 'tokens' => []];
             }
 
             if (
                 $token[ReflectionFile::TOKEN_TYPE] == '('
                 || $token[ReflectionFile::TOKEN_TYPE] == '['
-            ) {
+            ){
                 ++$level;
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
@@ -101,18 +101,18 @@ 
             if (
                 $token[ReflectionFile::TOKEN_TYPE] == ')'
                 || $token[ReflectionFile::TOKEN_TYPE] == ']'
-            ) {
+            ){
                 --$level;
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($level) {
+            if ($level){
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] == ',') {
+            if ($token[ReflectionFile::TOKEN_TYPE] == ','){
                 $result[] = self::createArgument($definition);
                 $definition = null;
                 continue;
@@ -123,9 +123,9 @@ 
         }
 
         //Last argument
-        if (is_array($definition)) {
+        if (is_array($definition)){
             $definition = self::createArgument($definition);
-            if (!empty($definition->getType())) {
+            if (!empty($definition->getType())){
                 $result[] = $definition;
             }
         }
@@ -142,9 +142,9 @@ 
     {
         $result = new static(self::EXPRESSION, $definition['value']);
 
-        if (count($definition['tokens']) == 1) {
+        if (count($definition['tokens']) == 1){
             //If argument represent by one token we can try to resolve it's type more precisely
-            switch ($definition['tokens'][0][0]) {
+            switch ($definition['tokens'][0][0]){
                 case T_VARIABLE:
                     $result->type = self::VARIABLE;
                     break;

src/Tokenizer/src/Tokenizer.php

Spacing +7 added lines, -7 removed lines

@@ -77,9 +77,9 @@ 
      */
     public function createInjection(ReflectionClass $class, string $context = null)
     {
-        if ($class->isSubclassOf(ClassesInterface::class)) {
+        if ($class->isSubclassOf(ClassesInterface::class)){
             return $this->classLocator();
-        } elseif ($class->isSubclassOf(InvocationsInterface::class)) {
+        } elseif ($class->isSubclassOf(InvocationsInterface::class)){
             return $this->invocationLocator();
         }
 
@@ -94,12 +94,12 @@ 
         $tokens = token_get_all(file_get_contents($filename));
 
         $line = 0;
-        foreach ($tokens as &$token) {
-            if (isset($token[self::LINE])) {
+        foreach ($tokens as &$token){
+            if (isset($token[self::LINE])){
                 $line = $token[self::LINE];
             }
 
-            if (!is_array($token)) {
+            if (!is_array($token)){
                 $token = [$token, $token, $line];
             }
 
@@ -117,11 +117,11 @@ 
     {
         $finder = new Finder();
 
-        if (empty($directories)) {
+        if (empty($directories)){
             $directories = $this->config->getDirectories();
         }
 
-        if (empty($exclude)) {
+        if (empty($exclude)){
             $exclude = $this->config->getExcludes();
         }
 

Braces +15 added lines, -7 removed lines

@@ -77,9 +77,12 @@ 
      */
     public function createInjection(ReflectionClass $class, string $context = null)
     {
-        if ($class->isSubclassOf(ClassesInterface::class)) {
+        if ($class->isSubclassOf(ClassesInterface::class))
+        {
             return $this->classLocator();
-        } elseif ($class->isSubclassOf(InvocationsInterface::class)) {
+        }
+        elseif ($class->isSubclassOf(InvocationsInterface::class))
+        {
             return $this->invocationLocator();
         }
 
@@ -94,12 +97,15 @@ 
         $tokens = token_get_all(file_get_contents($filename));
 
         $line = 0;
-        foreach ($tokens as &$token) {
-            if (isset($token[self::LINE])) {
+        foreach ($tokens as &$token)
+        {
+            if (isset($token[self::LINE]))
+            {
                 $line = $token[self::LINE];
             }
 
-            if (!is_array($token)) {
+            if (!is_array($token))
+            {
                 $token = [$token, $token, $line];
             }
 
@@ -117,11 +123,13 @@ 
     {
         $finder = new Finder();
 
-        if (empty($directories)) {
+        if (empty($directories))
+        {
             $directories = $this->config->getDirectories();
         }
 
-        if (empty($exclude)) {
+        if (empty($exclude))
+        {
             $exclude = $this->config->getExcludes();
         }
 

src/Router/src/CoreHandler.php

Spacing +17 added lines, -17 removed lines

@@ -52,7 +52,7 @@ 
         CoreInterface $core,
         ScopeInterface $scope,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->core = $core;
         $this->scope = $scope;
         $this->responseFactory = $responseFactory;
@@ -90,7 +90,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');
         }
 
@@ -100,7 +100,7 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -113,29 +113,29 @@ 
                     $this->parameters
                 )
             );
-        } 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
         );
     }
 
     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;
@@ -150,21 +150,21 @@ 
      */
     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 ($result instanceof Generator) {
+        if ($result instanceof Generator){
             return $response->withBody(new GeneratorStream($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);
         }
 
@@ -179,7 +179,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

@@ -90,7 +90,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');
         }
 
@@ -100,7 +101,8 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -113,14 +115,21 @@ 
                     $this->parameters
                 )
             );
-        } 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;
             }
         }
@@ -134,7 +143,8 @@ 
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
+        if ($this->verbActions)
+        {
             return strtolower($request->getMethod()) . ucfirst($this->action);
         }
 
@@ -150,21 +160,27 @@ 
      */
     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 ($result instanceof Generator) {
+        if ($result instanceof Generator)
+        {
             return $response->withBody(new GeneratorStream($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);
         }
 
@@ -179,7 +195,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

Spacing +31 added lines, -31 removed lines

@@ -34,7 +34,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 = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -70,7 +70,7 @@ 
     public function __construct(
         UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->uriFactory = $uriFactory;
         $this->slugify = $slugify ?? new Slugify();
     }
@@ -133,12 +133,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;
         }
 
@@ -154,7 +154,7 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -164,8 +164,8 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_){
+            if (empty($parameters[$key])){
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -174,7 +174,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));
     }
@@ -190,18 +190,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;
             }
@@ -219,15 +219,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 = '';
             }
         }
@@ -240,7 +240,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -248,14 +248,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;
@@ -265,13 +265,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>`.',
@@ -282,7 +282,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;
     }
@@ -293,7 +293,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;
         }
@@ -306,15 +306,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);

Braces +50 added lines, -24 removed lines

@@ -133,12 +133,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;
         }
 
@@ -154,7 +156,8 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -164,8 +167,10 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_)
+        {
+            if (empty($parameters[$key]))
+            {
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -190,18 +195,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;
             }
@@ -219,15 +229,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 = '';
             }
         }
@@ -240,7 +255,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -248,14 +264,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;
@@ -265,13 +284,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>`.',
@@ -293,7 +315,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;
         }
@@ -306,15 +329,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);