spiral / framework

src/Stempler/src/Transform/Merge/ResolveImports.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->useKeyword) === 0) {
+        if ($node instanceof Tag && strpos($node->name, $this->useKeyword) === 0){
             return self::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
@@ -59,23 +59,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(),
@@ -83,7 +83,7 @@ 
             );
         }
 
-        if ($import !== null) {
+        if ($import !== null){
             $node = $this->merger->merge($import, $node);
 
             return $this->merger->isolateNodes($node, $import->getContext()->getPath());
@@ -100,14 +100,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);
@@ -153,7 +153,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

@@ -47,7 +47,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;
         }
 
@@ -59,23 +60,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(),
@@ -83,7 +89,8 @@ 
             );
         }
 
-        if ($import !== null) {
+        if ($import !== null)
+        {
             $node = $this->merger->merge($import, $node);
 
             return $this->merger->isolateNodes($node, $import->getContext()->getPath());
@@ -100,14 +107,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);
@@ -153,7 +163,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/Transform/Merge/ExtendsParent.php

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,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;
         }
 
@@ -57,9 +57,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)
@@ -72,20 +72,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(),
@@ -99,14 +99,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

@@ -45,7 +45,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;
         }
 
@@ -57,9 +58,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)
@@ -72,20 +75,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(),
@@ -99,14 +107,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/Visitor/DefineBlocks.php

Spacing +6 added lines, -6 removed lines

