spiral / framework

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

Spacing +11 added lines, -11 removed lines

@@ -40,19 +40,19 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        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;
                         }
                     }
@@ -62,7 +62,7 @@ 
 
                     break;
                 case '=':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -70,7 +70,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 = [];
                     }
@@ -78,8 +78,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 = [];
                         }
@@ -91,7 +91,7 @@ 
             }
         }
 
-        if ($this->keyword !== []) {
+        if ($this->keyword !== []){
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
         }
     }
@@ -101,7 +101,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

@@ -40,19 +40,24 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        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;
                         }
                     }
@@ -62,7 +67,8 @@ 
 
                     break;
                 case '=':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -70,7 +76,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 = [];
                     }
@@ -78,8 +85,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 = [];
                         }
@@ -91,7 +100,8 @@ 
             }
         }
 
-        if ($this->keyword !== []) {
+        if ($this->keyword !== [])
+        {
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
         }
     }
@@ -101,7 +111,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();
@@ -105,7 +105,7 @@ 
      */
     public function getIterator()
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new \LogicException('Directive not parsed');
         }
 
@@ -129,8 +129,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;
             }
         }
@@ -145,8 +145,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;
             }
         }
@@ -159,7 +159,7 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === []){
             return;
         }
 
@@ -176,17 +176,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;
                     }
                 }
@@ -195,15 +195,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();
@@ -224,7 +224,7 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === []){
             return;
         }
 
@@ -237,7 +237,7 @@ 
      */
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new \LogicException('Directive not parsed');
         }
 
@@ -253,8 +253,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;
             }
 
@@ -262,19 +262,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();
@@ -105,7 +114,8 @@ 
      */
     public function getIterator()
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new \LogicException('Directive not parsed');
         }
 
@@ -129,8 +139,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;
             }
         }
@@ -145,8 +157,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;
             }
         }
@@ -159,7 +173,8 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === [])
+        {
             return;
         }
 
@@ -176,17 +191,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;
                     }
                 }
@@ -195,15 +215,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();
@@ -224,7 +247,8 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === [])
+        {
             return;
         }
 
@@ -237,7 +261,8 @@ 
      */
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new \LogicException('Directive not parsed');
         }
 
@@ -253,8 +278,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;
             }
 
@@ -262,19 +289,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/Dynamic/BracesGrammar.php

Spacing +14 added lines, -14 removed lines

