spiral / framework

src/Stempler/src/Transform/Finalizer/StackCollector.php

Spacing +8 added lines, -8 removed lines

@@ -40,11 +40,11 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->pushKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->pushKeyword) === 0){
             return $this->registerPush(StackContext::on($ctx), $node);
         }
 
-        if ($node instanceof Tag && strpos($node->name, $this->prependKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->prependKeyword) === 0){
             return $this->registerPrepend(StackContext::on($ctx), $node);
         }
 
@@ -58,7 +58,7 @@ 
     {
         $name = $this->stackName($node);
 
-        if ($name === null || !$ctx->push($name, $node, $this->uniqueID($node))) {
+        if ($name === null || !$ctx->push($name, $node, $this->uniqueID($node))){
             return null;
         }
 
@@ -72,7 +72,7 @@ 
     {
         $name = $this->stackName($node);
 
-        if ($name === null || !$ctx->prepend($name, $node, $this->uniqueID($node))) {
+        if ($name === null || !$ctx->prepend($name, $node, $this->uniqueID($node))){
             return null;
         }
 
@@ -81,8 +81,8 @@ 
 
     private function stackName(Tag $tag): ?string
     {
-        foreach ($tag->attrs as $attr) {
-            if (is_string($attr->value) && $attr->name === 'name') {
+        foreach ($tag->attrs as $attr){
+            if (is_string($attr->value) && $attr->name === 'name'){
                 return trim($attr->value, '\'"');
             }
         }
@@ -92,8 +92,8 @@ 
 
     private function uniqueID(Tag $tag): ?string
     {
-        foreach ($tag->attrs as $attr) {
-            if (is_string($attr->value) && $attr->name === 'unique-id') {
+        foreach ($tag->attrs as $attr){
+            if (is_string($attr->value) && $attr->name === 'unique-id'){
                 return trim($attr->value, '\'"');
             }
         }

Braces +16 added lines, -8 removed lines

@@ -40,11 +40,13 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->pushKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->pushKeyword) === 0)
+        {
             return $this->registerPush(StackContext::on($ctx), $node);
         }
 
-        if ($node instanceof Tag && strpos($node->name, $this->prependKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->prependKeyword) === 0)
+        {
             return $this->registerPrepend(StackContext::on($ctx), $node);
         }
 
@@ -58,7 +60,8 @@ 
     {
         $name = $this->stackName($node);
 
-        if ($name === null || !$ctx->push($name, $node, $this->uniqueID($node))) {
+        if ($name === null || !$ctx->push($name, $node, $this->uniqueID($node)))
+        {
             return null;
         }
 
@@ -72,7 +75,8 @@ 
     {
         $name = $this->stackName($node);
 
-        if ($name === null || !$ctx->prepend($name, $node, $this->uniqueID($node))) {
+        if ($name === null || !$ctx->prepend($name, $node, $this->uniqueID($node)))
+        {
             return null;
         }
 
@@ -81,8 +85,10 @@ 
 
     private function stackName(Tag $tag): ?string
     {
-        foreach ($tag->attrs as $attr) {
-            if (is_string($attr->value) && $attr->name === 'name') {
+        foreach ($tag->attrs as $attr)
+        {
+            if (is_string($attr->value) && $attr->name === 'name')
+            {
                 return trim($attr->value, '\'"');
             }
         }
@@ -92,8 +98,10 @@ 
 
     private function uniqueID(Tag $tag): ?string
     {
-        foreach ($tag->attrs as $attr) {
-            if (is_string($attr->value) && $attr->name === 'unique-id') {
+        foreach ($tag->attrs as $attr)
+        {
+            if (is_string($attr->value) && $attr->name === 'unique-id')
+            {
                 return trim($attr->value, '\'"');
             }
         }

src/Stempler/src/Transform/Finalizer/DynamicToPHP.php

Spacing +14 added lines, -14 removed lines

@@ -72,17 +72,17 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Output) {
+        if ($node instanceof Output){
             return $this->output($node, $ctx);
         }
 
-        if ($node instanceof Directive) {
+        if ($node instanceof Directive){
             return $this->directive($node);
         }
 
-        if ($node instanceof Template) {
+        if ($node instanceof Template){
             $extendsTag = $node->getAttribute(ExtendsParent::class);
-            if ($extendsTag instanceof Tag) {
+            if ($extendsTag instanceof Tag){
                 $extendsTag->attrs = $this->traverser->traverse($extendsTag->attrs);
             }
         }
@@ -92,9 +92,9 @@ 
 
     private function directive(Directive $node): PHP
     {
-        foreach ($this->directives as $renderer) {
+        foreach ($this->directives as $renderer){
             $result = $renderer->render($node);
-            if ($result !== null) {
+            if ($result !== null){
                 return new PHP($result, token_get_all($result), $node->getContext());
             }
         }
@@ -111,9 +111,9 @@ 
          * In future this method can support context aware escaping based on tag location.
          */
 
-        if ($node->rawOutput) {
+        if ($node->rawOutput){
             $result = sprintf('<?php echo %s; ?>', trim($node->body));
-        } else {
+        }else{
             $filter = $node->filter ?? $this->getFilterContext($ctx);
 
             $result = sprintf("<?php echo {$filter}; ?>", trim($node->body));
@@ -131,22 +131,22 @@ 
         // only "interesting" nodes
         $context = [];
 
-        foreach (array_reverse($ctx->getScope()) as $node) {
-            if ($node instanceof Attr || $node instanceof Tag || $node instanceof Verbatim) {
+        foreach (array_reverse($ctx->getScope()) as $node){
+            if ($node instanceof Attr || $node instanceof Tag || $node instanceof Verbatim){
                 $context[] = $node;
             }
 
-            if (count($context) === 2) {
+            if (count($context) === 2){
                 break;
             }
         }
 
-        if (count($context) !== 2) {
+        if (count($context) !== 2){
             return $this->defaultFilter;
         }
 
         // php {{ }} in javascript code (variable passing), use {! !} to bypass the filter
-        if ($context[0] instanceof Verbatim && $context[1] instanceof Tag && $context[1]->name === 'script') {
+        if ($context[0] instanceof Verbatim && $context[1] instanceof Tag && $context[1]->name === 'script'){
             return sprintf(
                 'json_encode(%s, %s, %s)',
                 '%s',
@@ -156,7 +156,7 @@ 
         }
 
         // in on* and other attributes
-        if ($context[0] instanceof Verbatim && $context[1] instanceof Attr && $context[1]->name !== 'style') {
+        if ($context[0] instanceof Verbatim && $context[1] instanceof Attr && $context[1]->name !== 'style'){
             return sprintf("'%s', %s, '%s'", '&quot;', $this->defaultFilter, '&quot;');
         }
 

Braces +29 added lines, -14 removed lines

@@ -72,17 +72,21 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Output) {
+        if ($node instanceof Output)
+        {
             return $this->output($node, $ctx);
         }
 
-        if ($node instanceof Directive) {
+        if ($node instanceof Directive)
+        {
             return $this->directive($node);
         }
 
-        if ($node instanceof Template) {
+        if ($node instanceof Template)
+        {
             $extendsTag = $node->getAttribute(ExtendsParent::class);
-            if ($extendsTag instanceof Tag) {
+            if ($extendsTag instanceof Tag)
+            {
                 $extendsTag->attrs = $this->traverser->traverse($extendsTag->attrs);
             }
         }
@@ -92,9 +96,11 @@ 
 
     private function directive(Directive $node): PHP
     {
-        foreach ($this->directives as $renderer) {
+        foreach ($this->directives as $renderer)
+        {
             $result = $renderer->render($node);
-            if ($result !== null) {
+            if ($result !== null)
+            {
                 return new PHP($result, token_get_all($result), $node->getContext());
             }
         }
@@ -111,9 +117,12 @@ 
          * In future this method can support context aware escaping based on tag location.
          */
 
-        if ($node->rawOutput) {
+        if ($node->rawOutput)
+        {
             $result = sprintf('<?php echo %s; ?>', trim($node->body));
-        } else {
+        }
+        else
+        {
             $filter = $node->filter ?? $this->getFilterContext($ctx);
 
             $result = sprintf("<?php echo {$filter}; ?>", trim($node->body));
@@ -131,22 +140,27 @@ 
         // only "interesting" nodes
         $context = [];
 
-        foreach (array_reverse($ctx->getScope()) as $node) {
-            if ($node instanceof Attr || $node instanceof Tag || $node instanceof Verbatim) {
+        foreach (array_reverse($ctx->getScope()) as $node)
+        {
+            if ($node instanceof Attr || $node instanceof Tag || $node instanceof Verbatim)
+            {
                 $context[] = $node;
             }
 
-            if (count($context) === 2) {
+            if (count($context) === 2)
+            {
                 break;
             }
         }
 
-        if (count($context) !== 2) {
+        if (count($context) !== 2)
+        {
             return $this->defaultFilter;
         }
 
         // php {{ }} in javascript code (variable passing), use {! !} to bypass the filter
-        if ($context[0] instanceof Verbatim && $context[1] instanceof Tag && $context[1]->name === 'script') {
+        if ($context[0] instanceof Verbatim && $context[1] instanceof Tag && $context[1]->name === 'script')
+        {
             return sprintf(
                 'json_encode(%s, %s, %s)',
                 '%s',
@@ -156,7 +170,8 @@ 
         }
 
         // in on* and other attributes
-        if ($context[0] instanceof Verbatim && $context[1] instanceof Attr && $context[1]->name !== 'style') {
+        if ($context[0] instanceof Verbatim && $context[1] instanceof Attr && $context[1]->name !== 'style')
+        {
             return sprintf("'%s', %s, '%s'", '&quot;', $this->defaultFilter, '&quot;');
         }
 

src/Stempler/src/Transform/Context/ImportContext.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
     public function add(ImportInterface $import): void
     {
         $node = $this->ctx->getParentNode();
-        if (!$node instanceof AttributedInterface) {
+        if (!$node instanceof AttributedInterface){
             throw new LogicException(\sprintf(
                 'Unable to create import on node without attribute storage (%s)',
                 \is_object($node) ? \get_class($node) : \gettype($node)
@@ -51,9 +51,9 @@ 
      */
     public function resolve(Builder $builder, string $name): ?Template
     {
-        foreach ($this->getImports() as $import) {
+        foreach ($this->getImports() as $import){
             $tpl = $import->resolve($builder, $name);
-            if ($tpl !== null) {
+            if ($tpl !== null){
                 return $tpl;
             }
         }
@@ -69,9 +69,9 @@ 
     public function getImports(): array
     {
         $imports = [];
-        foreach (array_reverse($this->ctx->getScope()) as $node) {
-            if ($node instanceof AttributedInterface) {
-                foreach ($node->getAttribute(self::class, []) as $import) {
+        foreach (array_reverse($this->ctx->getScope()) as $node){
+            if ($node instanceof AttributedInterface){
+                foreach ($node->getAttribute(self::class, []) as $import){
                     $imports[] = $import;
                 }
             }

Braces +12 added lines, -6 removed lines

@@ -34,7 +34,8 @@ 
     public function add(ImportInterface $import): void
     {
         $node = $this->ctx->getParentNode();
-        if (!$node instanceof AttributedInterface) {
+        if (!$node instanceof AttributedInterface)
+        {
             throw new LogicException(\sprintf(
                 'Unable to create import on node without attribute storage (%s)',
                 \is_object($node) ? \get_class($node) : \gettype($node)
@@ -51,9 +52,11 @@ 
      */
     public function resolve(Builder $builder, string $name): ?Template
     {
-        foreach ($this->getImports() as $import) {
+        foreach ($this->getImports() as $import)
+        {
             $tpl = $import->resolve($builder, $name);
-            if ($tpl !== null) {
+            if ($tpl !== null)
+            {
                 return $tpl;
             }
         }
@@ -69,9 +72,12 @@ 
     public function getImports(): array
     {
         $imports = [];
-        foreach (array_reverse($this->ctx->getScope()) as $node) {
-            if ($node instanceof AttributedInterface) {
-                foreach ($node->getAttribute(self::class, []) as $import) {
+        foreach (array_reverse($this->ctx->getScope()) as $node)
+        {
+            if ($node instanceof AttributedInterface)
+            {
+                foreach ($node->getAttribute(self::class, []) as $import)
+                {
                     $imports[] = $import;
                 }
             }

src/Stempler/src/Transform/Context/StackContext.php

Spacing +14 added lines, -14 removed lines

@@ -41,17 +41,17 @@ 
      */
     public function push(string $name, Tag $child, string $uniqueID = null): bool
     {
-        foreach ($this->getStacks() as $stack) {
-            if ($stack->accepts($name) !== $name) {
+        foreach ($this->getStacks() as $stack){
+            if ($stack->accepts($name) !== $name){
                 continue;
             }
 
-            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID])) {
+            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID])){
                 return true;
             }
             $stack->uniqueIDs[$uniqueID] = true;
 
-            foreach ($child->nodes as $child) {
+            foreach ($child->nodes as $child){
                 $stack->nodes[] = $child;
             }
 
@@ -66,17 +66,17 @@ 
      */
     public function prepend(string $name, Tag $child, string $uniqueID = null): bool
     {
-        foreach ($this->getStacks() as $stack) {
-            if ($stack->accepts($name) !== $name) {
+        foreach ($this->getStacks() as $stack){
+            if ($stack->accepts($name) !== $name){
                 continue;
             }
 
-            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID])) {
+            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID])){
                 return true;
             }
             $stack->uniqueIDs[$uniqueID] = true;
 
-            foreach ($child->nodes as $child) {
+            foreach ($child->nodes as $child){
                 array_unshift($stack->nodes, $child);
             }
 
@@ -94,9 +94,9 @@ 
     public function getStacks(): array
     {
         $stacks = [];
-        foreach (array_reverse($this->ctx->getScope()) as $node) {
-            if ($node instanceof AttributedInterface) {
-                foreach ($node->getAttribute(self::class, []) as $stack) {
+        foreach (array_reverse($this->ctx->getScope()) as $node){
+            if ($node instanceof AttributedInterface){
+                foreach ($node->getAttribute(self::class, []) as $stack){
                     $stacks[] = $stack;
                 }
             }
@@ -112,16 +112,16 @@ 
 
     private function getStackRootNode(int $level): AttributedInterface
     {
-        if ($level === 0) {
+        if ($level === 0){
             $node = $this->ctx->getParentNode();
-        } else {
+        }else{
             $scope = $this->ctx->getScope();
 
             // looking for the parent node via given nesting level
             $node = $scope[count($scope) - 2 - $level] ?? $this->ctx->getFirstNode();
         }
 
-        if (!$node instanceof AttributedInterface) {
+        if (!$node instanceof AttributedInterface){
             throw new \LogicException(
                 sprintf(
                     'Unable to create import on node without attribute storage (%s)',

Braces +29 added lines, -14 removed lines

@@ -41,17 +41,21 @@ 
      */
     public function push(string $name, Tag $child, string $uniqueID = null): bool
     {
-        foreach ($this->getStacks() as $stack) {
-            if ($stack->accepts($name) !== $name) {
+        foreach ($this->getStacks() as $stack)
+        {
+            if ($stack->accepts($name) !== $name)
+            {
                 continue;
             }
 
-            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID])) {
+            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID]))
+            {
                 return true;
             }
             $stack->uniqueIDs[$uniqueID] = true;
 
-            foreach ($child->nodes as $child) {
+            foreach ($child->nodes as $child)
+            {
                 $stack->nodes[] = $child;
             }
 
@@ -66,17 +70,21 @@ 
      */
     public function prepend(string $name, Tag $child, string $uniqueID = null): bool
     {
-        foreach ($this->getStacks() as $stack) {
-            if ($stack->accepts($name) !== $name) {
+        foreach ($this->getStacks() as $stack)
+        {
+            if ($stack->accepts($name) !== $name)
+            {
                 continue;
             }
 
-            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID])) {
+            if ($uniqueID !== null && isset($stack->uniqueIDs[$uniqueID]))
+            {
                 return true;
             }
             $stack->uniqueIDs[$uniqueID] = true;
 
-            foreach ($child->nodes as $child) {
+            foreach ($child->nodes as $child)
+            {
                 array_unshift($stack->nodes, $child);
             }
 
@@ -94,9 +102,12 @@ 
     public function getStacks(): array
     {
         $stacks = [];
-        foreach (array_reverse($this->ctx->getScope()) as $node) {
-            if ($node instanceof AttributedInterface) {
-                foreach ($node->getAttribute(self::class, []) as $stack) {
+        foreach (array_reverse($this->ctx->getScope()) as $node)
+        {
+            if ($node instanceof AttributedInterface)
+            {
+                foreach ($node->getAttribute(self::class, []) as $stack)
+                {
                     $stacks[] = $stack;
                 }
             }
@@ -112,16 +123,20 @@ 
 
     private function getStackRootNode(int $level): AttributedInterface
     {
-        if ($level === 0) {
+        if ($level === 0)
+        {
             $node = $this->ctx->getParentNode();
-        } else {
+        }
+        else
+        {
             $scope = $this->ctx->getScope();
 
             // looking for the parent node via given nesting level
             $node = $scope[count($scope) - 2 - $level] ?? $this->ctx->getFirstNode();
         }
 
-        if (!$node instanceof AttributedInterface) {
+        if (!$node instanceof AttributedInterface)
+        {
             throw new \LogicException(
                 sprintf(
                     'Unable to create import on node without attribute storage (%s)',

src/Stempler/src/Transform/Merge/Inject/PHPMixin.php

Spacing +24 added lines, -24 removed lines

@@ -32,8 +32,8 @@ 
     {
         $replace = [];
 
-        foreach ($this->blocks as $block) {
-            for ($i = $block['start']; $i <= $block['end']; $i++) {
+        foreach ($this->blocks as $block){
+            for ($i = $block['start']; $i <= $block['end']; $i++){
                 $replace[$i] = '';
             }
 
@@ -41,13 +41,13 @@ 
         }
 
         $result = '';
-        foreach ($this->tokens as $position => $token) {
-            if (array_key_exists($position, $replace)) {
+        foreach ($this->tokens as $position => $token){
+            if (array_key_exists($position, $replace)){
                 $result .= $replace[$position];
                 continue;
             }
 
-            if (is_string($token)) {
+            if (is_string($token)){
                 $result .= $token;
                 continue;
             }
@@ -65,8 +65,8 @@ 
     {
         $replace = [];
 
-        foreach ($this->blocks as $block) {
-            for ($i = $block['start']; $i <= $block['end']; $i++) {
+        foreach ($this->blocks as $block){
+            for ($i = $block['start']; $i <= $block['end']; $i++){
                 $replace[$i] = '';
             }
 
@@ -74,18 +74,18 @@ 
         }
 
         $result = '';
-        foreach ($this->tokens as $position => $token) {
-            if (array_key_exists($position, $replace)) {
+        foreach ($this->tokens as $position => $token){
+            if (array_key_exists($position, $replace)){
                 $result .= $replace[$position];
                 continue;
             }
 
-            if (is_string($token)) {
+            if (is_string($token)){
                 $result .= $token;
                 continue;
             }
 
-            if (in_array($token[0], [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, T_CLOSE_TAG, T_ECHO])) {
+            if (in_array($token[0], [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, T_CLOSE_TAG, T_ECHO])){
                 continue;
             }
 
@@ -101,7 +101,7 @@ 
     public function getBlocks(): array
     {
         $result = [];
-        foreach ($this->blocks as $name => $macro) {
+        foreach ($this->blocks as $name => $macro){
             $result[$name] = $macro['value'];
         }
 
@@ -115,7 +115,7 @@ 
 
     public function set(string $block, string $value): void
     {
-        if (!isset($this->blocks[$block])) {
+        if (!isset($this->blocks[$block])){
             return;
         }
 
@@ -126,26 +126,26 @@ 
     {
         $level = 0;
         $start = $name = $value = null;
-        foreach ($this->tokens as $position => $token) {
-            if (!is_array($token)) {
+        foreach ($this->tokens as $position => $token){
+            if (!is_array($token)){
                 $token = [$token, $token, 0];
             }
 
-            switch ($token[0]) {
+            switch ($token[0]){
                 case '(':
-                    if ($start !== null) {
+                    if ($start !== null){
                         $level++;
                         $value .= $token[1];
                     }
                     break;
                 case ')':
-                    if ($start === null) {
+                    if ($start === null){
                         break;
                     }
 
                     $level--;
                     $value .= $token[1];
-                    if ($level === 0) {
+                    if ($level === 0){
                         $this->blocks[$name] = [
                             'start' => $start,
                             'value' => trim($value),
@@ -157,22 +157,22 @@ 
                     }
                     break;
                 case T_STRING:
-                    if ($token[1] === $func) {
+                    if ($token[1] === $func){
                         $start = $position;
                         $value = $token[1];
                         break;
                     }
 
-                    if ($start !== null) {
+                    if ($start !== null){
                         $value .= $token[1];
                     }
                     break;
                 case T_CONSTANT_ENCAPSED_STRING:
-                    if ($start === null) {
+                    if ($start === null){
                         break;
                     }
 
-                    if ($name === null) {
+                    if ($name === null){
                         $name = stripcslashes(substr($token[1], 1, -1));
                     }
                     $value .= $token[1];
@@ -181,7 +181,7 @@ 
                     $value .= $token[1];
                     break;
                 default:
-                    if ($start !== null) {
+                    if ($start !== null){
                         $value .= $token[1];
                     }
             }

Braces +48 added lines, -24 removed lines

@@ -32,8 +32,10 @@ 
     {
         $replace = [];
 
-        foreach ($this->blocks as $block) {
-            for ($i = $block['start']; $i <= $block['end']; $i++) {
+        foreach ($this->blocks as $block)
+        {
+            for ($i = $block['start']; $i <= $block['end']; $i++)
+            {
                 $replace[$i] = '';
             }
 
@@ -41,13 +43,16 @@ 
         }
 
         $result = '';
-        foreach ($this->tokens as $position => $token) {
-            if (array_key_exists($position, $replace)) {
+        foreach ($this->tokens as $position => $token)
+        {
+            if (array_key_exists($position, $replace))
+            {
                 $result .= $replace[$position];
                 continue;
             }
 
-            if (is_string($token)) {
+            if (is_string($token))
+            {
                 $result .= $token;
                 continue;
             }
@@ -65,8 +70,10 @@ 
     {
         $replace = [];
 
-        foreach ($this->blocks as $block) {
-            for ($i = $block['start']; $i <= $block['end']; $i++) {
+        foreach ($this->blocks as $block)
+        {
+            for ($i = $block['start']; $i <= $block['end']; $i++)
+            {
                 $replace[$i] = '';
             }
 
@@ -74,18 +81,22 @@ 
         }
 
         $result = '';
-        foreach ($this->tokens as $position => $token) {
-            if (array_key_exists($position, $replace)) {
+        foreach ($this->tokens as $position => $token)
+        {
+            if (array_key_exists($position, $replace))
+            {
                 $result .= $replace[$position];
                 continue;
             }
 
-            if (is_string($token)) {
+            if (is_string($token))
+            {
                 $result .= $token;
                 continue;
             }
 
-            if (in_array($token[0], [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, T_CLOSE_TAG, T_ECHO])) {
+            if (in_array($token[0], [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, T_CLOSE_TAG, T_ECHO]))
+            {
                 continue;
             }
 
@@ -101,7 +112,8 @@ 
     public function getBlocks(): array
     {
         $result = [];
-        foreach ($this->blocks as $name => $macro) {
+        foreach ($this->blocks as $name => $macro)
+        {
             $result[$name] = $macro['value'];
         }
 
@@ -115,7 +127,8 @@ 
 
     public function set(string $block, string $value): void
     {
-        if (!isset($this->blocks[$block])) {
+        if (!isset($this->blocks[$block]))
+        {
             return;
         }
 
@@ -126,26 +139,32 @@ 
     {
         $level = 0;
         $start = $name = $value = null;
-        foreach ($this->tokens as $position => $token) {
-            if (!is_array($token)) {
+        foreach ($this->tokens as $position => $token)
+        {
+            if (!is_array($token))
+            {
                 $token = [$token, $token, 0];
             }
 
-            switch ($token[0]) {
+            switch ($token[0])
+            {
                 case '(':
-                    if ($start !== null) {
+                    if ($start !== null)
+                    {
                         $level++;
                         $value .= $token[1];
                     }
                     break;
                 case ')':
-                    if ($start === null) {
+                    if ($start === null)
+                    {
                         break;
                     }
 
                     $level--;
                     $value .= $token[1];
-                    if ($level === 0) {
+                    if ($level === 0)
+                    {
                         $this->blocks[$name] = [
                             'start' => $start,
                             'value' => trim($value),
@@ -157,22 +176,26 @@ 
                     }
                     break;
                 case T_STRING:
-                    if ($token[1] === $func) {
+                    if ($token[1] === $func)
+                    {
                         $start = $position;
                         $value = $token[1];
                         break;
                     }
 
-                    if ($start !== null) {
+                    if ($start !== null)
+                    {
                         $value .= $token[1];
                     }
                     break;
                 case T_CONSTANT_ENCAPSED_STRING:
-                    if ($start === null) {
+                    if ($start === null)
+                    {
                         break;
                     }
 
-                    if ($name === null) {
+                    if ($name === null)
+                    {
                         $name = stripcslashes(substr($token[1], 1, -1));
                     }
                     $value .= $token[1];
@@ -181,7 +204,8 @@ 
                     $value .= $token[1];
                     break;
                 default:
-                    if ($start !== null) {
+                    if ($start !== null)
+                    {
                         $value .= $token[1];
                     }
             }

src/Stempler/src/Transform/Merge/ExtendsParent.php

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function enterNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0){
             return self::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
@@ -59,9 +59,9 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0){
             $parent = $ctx->getParentNode();
-            if (!$parent instanceof AttributedInterface) {
+            if (!$parent instanceof AttributedInterface){
                 throw new LogicException(sprintf(
                     'Unable to extend non attributable node (%s)',
                     is_object($node) ? get_class($node) : gettype($node)
@@ -74,20 +74,20 @@ 
         }
 
         // extend current node
-        if ($node instanceof AttributedInterface && $node->getAttribute(self::class) !== null) {
+        if ($node instanceof AttributedInterface && $node->getAttribute(self::class) !== null){
             /** @var Tag $extends */
             $extends = $node->getAttribute(self::class);
 
-            foreach ($node->nodes as $child) {
+            foreach ($node->nodes as $child){
                 $extends->nodes[] = $child;
             }
 
             $path = 'undefined';
-            try {
+            try{
                 $path = $this->getPath($extends);
 
                 return $this->merger->merge($this->builder->load($path), $extends);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw new ExtendsException(
                     "Unable to extend parent `{$path}`",
                     $extends->getContext(),
@@ -101,14 +101,14 @@ 
 
     private function getPath(Tag $tag): string
     {
-        if (strpos($tag->name, $this->extendsKeyword . ':') === 0) {
+        if (strpos($tag->name, $this->extendsKeyword.':') === 0){
             $name = substr($tag->name, strlen($this->extendsKeyword) + 1);
 
             return str_replace(['.'], DIRECTORY_SEPARATOR, $name);
         }
 
-        foreach ($tag->attrs as $attr) {
-            if ($attr->name === 'path' && is_string($attr->value)) {
+        foreach ($tag->attrs as $attr){
+            if ($attr->name === 'path' && is_string($attr->value)){
                 return trim($attr->value, '\'"');
             }
         }

Braces +21 added lines, -10 removed lines

@@ -47,7 +47,8 @@ 
      */
     public function enterNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0)
+        {
             return self::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
@@ -59,9 +60,11 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->extendsKeyword) === 0)
+        {
             $parent = $ctx->getParentNode();
-            if (!$parent instanceof AttributedInterface) {
+            if (!$parent instanceof AttributedInterface)
+            {
                 throw new LogicException(sprintf(
                     'Unable to extend non attributable node (%s)',
                     is_object($node) ? get_class($node) : gettype($node)
@@ -74,20 +77,25 @@ 
         }
 
         // extend current node
-        if ($node instanceof AttributedInterface && $node->getAttribute(self::class) !== null) {
+        if ($node instanceof AttributedInterface && $node->getAttribute(self::class) !== null)
+        {
             /** @var Tag $extends */
             $extends = $node->getAttribute(self::class);
 
-            foreach ($node->nodes as $child) {
+            foreach ($node->nodes as $child)
+            {
                 $extends->nodes[] = $child;
             }
 
             $path = 'undefined';
-            try {
+            try
+            {
                 $path = $this->getPath($extends);
 
                 return $this->merger->merge($this->builder->load($path), $extends);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw new ExtendsException(
                     "Unable to extend parent `{$path}`",
                     $extends->getContext(),
@@ -101,14 +109,17 @@ 
 
     private function getPath(Tag $tag): string
     {
-        if (strpos($tag->name, $this->extendsKeyword . ':') === 0) {
+        if (strpos($tag->name, $this->extendsKeyword . ':') === 0)
+        {
             $name = substr($tag->name, strlen($this->extendsKeyword) + 1);
 
             return str_replace(['.'], DIRECTORY_SEPARATOR, $name);
         }
 
-        foreach ($tag->attrs as $attr) {
-            if ($attr->name === 'path' && is_string($attr->value)) {
+        foreach ($tag->attrs as $attr)
+        {
+            if ($attr->name === 'path' && is_string($attr->value))
+            {
                 return trim($attr->value, '\'"');
             }
         }

src/Stempler/src/Transform/Merge/ResolveImports.php

Spacing +10 added lines, -10 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function enterNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->useKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->useKeyword) === 0){
             return self::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
@@ -61,23 +61,23 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if (!$node instanceof Tag) {
+        if (!$node instanceof Tag){
             return null;
         }
 
         $importCtx = ImportContext::on($ctx);
 
         // import definition
-        if (\strpos($node->name, $this->useKeyword) === 0) {
+        if (\strpos($node->name, $this->useKeyword) === 0){
             $importCtx->add($this->makeImport($node));
 
             return self::REMOVE_NODE;
         }
 
         // imported tag
-        try {
+        try{
             $import = $importCtx->resolve($this->builder, $node->name);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new ImportException(
                 "Unable to resolve import `{$node->name}`",
                 $node->getContext(),
@@ -85,7 +85,7 @@ 
             );
         }
 
-        if ($import !== null) {
+        if ($import !== null){
             $node = $this->merger->merge($import, $node);
 
             return $this->merger->isolateNodes($node, $import->getContext()->getPath());
@@ -102,14 +102,14 @@ 
     private function makeImport(Tag $tag): ImportInterface
     {
         $options = [];
-        foreach ($tag->attrs as $attr) {
-            if (!\is_string($attr->value) || !\is_string($attr->name)) {
+        foreach ($tag->attrs as $attr){
+            if (!\is_string($attr->value) || !\is_string($attr->name)){
                 continue;
             }
             $options[$attr->name] = trim($attr->value, '\'"');
         }
 
-        switch (\strtolower($tag->name)) {
+        switch (\strtolower($tag->name)){
             case 'use':
             case 'use:element':
                 $this->assertHasOption('path', $options, $tag);
@@ -155,7 +155,7 @@ 
 
     private function assertHasOption(string $option, array $options, Tag $tag): void
     {
-        if (!isset($options[$option])) {
+        if (!isset($options[$option])){
             throw new ImportException("Missing `{$option}` option", $tag->getContext());
         }
     }

Braces +21 added lines, -10 removed lines

@@ -49,7 +49,8 @@ 
      */
     public function enterNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag && strpos($node->name, $this->useKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->useKeyword) === 0)
+        {
             return self::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
@@ -61,23 +62,28 @@ 
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if (!$node instanceof Tag) {
+        if (!$node instanceof Tag)
+        {
             return null;
         }
 
         $importCtx = ImportContext::on($ctx);
 
         // import definition
-        if (\strpos($node->name, $this->useKeyword) === 0) {
+        if (\strpos($node->name, $this->useKeyword) === 0)
+        {
             $importCtx->add($this->makeImport($node));
 
             return self::REMOVE_NODE;
         }
 
         // imported tag
-        try {
+        try
+        {
             $import = $importCtx->resolve($this->builder, $node->name);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new ImportException(
                 "Unable to resolve import `{$node->name}`",
                 $node->getContext(),
@@ -85,7 +91,8 @@ 
             );
         }
 
-        if ($import !== null) {
+        if ($import !== null)
+        {
             $node = $this->merger->merge($import, $node);
 
             return $this->merger->isolateNodes($node, $import->getContext()->getPath());
@@ -102,14 +109,17 @@ 
     private function makeImport(Tag $tag): ImportInterface
     {
         $options = [];
-        foreach ($tag->attrs as $attr) {
-            if (!\is_string($attr->value) || !\is_string($attr->name)) {
+        foreach ($tag->attrs as $attr)
+        {
+            if (!\is_string($attr->value) || !\is_string($attr->name))
+            {
                 continue;
             }
             $options[$attr->name] = trim($attr->value, '\'"');
         }
 
-        switch (\strtolower($tag->name)) {
+        switch (\strtolower($tag->name))
+        {
             case 'use':
             case 'use:element':
                 $this->assertHasOption('path', $options, $tag);
@@ -155,7 +165,8 @@ 
 
     private function assertHasOption(string $option, array $options, Tag $tag): void
     {
-        if (!isset($options[$option])) {
+        if (!isset($options[$option]))
+        {
             throw new ImportException("Missing `{$option}` option", $tag->getContext());
         }
     }

src/Stempler/src/Lexer/Lexer.php

Spacing +5 added lines, -5 removed lines

@@ -38,20 +38,20 @@ 
     public function parse(StreamInterface $src): \Generator
     {
         $stream = new Buffer($this->generate($src));
-        foreach ($this->grammars as $grammar) {
+        foreach ($this->grammars as $grammar){
             $stream = new Buffer($this->wrap(clone $grammar, $stream));
         }
 
         // always group raw bytes into raw tokens
-        foreach ($this->wrap(new RawGrammar(), $stream) as $n) {
+        foreach ($this->wrap(new RawGrammar(), $stream) as $n){
             yield $n;
         }
     }
 
     private function wrap(GrammarInterface $grammar, Buffer $stream): \Generator
     {
-        foreach ($grammar->parse($stream) as $n) {
-            if ($n instanceof Token && $n->grammar === null) {
+        foreach ($grammar->parse($stream) as $n){
+            if ($n instanceof Token && $n->grammar === null){
                 $n->grammar = get_class($grammar);
             }
 
@@ -66,7 +66,7 @@ 
      */
     private function generate(StreamInterface $src)
     {
-        while (!$src->isEOI()) {
+        while (!$src->isEOI()){
             yield new Byte($src->getOffset(), $src->peak());
         }
     }

Braces +10 added lines, -5 removed lines

@@ -38,20 +38,24 @@ 
     public function parse(StreamInterface $src): \Generator
     {
         $stream = new Buffer($this->generate($src));
-        foreach ($this->grammars as $grammar) {
+        foreach ($this->grammars as $grammar)
+        {
             $stream = new Buffer($this->wrap(clone $grammar, $stream));
         }
 
         // always group raw bytes into raw tokens
-        foreach ($this->wrap(new RawGrammar(), $stream) as $n) {
+        foreach ($this->wrap(new RawGrammar(), $stream) as $n)
+        {
             yield $n;
         }
     }
 
     private function wrap(GrammarInterface $grammar, Buffer $stream): \Generator
     {
-        foreach ($grammar->parse($stream) as $n) {
-            if ($n instanceof Token && $n->grammar === null) {
+        foreach ($grammar->parse($stream) as $n)
+        {
+            if ($n instanceof Token && $n->grammar === null)
+            {
                 $n->grammar = get_class($grammar);
             }
 
@@ -66,7 +70,8 @@ 
      */
     private function generate(StreamInterface $src)
     {
-        while (!$src->isEOI()) {
+        while (!$src->isEOI())
+        {
             yield new Byte($src->getOffset(), $src->peak());
         }
     }

src/Stempler/src/Lexer/Grammar/HTMLGrammar.php

Spacing +41 added lines, -41 removed lines

@@ -59,15 +59,15 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '<') {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte || $n->char !== '<'){
                 yield $n;
                 continue;
             }
 
             // work with isolated token stream!
             $tag = (clone $this)->parseGrammar($src);
-            if ($tag === null) {
+            if ($tag === null){
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -76,7 +76,7 @@ 
             $tagName = $this->tagName($tag);
 
             // todo: add support for custom tag list
-            if (in_array($tagName, self::VERBATIM_TAGS)) {
+            if (in_array($tagName, self::VERBATIM_TAGS)){
                 yield from $tag;
                 yield from $this->parseVerbatim($src, $tagName);
                 continue;
@@ -92,7 +92,7 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token){
             case self::TYPE_RAW:
                 return 'HTML:RAW';
             case self::TYPE_KEYWORD:
@@ -125,26 +125,26 @@ 
     {
         $chunks = [];
 
-        while ($n = $src->next()) {
-            if ($n instanceof Token) {
+        while ($n = $src->next()){
+            if ($n instanceof Token){
                 $chunks[] = $n;
                 continue;
             }
 
-            switch ($n->char) {
+            switch ($n->char){
                 case '"':
                 case "'":
                 case '`':
                     $chunks[] = $n;
 
                     // language inclusions allow nested strings
-                    while ($nc = $src->next()) {
+                    while ($nc = $src->next()){
                         $chunks[] = $nc;
-                        if ($nc instanceof Token) {
+                        if ($nc instanceof Token){
                             continue;
                         }
 
-                        if ($nc->char === $n->char) {
+                        if ($nc->char === $n->char){
                             break;
                         }
                     }
@@ -155,22 +155,22 @@ 
                     $chunks[] = $n;
 
                     $multiline = false;
-                    if ($src->lookaheadByte(1) === '/' || $src->lookaheadByte(1) === '*') {
-                        if ($src->lookaheadByte(1) === '*') {
+                    if ($src->lookaheadByte(1) === '/' || $src->lookaheadByte(1) === '*'){
+                        if ($src->lookaheadByte(1) === '*'){
                             $multiline = true;
                         }
 
                         $chunks[] = $src->next();
 
                         // language inclusions allow nested strings
-                        while ($nc = $src->next()) {
-                            if ($nc instanceof Token) {
+                        while ($nc = $src->next()){
+                            if ($nc instanceof Token){
                                 continue;
                             }
 
-                            if ($nc->char === '<') {
+                            if ($nc->char === '<'){
                                 $tag = (clone $this)->parseGrammar($src);
-                                if ($tag === null || $this->tagName($tag) !== $verbatim) {
+                                if ($tag === null || $this->tagName($tag) !== $verbatim){
                                     $src->replay($n->offset);
                                     break;
                                 }
@@ -181,12 +181,12 @@ 
 
                             $chunks[] = $nc;
 
-                            if ($multiline) {
-                                if ($nc->char === '*' && $src->lookaheadByte(1) === '/') {
+                            if ($multiline){
+                                if ($nc->char === '*' && $src->lookaheadByte(1) === '/'){
                                     $chunks[] = $src->next();
                                     break;
                                 }
-                            } elseif ($nc->char === "\n") {
+                            } elseif ($nc->char === "\n"){
                                 break;
                             }
                         }
@@ -197,7 +197,7 @@ 
                 case '<':
                     // tag beginning?
                     $tag = (clone $this)->parseGrammar($src);
-                    if ($tag === null || $this->tagName($tag) !== $verbatim) {
+                    if ($tag === null || $this->tagName($tag) !== $verbatim){
                         $chunks[] = $n;
                         $src->replay($n->offset);
                         break;
@@ -217,8 +217,8 @@ 
 
     private function tagName(array $tag): string
     {
-        foreach ($tag as $token) {
-            if ($token->type === self::TYPE_KEYWORD) {
+        foreach ($tag as $token){
+            if ($token->type === self::TYPE_KEYWORD){
                 return strtolower($token->content);
             }
         }
@@ -232,28 +232,28 @@ 
             new Token(self::TYPE_OPEN, $src->getOffset(), '<'),
         ];
 
-        if ($src->lookaheadByte() === '/') {
+        if ($src->lookaheadByte() === '/'){
             $this->tokens[0]->type = self::TYPE_OPEN_SHORT;
             $this->tokens[0]->content .= $src->next()->char;
         }
 
-        while ($n = $src->next()) {
-            if ($this->attribute !== []) {
+        while ($n = $src->next()){
+            if ($this->attribute !== []){
                 $this->attribute[] = $n;
 
-                if ($n instanceof Byte && $n->char === $this->attribute[0]->char) {
+                if ($n instanceof Byte && $n->char === $this->attribute[0]->char){
                     $this->flushAttribute();
                 }
 
                 continue;
             }
 
-            if ($n instanceof Token) {
+            if ($n instanceof Token){
                 $this->keyword[] = $n;
                 continue;
             }
 
-            switch ($n->char) {
+            switch ($n->char){
                 case '"':
                 case "'":
                 case '`':
@@ -271,12 +271,12 @@ 
                     break;
 
                 case '/':
-                    if ($src->lookaheadByte() === '>') {
+                    if ($src->lookaheadByte() === '>'){
                         $this->flush();
                         $this->tokens[] = new Token(
                             self::TYPE_CLOSE_SHORT,
                             $n->offset,
-                            $n->char . $src->next()->char
+                            $n->char.$src->next()->char
                         );
 
                         break 2;
@@ -295,7 +295,7 @@ 
                     break 2;
 
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
                         $this->flushKeyword();
                         $this->whitespace[] = $n;
                         break;
@@ -303,7 +303,7 @@ 
                     $this->flushWhitespace();
 
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)){
                         // unexpected char
                         return null;
                     }
@@ -312,7 +312,7 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid()){
             return null;
         }
 
@@ -322,17 +322,17 @@ 
     private function isValid(): bool
     {
         // tag is too short or does not have name keyword
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3){
             return false;
         }
 
         $last = $this->tokens[count($this->tokens) - 1];
-        if ($last->type !== self::TYPE_CLOSE && $last->type !== self::TYPE_CLOSE_SHORT) {
+        if ($last->type !== self::TYPE_CLOSE && $last->type !== self::TYPE_CLOSE_SHORT){
             return false;
         }
 
-        foreach ($this->tokens as $token) {
-            switch ($token->type) {
+        foreach ($this->tokens as $token){
+            switch ($token->type){
                 case self::TYPE_WHITESPACE:
                     // ignore
                     continue 2;
@@ -363,7 +363,7 @@ 
      */
     private function flushWhitespace(): void
     {
-        if ($this->whitespace === []) {
+        if ($this->whitespace === []){
             return;
         }
 
@@ -376,7 +376,7 @@ 
      */
     private function flushKeyword(): void
     {
-        if ($this->keyword === []) {
+        if ($this->keyword === []){
             return;
         }
 
@@ -389,7 +389,7 @@ 
      */
     private function flushAttribute(): void
     {
-        if ($this->attribute === []) {
+        if ($this->attribute === []){
             return;
         }
 

Braces +81 added lines, -40 removed lines

@@ -59,15 +59,18 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '<') {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte || $n->char !== '<')
+            {
                 yield $n;
                 continue;
             }
 
             // work with isolated token stream!
             $tag = (clone $this)->parseGrammar($src);
-            if ($tag === null) {
+            if ($tag === null)
+            {
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -76,7 +79,8 @@ 
             $tagName = $this->tagName($tag);
 
             // todo: add support for custom tag list
-            if (in_array($tagName, self::VERBATIM_TAGS)) {
+            if (in_array($tagName, self::VERBATIM_TAGS))
+            {
                 yield from $tag;
                 yield from $this->parseVerbatim($src, $tagName);
                 continue;
@@ -92,7 +96,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_RAW:
                 return 'HTML:RAW';
             case self::TYPE_KEYWORD:
@@ -125,26 +130,32 @@ 
     {
         $chunks = [];
 
-        while ($n = $src->next()) {
-            if ($n instanceof Token) {
+        while ($n = $src->next())
+        {
+            if ($n instanceof Token)
+            {
                 $chunks[] = $n;
                 continue;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
                 case '`':
                     $chunks[] = $n;
 
                     // language inclusions allow nested strings
-                    while ($nc = $src->next()) {
+                    while ($nc = $src->next())
+                    {
                         $chunks[] = $nc;
-                        if ($nc instanceof Token) {
+                        if ($nc instanceof Token)
+                        {
                             continue;
                         }
 
-                        if ($nc->char === $n->char) {
+                        if ($nc->char === $n->char)
+                        {
                             break;
                         }
                     }
@@ -155,22 +166,28 @@ 
                     $chunks[] = $n;
 
                     $multiline = false;
-                    if ($src->lookaheadByte(1) === '/' || $src->lookaheadByte(1) === '*') {
-                        if ($src->lookaheadByte(1) === '*') {
+                    if ($src->lookaheadByte(1) === '/' || $src->lookaheadByte(1) === '*')
+                    {
+                        if ($src->lookaheadByte(1) === '*')
+                        {
                             $multiline = true;
                         }
 
                         $chunks[] = $src->next();
 
                         // language inclusions allow nested strings
-                        while ($nc = $src->next()) {
-                            if ($nc instanceof Token) {
+                        while ($nc = $src->next())
+                        {
+                            if ($nc instanceof Token)
+                            {
                                 continue;
                             }
 
-                            if ($nc->char === '<') {
+                            if ($nc->char === '<')
+                            {
                                 $tag = (clone $this)->parseGrammar($src);
-                                if ($tag === null || $this->tagName($tag) !== $verbatim) {
+                                if ($tag === null || $this->tagName($tag) !== $verbatim)
+                                {
                                     $src->replay($n->offset);
                                     break;
                                 }
@@ -181,12 +198,16 @@ 
 
                             $chunks[] = $nc;
 
-                            if ($multiline) {
-                                if ($nc->char === '*' && $src->lookaheadByte(1) === '/') {
+                            if ($multiline)
+                            {
+                                if ($nc->char === '*' && $src->lookaheadByte(1) === '/')
+                                {
                                     $chunks[] = $src->next();
                                     break;
                                 }
-                            } elseif ($nc->char === "\n") {
+                            }
+                            elseif ($nc->char === "\n")
+                            {
                                 break;
                             }
                         }
@@ -197,7 +218,8 @@ 
                 case '<':
                     // tag beginning?
                     $tag = (clone $this)->parseGrammar($src);
-                    if ($tag === null || $this->tagName($tag) !== $verbatim) {
+                    if ($tag === null || $this->tagName($tag) !== $verbatim)
+                    {
                         $chunks[] = $n;
                         $src->replay($n->offset);
                         break;
@@ -217,8 +239,10 @@ 
 
     private function tagName(array $tag): string
     {
-        foreach ($tag as $token) {
-            if ($token->type === self::TYPE_KEYWORD) {
+        foreach ($tag as $token)
+        {
+            if ($token->type === self::TYPE_KEYWORD)
+            {
                 return strtolower($token->content);
             }
         }
@@ -232,28 +256,34 @@ 
             new Token(self::TYPE_OPEN, $src->getOffset(), '<'),
         ];
 
-        if ($src->lookaheadByte() === '/') {
+        if ($src->lookaheadByte() === '/')
+        {
             $this->tokens[0]->type = self::TYPE_OPEN_SHORT;
             $this->tokens[0]->content .= $src->next()->char;
         }
 
-        while ($n = $src->next()) {
-            if ($this->attribute !== []) {
+        while ($n = $src->next())
+        {
+            if ($this->attribute !== [])
+            {
                 $this->attribute[] = $n;
 
-                if ($n instanceof Byte && $n->char === $this->attribute[0]->char) {
+                if ($n instanceof Byte && $n->char === $this->attribute[0]->char)
+                {
                     $this->flushAttribute();
                 }
 
                 continue;
             }
 
-            if ($n instanceof Token) {
+            if ($n instanceof Token)
+            {
                 $this->keyword[] = $n;
                 continue;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
                 case '`':
@@ -271,7 +301,8 @@ 
                     break;
 
                 case '/':
-                    if ($src->lookaheadByte() === '>') {
+                    if ($src->lookaheadByte() === '>')
+                    {
                         $this->flush();
                         $this->tokens[] = new Token(
                             self::TYPE_CLOSE_SHORT,
@@ -295,7 +326,8 @@ 
                     break 2;
 
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
                         $this->flushKeyword();
                         $this->whitespace[] = $n;
                         break;
@@ -303,7 +335,8 @@ 
                     $this->flushWhitespace();
 
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char))
+                    {
                         // unexpected char
                         return null;
                     }
@@ -312,7 +345,8 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid())
+        {
             return null;
         }
 
@@ -322,17 +356,21 @@ 
     private function isValid(): bool
     {
         // tag is too short or does not have name keyword
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3)
+        {
             return false;
         }
 
         $last = $this->tokens[count($this->tokens) - 1];
-        if ($last->type !== self::TYPE_CLOSE && $last->type !== self::TYPE_CLOSE_SHORT) {
+        if ($last->type !== self::TYPE_CLOSE && $last->type !== self::TYPE_CLOSE_SHORT)
+        {
             return false;
         }
 
-        foreach ($this->tokens as $token) {
-            switch ($token->type) {
+        foreach ($this->tokens as $token)
+        {
+            switch ($token->type)
+            {
                 case self::TYPE_WHITESPACE:
                     // ignore
                     continue 2;
@@ -363,7 +401,8 @@ 
      */
     private function flushWhitespace(): void
     {
-        if ($this->whitespace === []) {
+        if ($this->whitespace === [])
+        {
             return;
         }
 
@@ -376,7 +415,8 @@ 
      */
     private function flushKeyword(): void
     {
-        if ($this->keyword === []) {
+        if ($this->keyword === [])
+        {
             return;
         }
 
@@ -389,7 +429,8 @@ 
      */
     private function flushAttribute(): void
     {
-        if ($this->attribute === []) {
+        if ($this->attribute === [])
+        {
             return;
         }