@@ -32,13 +32,13 @@ 
      */
     public function enterNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag) {
+        if ($node instanceof Tag){
             return $this->makeBlock($node);
         }
 
-        if ($node instanceof Inline) {
+        if ($node instanceof Inline){
             $block = new Block($node->name, $node->getContext());
-            if ($node->value !== null) {
+            if ($node->value !== null){
                 $block->nodes[] = new Raw($node->value);
             }
 
@@ -61,14 +61,14 @@ 
     private function makeBlock(Tag $node): ?NodeInterface
     {
         $name = null;
-        foreach ($this->prefix as $prefix) {
-            if (strpos($node->name, (string) $prefix) === 0) {
+        foreach ($this->prefix as $prefix){
+            if (strpos($node->name, (string)$prefix) === 0){
                 $name = substr($node->name, strlen($prefix));
                 break;
             }
         }
 
-        if ($name === null) {
+        if ($name === null){
             return null;
         }
 

Braces +12 added lines, -6 removed lines

@@ -32,13 +32,16 @@ 
      */
     public function enterNode($node, VisitorContext $ctx)
     {
-        if ($node instanceof Tag) {
+        if ($node instanceof Tag)
+        {
             return $this->makeBlock($node);
         }
 
-        if ($node instanceof Inline) {
+        if ($node instanceof Inline)
+        {
             $block = new Block($node->name, $node->getContext());
-            if ($node->value !== null) {
+            if ($node->value !== null)
+            {
                 $block->nodes[] = new Raw($node->value);
             }
 
@@ -61,14 +64,17 @@ 
     private function makeBlock(Tag $node): ?NodeInterface
     {
         $name = null;
-        foreach ($this->prefix as $prefix) {
-            if (strpos($node->name, (string) $prefix) === 0) {
+        foreach ($this->prefix as $prefix)
+        {
+            if (strpos($node->name, (string) $prefix) === 0)
+            {
                 $name = substr($node->name, strlen($prefix));
                 break;
             }
         }
 
-        if ($name === null) {
+        if ($name === null)
+        {
             return null;
         }
 

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/Lexer/Buffer.php

Spacing +16 added lines, -16 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function getIterator(): Traversable
     {
-        while ($n = $this->next()) {
+        while ($n = $this->next()){
             yield $n;
         }
     }
@@ -60,18 +60,18 @@ 
      */
     public function next()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== []){
             $n = array_shift($this->replay);
-        } else {
+        }else{
             $n = $this->generator->current();
-            if ($n === null) {
+            if ($n === null){
                 return null;
             }
             $this->generator->next();
             $this->buffer[] = $n;
         }
 
-        if ($n !== null) {
+        if ($n !== null){
             $this->offset = $n->offset;
         }
 
@@ -84,10 +84,10 @@ 
     public function nextBytes(): string
     {
         $result = '';
-        while ($n = $this->next()) {
-            if ($n instanceof Byte) {
+        while ($n = $this->next()){
+            if ($n instanceof Byte){
                 $result .= $n->char;
-            } else {
+            }else{
                 break;
             }
         }
@@ -100,12 +100,12 @@ 
      */
     public function lookahead()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== []){
             return $this->replay[0];
         }
 
         $n = $this->next();
-        if ($n !== null) {
+        if ($n !== null){
             array_unshift($this->replay, $n);
         }
 
@@ -121,20 +121,20 @@ 
     {
         $result = '';
         $replay = [];
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++){
             $n = $this->next();
-            if ($n !== null) {
+            if ($n !== null){
                 $replay[] = $n;
             }
 
-            if (!$n instanceof Byte) {
+            if (!$n instanceof Byte){
                 break;
             }
 
             $result .= $n->char;
         }
 
-        foreach (array_reverse($replay) as $n) {
+        foreach (array_reverse($replay) as $n){
             array_unshift($this->replay, $n);
         }
 
@@ -146,8 +146,8 @@ 
      */
     public function replay(int $offset): void
     {
-        foreach ($this->buffer as $n) {
-            if ($n->offset > $offset) {
+        foreach ($this->buffer as $n){
+            if ($n->offset > $offset){
                 $this->replay[] = $n;
             }
         }

Braces +34 added lines, -16 removed lines

@@ -45,7 +45,8 @@ 
      */
     public function getIterator(): Traversable
     {
-        while ($n = $this->next()) {
+        while ($n = $this->next())
+        {
             yield $n;
         }
     }
@@ -60,18 +61,23 @@ 
      */
     public function next()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== [])
+        {
             $n = array_shift($this->replay);
-        } else {
+        }
+        else
+        {
             $n = $this->generator->current();
-            if ($n === null) {
+            if ($n === null)
+            {
                 return null;
             }
             $this->generator->next();
             $this->buffer[] = $n;
         }
 
-        if ($n !== null) {
+        if ($n !== null)
+        {
             $this->offset = $n->offset;
         }
 
@@ -84,10 +90,14 @@ 
     public function nextBytes(): string
     {
         $result = '';
-        while ($n = $this->next()) {
-            if ($n instanceof Byte) {
+        while ($n = $this->next())
+        {
+            if ($n instanceof Byte)
+            {
                 $result .= $n->char;
-            } else {
+            }
+            else
+            {
                 break;
             }
         }
@@ -100,12 +110,14 @@ 
      */
     public function lookahead()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== [])
+        {
             return $this->replay[0];
         }
 
         $n = $this->next();
-        if ($n !== null) {
+        if ($n !== null)
+        {
             array_unshift($this->replay, $n);
         }
 
@@ -121,20 +133,24 @@ 
     {
         $result = '';
         $replay = [];
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++)
+        {
             $n = $this->next();
-            if ($n !== null) {
+            if ($n !== null)
+            {
                 $replay[] = $n;
             }
 
-            if (!$n instanceof Byte) {
+            if (!$n instanceof Byte)
+            {
                 break;
             }
 
             $result .= $n->char;
         }
 
-        foreach (array_reverse($replay) as $n) {
+        foreach (array_reverse($replay) as $n)
+        {
             array_unshift($this->replay, $n);
         }
 
@@ -146,8 +162,10 @@ 
      */
     public function replay(int $offset): void
     {
-        foreach ($this->buffer as $n) {
-            if ($n->offset > $offset) {
+        foreach ($this->buffer as $n)
+        {
+            if ($n->offset > $offset)
+            {
                 $this->replay[] = $n;
             }
         }

src/Stempler/src/Lexer/Lexer.php

Spacing +5 added lines, -5 removed lines

@@ -39,20 +39,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);
             }
 
@@ -67,7 +67,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

@@ -39,20 +39,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);
             }
 
@@ -67,7 +71,8 @@ 
      */
     private function generate(StreamInterface $src)
     {
-        while (!$src->isEOI()) {
+        while (!$src->isEOI())
+        {
             yield new Byte($src->getOffset(), $src->peak());
         }
     }

src/Stempler/src/Lexer/Grammar/Dynamic/DeclareGrammar.php

Spacing +11 added lines, -11 removed lines

@@ -41,19 +41,19 @@ 
     public function parse(Buffer $src): Generator
     {
         $quoted = [];
-        while ($n = $src->next()) {
-            switch ($n->char) {
+        while ($n = $src->next()){
+            switch ($n->char){
                 case '"':
                 case "'":
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
 
                     $quoted[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next()){
                         $quoted[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char){
                             break;
                         }
                     }
@@ -63,7 +63,7 @@ 
 
                     break;
                 case '=':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -71,7 +71,7 @@ 
                     yield new Token(self::TYPE_EQUAL, $n->offset, '=');
                     break;
                 case ',':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -79,8 +79,8 @@ 
                     yield new Token(self::TYPE_COMMA, $n->offset, ',');
                     break;
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
-                        if ($this->keyword !== []) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
+                        if ($this->keyword !== []){
                             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                             $this->keyword = [];
                         }
@@ -92,7 +92,7 @@ 
             }
         }
 
-        if ($this->keyword !== []) {
+        if ($this->keyword !== []){
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
         }
     }
@@ -102,7 +102,7 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token){
             case self::TYPE_KEYWORD:
                 return 'DECLARE:KEYWORD';
             case self::TYPE_EQUAL:

Braces +22 added lines, -11 removed lines

@@ -41,19 +41,24 @@ 
     public function parse(Buffer $src): Generator
     {
         $quoted = [];
-        while ($n = $src->next()) {
-            switch ($n->char) {
+        while ($n = $src->next())
+        {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
 
                     $quoted[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next())
+                    {
                         $quoted[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char)
+                        {
                             break;
                         }
                     }
@@ -63,7 +68,8 @@ 
 
                     break;
                 case '=':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -71,7 +77,8 @@ 
                     yield new Token(self::TYPE_EQUAL, $n->offset, '=');
                     break;
                 case ',':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -79,8 +86,10 @@ 
                     yield new Token(self::TYPE_COMMA, $n->offset, ',');
                     break;
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
-                        if ($this->keyword !== []) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
+                        if ($this->keyword !== [])
+                        {
                             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                             $this->keyword = [];
                         }
@@ -92,7 +101,8 @@ 
             }
         }
 
-        if ($this->keyword !== []) {
+        if ($this->keyword !== [])
+        {
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
         }
     }
@@ -102,7 +112,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_KEYWORD:
                 return 'DECLARE:KEYWORD';
             case self::TYPE_EQUAL:

src/Stempler/src/Lexer/Grammar/Dynamic/DirectiveGrammar.php

Spacing +30 added lines, -30 removed lines

@@ -51,39 +51,39 @@ 
         $this->body = null;
         $hasWhitespace = false;
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte){
                 // no other grammars are allowed
                 break;
             }
 
-            switch ($n->char) {
+            switch ($n->char){
                 case '(':
                     $this->flushName();
                     $this->tokens[] = new Token(DynamicGrammar::TYPE_BODY_OPEN, $n->offset, $n->char);
 
                     return $this->parseBody($src);
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
                         $hasWhitespace = true;
-                        if ($this->name !== []) {
+                        if ($this->name !== []){
                             $this->flushName();
                             $this->tokens[] = new Token(DynamicGrammar::TYPE_WHITESPACE, $n->offset, $n->char);
                             break;
                         }
 
-                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE) {
+                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE){
                             $this->getLastToken()->content .= $n->char;
                             break;
                         }
 
                         // invalid directive
                         return false;
-                    } elseif ($hasWhitespace) {
+                    } elseif ($hasWhitespace){
                         return $this->finalize();
                     }
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)){
                         $this->flushName();
 
                         return $this->finalize();
@@ -103,7 +103,7 @@ 
      */
     public function getIterator(): Traversable
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new LogicException('Directive not parsed');
         }
 
@@ -123,8 +123,8 @@ 
      */
     public function getKeyword(): string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_KEYWORD) {
+        foreach ($this->tokens as $token){
+            if ($token->type === DynamicGrammar::TYPE_KEYWORD){
                 return $token->content;
             }
         }
@@ -139,8 +139,8 @@ 
      */
     public function getBody(): ?string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_BODY) {
+        foreach ($this->tokens as $token){
+            if ($token->type === DynamicGrammar::TYPE_BODY){
                 return $token->content;
             }
         }
@@ -153,7 +153,7 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === []){
             return;
         }
 
@@ -169,17 +169,17 @@ 
         $this->body = [];
         $level = 1;
 
-        while ($nn = $src->next()) {
-            if (!$nn instanceof Byte) {
+        while ($nn = $src->next()){
+            if (!$nn instanceof Byte){
                 $this->flushBody();
                 return $this->finalize();
             }
 
-            if (in_array($nn->char, ['"', '"'])) {
+            if (in_array($nn->char, ['"', '"'])){
                 $this->body[] = $nn;
-                while ($nnn = $src->next()) {
+                while ($nnn = $src->next()){
                     $this->body[] = $nnn;
-                    if ($nnn instanceof Byte && $nnn->char === $nn->char) {
+                    if ($nnn instanceof Byte && $nnn->char === $nn->char){
                         break;
                     }
                 }
@@ -188,15 +188,15 @@ 
 
             $this->body[] = $nn;
 
-            if ($nn->char === '(') {
+            if ($nn->char === '('){
                 $level++;
                 continue;
             }
 
-            if ($nn->char === ')') {
+            if ($nn->char === ')'){
                 $level--;
 
-                if ($level === 0) {
+                if ($level === 0){
                     $n = array_pop($this->body);
 
                     $this->flushBody();
@@ -217,7 +217,7 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === []){
             return;
         }
 
@@ -227,7 +227,7 @@ 
 
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new LogicException('Directive not parsed');
         }
 
@@ -241,8 +241,8 @@ 
     {
         $tokens = $this->tokens;
 
-        foreach (array_reverse($tokens, true) as $i => $t) {
-            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE) {
+        foreach (array_reverse($tokens, true) as $i => $t){
+            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE){
                 break;
             }
 
@@ -250,19 +250,19 @@ 
         }
 
         $body = null;
-        foreach ($tokens as $t) {
-            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN) {
+        foreach ($tokens as $t){
+            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN){
                 $body = false;
                 continue;
             }
 
-            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE) {
+            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE){
                 $body = null;
                 continue;
             }
         }
 
-        if ($body !== null) {
+        if ($body !== null){
             return false;
         }
 

Braces +61 added lines, -30 removed lines

@@ -51,39 +51,48 @@ 
         $this->body = null;
         $hasWhitespace = false;
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte)
+            {
                 // no other grammars are allowed
                 break;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '(':
                     $this->flushName();
                     $this->tokens[] = new Token(DynamicGrammar::TYPE_BODY_OPEN, $n->offset, $n->char);
 
                     return $this->parseBody($src);
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
                         $hasWhitespace = true;
-                        if ($this->name !== []) {
+                        if ($this->name !== [])
+                        {
                             $this->flushName();
                             $this->tokens[] = new Token(DynamicGrammar::TYPE_WHITESPACE, $n->offset, $n->char);
                             break;
                         }
 
-                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE) {
+                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE)
+                        {
                             $this->getLastToken()->content .= $n->char;
                             break;
                         }
 
                         // invalid directive
                         return false;
-                    } elseif ($hasWhitespace) {
+                    }
+                    elseif ($hasWhitespace)
+                    {
                         return $this->finalize();
                     }
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char))
+                    {
                         $this->flushName();
 
                         return $this->finalize();
@@ -103,7 +112,8 @@ 
      */
     public function getIterator(): Traversable
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new LogicException('Directive not parsed');
         }
 
@@ -123,8 +133,10 @@ 
      */
     public function getKeyword(): string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_KEYWORD) {
+        foreach ($this->tokens as $token)
+        {
+            if ($token->type === DynamicGrammar::TYPE_KEYWORD)
+            {
                 return $token->content;
             }
         }
@@ -139,8 +151,10 @@ 
      */
     public function getBody(): ?string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_BODY) {
+        foreach ($this->tokens as $token)
+        {
+            if ($token->type === DynamicGrammar::TYPE_BODY)
+            {
                 return $token->content;
             }
         }
@@ -153,7 +167,8 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === [])
+        {
             return;
         }
 
@@ -169,17 +184,22 @@ 
         $this->body = [];
         $level = 1;
 
-        while ($nn = $src->next()) {
-            if (!$nn instanceof Byte) {
+        while ($nn = $src->next())
+        {
+            if (!$nn instanceof Byte)
+            {
                 $this->flushBody();
                 return $this->finalize();
             }
 
-            if (in_array($nn->char, ['"', '"'])) {
+            if (in_array($nn->char, ['"', '"']))
+            {
                 $this->body[] = $nn;
-                while ($nnn = $src->next()) {
+                while ($nnn = $src->next())
+                {
                     $this->body[] = $nnn;
-                    if ($nnn instanceof Byte && $nnn->char === $nn->char) {
+                    if ($nnn instanceof Byte && $nnn->char === $nn->char)
+                    {
                         break;
                     }
                 }
@@ -188,15 +208,18 @@ 
 
             $this->body[] = $nn;
 
-            if ($nn->char === '(') {
+            if ($nn->char === '(')
+            {
                 $level++;
                 continue;
             }
 
-            if ($nn->char === ')') {
+            if ($nn->char === ')')
+            {
                 $level--;
 
-                if ($level === 0) {
+                if ($level === 0)
+                {
                     $n = array_pop($this->body);
 
                     $this->flushBody();
@@ -217,7 +240,8 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === [])
+        {
             return;
         }
 
@@ -227,7 +251,8 @@ 
 
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new LogicException('Directive not parsed');
         }
 
@@ -241,8 +266,10 @@ 
     {
         $tokens = $this->tokens;
 
-        foreach (array_reverse($tokens, true) as $i => $t) {
-            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE) {
+        foreach (array_reverse($tokens, true) as $i => $t)
+        {
+            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE)
+            {
                 break;
             }
 
@@ -250,19 +277,23 @@ 
         }
 
         $body = null;
-        foreach ($tokens as $t) {
-            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN) {
+        foreach ($tokens as $t)
+        {
+            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN)
+            {
                 $body = false;
                 continue;
             }
 
-            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE) {
+            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE)
+            {
                 $body = null;
                 continue;
             }
         }
 
-        if ($body !== null) {
+        if ($body !== null)
+        {
             return false;
         }
 

src/Stempler/src/Lexer/Grammar/DynamicGrammar.php

Spacing +23 added lines, -23 removed lines

@@ -82,33 +82,33 @@ 
      */
     public function parse(Buffer $src): Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte){
                 yield $n;
                 continue;
             }
 
-            if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR) {
+            if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR){
                 if (
                     $this->echo->nextToken($src) ||
                     $this->raw->nextToken($src) ||
                     $src->lookaheadByte() === DirectiveGrammar::DIRECTIVE_CHAR
-                ) {
+                ){
                     // escaped echo sequence, hide directive byte
                     yield $src->next();
                     continue;
                 }
 
                 $directive = new DirectiveGrammar();
-                if ($directive->parse($src, $n->offset)) {
-                    if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE) {
+                if ($directive->parse($src, $n->offset)){
+                    if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE){
                         // configure braces syntax
                         $this->declare($directive->getBody());
-                    } else {
+                    }else{
                         if (
                             $this->directiveRenderer !== null
                             && !$this->directiveRenderer->hasDirective($directive->getKeyword())
-                        ) {
+                        ){
                             // directive opening char
                             yield $n;
 
@@ -129,15 +129,15 @@ 
 
             /** @var BracesGrammar|null $braces */
             $braces = null;
-            if ($this->echo->starts($src, $n)) {
+            if ($this->echo->starts($src, $n)){
                 $braces = clone $this->echo;
-            } elseif ($this->raw->starts($src, $n)) {
+            } elseif ($this->raw->starts($src, $n)){
                 $braces = clone $this->raw;
             }
 
-            if ($braces !== null) {
+            if ($braces !== null){
                 $echo = $braces->parse($src, $n);
-                if ($echo !== null) {
+                if ($echo !== null){
                     yield from $echo;
                     continue;
                 }
@@ -157,7 +157,7 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token){
             case self::TYPE_OPEN_TAG:
                 return 'DYNAMIC:OPEN_TAG';
             case self::TYPE_CLOSE_TAG:
@@ -182,20 +182,20 @@ 
     /**
      * @param string $body
      */
-    private function declare(?string $body): void
+    private function declare(?string$body) : void
     {
-        if ($body === null) {
+        if ($body === null){
             return;
         }
 
-        foreach ($this->fetchOptions($body) as $option => $value) {
+        foreach ($this->fetchOptions($body) as $option => $value){
             $value = trim($value, '\'" ');
-            switch ($option) {
+            switch ($option){
                 case 'syntax':
                     $this->echo->setActive($value !== 'off');
                     $this->raw->setActive($value !== 'off');
 
-                    if ($value === 'default') {
+                    if ($value === 'default'){
                         $this->echo->setStartSequence('{{');
                         $this->echo->setEndSequence('}}');
                         $this->raw->setStartSequence('{!!');
@@ -232,10 +232,10 @@ 
         $keyword = null;
 
         /** @var Token $token */
-        foreach ($lexer->parse(new StringStream($body)) as $token) {
-            switch ($token->type) {
+        foreach ($lexer->parse(new StringStream($body)) as $token){
+            switch ($token->type){
                 case DeclareGrammar::TYPE_KEYWORD:
-                    if ($keyword !== null) {
+                    if ($keyword !== null){
                         $options[$keyword] = $token->content;
                         $keyword = null;
                         break;
@@ -243,7 +243,7 @@ 
                     $keyword = $token->content;
                     break;
                 case DeclareGrammar::TYPE_QUOTED:
-                    if ($keyword !== null) {
+                    if ($keyword !== null){
                         $options[$keyword] = trim($token->content, $token->content[0]);
                         $keyword = null;
                         break;
@@ -252,7 +252,7 @@ 
                     $keyword = trim($token->content, $token->content[0]);
                     break;
                 case DeclareGrammar::TYPE_COMMA:
-                    if ($keyword !== null) {
+                    if ($keyword !== null){
                         $options[$keyword] = null;
                         $keyword = null;
                         break;

Braces +42 added lines, -20 removed lines

@@ -82,13 +82,16 @@ 
      */
     public function parse(Buffer $src): Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte)
+            {
                 yield $n;
                 continue;
             }
 
-            if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR) {
+            if ($n->char === DirectiveGrammar::DIRECTIVE_CHAR)
+            {
                 if (
                     $this->echo->nextToken($src) ||
                     $this->raw->nextToken($src) ||
@@ -100,11 +103,15 @@ 
                 }
 
                 $directive = new DirectiveGrammar();
-                if ($directive->parse($src, $n->offset)) {
-                    if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE) {
+                if ($directive->parse($src, $n->offset))
+                {
+                    if (strtolower($directive->getKeyword()) === self::DECLARE_DIRECTIVE)
+                    {
                         // configure braces syntax
                         $this->declare($directive->getBody());
-                    } else {
+                    }
+                    else
+                    {
                         if (
                             $this->directiveRenderer !== null
                             && !$this->directiveRenderer->hasDirective($directive->getKeyword())
@@ -129,15 +136,20 @@ 
 
             /** @var BracesGrammar|null $braces */
             $braces = null;
-            if ($this->echo->starts($src, $n)) {
+            if ($this->echo->starts($src, $n))
+            {
                 $braces = clone $this->echo;
-            } elseif ($this->raw->starts($src, $n)) {
+            }
+            elseif ($this->raw->starts($src, $n))
+            {
                 $braces = clone $this->raw;
             }
 
-            if ($braces !== null) {
+            if ($braces !== null)
+            {
                 $echo = $braces->parse($src, $n);
-                if ($echo !== null) {
+                if ($echo !== null)
+                {
                     yield from $echo;
                     continue;
                 }
@@ -157,7 +169,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_OPEN_TAG:
                 return 'DYNAMIC:OPEN_TAG';
             case self::TYPE_CLOSE_TAG:
@@ -184,18 +197,22 @@ 
      */
     private function declare(?string $body): void
     {
-        if ($body === null) {
+        if ($body === null)
+        {
             return;
         }
 
-        foreach ($this->fetchOptions($body) as $option => $value) {
+        foreach ($this->fetchOptions($body) as $option => $value)
+        {
             $value = trim($value, '\'" ');
-            switch ($option) {
+            switch ($option)
+            {
                 case 'syntax':
                     $this->echo->setActive($value !== 'off');
                     $this->raw->setActive($value !== 'off');
 
-                    if ($value === 'default') {
+                    if ($value === 'default')
+                    {
                         $this->echo->setStartSequence('{{');
                         $this->echo->setEndSequence('}}');
                         $this->raw->setStartSequence('{!!');
@@ -232,10 +249,13 @@ 
         $keyword = null;
 
         /** @var Token $token */
-        foreach ($lexer->parse(new StringStream($body)) as $token) {
-            switch ($token->type) {
+        foreach ($lexer->parse(new StringStream($body)) as $token)
+        {
+            switch ($token->type)
+            {
                 case DeclareGrammar::TYPE_KEYWORD:
-                    if ($keyword !== null) {
+                    if ($keyword !== null)
+                    {
                         $options[$keyword] = $token->content;
                         $keyword = null;
                         break;
@@ -243,7 +263,8 @@ 
                     $keyword = $token->content;
                     break;
                 case DeclareGrammar::TYPE_QUOTED:
-                    if ($keyword !== null) {
+                    if ($keyword !== null)
+                    {
                         $options[$keyword] = trim($token->content, $token->content[0]);
                         $keyword = null;
                         break;
@@ -252,7 +273,8 @@ 
                     $keyword = trim($token->content, $token->content[0]);
                     break;
                 case DeclareGrammar::TYPE_COMMA:
-                    if ($keyword !== null) {
+                    if ($keyword !== null)
+                    {
                         $options[$keyword] = null;
                         $keyword = null;
                         break;