@@ -119,11 +119,11 @@ 
      */
     public function starts(Buffer $src, Byte $n): bool
     {
-        if (!$this->active) {
+        if (!$this->active){
             return false;
         }
 
-        return $this->startSequence === ($n->char . $src->lookaheadByte(strlen($this->startSequence) - 1));
+        return $this->startSequence === ($n->char.$src->lookaheadByte(strlen($this->startSequence) - 1));
     }
 
     /**
@@ -139,30 +139,30 @@ 
             new Token(
                 $this->startToken,
                 $n->offset,
-                $n->char . $this->nextBytes($src, strlen($this->startSequence) - 1)
+                $n->char.$this->nextBytes($src, strlen($this->startSequence) - 1)
             )
         ];
 
-        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 '"':
                 case "'":
                     $this->body[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next()){
                         $this->body[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char){
                             break;
                         }
                     }
                     break;
 
                 case $this->endSequence[0]:
-                    if (!$this->ends($src, $n)) {
+                    if (!$this->ends($src, $n)){
                         // still part of body
                         $this->body[] = $n;
                         break;
@@ -172,7 +172,7 @@ 
                     $this->tokens[] = new Token(
                         $this->endToken,
                         $n->offset,
-                        $n->char . $this->nextBytes($src, strlen($this->endSequence) - 1)
+                        $n->char.$this->nextBytes($src, strlen($this->endSequence) - 1)
                     );
 
                     break 2;
@@ -181,7 +181,7 @@ 
             }
         }
 
-        if (count($this->tokens) !== 3) {
+        if (count($this->tokens) !== 3){
             return null;
         }
 
@@ -197,7 +197,7 @@ 
      */
     private function ends(Buffer $src, Byte $n): bool
     {
-        return $this->endSequence === ($n->char . $src->lookaheadByte(strlen($this->endSequence) - 1));
+        return $this->endSequence === ($n->char.$src->lookaheadByte(strlen($this->endSequence) - 1));
     }
 
     /**
@@ -210,7 +210,7 @@ 
     private function nextBytes(Buffer $src, int $size): string
     {
         $result = '';
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++){
             $result .= $src->next()->char;
         }
 
@@ -222,7 +222,7 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === []){
             return;
         }
 

Braces +20 added lines, -10 removed lines

@@ -119,7 +119,8 @@ 
      */
     public function starts(Buffer $src, Byte $n): bool
     {
-        if (!$this->active) {
+        if (!$this->active)
+        {
             return false;
         }
 
@@ -143,26 +144,32 @@ 
             )
         ];
 
-        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 '"':
                 case "'":
                     $this->body[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next())
+                    {
                         $this->body[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char)
+                        {
                             break;
                         }
                     }
                     break;
 
                 case $this->endSequence[0]:
-                    if (!$this->ends($src, $n)) {
+                    if (!$this->ends($src, $n))
+                    {
                         // still part of body
                         $this->body[] = $n;
                         break;
@@ -181,7 +188,8 @@ 
             }
         }
 
-        if (count($this->tokens) !== 3) {
+        if (count($this->tokens) !== 3)
+        {
             return null;
         }
 
@@ -210,7 +218,8 @@ 
     private function nextBytes(Buffer $src, int $size): string
     {
         $result = '';
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++)
+        {
             $result .= $src->next()->char;
         }
 
@@ -222,7 +231,8 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === [])
+        {
             return;
         }
 

src/Stempler/src/Parser/Assembler.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
     public function getStackPath(): string
     {
         $path = [$this->nodeName($this->node)];
-        foreach ($this->stack as $tuple) {
+        foreach ($this->stack as $tuple){
             $path[] = $this->nodeName($tuple[0]);
         }
 
@@ -94,8 +94,8 @@ 
     private function nodeName(NodeInterface $node): string
     {
         $r = new \ReflectionClass($node);
-        if (property_exists($node, 'name')) {
-            return lcfirst($r->getShortName()) . "[{$node->name}]";
+        if (property_exists($node, 'name')){
+            return lcfirst($r->getShortName())."[{$node->name}]";
         }
 
         return lcfirst($r->getShortName());

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
     public function getStackPath(): string
     {
         $path = [$this->nodeName($this->node)];
-        foreach ($this->stack as $tuple) {
+        foreach ($this->stack as $tuple)
+        {
             $path[] = $this->nodeName($tuple[0]);
         }
 
@@ -94,7 +95,8 @@ 
     private function nodeName(NodeInterface $node): string
     {
         $r = new \ReflectionClass($node);
-        if (property_exists($node, 'name')) {
+        if (property_exists($node, 'name'))
+        {
             return lcfirst($r->getShortName()) . "[{$node->name}]";
         }
 

src/Stempler/src/Parser/Syntax/HTMLSyntax.php

Spacing +17 added lines, -17 removed lines

@@ -69,7 +69,7 @@ 
      */
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type){
             case HTMLGrammar::TYPE_OPEN:
             case HTMLGrammar::TYPE_OPEN_SHORT:
                 $this->node = new Tag(new Parser\Context($token, $parser->getPath()));
@@ -78,12 +78,12 @@ 
                 break;
 
             case HTMLGrammar::TYPE_KEYWORD:
-                if ($this->node->name === null) {
+                if ($this->node->name === null){
                     $this->node->name = $this->parseToken($parser, $token);
                     return;
                 }
 
-                if ($this->attr !== null && !$this->attr->value instanceof Nil) {
+                if ($this->attr !== null && !$this->attr->value instanceof Nil){
                     $this->attr->value = $this->parseToken($parser, $token);
                     $this->attr = null;
                     break;
@@ -99,7 +99,7 @@ 
                 break;
 
             case HTMLGrammar::TYPE_EQUAL:
-                if ($this->attr === null) {
+                if ($this->attr === null){
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -108,7 +108,7 @@ 
                 break;
 
             case HTMLGrammar::TYPE_ATTRIBUTE:
-                if ($this->attr === null) {
+                if ($this->attr === null){
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -118,9 +118,9 @@ 
                         strpos($this->attr->name, 'on') === 0
                         || in_array($this->attr->name, self::VERBATIM_ATTRIBUTES, true)
                     )
-                ) {
+                ){
                     $this->attr->value = $this->parseVerbatim($parser, $token);
-                } else {
+                }else{
                     $this->attr->value = $this->parseToken($parser, $token);
                 }
 
@@ -134,8 +134,8 @@ 
                 break;
 
             case HTMLGrammar::TYPE_CLOSE:
-                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) {
-                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) {
+                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT){
+                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name){
                         throw new SyntaxException(
                             "Invalid closing tag `{$this->node->name}`, expected `{$asm->getNode()->name}`",
                             $this->token
@@ -143,11 +143,11 @@ 
                     }
 
                     $asm->close();
-                } else {
-                    if (in_array($this->node->name, self::VOID_TAGS)) {
+                }else{
+                    if (in_array($this->node->name, self::VOID_TAGS)){
                         $this->node->void = true;
                         $asm->push($this->node);
-                    } else {
+                    }else{
                         $asm->open($this->node, 'nodes');
                     }
                 }
@@ -160,9 +160,9 @@ 
                 break;
 
             default:
-                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) {
+                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim){
                     $node = $this->parseToken($parser, $token);
-                    if (is_string($node)) {
+                    if (is_string($node)){
                         $node = new Raw($node, new Parser\Context($token, $parser->getPath()));
                     }
 
@@ -190,11 +190,11 @@ 
     {
         $verbatim = new Verbatim(new Parser\Context($token, $parser->getPath()));
 
-        if ($token->tokens === []) {
-            if ($token->content) {
+        if ($token->tokens === []){
+            if ($token->content){
                 $verbatim->nodes[] = $token->content;
             }
-        } else {
+        }else{
             $parser->parseTokens(
                 new Assembler($verbatim, 'nodes'),
                 $token->tokens

Braces +36 added lines, -16 removed lines

@@ -69,7 +69,8 @@ 
      */
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type)
+        {
             case HTMLGrammar::TYPE_OPEN:
             case HTMLGrammar::TYPE_OPEN_SHORT:
                 $this->node = new Tag(new Parser\Context($token, $parser->getPath()));
@@ -78,12 +79,14 @@ 
                 break;
 
             case HTMLGrammar::TYPE_KEYWORD:
-                if ($this->node->name === null) {
+                if ($this->node->name === null)
+                {
                     $this->node->name = $this->parseToken($parser, $token);
                     return;
                 }
 
-                if ($this->attr !== null && !$this->attr->value instanceof Nil) {
+                if ($this->attr !== null && !$this->attr->value instanceof Nil)
+                {
                     $this->attr->value = $this->parseToken($parser, $token);
                     $this->attr = null;
                     break;
@@ -99,7 +102,8 @@ 
                 break;
 
             case HTMLGrammar::TYPE_EQUAL:
-                if ($this->attr === null) {
+                if ($this->attr === null)
+                {
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -108,7 +112,8 @@ 
                 break;
 
             case HTMLGrammar::TYPE_ATTRIBUTE:
-                if ($this->attr === null) {
+                if ($this->attr === null)
+                {
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -120,7 +125,9 @@ 
                     )
                 ) {
                     $this->attr->value = $this->parseVerbatim($parser, $token);
-                } else {
+                }
+                else
+                {
                     $this->attr->value = $this->parseToken($parser, $token);
                 }
 
@@ -134,8 +141,10 @@ 
                 break;
 
             case HTMLGrammar::TYPE_CLOSE:
-                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) {
-                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) {
+                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT)
+                {
+                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name)
+                    {
                         throw new SyntaxException(
                             "Invalid closing tag `{$this->node->name}`, expected `{$asm->getNode()->name}`",
                             $this->token
@@ -143,11 +152,16 @@ 
                     }
 
                     $asm->close();
-                } else {
-                    if (in_array($this->node->name, self::VOID_TAGS)) {
+                }
+                else
+                {
+                    if (in_array($this->node->name, self::VOID_TAGS))
+                    {
                         $this->node->void = true;
                         $asm->push($this->node);
-                    } else {
+                    }
+                    else
+                    {
                         $asm->open($this->node, 'nodes');
                     }
                 }
@@ -160,9 +174,11 @@ 
                 break;
 
             default:
-                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) {
+                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim)
+                {
                     $node = $this->parseToken($parser, $token);
-                    if (is_string($node)) {
+                    if (is_string($node))
+                    {
                         $node = new Raw($node, new Parser\Context($token, $parser->getPath()));
                     }
 
@@ -190,11 +206,15 @@ 
     {
         $verbatim = new Verbatim(new Parser\Context($token, $parser->getPath()));
 
-        if ($token->tokens === []) {
-            if ($token->content) {
+        if ($token->tokens === [])
+        {
+            if ($token->content)
+            {
                 $verbatim->nodes[] = $token->content;
             }
-        } else {
+        }
+        else
+        {
             $parser->parseTokens(
                 new Assembler($verbatim, 'nodes'),
                 $token->tokens

src/Stempler/src/Parser/Syntax/InlineSyntax.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      */
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type){
             case InlineGrammar::TYPE_OPEN_TAG:
                 $this->inline = new Inline(new Parser\Context($token, $parser->getPath()));
                 $asm->push($this->inline);

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
      */
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type)
+        {
             case InlineGrammar::TYPE_OPEN_TAG:
                 $this->inline = new Inline(new Parser\Context($token, $parser->getPath()));
                 $asm->push($this->inline);

src/Stempler/src/Parser/Syntax/DynamicSyntax.php

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type){
             case DynamicGrammar::TYPE_DIRECTIVE:
                 $this->directive = new Directive(new Parser\Context($token, $parser->getPath()));
                 $asm->push($this->directive);
@@ -61,20 +61,20 @@ 
                 break;
 
             case DynamicGrammar::TYPE_KEYWORD:
-                if ($this->directive !== null) {
+                if ($this->directive !== null){
                     $this->directive->name = $token->content;
                 }
                 break;
 
             case DynamicGrammar::TYPE_BODY:
-                if ($this->directive !== null) {
+                if ($this->directive !== null){
                     $this->directive->body = $token->content;
                     $this->directive->values = $this->fetchValues($this->directive->body);
 
                     $this->directive = null;
                 }
 
-                if ($this->output !== null) {
+                if ($this->output !== null){
                     $this->output->body = $token->content;
                 }
 
@@ -95,31 +95,31 @@ 
 
         $src = new StringStream($body);
 
-        while ($n = $src->peak()) {
-            if (in_array($n, ['"', '"'])) {
+        while ($n = $src->peak()){
+            if (in_array($n, ['"', '"'])){
                 $values[count($values) - 1] .= $n;
-                while ($nn = $src->peak()) {
+                while ($nn = $src->peak()){
                     $values[count($values) - 1] .= $nn;
-                    if ($nn === $n) {
+                    if ($nn === $n){
                         break;
                     }
                 }
                 continue;
             }
 
-            if ($n === ',' && $level === 0) {
+            if ($n === ',' && $level === 0){
                 $values[] = '';
                 continue;
             }
 
             $values[count($values) - 1] .= $n;
 
-            if ($n === '(' || $n === '[' || $n === '{') {
+            if ($n === '(' || $n === '[' || $n === '{'){
                 $level++;
                 continue;
             }
 
-            if ($n === ')' || $n === ']' || $n === '}') {
+            if ($n === ')' || $n === ']' || $n === '}'){
                 $level--;
             }
         }

Braces +22 added lines, -11 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type)
+        {
             case DynamicGrammar::TYPE_DIRECTIVE:
                 $this->directive = new Directive(new Parser\Context($token, $parser->getPath()));
                 $asm->push($this->directive);
@@ -61,20 +62,23 @@ 
                 break;
 
             case DynamicGrammar::TYPE_KEYWORD:
-                if ($this->directive !== null) {
+                if ($this->directive !== null)
+                {
                     $this->directive->name = $token->content;
                 }
                 break;
 
             case DynamicGrammar::TYPE_BODY:
-                if ($this->directive !== null) {
+                if ($this->directive !== null)
+                {
                     $this->directive->body = $token->content;
                     $this->directive->values = $this->fetchValues($this->directive->body);
 
                     $this->directive = null;
                 }
 
-                if ($this->output !== null) {
+                if ($this->output !== null)
+                {
                     $this->output->body = $token->content;
                 }
 
@@ -95,31 +99,38 @@ 
 
         $src = new StringStream($body);
 
-        while ($n = $src->peak()) {
-            if (in_array($n, ['"', '"'])) {
+        while ($n = $src->peak())
+        {
+            if (in_array($n, ['"', '"']))
+            {
                 $values[count($values) - 1] .= $n;
-                while ($nn = $src->peak()) {
+                while ($nn = $src->peak())
+                {
                     $values[count($values) - 1] .= $nn;
-                    if ($nn === $n) {
+                    if ($nn === $n)
+                    {
                         break;
                     }
                 }
                 continue;
             }
 
-            if ($n === ',' && $level === 0) {
+            if ($n === ',' && $level === 0)
+            {
                 $values[] = '';
                 continue;
             }
 
             $values[count($values) - 1] .= $n;
 
-            if ($n === '(' || $n === '[' || $n === '{') {
+            if ($n === '(' || $n === '[' || $n === '{')
+            {
                 $level++;
                 continue;
             }
 
-            if ($n === ')' || $n === ']' || $n === '}') {
+            if ($n === ')' || $n === ']' || $n === '}')
+            {
                 $level--;
             }
         }

src/Stempler/src/Parser/Syntax/Traits/MixinTrait.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
      */
     private function parseToken(Parser $parser, Token $token)
     {
-        if ($token->tokens === []) {
-            if ($token->type === Token::TYPE_RAW) {
+        if ($token->tokens === []){
+            if ($token->type === Token::TYPE_RAW){
                 return new Raw($token->content);
             }
 

Braces +4 added lines, -2 removed lines

@@ -26,8 +26,10 @@
      */
     private function parseToken(Parser $parser, Token $token)
     {
-        if ($token->tokens === []) {
-            if ($token->type === Token::TYPE_RAW) {
+        if ($token->tokens === [])
+        {
+            if ($token->type === Token::TYPE_RAW)
+            {
                 return new Raw($token->content);
             }
 

src/Stempler/src/Parser.php

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
         $parser->path = $path;
         $parser->lexer = clone $this->lexer;
 
-        foreach ($parser->syntax as $grammar => $stx) {
+        foreach ($parser->syntax as $grammar => $stx){
             $parser->syntax[$grammar] = clone $stx;
         }
 
@@ -95,12 +95,12 @@ 
     {
         $template = new Template();
 
-        try {
+        try{
             $this->parseTokens(
                 new Assembler($template, 'nodes'),
                 $this->lexer->parse($stream)
             );
-        } catch (SyntaxException $e) {
+        }catch (SyntaxException $e){
             throw new ParserException(
                 $e->getMessage(),
                 new Context($e->getToken(), $this->getPath()),
@@ -122,21 +122,21 @@ 
         $node = $asm->getNode();
 
         $syntax = [];
-        foreach ($this->syntax as $grammar => $stx) {
+        foreach ($this->syntax as $grammar => $stx){
             $syntax[$grammar] = clone $stx;
         }
 
-        foreach ($tokens as $token) {
-            if (!isset($syntax[$token->grammar])) {
+        foreach ($tokens as $token){
+            if (!isset($syntax[$token->grammar])){
                 throw new SyntaxException('Undefined token', $token);
             }
 
             $syntax[$token->grammar]->handle($this, $asm, $token);
         }
 
-        if ($asm->getNode() !== $node) {
+        if ($asm->getNode() !== $node){
             throw new SyntaxException(
-                'Invalid node hierarchy, unclosed ' . $asm->getStackPath(),
+                'Invalid node hierarchy, unclosed '.$asm->getStackPath(),
                 $asm->getNode()->getContext()->getToken()
             );
         }

Braces +15 added lines, -7 removed lines

@@ -58,7 +58,8 @@ 
         $parser->path = $path;
         $parser->lexer = clone $this->lexer;
 
-        foreach ($parser->syntax as $grammar => $stx) {
+        foreach ($parser->syntax as $grammar => $stx)
+        {
             $parser->syntax[$grammar] = clone $stx;
         }
 
@@ -95,12 +96,15 @@ 
     {
         $template = new Template();
 
-        try {
+        try
+        {
             $this->parseTokens(
                 new Assembler($template, 'nodes'),
                 $this->lexer->parse($stream)
             );
-        } catch (SyntaxException $e) {
+        }
+        catch (SyntaxException $e)
+        {
             throw new ParserException(
                 $e->getMessage(),
                 new Context($e->getToken(), $this->getPath()),
@@ -122,19 +126,23 @@ 
         $node = $asm->getNode();
 
         $syntax = [];
-        foreach ($this->syntax as $grammar => $stx) {
+        foreach ($this->syntax as $grammar => $stx)
+        {
             $syntax[$grammar] = clone $stx;
         }
 
-        foreach ($tokens as $token) {
-            if (!isset($syntax[$token->grammar])) {
+        foreach ($tokens as $token)
+        {
+            if (!isset($syntax[$token->grammar]))
+            {
                 throw new SyntaxException('Undefined token', $token);
             }
 
             $syntax[$token->grammar]->handle($this, $asm, $token);
         }
 
-        if ($asm->getNode() !== $node) {
+        if ($asm->getNode() !== $node)
+        {
             throw new SyntaxException(
                 'Invalid node hierarchy, unclosed ' . $asm->getStackPath(),
                 $asm->getNode()->getContext()->getToken()