@@ -32,11 +32,11 @@ discard block |
||
32 | 32 | $buffer = null; |
33 | 33 | $bufferOffset = 0; |
34 | 34 | |
35 | - foreach ($inner as $n) { |
|
35 | + foreach ($inner as $n){ |
|
36 | 36 | $token->offset = $token->offset ?? $n->offset; |
37 | 37 | |
38 | - if ($n instanceof Byte) { |
|
39 | - if ($buffer === null) { |
|
38 | + if ($n instanceof Byte){ |
|
39 | + if ($buffer === null){ |
|
40 | 40 | $buffer = ''; |
41 | 41 | $bufferOffset = $n->offset; |
42 | 42 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | continue; |
48 | 48 | } |
49 | 49 | |
50 | - if ($buffer !== null) { |
|
50 | + if ($buffer !== null){ |
|
51 | 51 | $token->tokens[] = new Token( |
52 | 52 | Token::TYPE_RAW, |
53 | 53 | $bufferOffset, |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $token->tokens[] = $n; |
62 | 62 | } |
63 | 63 | |
64 | - if ($buffer !== null) { |
|
64 | + if ($buffer !== null){ |
|
65 | 65 | $token->tokens[] = new Token( |
66 | 66 | Token::TYPE_RAW, |
67 | 67 | $bufferOffset, |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | ); |
71 | 71 | } |
72 | 72 | |
73 | - if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) { |
|
73 | + if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW){ |
|
74 | 74 | $token->tokens = []; |
75 | 75 | } |
76 | 76 |
@@ -32,11 +32,14 @@ discard block |
||
32 | 32 | $buffer = null; |
33 | 33 | $bufferOffset = 0; |
34 | 34 | |
35 | - foreach ($inner as $n) { |
|
35 | + foreach ($inner as $n) |
|
36 | + { |
|
36 | 37 | $token->offset = $token->offset ?? $n->offset; |
37 | 38 | |
38 | - if ($n instanceof Byte) { |
|
39 | - if ($buffer === null) { |
|
39 | + if ($n instanceof Byte) |
|
40 | + { |
|
41 | + if ($buffer === null) |
|
42 | + { |
|
40 | 43 | $buffer = ''; |
41 | 44 | $bufferOffset = $n->offset; |
42 | 45 | } |
@@ -47,7 +50,8 @@ discard block |
||
47 | 50 | continue; |
48 | 51 | } |
49 | 52 | |
50 | - if ($buffer !== null) { |
|
53 | + if ($buffer !== null) |
|
54 | + { |
|
51 | 55 | $token->tokens[] = new Token( |
52 | 56 | Token::TYPE_RAW, |
53 | 57 | $bufferOffset, |
@@ -61,7 +65,8 @@ discard block |
||
61 | 65 | $token->tokens[] = $n; |
62 | 66 | } |
63 | 67 | |
64 | - if ($buffer !== null) { |
|
68 | + if ($buffer !== null) |
|
69 | + { |
|
65 | 70 | $token->tokens[] = new Token( |
66 | 71 | Token::TYPE_RAW, |
67 | 72 | $bufferOffset, |
@@ -70,7 +75,8 @@ discard block |
||
70 | 75 | ); |
71 | 76 | } |
72 | 77 | |
73 | - if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) { |
|
78 | + if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) |
|
79 | + { |
|
74 | 80 | $token->tokens = []; |
75 | 81 | } |
76 | 82 |
@@ -84,33 +84,33 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function parse(Buffer $src): \Generator |
86 | 86 | { |
87 | - while ($n = $src->next()) { |
|
88 | - if (!$n instanceof Byte) { |
|
87 | + while ($n = $src->next()){ |
|
88 | + if (!$n instanceof Byte){ |
|
89 | 89 | yield $n; |
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | |
93 | - if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR) { |
|
93 | + if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR){ |
|
94 | 94 | if ( |
95 | 95 | $this->echo->nextToken($src) || |
96 | 96 | $this->raw->nextToken($src) || |
97 | 97 | $src->lookaheadByte() === DirectiveGrammar::DIRECTIVE_CHAR |
98 | - ) { |
|
98 | + ){ |
|
99 | 99 | // escaped echo sequence, hide directive byte |
100 | 100 | yield $src->next(); |
101 | 101 | continue; |
102 | 102 | } |
103 | 103 | |
104 | 104 | $directive = new DirectiveGrammar(); |
105 | - if ($directive->parse($src, $n->offset)) { |
|
106 | - if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE) { |
|
105 | + if ($directive->parse($src, $n->offset)){ |
|
106 | + if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE){ |
|
107 | 107 | // configure braces syntax |
108 | 108 | $this->declare($directive->getBody()); |
109 | - } else { |
|
109 | + }else{ |
|
110 | 110 | if ( |
111 | 111 | $this->directiveRenderer !== null |
112 | 112 | && !$this->directiveRenderer->hasDirective($directive->getKeyword()) |
113 | - ) { |
|
113 | + ){ |
|
114 | 114 | // directive opening char |
115 | 115 | yield $n; |
116 | 116 | |
@@ -131,15 +131,15 @@ discard block |
||
131 | 131 | |
132 | 132 | /** @var BracesGrammar|null $braces */ |
133 | 133 | $braces = null; |
134 | - if ($this->echo->starts($src, $n)) { |
|
134 | + if ($this->echo->starts($src, $n)){ |
|
135 | 135 | $braces = clone $this->echo; |
136 | - } elseif ($this->raw->starts($src, $n)) { |
|
136 | + } elseif ($this->raw->starts($src, $n)){ |
|
137 | 137 | $braces = clone $this->raw; |
138 | 138 | } |
139 | 139 | |
140 | - if ($braces !== null) { |
|
140 | + if ($braces !== null){ |
|
141 | 141 | $echo = $braces->parse($src, $n); |
142 | - if ($echo !== null) { |
|
142 | + if ($echo !== null){ |
|
143 | 143 | yield from $echo; |
144 | 144 | continue; |
145 | 145 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public static function tokenName(int $token): string |
161 | 161 | { |
162 | - switch ($token) { |
|
162 | + switch ($token){ |
|
163 | 163 | case self::TYPE_OPEN_TAG: |
164 | 164 | return 'DYNAMIC:OPEN_TAG'; |
165 | 165 | case self::TYPE_CLOSE_TAG: |
@@ -184,20 +184,20 @@ discard block |
||
184 | 184 | /** |
185 | 185 | * @param string $body |
186 | 186 | */ |
187 | - private function declare(?string $body): void |
|
187 | + private function declare(?string$body) : void |
|
188 | 188 | { |
189 | - if ($body === null) { |
|
189 | + if ($body === null){ |
|
190 | 190 | return; |
191 | 191 | } |
192 | 192 | |
193 | - foreach ($this->fetchOptions($body) as $option => $value) { |
|
193 | + foreach ($this->fetchOptions($body) as $option => $value){ |
|
194 | 194 | $value = trim($value, '\'" '); |
195 | - switch ($option) { |
|
195 | + switch ($option){ |
|
196 | 196 | case 'syntax': |
197 | 197 | $this->echo->setActive($value !== 'off'); |
198 | 198 | $this->raw->setActive($value !== 'off'); |
199 | 199 | |
200 | - if ($value === 'default') { |
|
200 | + if ($value === 'default'){ |
|
201 | 201 | $this->echo->setStartSequence('{{'); |
202 | 202 | $this->echo->setEndSequence('}}'); |
203 | 203 | $this->raw->setStartSequence('{!!'); |
@@ -238,10 +238,10 @@ discard block |
||
238 | 238 | $keyword = null; |
239 | 239 | |
240 | 240 | /** @var Token $token */ |
241 | - foreach ($lexer->parse(new StringStream($body)) as $token) { |
|
242 | - switch ($token->type) { |
|
241 | + foreach ($lexer->parse(new StringStream($body)) as $token){ |
|
242 | + switch ($token->type){ |
|
243 | 243 | case DeclareGrammar::TYPE_KEYWORD: |
244 | - if ($keyword !== null) { |
|
244 | + if ($keyword !== null){ |
|
245 | 245 | $options[$keyword] = $token->content; |
246 | 246 | $keyword = null; |
247 | 247 | break; |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | $keyword = $token->content; |
250 | 250 | break; |
251 | 251 | case DeclareGrammar::TYPE_QUOTED: |
252 | - if ($keyword !== null) { |
|
252 | + if ($keyword !== null){ |
|
253 | 253 | $options[$keyword] = trim($token->content, $token->content[0]); |
254 | 254 | $keyword = null; |
255 | 255 | break; |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | $keyword = trim($token->content, $token->content[0]); |
259 | 259 | break; |
260 | 260 | case DeclareGrammar::TYPE_COMMA: |
261 | - if ($keyword !== null) { |
|
261 | + if ($keyword !== null){ |
|
262 | 262 | $options[$keyword] = null; |
263 | 263 | $keyword = null; |
264 | 264 | break; |
@@ -84,13 +84,16 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function parse(Buffer $src): \Generator |
86 | 86 | { |
87 | - while ($n = $src->next()) { |
|
88 | - if (!$n instanceof Byte) { |
|
87 | + while ($n = $src->next()) |
|
88 | + { |
|
89 | + if (!$n instanceof Byte) |
|
90 | + { |
|
89 | 91 | yield $n; |
90 | 92 | continue; |
91 | 93 | } |
92 | 94 | |
93 | - if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR) { |
|
95 | + if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR) |
|
96 | + { |
|
94 | 97 | if ( |
95 | 98 | $this->echo->nextToken($src) || |
96 | 99 | $this->raw->nextToken($src) || |
@@ -102,11 +105,15 @@ discard block |
||
102 | 105 | } |
103 | 106 | |
104 | 107 | $directive = new DirectiveGrammar(); |
105 | - if ($directive->parse($src, $n->offset)) { |
|
106 | - if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE) { |
|
108 | + if ($directive->parse($src, $n->offset)) |
|
109 | + { |
|
110 | + if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE) |
|
111 | + { |
|
107 | 112 | // configure braces syntax |
108 | 113 | $this->declare($directive->getBody()); |
109 | - } else { |
|
114 | + } |
|
115 | + else |
|
116 | + { |
|
110 | 117 | if ( |
111 | 118 | $this->directiveRenderer !== null |
112 | 119 | && !$this->directiveRenderer->hasDirective($directive->getKeyword()) |
@@ -131,15 +138,20 @@ discard block |
||
131 | 138 | |
132 | 139 | /** @var BracesGrammar|null $braces */ |
133 | 140 | $braces = null; |
134 | - if ($this->echo->starts($src, $n)) { |
|
141 | + if ($this->echo->starts($src, $n)) |
|
142 | + { |
|
135 | 143 | $braces = clone $this->echo; |
136 | - } elseif ($this->raw->starts($src, $n)) { |
|
144 | + } |
|
145 | + elseif ($this->raw->starts($src, $n)) |
|
146 | + { |
|
137 | 147 | $braces = clone $this->raw; |
138 | 148 | } |
139 | 149 | |
140 | - if ($braces !== null) { |
|
150 | + if ($braces !== null) |
|
151 | + { |
|
141 | 152 | $echo = $braces->parse($src, $n); |
142 | - if ($echo !== null) { |
|
153 | + if ($echo !== null) |
|
154 | + { |
|
143 | 155 | yield from $echo; |
144 | 156 | continue; |
145 | 157 | } |
@@ -159,7 +171,8 @@ discard block |
||
159 | 171 | */ |
160 | 172 | public static function tokenName(int $token): string |
161 | 173 | { |
162 | - switch ($token) { |
|
174 | + switch ($token) |
|
175 | + { |
|
163 | 176 | case self::TYPE_OPEN_TAG: |
164 | 177 | return 'DYNAMIC:OPEN_TAG'; |
165 | 178 | case self::TYPE_CLOSE_TAG: |
@@ -186,18 +199,22 @@ discard block |
||
186 | 199 | */ |
187 | 200 | private function declare(?string $body): void |
188 | 201 | { |
189 | - if ($body === null) { |
|
202 | + if ($body === null) |
|
203 | + { |
|
190 | 204 | return; |
191 | 205 | } |
192 | 206 | |
193 | - foreach ($this->fetchOptions($body) as $option => $value) { |
|
207 | + foreach ($this->fetchOptions($body) as $option => $value) |
|
208 | + { |
|
194 | 209 | $value = trim($value, '\'" '); |
195 | - switch ($option) { |
|
210 | + switch ($option) |
|
211 | + { |
|
196 | 212 | case 'syntax': |
197 | 213 | $this->echo->setActive($value !== 'off'); |
198 | 214 | $this->raw->setActive($value !== 'off'); |
199 | 215 | |
200 | - if ($value === 'default') { |
|
216 | + if ($value === 'default') |
|
217 | + { |
|
201 | 218 | $this->echo->setStartSequence('{{'); |
202 | 219 | $this->echo->setEndSequence('}}'); |
203 | 220 | $this->raw->setStartSequence('{!!'); |
@@ -238,10 +255,13 @@ discard block |
||
238 | 255 | $keyword = null; |
239 | 256 | |
240 | 257 | /** @var Token $token */ |
241 | - foreach ($lexer->parse(new StringStream($body)) as $token) { |
|
242 | - switch ($token->type) { |
|
258 | + foreach ($lexer->parse(new StringStream($body)) as $token) |
|
259 | + { |
|
260 | + switch ($token->type) |
|
261 | + { |
|
243 | 262 | case DeclareGrammar::TYPE_KEYWORD: |
244 | - if ($keyword !== null) { |
|
263 | + if ($keyword !== null) |
|
264 | + { |
|
245 | 265 | $options[$keyword] = $token->content; |
246 | 266 | $keyword = null; |
247 | 267 | break; |
@@ -249,7 +269,8 @@ discard block |
||
249 | 269 | $keyword = $token->content; |
250 | 270 | break; |
251 | 271 | case DeclareGrammar::TYPE_QUOTED: |
252 | - if ($keyword !== null) { |
|
272 | + if ($keyword !== null) |
|
273 | + { |
|
253 | 274 | $options[$keyword] = trim($token->content, $token->content[0]); |
254 | 275 | $keyword = null; |
255 | 276 | break; |
@@ -258,7 +279,8 @@ discard block |
||
258 | 279 | $keyword = trim($token->content, $token->content[0]); |
259 | 280 | break; |
260 | 281 | case DeclareGrammar::TYPE_COMMA: |
261 | - if ($keyword !== null) { |
|
282 | + if ($keyword !== null) |
|
283 | + { |
|
262 | 284 | $options[$keyword] = null; |
263 | 285 | $keyword = null; |
264 | 286 | break; |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | $buffer = null; |
28 | 28 | $bufferOffset = 0; |
29 | 29 | |
30 | - foreach ($src as $n) { |
|
31 | - if ($n instanceof Byte) { |
|
32 | - if ($buffer === null) { |
|
30 | + foreach ($src as $n){ |
|
31 | + if ($n instanceof Byte){ |
|
32 | + if ($buffer === null){ |
|
33 | 33 | $buffer = ''; |
34 | 34 | $bufferOffset = $n->offset; |
35 | 35 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | continue; |
39 | 39 | } |
40 | 40 | |
41 | - if ($buffer !== null) { |
|
41 | + if ($buffer !== null){ |
|
42 | 42 | yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer); |
43 | 43 | $buffer = null; |
44 | 44 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | yield $n; |
47 | 47 | } |
48 | 48 | |
49 | - if ($buffer !== null) { |
|
49 | + if ($buffer !== null){ |
|
50 | 50 | yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer); |
51 | 51 | } |
52 | 52 | } |
@@ -27,9 +27,12 @@ discard block |
||
27 | 27 | $buffer = null; |
28 | 28 | $bufferOffset = 0; |
29 | 29 | |
30 | - foreach ($src as $n) { |
|
31 | - if ($n instanceof Byte) { |
|
32 | - if ($buffer === null) { |
|
30 | + foreach ($src as $n) |
|
31 | + { |
|
32 | + if ($n instanceof Byte) |
|
33 | + { |
|
34 | + if ($buffer === null) |
|
35 | + { |
|
33 | 36 | $buffer = ''; |
34 | 37 | $bufferOffset = $n->offset; |
35 | 38 | } |
@@ -38,7 +41,8 @@ discard block |
||
38 | 41 | continue; |
39 | 42 | } |
40 | 43 | |
41 | - if ($buffer !== null) { |
|
44 | + if ($buffer !== null) |
|
45 | + { |
|
42 | 46 | yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer); |
43 | 47 | $buffer = null; |
44 | 48 | } |
@@ -46,7 +50,8 @@ discard block |
||
46 | 50 | yield $n; |
47 | 51 | } |
48 | 52 | |
49 | - if ($buffer !== null) { |
|
53 | + if ($buffer !== null) |
|
54 | + { |
|
50 | 55 | yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer); |
51 | 56 | } |
52 | 57 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | public function getStackPath(): string |
52 | 52 | { |
53 | 53 | $path = [$this->nodeName($this->node)]; |
54 | - foreach ($this->stack as $tuple) { |
|
54 | + foreach ($this->stack as $tuple){ |
|
55 | 55 | $path[] = $this->nodeName($tuple[0]); |
56 | 56 | } |
57 | 57 | |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | private function nodeName(NodeInterface $node): string |
95 | 95 | { |
96 | 96 | $r = new \ReflectionClass($node); |
97 | - if (property_exists($node, 'name')) { |
|
98 | - return lcfirst($r->getShortName()) . "[{$node->name}]"; |
|
97 | + if (property_exists($node, 'name')){ |
|
98 | + return lcfirst($r->getShortName())."[{$node->name}]"; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | return lcfirst($r->getShortName()); |
@@ -51,7 +51,8 @@ discard block |
||
51 | 51 | public function getStackPath(): string |
52 | 52 | { |
53 | 53 | $path = [$this->nodeName($this->node)]; |
54 | - foreach ($this->stack as $tuple) { |
|
54 | + foreach ($this->stack as $tuple) |
|
55 | + { |
|
55 | 56 | $path[] = $this->nodeName($tuple[0]); |
56 | 57 | } |
57 | 58 | |
@@ -94,7 +95,8 @@ discard block |
||
94 | 95 | private function nodeName(NodeInterface $node): string |
95 | 96 | { |
96 | 97 | $r = new \ReflectionClass($node); |
97 | - if (property_exists($node, 'name')) { |
|
98 | + if (property_exists($node, 'name')) |
|
99 | + { |
|
98 | 100 | return lcfirst($r->getShortName()) . "[{$node->name}]"; |
99 | 101 | } |
100 | 102 |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function handle(Parser $parser, Assembler $asm, Token $token): void |
71 | 71 | { |
72 | - switch ($token->type) { |
|
72 | + switch ($token->type){ |
|
73 | 73 | case HTMLGrammar::TYPE_OPEN: |
74 | 74 | case HTMLGrammar::TYPE_OPEN_SHORT: |
75 | 75 | $this->node = new Tag(new Parser\Context($token, $parser->getPath())); |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | break; |
79 | 79 | |
80 | 80 | case HTMLGrammar::TYPE_KEYWORD: |
81 | - if ($this->node->name === null) { |
|
81 | + if ($this->node->name === null){ |
|
82 | 82 | $this->node->name = $this->parseToken($parser, $token); |
83 | 83 | return; |
84 | 84 | } |
85 | 85 | |
86 | - if ($this->attr !== null && !$this->attr->value instanceof Nil) { |
|
86 | + if ($this->attr !== null && !$this->attr->value instanceof Nil){ |
|
87 | 87 | $this->attr->value = $this->parseToken($parser, $token); |
88 | 88 | $this->attr = null; |
89 | 89 | break; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | break; |
100 | 100 | |
101 | 101 | case HTMLGrammar::TYPE_EQUAL: |
102 | - if ($this->attr === null) { |
|
102 | + if ($this->attr === null){ |
|
103 | 103 | throw new SyntaxException('unexpected attribute token', $token); |
104 | 104 | } |
105 | 105 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | break; |
109 | 109 | |
110 | 110 | case HTMLGrammar::TYPE_ATTRIBUTE: |
111 | - if ($this->attr === null) { |
|
111 | + if ($this->attr === null){ |
|
112 | 112 | throw new SyntaxException('unexpected attribute token', $token); |
113 | 113 | } |
114 | 114 | |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | strpos($this->attr->name, 'on') === 0 |
119 | 119 | || in_array($this->attr->name, self::VERBATIM_ATTRIBUTES, true) |
120 | 120 | ) |
121 | - ) { |
|
121 | + ){ |
|
122 | 122 | $this->attr->value = $this->parseVerbatim($parser, $token); |
123 | - } else { |
|
123 | + }else{ |
|
124 | 124 | $this->attr->value = $this->parseToken($parser, $token); |
125 | 125 | } |
126 | 126 | |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | break; |
135 | 135 | |
136 | 136 | case HTMLGrammar::TYPE_CLOSE: |
137 | - if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) { |
|
138 | - if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) { |
|
137 | + if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT){ |
|
138 | + if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name){ |
|
139 | 139 | throw new SyntaxException( |
140 | 140 | "Invalid closing tag `{$this->node->name}`, expected `{$asm->getNode()->name}`", |
141 | 141 | $this->token |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | $asm->close(); |
146 | - } else { |
|
147 | - if (in_array($this->node->name, self::VOID_TAGS)) { |
|
146 | + }else{ |
|
147 | + if (in_array($this->node->name, self::VOID_TAGS)){ |
|
148 | 148 | $this->node->void = true; |
149 | 149 | $asm->push($this->node); |
150 | - } else { |
|
150 | + }else{ |
|
151 | 151 | $asm->open($this->node, 'nodes'); |
152 | 152 | } |
153 | 153 | } |
@@ -160,9 +160,9 @@ discard block |
||
160 | 160 | break; |
161 | 161 | |
162 | 162 | default: |
163 | - if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) { |
|
163 | + if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim){ |
|
164 | 164 | $node = $this->parseToken($parser, $token); |
165 | - if (is_string($node)) { |
|
165 | + if (is_string($node)){ |
|
166 | 166 | $node = new Raw($node, new Parser\Context($token, $parser->getPath())); |
167 | 167 | } |
168 | 168 | |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | { |
191 | 191 | $verbatim = new Verbatim(new Parser\Context($token, $parser->getPath())); |
192 | 192 | |
193 | - if ($token->tokens === []) { |
|
194 | - if ($token->content) { |
|
193 | + if ($token->tokens === []){ |
|
194 | + if ($token->content){ |
|
195 | 195 | $verbatim->nodes[] = $token->content; |
196 | 196 | } |
197 | - } else { |
|
197 | + }else{ |
|
198 | 198 | $parser->parseTokens( |
199 | 199 | new Assembler($verbatim, 'nodes'), |
200 | 200 | $token->tokens |
@@ -69,7 +69,8 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function handle(Parser $parser, Assembler $asm, Token $token): void |
71 | 71 | { |
72 | - switch ($token->type) { |
|
72 | + switch ($token->type) |
|
73 | + { |
|
73 | 74 | case HTMLGrammar::TYPE_OPEN: |
74 | 75 | case HTMLGrammar::TYPE_OPEN_SHORT: |
75 | 76 | $this->node = new Tag(new Parser\Context($token, $parser->getPath())); |
@@ -78,12 +79,14 @@ discard block |
||
78 | 79 | break; |
79 | 80 | |
80 | 81 | case HTMLGrammar::TYPE_KEYWORD: |
81 | - if ($this->node->name === null) { |
|
82 | + if ($this->node->name === null) |
|
83 | + { |
|
82 | 84 | $this->node->name = $this->parseToken($parser, $token); |
83 | 85 | return; |
84 | 86 | } |
85 | 87 | |
86 | - if ($this->attr !== null && !$this->attr->value instanceof Nil) { |
|
88 | + if ($this->attr !== null && !$this->attr->value instanceof Nil) |
|
89 | + { |
|
87 | 90 | $this->attr->value = $this->parseToken($parser, $token); |
88 | 91 | $this->attr = null; |
89 | 92 | break; |
@@ -99,7 +102,8 @@ discard block |
||
99 | 102 | break; |
100 | 103 | |
101 | 104 | case HTMLGrammar::TYPE_EQUAL: |
102 | - if ($this->attr === null) { |
|
105 | + if ($this->attr === null) |
|
106 | + { |
|
103 | 107 | throw new SyntaxException('unexpected attribute token', $token); |
104 | 108 | } |
105 | 109 | |
@@ -108,7 +112,8 @@ discard block |
||
108 | 112 | break; |
109 | 113 | |
110 | 114 | case HTMLGrammar::TYPE_ATTRIBUTE: |
111 | - if ($this->attr === null) { |
|
115 | + if ($this->attr === null) |
|
116 | + { |
|
112 | 117 | throw new SyntaxException('unexpected attribute token', $token); |
113 | 118 | } |
114 | 119 | |
@@ -120,7 +125,9 @@ discard block |
||
120 | 125 | ) |
121 | 126 | ) { |
122 | 127 | $this->attr->value = $this->parseVerbatim($parser, $token); |
123 | - } else { |
|
128 | + } |
|
129 | + else |
|
130 | + { |
|
124 | 131 | $this->attr->value = $this->parseToken($parser, $token); |
125 | 132 | } |
126 | 133 | |
@@ -134,8 +141,10 @@ discard block |
||
134 | 141 | break; |
135 | 142 | |
136 | 143 | case HTMLGrammar::TYPE_CLOSE: |
137 | - if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) { |
|
138 | - if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) { |
|
144 | + if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) |
|
145 | + { |
|
146 | + if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) |
|
147 | + { |
|
139 | 148 | throw new SyntaxException( |
140 | 149 | "Invalid closing tag `{$this->node->name}`, expected `{$asm->getNode()->name}`", |
141 | 150 | $this->token |
@@ -143,11 +152,16 @@ discard block |
||
143 | 152 | } |
144 | 153 | |
145 | 154 | $asm->close(); |
146 | - } else { |
|
147 | - if (in_array($this->node->name, self::VOID_TAGS)) { |
|
155 | + } |
|
156 | + else |
|
157 | + { |
|
158 | + if (in_array($this->node->name, self::VOID_TAGS)) |
|
159 | + { |
|
148 | 160 | $this->node->void = true; |
149 | 161 | $asm->push($this->node); |
150 | - } else { |
|
162 | + } |
|
163 | + else |
|
164 | + { |
|
151 | 165 | $asm->open($this->node, 'nodes'); |
152 | 166 | } |
153 | 167 | } |
@@ -160,9 +174,11 @@ discard block |
||
160 | 174 | break; |
161 | 175 | |
162 | 176 | default: |
163 | - if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) { |
|
177 | + if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) |
|
178 | + { |
|
164 | 179 | $node = $this->parseToken($parser, $token); |
165 | - if (is_string($node)) { |
|
180 | + if (is_string($node)) |
|
181 | + { |
|
166 | 182 | $node = new Raw($node, new Parser\Context($token, $parser->getPath())); |
167 | 183 | } |
168 | 184 | |
@@ -190,11 +206,15 @@ discard block |
||
190 | 206 | { |
191 | 207 | $verbatim = new Verbatim(new Parser\Context($token, $parser->getPath())); |
192 | 208 | |
193 | - if ($token->tokens === []) { |
|
194 | - if ($token->content) { |
|
209 | + if ($token->tokens === []) |
|
210 | + { |
|
211 | + if ($token->content) |
|
212 | + { |
|
195 | 213 | $verbatim->nodes[] = $token->content; |
196 | 214 | } |
197 | - } else { |
|
215 | + } |
|
216 | + else |
|
217 | + { |
|
198 | 218 | $parser->parseTokens( |
199 | 219 | new Assembler($verbatim, 'nodes'), |
200 | 220 | $token->tokens |
@@ -30,7 +30,7 @@ |
||
30 | 30 | */ |
31 | 31 | public function handle(Parser $parser, Assembler $asm, Token $token): void |
32 | 32 | { |
33 | - switch ($token->type) { |
|
33 | + switch ($token->type){ |
|
34 | 34 | case InlineGrammar::TYPE_OPEN_TAG: |
35 | 35 | $this->inline = new Inline(new Parser\Context($token, $parser->getPath())); |
36 | 36 | $asm->push($this->inline); |
@@ -30,7 +30,8 @@ |
||
30 | 30 | */ |
31 | 31 | public function handle(Parser $parser, Assembler $asm, Token $token): void |
32 | 32 | { |
33 | - switch ($token->type) { |
|
33 | + switch ($token->type) |
|
34 | + { |
|
34 | 35 | case InlineGrammar::TYPE_OPEN_TAG: |
35 | 36 | $this->inline = new Inline(new Parser\Context($token, $parser->getPath())); |
36 | 37 | $asm->push($this->inline); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public function handle(Parser $parser, Assembler $asm, Token $token): void |
38 | 38 | { |
39 | - switch ($token->type) { |
|
39 | + switch ($token->type){ |
|
40 | 40 | case DynamicGrammar::TYPE_DIRECTIVE: |
41 | 41 | $this->directive = new Directive(new Parser\Context($token, $parser->getPath())); |
42 | 42 | $asm->push($this->directive); |
@@ -61,20 +61,20 @@ discard block |
||
61 | 61 | break; |
62 | 62 | |
63 | 63 | case DynamicGrammar::TYPE_KEYWORD: |
64 | - if ($this->directive !== null) { |
|
64 | + if ($this->directive !== null){ |
|
65 | 65 | $this->directive->name = $token->content; |
66 | 66 | } |
67 | 67 | break; |
68 | 68 | |
69 | 69 | case DynamicGrammar::TYPE_BODY: |
70 | - if ($this->directive !== null) { |
|
70 | + if ($this->directive !== null){ |
|
71 | 71 | $this->directive->body = $token->content; |
72 | 72 | $this->directive->values = $this->fetchValues($this->directive->body); |
73 | 73 | |
74 | 74 | $this->directive = null; |
75 | 75 | } |
76 | 76 | |
77 | - if ($this->output !== null) { |
|
77 | + if ($this->output !== null){ |
|
78 | 78 | $this->output->body = $token->content; |
79 | 79 | } |
80 | 80 | |
@@ -95,31 +95,31 @@ discard block |
||
95 | 95 | |
96 | 96 | $src = new StringStream($body); |
97 | 97 | |
98 | - while ($n = $src->peak()) { |
|
99 | - if (in_array($n, ['"', '"'])) { |
|
98 | + while ($n = $src->peak()){ |
|
99 | + if (in_array($n, ['"', '"'])){ |
|
100 | 100 | $values[count($values) - 1] .= $n; |
101 | - while ($nn = $src->peak()) { |
|
101 | + while ($nn = $src->peak()){ |
|
102 | 102 | $values[count($values) - 1] .= $nn; |
103 | - if ($nn === $n) { |
|
103 | + if ($nn === $n){ |
|
104 | 104 | break; |
105 | 105 | } |
106 | 106 | } |
107 | 107 | continue; |
108 | 108 | } |
109 | 109 | |
110 | - if ($n === ',' && $level === 0) { |
|
110 | + if ($n === ',' && $level === 0){ |
|
111 | 111 | $values[] = ''; |
112 | 112 | continue; |
113 | 113 | } |
114 | 114 | |
115 | 115 | $values[count($values) - 1] .= $n; |
116 | 116 | |
117 | - if ($n === '(' || $n === '[' || $n === '{') { |
|
117 | + if ($n === '(' || $n === '[' || $n === '{'){ |
|
118 | 118 | $level++; |
119 | 119 | continue; |
120 | 120 | } |
121 | 121 | |
122 | - if ($n === ')' || $n === ']' || $n === '}') { |
|
122 | + if ($n === ')' || $n === ']' || $n === '}'){ |
|
123 | 123 | $level--; |
124 | 124 | } |
125 | 125 | } |
@@ -36,7 +36,8 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public function handle(Parser $parser, Assembler $asm, Token $token): void |
38 | 38 | { |
39 | - switch ($token->type) { |
|
39 | + switch ($token->type) |
|
40 | + { |
|
40 | 41 | case DynamicGrammar::TYPE_DIRECTIVE: |
41 | 42 | $this->directive = new Directive(new Parser\Context($token, $parser->getPath())); |
42 | 43 | $asm->push($this->directive); |
@@ -61,20 +62,23 @@ discard block |
||
61 | 62 | break; |
62 | 63 | |
63 | 64 | case DynamicGrammar::TYPE_KEYWORD: |
64 | - if ($this->directive !== null) { |
|
65 | + if ($this->directive !== null) |
|
66 | + { |
|
65 | 67 | $this->directive->name = $token->content; |
66 | 68 | } |
67 | 69 | break; |
68 | 70 | |
69 | 71 | case DynamicGrammar::TYPE_BODY: |
70 | - if ($this->directive !== null) { |
|
72 | + if ($this->directive !== null) |
|
73 | + { |
|
71 | 74 | $this->directive->body = $token->content; |
72 | 75 | $this->directive->values = $this->fetchValues($this->directive->body); |
73 | 76 | |
74 | 77 | $this->directive = null; |
75 | 78 | } |
76 | 79 | |
77 | - if ($this->output !== null) { |
|
80 | + if ($this->output !== null) |
|
81 | + { |
|
78 | 82 | $this->output->body = $token->content; |
79 | 83 | } |
80 | 84 | |
@@ -95,31 +99,38 @@ discard block |
||
95 | 99 | |
96 | 100 | $src = new StringStream($body); |
97 | 101 | |
98 | - while ($n = $src->peak()) { |
|
99 | - if (in_array($n, ['"', '"'])) { |
|
102 | + while ($n = $src->peak()) |
|
103 | + { |
|
104 | + if (in_array($n, ['"', '"'])) |
|
105 | + { |
|
100 | 106 | $values[count($values) - 1] .= $n; |
101 | - while ($nn = $src->peak()) { |
|
107 | + while ($nn = $src->peak()) |
|
108 | + { |
|
102 | 109 | $values[count($values) - 1] .= $nn; |
103 | - if ($nn === $n) { |
|
110 | + if ($nn === $n) |
|
111 | + { |
|
104 | 112 | break; |
105 | 113 | } |
106 | 114 | } |
107 | 115 | continue; |
108 | 116 | } |
109 | 117 | |
110 | - if ($n === ',' && $level === 0) { |
|
118 | + if ($n === ',' && $level === 0) |
|
119 | + { |
|
111 | 120 | $values[] = ''; |
112 | 121 | continue; |
113 | 122 | } |
114 | 123 | |
115 | 124 | $values[count($values) - 1] .= $n; |
116 | 125 | |
117 | - if ($n === '(' || $n === '[' || $n === '{') { |
|
126 | + if ($n === '(' || $n === '[' || $n === '{') |
|
127 | + { |
|
118 | 128 | $level++; |
119 | 129 | continue; |
120 | 130 | } |
121 | 131 | |
122 | - if ($n === ')' || $n === ']' || $n === '}') { |
|
132 | + if ($n === ')' || $n === ']' || $n === '}') |
|
133 | + { |
|
123 | 134 | $level--; |
124 | 135 | } |
125 | 136 | } |
@@ -26,8 +26,8 @@ |
||
26 | 26 | */ |
27 | 27 | private function parseToken(Parser $parser, Token $token) |
28 | 28 | { |
29 | - if ($token->tokens === []) { |
|
30 | - if ($token->type === Token::TYPE_RAW) { |
|
29 | + if ($token->tokens === []){ |
|
30 | + if ($token->type === Token::TYPE_RAW){ |
|
31 | 31 | return new Raw($token->content); |
32 | 32 | } |
33 | 33 |
@@ -26,8 +26,10 @@ |
||
26 | 26 | */ |
27 | 27 | private function parseToken(Parser $parser, Token $token) |
28 | 28 | { |
29 | - if ($token->tokens === []) { |
|
30 | - if ($token->type === Token::TYPE_RAW) { |
|
29 | + if ($token->tokens === []) |
|
30 | + { |
|
31 | + if ($token->type === Token::TYPE_RAW) |
|
32 | + { |
|
31 | 33 | return new Raw($token->content); |
32 | 34 | } |
33 | 35 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $parser->path = $path; |
59 | 59 | $parser->lexer = clone $this->lexer; |
60 | 60 | |
61 | - foreach ($parser->syntax as $grammar => $stx) { |
|
61 | + foreach ($parser->syntax as $grammar => $stx){ |
|
62 | 62 | $parser->syntax[$grammar] = clone $stx; |
63 | 63 | } |
64 | 64 | |
@@ -95,12 +95,12 @@ discard block |
||
95 | 95 | { |
96 | 96 | $template = new Template(); |
97 | 97 | |
98 | - try { |
|
98 | + try{ |
|
99 | 99 | $this->parseTokens( |
100 | 100 | new Assembler($template, 'nodes'), |
101 | 101 | $this->lexer->parse($stream) |
102 | 102 | ); |
103 | - } catch (SyntaxException $e) { |
|
103 | + }catch (SyntaxException $e){ |
|
104 | 104 | throw new ParserException( |
105 | 105 | $e->getMessage(), |
106 | 106 | new Context($e->getToken(), $this->getPath()), |
@@ -122,21 +122,21 @@ discard block |
||
122 | 122 | $node = $asm->getNode(); |
123 | 123 | |
124 | 124 | $syntax = []; |
125 | - foreach ($this->syntax as $grammar => $stx) { |
|
125 | + foreach ($this->syntax as $grammar => $stx){ |
|
126 | 126 | $syntax[$grammar] = clone $stx; |
127 | 127 | } |
128 | 128 | |
129 | - foreach ($tokens as $token) { |
|
130 | - if (!isset($syntax[$token->grammar])) { |
|
129 | + foreach ($tokens as $token){ |
|
130 | + if (!isset($syntax[$token->grammar])){ |
|
131 | 131 | throw new SyntaxException('Undefined token', $token); |
132 | 132 | } |
133 | 133 | |
134 | 134 | $syntax[$token->grammar]->handle($this, $asm, $token); |
135 | 135 | } |
136 | 136 | |
137 | - if ($asm->getNode() !== $node) { |
|
137 | + if ($asm->getNode() !== $node){ |
|
138 | 138 | throw new SyntaxException( |
139 | - 'Invalid node hierarchy, unclosed ' . $asm->getStackPath(), |
|
139 | + 'Invalid node hierarchy, unclosed '.$asm->getStackPath(), |
|
140 | 140 | $asm->getNode()->getContext()->getToken() |
141 | 141 | ); |
142 | 142 | } |
@@ -58,7 +58,8 @@ discard block |
||
58 | 58 | $parser->path = $path; |
59 | 59 | $parser->lexer = clone $this->lexer; |
60 | 60 | |
61 | - foreach ($parser->syntax as $grammar => $stx) { |
|
61 | + foreach ($parser->syntax as $grammar => $stx) |
|
62 | + { |
|
62 | 63 | $parser->syntax[$grammar] = clone $stx; |
63 | 64 | } |
64 | 65 | |
@@ -95,12 +96,15 @@ discard block |
||
95 | 96 | { |
96 | 97 | $template = new Template(); |
97 | 98 | |
98 | - try { |
|
99 | + try |
|
100 | + { |
|
99 | 101 | $this->parseTokens( |
100 | 102 | new Assembler($template, 'nodes'), |
101 | 103 | $this->lexer->parse($stream) |
102 | 104 | ); |
103 | - } catch (SyntaxException $e) { |
|
105 | + } |
|
106 | + catch (SyntaxException $e) |
|
107 | + { |
|
104 | 108 | throw new ParserException( |
105 | 109 | $e->getMessage(), |
106 | 110 | new Context($e->getToken(), $this->getPath()), |
@@ -122,19 +126,23 @@ discard block |
||
122 | 126 | $node = $asm->getNode(); |
123 | 127 | |
124 | 128 | $syntax = []; |
125 | - foreach ($this->syntax as $grammar => $stx) { |
|
129 | + foreach ($this->syntax as $grammar => $stx) |
|
130 | + { |
|
126 | 131 | $syntax[$grammar] = clone $stx; |
127 | 132 | } |
128 | 133 | |
129 | - foreach ($tokens as $token) { |
|
130 | - if (!isset($syntax[$token->grammar])) { |
|
134 | + foreach ($tokens as $token) |
|
135 | + { |
|
136 | + if (!isset($syntax[$token->grammar])) |
|
137 | + { |
|
131 | 138 | throw new SyntaxException('Undefined token', $token); |
132 | 139 | } |
133 | 140 | |
134 | 141 | $syntax[$token->grammar]->handle($this, $asm, $token); |
135 | 142 | } |
136 | 143 | |
137 | - if ($asm->getNode() !== $node) { |
|
144 | + if ($asm->getNode() !== $node) |
|
145 | + { |
|
138 | 146 | throw new SyntaxException( |
139 | 147 | 'Invalid node hierarchy, unclosed ' . $asm->getStackPath(), |
140 | 148 | $asm->getNode()->getContext()->getToken() |