Test Failed
Pull Request — master (#1003)
by Maxim
20:36 queued 08:54
created
src/Stempler/src/Transform/Import/Element.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
         private string $path,
23 23
         string $alias = null,
24 24
         Context $context = null
25
-    ) {
25
+    ){
26 26
         $this->alias = $alias ?? $path;
27 27
 
28
-        if ($alias === null && \strrpos($this->alias, '/') !== false) {
28
+        if ($alias === null && \strrpos($this->alias, '/') !== false){
29 29
             $this->alias = \substr($this->alias, \strrpos($this->alias, '/') + 1);
30 30
         }
31 31
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
     public function resolve(Builder $builder, string $name): ?Template
46 46
     {
47
-        if ($this->alias !== $name) {
47
+        if ($this->alias !== $name){
48 48
             return null;
49 49
         }
50 50
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@  discard block
 block discarded – undo
25 25
     ) {
26 26
         $this->alias = $alias ?? $path;
27 27
 
28
-        if ($alias === null && \strrpos($this->alias, '/') !== false) {
28
+        if ($alias === null && \strrpos($this->alias, '/') !== false)
29
+        {
29 30
             $this->alias = \substr($this->alias, \strrpos($this->alias, '/') + 1);
30 31
         }
31 32
 
@@ -44,7 +45,8 @@  discard block
 block discarded – undo
44 45
 
45 46
     public function resolve(Builder $builder, string $name): ?Template
46 47
     {
47
-        if ($this->alias !== $name) {
48
+        if ($this->alias !== $name)
49
+        {
48 50
             return null;
49 51
         }
50 52
 
Please login to merge, or discard this patch.
src/Stempler/src/Parser.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $parser->path = $path;
44 44
         $parser->lexer = clone $this->lexer;
45 45
 
46
-        foreach ($parser->syntax as $grammar => $stx) {
46
+        foreach ($parser->syntax as $grammar => $stx){
47 47
             $parser->syntax[$grammar] = clone $stx;
48 48
         }
49 49
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
     {
72 72
         $template = new Template();
73 73
 
74
-        try {
74
+        try{
75 75
             /**
76 76
              * TODO issue #767
77 77
              * @link https://github.com/spiral/framework/issues/767
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 new Assembler($template, 'nodes'),
82 82
                 $this->lexer->parse($stream)
83 83
             );
84
-        } catch (SyntaxException $e) {
84
+        }catch (SyntaxException $e){
85 85
             throw new ParserException(
86 86
                 $e->getMessage(),
87 87
                 new Context($e->getToken(), $this->getPath()),
@@ -100,21 +100,21 @@  discard block
 block discarded – undo
100 100
         $node = $asm->getNode();
101 101
 
102 102
         $syntax = [];
103
-        foreach ($this->syntax as $grammar => $stx) {
103
+        foreach ($this->syntax as $grammar => $stx){
104 104
             $syntax[$grammar] = clone $stx;
105 105
         }
106 106
 
107
-        foreach ($tokens as $token) {
108
-            if (!isset($syntax[$token->grammar])) {
107
+        foreach ($tokens as $token){
108
+            if (!isset($syntax[$token->grammar])){
109 109
                 throw new SyntaxException('Undefined token', $token);
110 110
             }
111 111
 
112 112
             $syntax[$token->grammar]->handle($this, $asm, $token);
113 113
         }
114 114
 
115
-        if ($asm->getNode() !== $node) {
115
+        if ($asm->getNode() !== $node){
116 116
             throw new SyntaxException(
117
-                'Invalid node hierarchy, unclosed ' . $asm->getStackPath(),
117
+                'Invalid node hierarchy, unclosed '.$asm->getStackPath(),
118 118
                 $asm->getNode()->getContext()->getToken()
119 119
             );
120 120
         }
Please login to merge, or discard this patch.
Braces   +15 added lines, -7 removed lines patch added patch discarded remove patch
@@ -43,7 +43,8 @@  discard block
 block discarded – undo
43 43
         $parser->path = $path;
44 44
         $parser->lexer = clone $this->lexer;
45 45
 
46
-        foreach ($parser->syntax as $grammar => $stx) {
46
+        foreach ($parser->syntax as $grammar => $stx)
47
+        {
47 48
             $parser->syntax[$grammar] = clone $stx;
48 49
         }
49 50
 
@@ -71,7 +72,8 @@  discard block
 block discarded – undo
71 72
     {
72 73
         $template = new Template();
73 74
 
74
-        try {
75
+        try
76
+        {
75 77
             /**
76 78
              * TODO issue #767
77 79
              * @link https://github.com/spiral/framework/issues/767
@@ -81,7 +83,9 @@  discard block
 block discarded – undo
81 83
                 new Assembler($template, 'nodes'),
82 84
                 $this->lexer->parse($stream)
83 85
             );
84
-        } catch (SyntaxException $e) {
86
+        }
87
+        catch (SyntaxException $e)
88
+        {
85 89
             throw new ParserException(
86 90
                 $e->getMessage(),
87 91
                 new Context($e->getToken(), $this->getPath()),
@@ -100,19 +104,23 @@  discard block
 block discarded – undo
100 104
         $node = $asm->getNode();
101 105
 
102 106
         $syntax = [];
103
-        foreach ($this->syntax as $grammar => $stx) {
107
+        foreach ($this->syntax as $grammar => $stx)
108
+        {
104 109
             $syntax[$grammar] = clone $stx;
105 110
         }
106 111
 
107
-        foreach ($tokens as $token) {
108
-            if (!isset($syntax[$token->grammar])) {
112
+        foreach ($tokens as $token)
113
+        {
114
+            if (!isset($syntax[$token->grammar]))
115
+            {
109 116
                 throw new SyntaxException('Undefined token', $token);
110 117
             }
111 118
 
112 119
             $syntax[$token->grammar]->handle($this, $asm, $token);
113 120
         }
114 121
 
115
-        if ($asm->getNode() !== $node) {
122
+        if ($asm->getNode() !== $node)
123
+        {
116 124
             throw new SyntaxException(
117 125
                 'Invalid node hierarchy, unclosed ' . $asm->getStackPath(),
118 126
                 $asm->getNode()->getContext()->getToken()
Please login to merge, or discard this patch.
src/Stempler/src/helpers.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 declare(strict_types=1);
4 4
 
5
-if (!\function_exists('inject')) {
5
+if (!\function_exists('inject')){
6 6
     /**
7 7
      * Macro function to be replaced by the injected value.
8 8
      *
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     }
15 15
 }
16 16
 
17
-if (!\function_exists('injected')) {
17
+if (!\function_exists('injected')){
18 18
     /**
19 19
      * Return true if block value has been defined.
20 20
      *
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 declare(strict_types=1);
4 4
 
5
-if (!\function_exists('inject')) {
5
+if (!\function_exists('inject'))
6
+{
6 7
     /**
7 8
      * Macro function to be replaced by the injected value.
8 9
      *
@@ -14,7 +15,8 @@  discard block
 block discarded – undo
14 15
     }
15 16
 }
16 17
 
17
-if (!\function_exists('injected')) {
18
+if (!\function_exists('injected'))
19
+{
18 20
     /**
19 21
      * Return true if block value has been defined.
20 22
      *
Please login to merge, or discard this patch.
src/Stempler/src/Directive/ConditionalDirective.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
     public function renderCase(Directive $directive): string
74 74
     {
75
-        if ($this->firstSwitchCase) {
75
+        if ($this->firstSwitchCase){
76 76
             $this->firstSwitchCase = false;
77 77
 
78 78
             return \sprintf('case (%s): ?>', $directive->body);
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
     public function renderDefault(Directive $directive): string
85 85
     {
86
-        if ($this->firstSwitchCase) {
86
+        if ($this->firstSwitchCase){
87 87
             $this->firstSwitchCase = false;
88 88
 
89 89
             return 'default: ?>';
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
     public function renderBreak(Directive $directive): string
101 101
     {
102
-        if (isset($directive->values[0])) {
102
+        if (isset($directive->values[0])){
103 103
             return \sprintf('<?php break %s; ?>', $directive->values[0]);
104 104
         }
105 105
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,7 +72,8 @@  discard block
 block discarded – undo
72 72
 
73 73
     public function renderCase(Directive $directive): string
74 74
     {
75
-        if ($this->firstSwitchCase) {
75
+        if ($this->firstSwitchCase)
76
+        {
76 77
             $this->firstSwitchCase = false;
77 78
 
78 79
             return \sprintf('case (%s): ?>', $directive->body);
@@ -83,7 +84,8 @@  discard block
 block discarded – undo
83 84
 
84 85
     public function renderDefault(Directive $directive): string
85 86
     {
86
-        if ($this->firstSwitchCase) {
87
+        if ($this->firstSwitchCase)
88
+        {
87 89
             $this->firstSwitchCase = false;
88 90
 
89 91
             return 'default: ?>';
@@ -99,7 +101,8 @@  discard block
 block discarded – undo
99 101
 
100 102
     public function renderBreak(Directive $directive): string
101 103
     {
102
-        if (isset($directive->values[0])) {
104
+        if (isset($directive->values[0]))
105
+        {
103 106
             return \sprintf('<?php break %s; ?>', $directive->values[0]);
104 107
         }
105 108
 
Please login to merge, or discard this patch.
src/Stempler/src/Directive/LoopDirective.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
     public function renderBreak(Directive $directive): string
35 35
     {
36
-        if (isset($directive->values[0])) {
36
+        if (isset($directive->values[0])){
37 37
             return \sprintf('<?php break %s; ?>', $directive->values[0]);
38 38
         }
39 39
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
     public function renderContinue(Directive $directive): string
44 44
     {
45
-        if (isset($directive->values[0])) {
45
+        if (isset($directive->values[0])){
46 46
             return \sprintf('<?php continue %s; ?>', $directive->values[0]);
47 47
         }
48 48
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,8 @@  discard block
 block discarded – undo
33 33
 
34 34
     public function renderBreak(Directive $directive): string
35 35
     {
36
-        if (isset($directive->values[0])) {
36
+        if (isset($directive->values[0]))
37
+        {
37 38
             return \sprintf('<?php break %s; ?>', $directive->values[0]);
38 39
         }
39 40
 
@@ -42,7 +43,8 @@  discard block
 block discarded – undo
42 43
 
43 44
     public function renderContinue(Directive $directive): string
44 45
     {
45
-        if (isset($directive->values[0])) {
46
+        if (isset($directive->values[0]))
47
+        {
46 48
             return \sprintf('<?php continue %s; ?>', $directive->values[0]);
47 49
         }
48 50
 
Please login to merge, or discard this patch.
src/Stempler/src/Lexer/Token.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
         public ?int $offset,
17 17
         public string $content,
18 18
         public ?string $grammar = null
19
-    ) {
19
+    ){
20 20
     }
21 21
 
22 22
     /**
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
             'content' => $this->content,
33 33
         ];
34 34
 
35
-        if ($this->grammar !== null) {
35
+        if ($this->grammar !== null){
36 36
             $token['type'] = \call_user_func([$this->grammar, 'tokenName'], $this->type);
37 37
         }
38 38
 
39
-        if ($this->tokens !== []) {
39
+        if ($this->tokens !== []){
40 40
             $token['tokens'] = $this->tokens;
41 41
         }
42 42
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,11 +32,13 @@
 block discarded – undo
32 32
             'content' => $this->content,
33 33
         ];
34 34
 
35
-        if ($this->grammar !== null) {
35
+        if ($this->grammar !== null)
36
+        {
36 37
             $token['type'] = \call_user_func([$this->grammar, 'tokenName'], $this->type);
37 38
         }
38 39
 
39
-        if ($this->tokens !== []) {
40
+        if ($this->tokens !== [])
41
+        {
40 42
             $token['tokens'] = $this->tokens;
41 43
         }
42 44
 
Please login to merge, or discard this patch.
src/Stempler/src/Lexer/Grammar/Traits/TokenTrait.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,11 +20,11 @@  discard block
 block discarded – undo
20 20
         $buffer = null;
21 21
         $bufferOffset = 0;
22 22
 
23
-        foreach ($inner as $n) {
23
+        foreach ($inner as $n){
24 24
             $token->offset ??= $n->offset;
25 25
 
26
-            if ($n instanceof Byte) {
27
-                if ($buffer === null) {
26
+            if ($n instanceof Byte){
27
+                if ($buffer === null){
28 28
                     $buffer = '';
29 29
                     $bufferOffset = $n->offset;
30 30
                 }
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
                 continue;
36 36
             }
37 37
 
38
-            if ($buffer !== null) {
38
+            if ($buffer !== null){
39 39
                 $token->tokens[] = new Token(
40 40
                     Token::TYPE_RAW,
41 41
                     $bufferOffset,
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
             $token->tokens[] = $n;
50 50
         }
51 51
 
52
-        if ($buffer !== null) {
52
+        if ($buffer !== null){
53 53
             $token->tokens[] = new Token(
54 54
                 Token::TYPE_RAW,
55 55
                 $bufferOffset,
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
             );
59 59
         }
60 60
 
61
-        if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) {
61
+        if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW){
62 62
             $token->tokens = [];
63 63
         }
64 64
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,11 +20,14 @@  discard block
 block discarded – undo
20 20
         $buffer = null;
21 21
         $bufferOffset = 0;
22 22
 
23
-        foreach ($inner as $n) {
23
+        foreach ($inner as $n)
24
+        {
24 25
             $token->offset ??= $n->offset;
25 26
 
26
-            if ($n instanceof Byte) {
27
-                if ($buffer === null) {
27
+            if ($n instanceof Byte)
28
+            {
29
+                if ($buffer === null)
30
+                {
28 31
                     $buffer = '';
29 32
                     $bufferOffset = $n->offset;
30 33
                 }
@@ -35,7 +38,8 @@  discard block
 block discarded – undo
35 38
                 continue;
36 39
             }
37 40
 
38
-            if ($buffer !== null) {
41
+            if ($buffer !== null)
42
+            {
39 43
                 $token->tokens[] = new Token(
40 44
                     Token::TYPE_RAW,
41 45
                     $bufferOffset,
@@ -49,7 +53,8 @@  discard block
 block discarded – undo
49 53
             $token->tokens[] = $n;
50 54
         }
51 55
 
52
-        if ($buffer !== null) {
56
+        if ($buffer !== null)
57
+        {
53 58
             $token->tokens[] = new Token(
54 59
                 Token::TYPE_RAW,
55 60
                 $bufferOffset,
@@ -58,7 +63,8 @@  discard block
 block discarded – undo
58 63
             );
59 64
         }
60 65
 
61
-        if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) {
66
+        if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW)
67
+        {
62 68
             $token->tokens = [];
63 69
         }
64 70
 
Please login to merge, or discard this patch.
src/Stempler/src/Lexer/Grammar/Dynamic/DeclareGrammar.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,19 +35,19 @@  discard block
 block discarded – undo
35 35
     public function parse(Buffer $src): \Generator
36 36
     {
37 37
         $quoted = [];
38
-        while ($n = $src->next()) {
39
-            switch ($n->char) {
38
+        while ($n = $src->next()){
39
+            switch ($n->char){
40 40
                 case '"':
41 41
                 case "'":
42
-                    if ($this->keyword !== []) {
42
+                    if ($this->keyword !== []){
43 43
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
44 44
                         $this->keyword = [];
45 45
                     }
46 46
 
47 47
                     $quoted[] = $n;
48
-                    while ($nn = $src->next()) {
48
+                    while ($nn = $src->next()){
49 49
                         $quoted[] = $nn;
50
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
50
+                        if ($nn instanceof Byte && $nn->char === $n->char){
51 51
                             break;
52 52
                         }
53 53
                     }
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
                     break;
59 59
                 case '=':
60
-                    if ($this->keyword !== []) {
60
+                    if ($this->keyword !== []){
61 61
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
62 62
                         $this->keyword = [];
63 63
                     }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
                     yield new Token(self::TYPE_EQUAL, $n->offset, '=');
66 66
                     break;
67 67
                 case ',':
68
-                    if ($this->keyword !== []) {
68
+                    if ($this->keyword !== []){
69 69
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
70 70
                         $this->keyword = [];
71 71
                     }
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
                     yield new Token(self::TYPE_COMMA, $n->offset, ',');
74 74
                     break;
75 75
                 default:
76
-                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) {
77
-                        if ($this->keyword !== []) {
76
+                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char)){
77
+                        if ($this->keyword !== []){
78 78
                             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
79 79
                             $this->keyword = [];
80 80
                         }
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             }
87 87
         }
88 88
 
89
-        if ($this->keyword !== []) {
89
+        if ($this->keyword !== []){
90 90
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
91 91
         }
92 92
     }
Please login to merge, or discard this patch.
Braces   +20 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,19 +35,24 @@  discard block
 block discarded – undo
35 35
     public function parse(Buffer $src): \Generator
36 36
     {
37 37
         $quoted = [];
38
-        while ($n = $src->next()) {
39
-            switch ($n->char) {
38
+        while ($n = $src->next())
39
+        {
40
+            switch ($n->char)
41
+            {
40 42
                 case '"':
41 43
                 case "'":
42
-                    if ($this->keyword !== []) {
44
+                    if ($this->keyword !== [])
45
+                    {
43 46
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
44 47
                         $this->keyword = [];
45 48
                     }
46 49
 
47 50
                     $quoted[] = $n;
48
-                    while ($nn = $src->next()) {
51
+                    while ($nn = $src->next())
52
+                    {
49 53
                         $quoted[] = $nn;
50
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
54
+                        if ($nn instanceof Byte && $nn->char === $n->char)
55
+                        {
51 56
                             break;
52 57
                         }
53 58
                     }
@@ -57,7 +62,8 @@  discard block
 block discarded – undo
57 62
 
58 63
                     break;
59 64
                 case '=':
60
-                    if ($this->keyword !== []) {
65
+                    if ($this->keyword !== [])
66
+                    {
61 67
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
62 68
                         $this->keyword = [];
63 69
                     }
@@ -65,7 +71,8 @@  discard block
 block discarded – undo
65 71
                     yield new Token(self::TYPE_EQUAL, $n->offset, '=');
66 72
                     break;
67 73
                 case ',':
68
-                    if ($this->keyword !== []) {
74
+                    if ($this->keyword !== [])
75
+                    {
69 76
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
70 77
                         $this->keyword = [];
71 78
                     }
@@ -73,8 +80,10 @@  discard block
 block discarded – undo
73 80
                     yield new Token(self::TYPE_COMMA, $n->offset, ',');
74 81
                     break;
75 82
                 default:
76
-                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) {
77
-                        if ($this->keyword !== []) {
83
+                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char))
84
+                    {
85
+                        if ($this->keyword !== [])
86
+                        {
78 87
                             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
79 88
                             $this->keyword = [];
80 89
                         }
@@ -86,7 +95,8 @@  discard block
 block discarded – undo
86 95
             }
87 96
         }
88 97
 
89
-        if ($this->keyword !== []) {
98
+        if ($this->keyword !== [])
99
+        {
90 100
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
91 101
         }
92 102
     }
Please login to merge, or discard this patch.
src/Stempler/src/Lexer/Grammar/Dynamic/DirectiveGrammar.php 2 patches
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -36,39 +36,39 @@  discard block
 block discarded – undo
36 36
         $this->body = null;
37 37
         $hasWhitespace = false;
38 38
 
39
-        while ($n = $src->next()) {
40
-            if (!$n instanceof Byte) {
39
+        while ($n = $src->next()){
40
+            if (!$n instanceof Byte){
41 41
                 // no other grammars are allowed
42 42
                 break;
43 43
             }
44 44
 
45
-            switch ($n->char) {
45
+            switch ($n->char){
46 46
                 case '(':
47 47
                     $this->flushName();
48 48
                     $this->tokens[] = new Token(DynamicGrammar::TYPE_BODY_OPEN, $n->offset, $n->char);
49 49
 
50 50
                     return $this->parseBody($src);
51 51
                 default:
52
-                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) {
52
+                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char)){
53 53
                         $hasWhitespace = true;
54
-                        if ($this->name !== []) {
54
+                        if ($this->name !== []){
55 55
                             $this->flushName();
56 56
                             $this->tokens[] = new Token(DynamicGrammar::TYPE_WHITESPACE, $n->offset, $n->char);
57 57
                             break;
58 58
                         }
59 59
 
60
-                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE) {
60
+                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE){
61 61
                             $this->getLastToken()->content .= $n->char;
62 62
                             break;
63 63
                         }
64 64
 
65 65
                         // invalid directive
66 66
                         return false;
67
-                    } elseif ($hasWhitespace) {
67
+                    } elseif ($hasWhitespace){
68 68
                         return $this->finalize();
69 69
                     }
70 70
 
71
-                    if (!\preg_match(self::REGEXP_KEYWORD, $n->char)) {
71
+                    if (!\preg_match(self::REGEXP_KEYWORD, $n->char)){
72 72
                         $this->flushName();
73 73
 
74 74
                         return $this->finalize();
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
      */
91 91
     public function getIterator(): \Generator
92 92
     {
93
-        if ($this->tokens === []) {
93
+        if ($this->tokens === []){
94 94
             throw new \LogicException('Directive not parsed');
95 95
         }
96 96
 
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
      */
111 111
     public function getKeyword(): string
112 112
     {
113
-        foreach ($this->tokens as $token) {
114
-            if ($token->type === DynamicGrammar::TYPE_KEYWORD) {
113
+        foreach ($this->tokens as $token){
114
+            if ($token->type === DynamicGrammar::TYPE_KEYWORD){
115 115
                 return $token->content;
116 116
             }
117 117
         }
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
      */
125 125
     public function getBody(): ?string
126 126
     {
127
-        foreach ($this->tokens as $token) {
128
-            if ($token->type === DynamicGrammar::TYPE_BODY) {
127
+        foreach ($this->tokens as $token){
128
+            if ($token->type === DynamicGrammar::TYPE_BODY){
129 129
                 return $token->content;
130 130
             }
131 131
         }
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
      */
139 139
     private function flushName(): void
140 140
     {
141
-        if ($this->name === []) {
141
+        if ($this->name === []){
142 142
             return;
143 143
         }
144 144
 
@@ -156,17 +156,17 @@  discard block
 block discarded – undo
156 156
         $this->body = [];
157 157
         $level = 1;
158 158
 
159
-        while ($nn = $src->next()) {
160
-            if (!$nn instanceof Byte) {
159
+        while ($nn = $src->next()){
160
+            if (!$nn instanceof Byte){
161 161
                 $this->flushBody();
162 162
                 return $this->finalize();
163 163
             }
164 164
 
165
-            if (\in_array($nn->char, ['"', '"'])) {
165
+            if (\in_array($nn->char, ['"', '"'])){
166 166
                 $this->body[] = $nn;
167
-                while ($nnn = $src->next()) {
167
+                while ($nnn = $src->next()){
168 168
                     $this->body[] = $nnn;
169
-                    if ($nnn instanceof Byte && $nnn->char === $nn->char) {
169
+                    if ($nnn instanceof Byte && $nnn->char === $nn->char){
170 170
                         break;
171 171
                     }
172 172
                 }
@@ -175,15 +175,15 @@  discard block
 block discarded – undo
175 175
 
176 176
             $this->body[] = $nn;
177 177
 
178
-            if ($nn->char === '(') {
178
+            if ($nn->char === '('){
179 179
                 $level++;
180 180
                 continue;
181 181
             }
182 182
 
183
-            if ($nn->char === ')') {
183
+            if ($nn->char === ')'){
184 184
                 $level--;
185 185
 
186
-                if ($level === 0) {
186
+                if ($level === 0){
187 187
                     $n = \array_pop($this->body);
188 188
 
189 189
                     $this->flushBody();
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
      */
203 203
     private function flushBody(): void
204 204
     {
205
-        if ($this->body === []) {
205
+        if ($this->body === []){
206 206
             return;
207 207
         }
208 208
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
     private function getLastToken(): Token
214 214
     {
215
-        if ($this->tokens === []) {
215
+        if ($this->tokens === []){
216 216
             throw new \LogicException('Directive not parsed');
217 217
         }
218 218
 
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
     {
227 227
         $tokens = $this->tokens;
228 228
 
229
-        foreach (\array_reverse($tokens, true) as $i => $t) {
230
-            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE) {
229
+        foreach (\array_reverse($tokens, true) as $i => $t){
230
+            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE){
231 231
                 break;
232 232
             }
233 233
 
@@ -235,18 +235,18 @@  discard block
 block discarded – undo
235 235
         }
236 236
 
237 237
         $body = null;
238
-        foreach ($tokens as $t) {
239
-            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN) {
238
+        foreach ($tokens as $t){
239
+            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN){
240 240
                 $body = false;
241 241
                 continue;
242 242
             }
243 243
 
244
-            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE) {
244
+            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE){
245 245
                 $body = null;
246 246
             }
247 247
         }
248 248
 
249
-        if ($body !== null) {
249
+        if ($body !== null){
250 250
             return false;
251 251
         }
252 252
 
Please login to merge, or discard this patch.
Braces   +61 added lines, -30 removed lines patch added patch discarded remove patch
@@ -36,39 +36,48 @@  discard block
 block discarded – undo
36 36
         $this->body = null;
37 37
         $hasWhitespace = false;
38 38
 
39
-        while ($n = $src->next()) {
40
-            if (!$n instanceof Byte) {
39
+        while ($n = $src->next())
40
+        {
41
+            if (!$n instanceof Byte)
42
+            {
41 43
                 // no other grammars are allowed
42 44
                 break;
43 45
             }
44 46
 
45
-            switch ($n->char) {
47
+            switch ($n->char)
48
+            {
46 49
                 case '(':
47 50
                     $this->flushName();
48 51
                     $this->tokens[] = new Token(DynamicGrammar::TYPE_BODY_OPEN, $n->offset, $n->char);
49 52
 
50 53
                     return $this->parseBody($src);
51 54
                 default:
52
-                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) {
55
+                    if (\preg_match(self::REGEXP_WHITESPACE, $n->char))
56
+                    {
53 57
                         $hasWhitespace = true;
54
-                        if ($this->name !== []) {
58
+                        if ($this->name !== [])
59
+                        {
55 60
                             $this->flushName();
56 61
                             $this->tokens[] = new Token(DynamicGrammar::TYPE_WHITESPACE, $n->offset, $n->char);
57 62
                             break;
58 63
                         }
59 64
 
60
-                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE) {
65
+                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE)
66
+                        {
61 67
                             $this->getLastToken()->content .= $n->char;
62 68
                             break;
63 69
                         }
64 70
 
65 71
                         // invalid directive
66 72
                         return false;
67
-                    } elseif ($hasWhitespace) {
73
+                    }
74
+                    elseif ($hasWhitespace)
75
+                    {
68 76
                         return $this->finalize();
69 77
                     }
70 78
 
71
-                    if (!\preg_match(self::REGEXP_KEYWORD, $n->char)) {
79
+                    if (!\preg_match(self::REGEXP_KEYWORD, $n->char))
80
+                    {
72 81
                         $this->flushName();
73 82
 
74 83
                         return $this->finalize();
@@ -90,7 +99,8 @@  discard block
 block discarded – undo
90 99
      */
91 100
     public function getIterator(): \Generator
92 101
     {
93
-        if ($this->tokens === []) {
102
+        if ($this->tokens === [])
103
+        {
94 104
             throw new \LogicException('Directive not parsed');
95 105
         }
96 106
 
@@ -110,8 +120,10 @@  discard block
 block discarded – undo
110 120
      */
111 121
     public function getKeyword(): string
112 122
     {
113
-        foreach ($this->tokens as $token) {
114
-            if ($token->type === DynamicGrammar::TYPE_KEYWORD) {
123
+        foreach ($this->tokens as $token)
124
+        {
125
+            if ($token->type === DynamicGrammar::TYPE_KEYWORD)
126
+            {
115 127
                 return $token->content;
116 128
             }
117 129
         }
@@ -124,8 +136,10 @@  discard block
 block discarded – undo
124 136
      */
125 137
     public function getBody(): ?string
126 138
     {
127
-        foreach ($this->tokens as $token) {
128
-            if ($token->type === DynamicGrammar::TYPE_BODY) {
139
+        foreach ($this->tokens as $token)
140
+        {
141
+            if ($token->type === DynamicGrammar::TYPE_BODY)
142
+            {
129 143
                 return $token->content;
130 144
             }
131 145
         }
@@ -138,7 +152,8 @@  discard block
 block discarded – undo
138 152
      */
139 153
     private function flushName(): void
140 154
     {
141
-        if ($this->name === []) {
155
+        if ($this->name === [])
156
+        {
142 157
             return;
143 158
         }
144 159
 
@@ -156,17 +171,22 @@  discard block
 block discarded – undo
156 171
         $this->body = [];
157 172
         $level = 1;
158 173
 
159
-        while ($nn = $src->next()) {
160
-            if (!$nn instanceof Byte) {
174
+        while ($nn = $src->next())
175
+        {
176
+            if (!$nn instanceof Byte)
177
+            {
161 178
                 $this->flushBody();
162 179
                 return $this->finalize();
163 180
             }
164 181
 
165
-            if (\in_array($nn->char, ['"', '"'])) {
182
+            if (\in_array($nn->char, ['"', '"']))
183
+            {
166 184
                 $this->body[] = $nn;
167
-                while ($nnn = $src->next()) {
185
+                while ($nnn = $src->next())
186
+                {
168 187
                     $this->body[] = $nnn;
169
-                    if ($nnn instanceof Byte && $nnn->char === $nn->char) {
188
+                    if ($nnn instanceof Byte && $nnn->char === $nn->char)
189
+                    {
170 190
                         break;
171 191
                     }
172 192
                 }
@@ -175,15 +195,18 @@  discard block
 block discarded – undo
175 195
 
176 196
             $this->body[] = $nn;
177 197
 
178
-            if ($nn->char === '(') {
198
+            if ($nn->char === '(')
199
+            {
179 200
                 $level++;
180 201
                 continue;
181 202
             }
182 203
 
183
-            if ($nn->char === ')') {
204
+            if ($nn->char === ')')
205
+            {
184 206
                 $level--;
185 207
 
186
-                if ($level === 0) {
208
+                if ($level === 0)
209
+                {
187 210
                     $n = \array_pop($this->body);
188 211
 
189 212
                     $this->flushBody();
@@ -202,7 +225,8 @@  discard block
 block discarded – undo
202 225
      */
203 226
     private function flushBody(): void
204 227
     {
205
-        if ($this->body === []) {
228
+        if ($this->body === [])
229
+        {
206 230
             return;
207 231
         }
208 232
 
@@ -212,7 +236,8 @@  discard block
 block discarded – undo
212 236
 
213 237
     private function getLastToken(): Token
214 238
     {
215
-        if ($this->tokens === []) {
239
+        if ($this->tokens === [])
240
+        {
216 241
             throw new \LogicException('Directive not parsed');
217 242
         }
218 243
 
@@ -226,8 +251,10 @@  discard block
 block discarded – undo
226 251
     {
227 252
         $tokens = $this->tokens;
228 253
 
229
-        foreach (\array_reverse($tokens, true) as $i => $t) {
230
-            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE) {
254
+        foreach (\array_reverse($tokens, true) as $i => $t)
255
+        {
256
+            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE)
257
+            {
231 258
                 break;
232 259
             }
233 260
 
@@ -235,18 +262,22 @@  discard block
 block discarded – undo
235 262
         }
236 263
 
237 264
         $body = null;
238
-        foreach ($tokens as $t) {
239
-            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN) {
265
+        foreach ($tokens as $t)
266
+        {
267
+            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN)
268
+            {
240 269
                 $body = false;
241 270
                 continue;
242 271
             }
243 272
 
244
-            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE) {
273
+            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE)
274
+            {
245 275
                 $body = null;
246 276
             }
247 277
         }
248 278
 
249
-        if ($body !== null) {
279
+        if ($body !== null)
280
+        {
250 281
             return false;
251 282
         }
252 283
 
Please login to merge, or discard this patch.