spiral / framework

src/Prototype/tests/Traverse/ConstructorParamsVisitor.php

Spacing +7 added lines, -7 removed lines

@@ -24,19 +24,19 @@
      */
     public function leaveNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct') {
-            foreach ($node->params as $param) {
-                if ($param->type instanceof Node\NullableType) {
-                    if ($param->type->type instanceof Node\Identifier) {
+        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct'){
+            foreach ($node->params as $param){
+                if ($param->type instanceof Node\NullableType){
+                    if ($param->type->type instanceof Node\Identifier){
                         $type = $param->type->type->name;
-                    } else {
+                    }else{
                         $type = implode('\\', $param->type->type->parts);
                     }
 
                     $type = "?$type";
-                } elseif ($param->type instanceof Node\Name) {
+                } elseif ($param->type instanceof Node\Name){
                     $type = implode('\\', $param->type->parts);
-                } else {
+                }else{
                     $type = $param->type->name ?? null;
                 }
 

Braces +17 added lines, -7 removed lines

@@ -24,19 +24,29 @@
      */
     public function leaveNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct') {
-            foreach ($node->params as $param) {
-                if ($param->type instanceof Node\NullableType) {
-                    if ($param->type->type instanceof Node\Identifier) {
+        if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct')
+        {
+            foreach ($node->params as $param)
+            {
+                if ($param->type instanceof Node\NullableType)
+                {
+                    if ($param->type->type instanceof Node\Identifier)
+                    {
                         $type = $param->type->type->name;
-                    } else {
+                    }
+                    else
+                    {
                         $type = implode('\\', $param->type->type->parts);
                     }
 
                     $type = "?$type";
-                } elseif ($param->type instanceof Node\Name) {
+                }
+                elseif ($param->type instanceof Node\Name)
+                {
                     $type = implode('\\', $param->type->parts);
-                } else {
+                }
+                else
+                {
                     $type = $param->type->name ?? null;
                 }
 

src/Prototype/src/Annotation/Parser.php

Spacing +7 added lines, -7 removed lines

@@ -26,22 +26,22 @@ 
     {
         $lines = explode("\n", $comment);
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line){
             // strip up comment prefix
             $line = preg_replace('/[\t ]*[\/]?\*[\/]? ?/', '', $line);
 
-            if (preg_match('/ *@([^ ]+) (.*)/u', $line, $matches)) {
+            if (preg_match('/ *@([^ ]+) (.*)/u', $line, $matches)){
                 $this->lines[] = new Line($matches[2], $matches[1]);
-            } else {
+            }else{
                 $this->lines[] = new Line($line);
             }
         }
 
-        if (isset($this->lines[0]) && $this->lines[0]->isEmpty()) {
+        if (isset($this->lines[0]) && $this->lines[0]->isEmpty()){
             array_shift($this->lines);
         }
 
-        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty()) {
+        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty()){
             array_pop($this->lines);
         }
     }
@@ -55,8 +55,8 @@ 
         $result[] = '/**';
 
         // skip first and last tokens
-        foreach ($this->lines as $line) {
-            if ($line->type === null) {
+        foreach ($this->lines as $line){
+            if ($line->type === null){
                 $result[] = sprintf(' * %s', $line->value);
                 continue;
             }

Braces +15 added lines, -7 removed lines

@@ -26,22 +26,28 @@ 
     {
         $lines = explode("\n", $comment);
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line)
+        {
             // strip up comment prefix
             $line = preg_replace('/[\t ]*[\/]?\*[\/]? ?/', '', $line);
 
-            if (preg_match('/ *@([^ ]+) (.*)/u', $line, $matches)) {
+            if (preg_match('/ *@([^ ]+) (.*)/u', $line, $matches))
+            {
                 $this->lines[] = new Line($matches[2], $matches[1]);
-            } else {
+            }
+            else
+            {
                 $this->lines[] = new Line($line);
             }
         }
 
-        if (isset($this->lines[0]) && $this->lines[0]->isEmpty()) {
+        if (isset($this->lines[0]) && $this->lines[0]->isEmpty())
+        {
             array_shift($this->lines);
         }
 
-        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty()) {
+        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty())
+        {
             array_pop($this->lines);
         }
     }
@@ -55,8 +61,10 @@ 
         $result[] = '/**';
 
         // skip first and last tokens
-        foreach ($this->lines as $line) {
-            if ($line->type === null) {
+        foreach ($this->lines as $line)
+        {
+            if ($line->type === null)
+            {
                 $result[] = sprintf(' * %s', $line->value);
                 continue;
             }

monorepo-builder.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
  *
  * @see https://github.com/symplify/symplify/issues/2061
  */
-\register_shutdown_function(static function () {
-    $dest = \json_decode(\file_get_contents(__DIR__ . '/composer.json'), true);
+\register_shutdown_function(static function (){
+    $dest = \json_decode(\file_get_contents(__DIR__.'/composer.json'), true);
 
     $result = [
         'name'              => 'spiral/framework',
@@ -46,7 +46,7 @@ 
 
     $json = \json_encode($result, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES);
 
-    \file_put_contents(__DIR__ . '/composer.json', $json . "\n");
+    \file_put_contents(__DIR__.'/composer.json', $json."\n");
 });
 
 

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @see https://github.com/symplify/symplify/issues/2061
  */
-\register_shutdown_function(static function () {
+\register_shutdown_function(static function ()
+{
     $dest = \json_decode(\file_get_contents(__DIR__ . '/composer.json'), true);
 
     $result = [

src/Streams/tests/StreamsTest.php

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
 
 class StreamsTest extends TestCase
 {
-    private const FIXTURE_DIRECTORY = __DIR__ . '/fixtures';
+    private const FIXTURE_DIRECTORY = __DIR__.'/fixtures';
 
     public function setUp(): void
     {
@@ -42,7 +42,7 @@ 
         $this->assertSame(strlen('sample text'), filesize($filename));
         $this->assertSame(md5('sample text'), md5_file($filename));
 
-        $newFilename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $newFilename = self::FIXTURE_DIRECTORY.'/test.txt';
         copy($filename, $newFilename);
 
         $this->assertFileExists($newFilename);
@@ -83,15 +83,15 @@ 
      */
     public function testException()
     {
-        try {
+        try{
             fopen('spiral://non-exists', 'rb');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $this->assertStringContainsString('failed to open stream', $e->getMessage());
         }
 
-        try {
+        try{
             filemtime('spiral://non-exists');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $this->assertStringContainsString('stat failed', $e->getMessage());
         }
     }
@@ -101,15 +101,15 @@ 
      */
     public function testExceptionPHP8()
     {
-        try {
+        try{
             fopen('spiral://non-exists', 'rb');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $this->assertStringContainsString('Failed to open stream', $e->getMessage());
         }
 
-        try {
+        try{
             filemtime('spiral://non-exists');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $this->assertStringContainsString('stat failed', $e->getMessage());
         }
     }

Braces +20 added lines, -8 removed lines

@@ -83,15 +83,21 @@ 
      */
     public function testException()
     {
-        try {
+        try
+        {
             fopen('spiral://non-exists', 'rb');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->assertStringContainsString('failed to open stream', $e->getMessage());
         }
 
-        try {
+        try
+        {
             filemtime('spiral://non-exists');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->assertStringContainsString('stat failed', $e->getMessage());
         }
     }
@@ -101,15 +107,21 @@ 
      */
     public function testExceptionPHP8()
     {
-        try {
+        try
+        {
             fopen('spiral://non-exists', 'rb');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->assertStringContainsString('Failed to open stream', $e->getMessage());
         }
 
-        try {
+        try
+        {
             filemtime('spiral://non-exists');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->assertStringContainsString('stat failed', $e->getMessage());
         }
     }

src/SendIt/src/MessageSerializer.php

Spacing +2 added lines, -2 removed lines

@@ -51,11 +51,11 @@
     public static function unpack(array $payload): MessageInterface
     {
         $message = new Message($payload['subject'], $payload['to'], $payload['data']);
-        if ($payload['from'] !== null) {
+        if ($payload['from'] !== null){
             $message->setFrom($payload['from']);
         }
 
-        if ($payload['replyTo'] !== null) {
+        if ($payload['replyTo'] !== null){
             $message->setReplyTo($payload['replyTo']);
         }
 

Braces +4 added lines, -2 removed lines

@@ -51,11 +51,13 @@
     public static function unpack(array $payload): MessageInterface
     {
         $message = new Message($payload['subject'], $payload['to'], $payload['data']);
-        if ($payload['from'] !== null) {
+        if ($payload['from'] !== null)
+        {
             $message->setFrom($payload['from']);
         }
 
-        if ($payload['replyTo'] !== null) {
+        if ($payload['replyTo'] !== null)
+        {
             $message->setReplyTo($payload['replyTo']);
         }
 

src/Reactor/src/Serializer.php

Spacing +25 added lines, -25 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function serialize($value): string
     {
-        if (is_array($value)) {
+        if (is_array($value)){
             return $this->packArray($value);
         }
 
@@ -50,49 +50,49 @@ 
      */
     protected function packArray(array $array, int $level = 0): string
     {
-        if ($array === []) {
+        if ($array === []){
             return '[]';
         }
         //Delimiters between rows and sub-arrays.
-        $subIndent = "\n" . str_repeat(self::INDENT, $level + 2);
-        $keyIndent = "\n" . str_repeat(self::INDENT, $level + 1);
+        $subIndent = "\n".str_repeat(self::INDENT, $level + 2);
+        $keyIndent = "\n".str_repeat(self::INDENT, $level + 1);
         //No keys for associated array
         $associated = array_diff_key($array, array_keys(array_keys($array)));
         $result = [];
         $innerIndent = 0;
-        if (!empty($associated)) {
-            foreach ($array as $key => $_) {
+        if (!empty($associated)){
+            foreach ($array as $key => $_){
                 //Based on biggest key length
                 $innerIndent = max(strlen(var_export($key, true)), $innerIndent);
             }
         }
-        foreach ($array as $key => $value) {
+        foreach ($array as $key => $value){
             $prefix = '';
-            if (!empty($associated)) {
+            if (!empty($associated)){
                 //Key prefix
                 $prefix = str_pad(
                     var_export($key, true),
                     $innerIndent,
                     ' ',
                     STR_PAD_RIGHT
-                ) . ' => ';
+                ).' => ';
             }
-            if (!is_array($value)) {
-                $result[] = $prefix . $this->packValue($value);
+            if (!is_array($value)){
+                $result[] = $prefix.$this->packValue($value);
                 continue;
             }
-            if ($value === []) {
-                $result[] = $prefix . '[]';
+            if ($value === []){
+                $result[] = $prefix.'[]';
                 continue;
             }
             $subArray = $this->packArray($value, $level + 1);
-            $result[] = $prefix . "[{$subIndent}" . $subArray . "{$keyIndent}]";
+            $result[] = $prefix."[{$subIndent}".$subArray."{$keyIndent}]";
         }
-        if ($level !== 0) {
+        if ($level !== 0){
             return $result ? implode(",{$keyIndent}", $result) : '';
         }
 
-        return "[{$keyIndent}" . implode(",{$keyIndent}", $result) . "\n]";
+        return "[{$keyIndent}".implode(",{$keyIndent}", $result)."\n]";
     }
 
     /**
@@ -105,31 +105,31 @@ 
      */
     protected function packValue($value): string
     {
-        if ($value instanceof DeclarationInterface) {
+        if ($value instanceof DeclarationInterface){
             //No indentation here
             return $value->render();
         }
 
-        if ($value === null) {
+        if ($value === null){
             return 'null';
         }
 
-        if (is_bool($value)) {
+        if (is_bool($value)){
             return ($value ? 'true' : 'false');
         }
 
-        if (is_object($value) && method_exists($value, '__set_state')) {
-            return '\\' . var_export($value, true);
+        if (is_object($value) && method_exists($value, '__set_state')){
+            return '\\'.var_export($value, true);
         }
 
-        if (!is_string($value) && !is_numeric($value)) {
+        if (!is_string($value) && !is_numeric($value)){
             throw new SerializeException('Unable to pack non scalar value');
         }
 
-        if (is_string($value) && class_exists($value)) {
+        if (is_string($value) && class_exists($value)){
             $reflection = new ReflectionClass($value);
-            if ($value === $reflection->getName()) {
-                return '\\' . $reflection->getName() . '::class';
+            if ($value === $reflection->getName()){
+                return '\\'.$reflection->getName().'::class';
             }
         }
 

Braces +32 added lines, -16 removed lines

@@ -35,7 +35,8 @@ 
      */
     public function serialize($value): string
     {
-        if (is_array($value)) {
+        if (is_array($value))
+        {
             return $this->packArray($value);
         }
 
@@ -50,7 +51,8 @@ 
      */
     protected function packArray(array $array, int $level = 0): string
     {
-        if ($array === []) {
+        if ($array === [])
+        {
             return '[]';
         }
         //Delimiters between rows and sub-arrays.
@@ -60,15 +62,19 @@ 
         $associated = array_diff_key($array, array_keys(array_keys($array)));
         $result = [];
         $innerIndent = 0;
-        if (!empty($associated)) {
-            foreach ($array as $key => $_) {
+        if (!empty($associated))
+        {
+            foreach ($array as $key => $_)
+            {
                 //Based on biggest key length
                 $innerIndent = max(strlen(var_export($key, true)), $innerIndent);
             }
         }
-        foreach ($array as $key => $value) {
+        foreach ($array as $key => $value)
+        {
             $prefix = '';
-            if (!empty($associated)) {
+            if (!empty($associated))
+            {
                 //Key prefix
                 $prefix = str_pad(
                     var_export($key, true),
@@ -77,18 +83,21 @@ 
                     STR_PAD_RIGHT
                 ) . ' => ';
             }
-            if (!is_array($value)) {
+            if (!is_array($value))
+            {
                 $result[] = $prefix . $this->packValue($value);
                 continue;
             }
-            if ($value === []) {
+            if ($value === [])
+            {
                 $result[] = $prefix . '[]';
                 continue;
             }
             $subArray = $this->packArray($value, $level + 1);
             $result[] = $prefix . "[{$subIndent}" . $subArray . "{$keyIndent}]";
         }
-        if ($level !== 0) {
+        if ($level !== 0)
+        {
             return $result ? implode(",{$keyIndent}", $result) : '';
         }
 
@@ -105,30 +114,37 @@ 
      */
     protected function packValue($value): string
     {
-        if ($value instanceof DeclarationInterface) {
+        if ($value instanceof DeclarationInterface)
+        {
             //No indentation here
             return $value->render();
         }
 
-        if ($value === null) {
+        if ($value === null)
+        {
             return 'null';
         }
 
-        if (is_bool($value)) {
+        if (is_bool($value))
+        {
             return ($value ? 'true' : 'false');
         }
 
-        if (is_object($value) && method_exists($value, '__set_state')) {
+        if (is_object($value) && method_exists($value, '__set_state'))
+        {
             return '\\' . var_export($value, true);
         }
 
-        if (!is_string($value) && !is_numeric($value)) {
+        if (!is_string($value) && !is_numeric($value))
+        {
             throw new SerializeException('Unable to pack non scalar value');
         }
 
-        if (is_string($value) && class_exists($value)) {
+        if (is_string($value) && class_exists($value))
+        {
             $reflection = new ReflectionClass($value);
-            if ($value === $reflection->getName()) {
+            if ($value === $reflection->getName())
+            {
                 return '\\' . $reflection->getName() . '::class';
             }
         }

src/Reactor/src/ClassDeclaration.php

Braces +22 added lines, -11 removed lines

@@ -64,7 +64,8 @@ 
     ) {
         $this->setName($name);
 
-        if (!empty($extends)) {
+        if (!empty($extends))
+        {
             $this->setExtends($extends);
         }
 
@@ -157,7 +158,8 @@ 
     public function setInterfaces(array $interfaces): ClassDeclaration
     {
         $this->interfaces = [];
-        foreach ($interfaces as $interface) {
+        foreach ($interfaces as $interface)
+        {
             $this->addInterface($interface);
         }
 
@@ -203,7 +205,8 @@ 
     public function setTraits(array $traits): ClassDeclaration
     {
         $this->traits = [];
-        foreach ($traits as $trait) {
+        foreach ($traits as $trait)
+        {
             $this->addTrait($trait);
         }
 
@@ -293,7 +296,8 @@ 
     {
         $result = '';
 
-        if (!$this->docComment->isEmpty()) {
+        if (!$this->docComment->isEmpty())
+        {
             $result .= $this->docComment->render($indentLevel) . "\n";
         }
 
@@ -301,11 +305,13 @@ 
         $header = "class {$this->getName()}";
 
         //Rendering extends
-        if (!empty($this->extends)) {
+        if (!empty($this->extends))
+        {
             $header .= " extends {$this->extends}";
         }
 
-        if (!empty($this->interfaces)) {
+        if (!empty($this->interfaces))
+        {
             $interfaces = implode(', ', array_keys($this->interfaces));
             $header .= " implements {$interfaces}";
         }
@@ -329,19 +335,23 @@ 
     protected function renderBody(int $indentLevel): string
     {
         $result = '';
-        if (!empty($this->traits)) {
+        if (!empty($this->traits))
+        {
             $result .= $this->renderTraits($indentLevel + 1) . "\n\n";
         }
 
-        if (!$this->constants->isEmpty()) {
+        if (!$this->constants->isEmpty())
+        {
             $result .= $this->constants->render($indentLevel + 1) . "\n\n";
         }
 
-        if (!$this->properties->isEmpty()) {
+        if (!$this->properties->isEmpty())
+        {
             $result .= $this->properties->render($indentLevel + 1) . "\n\n";
         }
 
-        if (!$this->methods->isEmpty()) {
+        if (!$this->methods->isEmpty())
+        {
             $result .= $this->methods->render($indentLevel + 1) . "\n\n";
         }
 
@@ -355,7 +365,8 @@ 
     private function renderTraits(int $indentLevel = 0): string
     {
         $lines = [];
-        foreach ($this->traits as $class => $_) {
+        foreach ($this->traits as $class => $_)
+        {
             $lines[] = $this->addIndent("use {$class};", $indentLevel);
         }
 

Spacing +21 added lines, -21 removed lines

@@ -57,10 +57,10 @@ 
         string $extends = '',
         array $interfaces = [],
         string $comment = ''
-    ) {
+    ){
         $this->setName($name);
 
-        if (!empty($extends)) {
+        if (!empty($extends)){
             $this->setExtends($extends);
         }
 
@@ -132,7 +132,7 @@ 
     public function setInterfaces(array $interfaces): ClassDeclaration
     {
         $this->interfaces = [];
-        foreach ($interfaces as $interface) {
+        foreach ($interfaces as $interface){
             $this->addInterface($interface);
         }
 
@@ -164,7 +164,7 @@ 
     public function setTraits(array $traits): ClassDeclaration
     {
         $this->traits = [];
-        foreach ($traits as $trait) {
+        foreach ($traits as $trait){
             $this->addTrait($trait);
         }
 
@@ -233,51 +233,51 @@ 
     {
         $result = '';
 
-        if (!$this->docComment->isEmpty()) {
-            $result .= $this->docComment->render($indentLevel) . "\n";
+        if (!$this->docComment->isEmpty()){
+            $result .= $this->docComment->render($indentLevel)."\n";
         }
 
         //Class header
         $header = "class {$this->getName()}";
 
         //Rendering extends
-        if (!empty($this->extends)) {
+        if (!empty($this->extends)){
             $header .= " extends {$this->extends}";
         }
 
-        if (!empty($this->interfaces)) {
+        if (!empty($this->interfaces)){
             $interfaces = implode(', ', array_keys($this->interfaces));
             $header .= " implements {$interfaces}";
         }
 
-        $result .= $this->addIndent($header, $indentLevel) . "\n";
-        $result .= $this->addIndent('{', $indentLevel) . "\n";
+        $result .= $this->addIndent($header, $indentLevel)."\n";
+        $result .= $this->addIndent('{', $indentLevel)."\n";
 
         //Rendering class body
         $result .= $this->renderBody($indentLevel);
 
-        $result = rtrim($result, "\n") . "\n";
+        $result = rtrim($result, "\n")."\n";
 
-        return $result . $this->addIndent('}', $indentLevel);
+        return $result.$this->addIndent('}', $indentLevel);
     }
 
     protected function renderBody(int $indentLevel): string
     {
         $result = '';
-        if (!empty($this->traits)) {
-            $result .= $this->renderTraits($indentLevel + 1) . "\n\n";
+        if (!empty($this->traits)){
+            $result .= $this->renderTraits($indentLevel + 1)."\n\n";
         }
 
-        if (!$this->constants->isEmpty()) {
-            $result .= $this->constants->render($indentLevel + 1) . "\n\n";
+        if (!$this->constants->isEmpty()){
+            $result .= $this->constants->render($indentLevel + 1)."\n\n";
         }
 
-        if (!$this->properties->isEmpty()) {
-            $result .= $this->properties->render($indentLevel + 1) . "\n\n";
+        if (!$this->properties->isEmpty()){
+            $result .= $this->properties->render($indentLevel + 1)."\n\n";
         }
 
-        if (!$this->methods->isEmpty()) {
-            $result .= $this->methods->render($indentLevel + 1) . "\n\n";
+        if (!$this->methods->isEmpty()){
+            $result .= $this->methods->render($indentLevel + 1)."\n\n";
         }
 
         return $result;
@@ -286,7 +286,7 @@ 
     private function renderTraits(int $indentLevel = 0): string
     {
         $lines = [];
-        foreach ($this->traits as $class => $_) {
+        foreach ($this->traits as $class => $_){
             $lines[] = $this->addIndent("use {$class};", $indentLevel);
         }
 

src/Validation/src/Condition/Compositor.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
             ],
         ]);
 
-        foreach ($rules as $rule) {
+        foreach ($rules as $rule){
             return $rule->getConditions();
         }
 

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
             ],
         ]);
 
-        foreach ($rules as $rule) {
+        foreach ($rules as $rule)
+        {
             return $rule->getConditions();
         }
 

src/Router/src/UriHandler.php

Braces +50 added lines, -24 removed lines

@@ -167,12 +167,14 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
         $matches = [];
-        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches))
+        {
             return null;
         }
 
@@ -190,7 +192,8 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -200,8 +203,10 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_)
+        {
+            if (empty($parameters[$key]))
+            {
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -227,18 +232,23 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter)
+        {
+            if (is_numeric($key) && isset($allowed[$key]))
+            {
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) {
+            }
+            elseif (!array_key_exists($key, $this->options) && is_array($parameters))
+            {
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter))
+            {
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -259,15 +269,20 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
+        if (empty($path) || $path[0] !== '/')
+        {
             $path = '/' . $path;
         }
 
-        if ($this->matchHost) {
+        if ($this->matchHost)
+        {
             $uriString = $uri->getHost() . $path;
-        } else {
+        }
+        else
+        {
             $uriString = substr($path, strlen($this->prefix));
-            if ($uriString === false) {
+            if ($uriString === false)
+            {
                 $uriString = '';
             }
         }
@@ -280,7 +295,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -288,14 +304,17 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
+        if (strpos($pattern, '[/') === 0)
+        {
             $pattern = '[' . substr($pattern, 2);
         }
 
-        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches))
+        {
             $variables = array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment)
+            {
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -305,13 +324,16 @@ 
         $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value)
+        {
+            if ($value instanceof Autofill)
+            {
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!array_key_exists($key, $options) && !isset($this->defaults[$key]))
+            {
                 throw new ConstrainException(
                     sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -337,7 +359,8 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -354,15 +377,18 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== '')
+        {
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name]))
+        {
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name]))
+        {
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);

Spacing +31 added lines, -31 removed lines

@@ -32,7 +32,7 @@ 
         'integer' => '\d+',
         'uuid'    => '[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}',
     ];
-    private const URI_FIXERS       = [
+    private const URI_FIXERS = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -78,7 +78,7 @@ 
     public function __construct(
         UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->uriFactory = $uriFactory;
         $this->slugify = $slugify ?? new Slugify();
     }
@@ -167,12 +167,12 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
         $matches = [];
-        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)){
             return null;
         }
 
@@ -190,7 +190,7 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -200,8 +200,8 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_){
+            if (empty($parameters[$key])){
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -210,7 +210,7 @@ 
         $path = $this->interpolate($this->template, $parameters);
 
         //Uri with added prefix
-        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix) . trim($path, '/'));
+        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix).trim($path, '/'));
 
         return empty($query) ? $uri : $uri->withQuery(http_build_query($query));
     }
@@ -227,18 +227,18 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter){
+            if (is_numeric($key) && isset($allowed[$key])){
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) {
+            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)){
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)){
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -259,15 +259,15 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
-            $path = '/' . $path;
+        if (empty($path) || $path[0] !== '/'){
+            $path = '/'.$path;
         }
 
-        if ($this->matchHost) {
-            $uriString = $uri->getHost() . $path;
-        } else {
+        if ($this->matchHost){
+            $uriString = $uri->getHost().$path;
+        }else{
             $uriString = substr($path, strlen($this->prefix));
-            if ($uriString === false) {
+            if ($uriString === false){
                 $uriString = '';
             }
         }
@@ -280,7 +280,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -288,14 +288,14 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
-            $pattern = '[' . substr($pattern, 2);
+        if (strpos($pattern, '[/') === 0){
+            $pattern = '['.substr($pattern, 2);
         }
 
-        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)){
             $variables = array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment){
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -305,13 +305,13 @@ 
         $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value){
+            if ($value instanceof Autofill){
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])){
                 throw new ConstrainException(
                     sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -322,7 +322,7 @@ 
             }
         }
 
-        $this->compiled = '/^' . strtr($template, $replaces + self::PATTERN_REPLACES) . '$/iu';
+        $this->compiled = '/^'.strtr($template, $replaces + self::PATTERN_REPLACES).'$/iu';
         $this->template = stripslashes(str_replace('?', '', $template));
         $this->options = $options;
     }
@@ -337,7 +337,7 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value){
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -354,15 +354,15 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== ''){
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name])){
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name])){
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);