spiral / framework

src/Stempler/src/Lexer/Grammar/PHPGrammar.php

Spacing +12 added lines, -12 removed lines

@@ -26,14 +26,14 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '<' || $src->lookaheadByte() !== '?') {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte || $n->char !== '<' || $src->lookaheadByte() !== '?'){
                 yield $n;
                 continue;
             }
 
-            $php = $this->parseGrammar($n->char . $src->nextBytes(), $n->offset);
-            if ($php === null) {
+            $php = $this->parseGrammar($n->char.$src->nextBytes(), $n->offset);
+            if ($php === null){
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -61,27 +61,27 @@ 
     private function parseGrammar(string $content, int $offset): ?Token
     {
         $tokens = null;
-        foreach (token_get_all($content) as $token) {
-            if ($tokens === null) {
-                if (!$this->is($token, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO])) {
+        foreach (token_get_all($content) as $token){
+            if ($tokens === null){
+                if (!$this->is($token, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO])){
                     // not php
                     return null;
                 }
             }
 
             $tokens[] = $token;
-            if ($this->is($token, [T_CLOSE_TAG])) {
+            if ($this->is($token, [T_CLOSE_TAG])){
                 break;
             }
         }
 
-        if ($tokens === null) {
+        if ($tokens === null){
             return null;
         }
 
         $buffer = '';
-        foreach ($tokens as $token) {
-            if (!is_array($token)) {
+        foreach ($tokens as $token){
+            if (!is_array($token)){
                 $buffer .= $token;
                 continue;
             }
@@ -101,7 +101,7 @@ 
      */
     private function is($token, array $type): bool
     {
-        if (!is_array($token)) {
+        if (!is_array($token)){
             return false;
         }
 

Braces +22 added lines, -11 removed lines

@@ -26,14 +26,17 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '<' || $src->lookaheadByte() !== '?') {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte || $n->char !== '<' || $src->lookaheadByte() !== '?')
+            {
                 yield $n;
                 continue;
             }
 
             $php = $this->parseGrammar($n->char . $src->nextBytes(), $n->offset);
-            if ($php === null) {
+            if ($php === null)
+            {
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -61,27 +64,34 @@ 
     private function parseGrammar(string $content, int $offset): ?Token
     {
         $tokens = null;
-        foreach (token_get_all($content) as $token) {
-            if ($tokens === null) {
-                if (!$this->is($token, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO])) {
+        foreach (token_get_all($content) as $token)
+        {
+            if ($tokens === null)
+            {
+                if (!$this->is($token, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO]))
+                {
                     // not php
                     return null;
                 }
             }
 
             $tokens[] = $token;
-            if ($this->is($token, [T_CLOSE_TAG])) {
+            if ($this->is($token, [T_CLOSE_TAG]))
+            {
                 break;
             }
         }
 
-        if ($tokens === null) {
+        if ($tokens === null)
+        {
             return null;
         }
 
         $buffer = '';
-        foreach ($tokens as $token) {
-            if (!is_array($token)) {
+        foreach ($tokens as $token)
+        {
+            if (!is_array($token))
+            {
                 $buffer .= $token;
                 continue;
             }
@@ -101,7 +111,8 @@ 
      */
     private function is($token, array $type): bool
     {
-        if (!is_array($token)) {
+        if (!is_array($token))
+        {
             return false;
         }
 

src/Stempler/src/Lexer/Grammar/Traits/TokenTrait.php

Spacing +6 added lines, -6 removed lines

@@ -32,11 +32,11 @@ 
         $buffer = null;
         $bufferOffset = 0;
 
-        foreach ($inner as $n) {
+        foreach ($inner as $n){
             $token->offset = $token->offset ?? $n->offset;
 
-            if ($n instanceof Byte) {
-                if ($buffer === null) {
+            if ($n instanceof Byte){
+                if ($buffer === null){
                     $buffer = '';
                     $bufferOffset = $n->offset;
                 }
@@ -47,7 +47,7 @@ 
                 continue;
             }
 
-            if ($buffer !== null) {
+            if ($buffer !== null){
                 $token->tokens[] = new Token(
                     Token::TYPE_RAW,
                     $bufferOffset,
@@ -61,7 +61,7 @@ 
             $token->tokens[] = $n;
         }
 
-        if ($buffer !== null) {
+        if ($buffer !== null){
             $token->tokens[] = new Token(
                 Token::TYPE_RAW,
                 $bufferOffset,
@@ -70,7 +70,7 @@ 
             );
         }
 
-        if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) {
+        if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW){
             $token->tokens = [];
         }
 

Braces +12 added lines, -6 removed lines

@@ -32,11 +32,14 @@ 
         $buffer = null;
         $bufferOffset = 0;
 
-        foreach ($inner as $n) {
+        foreach ($inner as $n)
+        {
             $token->offset = $token->offset ?? $n->offset;
 
-            if ($n instanceof Byte) {
-                if ($buffer === null) {
+            if ($n instanceof Byte)
+            {
+                if ($buffer === null)
+                {
                     $buffer = '';
                     $bufferOffset = $n->offset;
                 }
@@ -47,7 +50,8 @@ 
                 continue;
             }
 
-            if ($buffer !== null) {
+            if ($buffer !== null)
+            {
                 $token->tokens[] = new Token(
                     Token::TYPE_RAW,
                     $bufferOffset,
@@ -61,7 +65,8 @@ 
             $token->tokens[] = $n;
         }
 
-        if ($buffer !== null) {
+        if ($buffer !== null)
+        {
             $token->tokens[] = new Token(
                 Token::TYPE_RAW,
                 $bufferOffset,
@@ -70,7 +75,8 @@ 
             );
         }
 
-        if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) {
+        if (count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW)
+        {
             $token->tokens = [];
         }
 

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

Spacing +23 added lines, -23 removed lines

@@ -84,33 +84,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;
 
@@ -131,15 +131,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;
                 }
@@ -159,7 +159,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:
@@ -184,20 +184,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('{!!');
@@ -238,10 +238,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;
@@ -249,7 +249,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;
@@ -258,7 +258,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

@@ -84,13 +84,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) ||
@@ -102,11 +105,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())
@@ -131,15 +138,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;
                 }
@@ -159,7 +171,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:
@@ -186,18 +199,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('{!!');
@@ -238,10 +255,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;
@@ -249,7 +269,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;
@@ -258,7 +279,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;

src/Stempler/src/Lexer/Grammar/RawGrammar.php

Spacing +5 added lines, -5 removed lines

@@ -27,9 +27,9 @@ 
         $buffer = null;
         $bufferOffset = 0;
 
-        foreach ($src as $n) {
-            if ($n instanceof Byte) {
-                if ($buffer === null) {
+        foreach ($src as $n){
+            if ($n instanceof Byte){
+                if ($buffer === null){
                     $buffer = '';
                     $bufferOffset = $n->offset;
                 }
@@ -38,7 +38,7 @@ 
                 continue;
             }
 
-            if ($buffer !== null) {
+            if ($buffer !== null){
                 yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer);
                 $buffer = null;
             }
@@ -46,7 +46,7 @@ 
             yield $n;
         }
 
-        if ($buffer !== null) {
+        if ($buffer !== null){
             yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer);
         }
     }

Braces +10 added lines, -5 removed lines

@@ -27,9 +27,12 @@ 
         $buffer = null;
         $bufferOffset = 0;
 
-        foreach ($src as $n) {
-            if ($n instanceof Byte) {
-                if ($buffer === null) {
+        foreach ($src as $n)
+        {
+            if ($n instanceof Byte)
+            {
+                if ($buffer === null)
+                {
                     $buffer = '';
                     $bufferOffset = $n->offset;
                 }
@@ -38,7 +41,8 @@ 
                 continue;
             }
 
-            if ($buffer !== null) {
+            if ($buffer !== null)
+            {
                 yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer);
                 $buffer = null;
             }
@@ -46,7 +50,8 @@ 
             yield $n;
         }
 
-        if ($buffer !== null) {
+        if ($buffer !== null)
+        {
             yield new Token(Token::TYPE_RAW, $bufferOffset, $buffer);
         }
     }

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/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);