spiral / framework

src/Stempler/src/Lexer/Lexer.php

Spacing +5 added lines, -5 removed lines

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

Braces +10 added lines, -5 removed lines

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

src/Stempler/src/Lexer/StringStream.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      */
     public function peak(): ?string
     {
-        if ($this->offset + 1 > $this->length) {
+        if ($this->offset + 1 > $this->length){
             return null;
         }
 

Braces +2 added lines, -1 removed lines

@@ -53,7 +53,8 @@
      */
     public function peak(): ?string
     {
-        if ($this->offset + 1 > $this->length) {
+        if ($this->offset + 1 > $this->length)
+        {
             return null;
         }
 

src/Stempler/src/Lexer/Token.php

Spacing +2 added lines, -2 removed lines

@@ -58,11 +58,11 @@
             'content' => $this->content
         ];
 
-        if ($this->grammar !== null) {
+        if ($this->grammar !== null){
             $token['type'] = call_user_func([$this->grammar, 'tokenName'], $this->type);
         }
 
-        if ($this->tokens !== []) {
+        if ($this->tokens !== []){
             $token['tokens'] = $this->tokens;
         }
 

Braces +4 added lines, -2 removed lines

@@ -58,11 +58,13 @@
             'content' => $this->content
         ];
 
-        if ($this->grammar !== null) {
+        if ($this->grammar !== null)
+        {
             $token['type'] = call_user_func([$this->grammar, 'tokenName'], $this->type);
         }
 
-        if ($this->tokens !== []) {
+        if ($this->tokens !== [])
+        {
             $token['tokens'] = $this->tokens;
         }
 

src/Stempler/src/Lexer/Buffer.php

Spacing +16 added lines, -16 removed lines

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

Braces +34 added lines, -16 removed lines

@@ -46,7 +46,8 @@ 
      */
     public function getIterator()
     {
-        while ($n = $this->next()) {
+        while ($n = $this->next())
+        {
             yield $n;
         }
     }
@@ -64,18 +65,23 @@ 
      */
     public function next()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== [])
+        {
             $n = array_shift($this->replay);
-        } else {
+        }
+        else
+        {
             $n = $this->generator->current();
-            if ($n === null) {
+            if ($n === null)
+            {
                 return null;
             }
             $this->generator->next();
             $this->buffer[] = $n;
         }
 
-        if ($n !== null) {
+        if ($n !== null)
+        {
             $this->offset = $n->offset;
         }
 
@@ -90,10 +96,14 @@ 
     public function nextBytes(): string
     {
         $result = '';
-        while ($n = $this->next()) {
-            if ($n instanceof Byte) {
+        while ($n = $this->next())
+        {
+            if ($n instanceof Byte)
+            {
                 $result .= $n->char;
-            } else {
+            }
+            else
+            {
                 break;
             }
         }
@@ -106,12 +116,14 @@ 
      */
     public function lookahead()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== [])
+        {
             return $this->replay[0];
         }
 
         $n = $this->next();
-        if ($n !== null) {
+        if ($n !== null)
+        {
             array_unshift($this->replay, $n);
         }
 
@@ -128,20 +140,24 @@ 
     {
         $result = '';
         $replay = [];
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++)
+        {
             $n = $this->next();
-            if ($n !== null) {
+            if ($n !== null)
+            {
                 $replay[] = $n;
             }
 
-            if (!$n instanceof Byte) {
+            if (!$n instanceof Byte)
+            {
                 break;
             }
 
             $result .= $n->char;
         }
 
-        foreach (array_reverse($replay) as $n) {
+        foreach (array_reverse($replay) as $n)
+        {
             array_unshift($this->replay, $n);
         }
 
@@ -155,8 +171,10 @@ 
      */
     public function replay(int $offset): void
     {
-        foreach ($this->buffer as $n) {
-            if ($n->offset > $offset) {
+        foreach ($this->buffer as $n)
+        {
+            if ($n->offset > $offset)
+            {
                 $this->replay[] = $n;
             }
         }

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

Spacing +41 added lines, -41 removed lines

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

Braces +81 added lines, -40 removed lines

@@ -59,15 +59,18 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '<') {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte || $n->char !== '<')
+            {
                 yield $n;
                 continue;
             }
 
             // work with isolated token stream!
             $tag = (clone $this)->parseGrammar($src);
-            if ($tag === null) {
+            if ($tag === null)
+            {
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -76,7 +79,8 @@ 
             $tagName = $this->tagName($tag);
 
             // todo: add support for custom tag list
-            if (in_array($tagName, self::VERBATIM_TAGS)) {
+            if (in_array($tagName, self::VERBATIM_TAGS))
+            {
                 yield from $tag;
                 yield from $this->parseVerbatim($src, $tagName);
                 continue;
@@ -92,7 +96,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_RAW:
                 return 'HTML:RAW';
             case self::TYPE_KEYWORD:
@@ -127,26 +132,32 @@ 
     {
         $chunks = [];
 
-        while ($n = $src->next()) {
-            if ($n instanceof Token) {
+        while ($n = $src->next())
+        {
+            if ($n instanceof Token)
+            {
                 $chunks[] = $n;
                 continue;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
                 case '`':
                     $chunks[] = $n;
 
                     // language inclusions allow nested strings
-                    while ($nc = $src->next()) {
+                    while ($nc = $src->next())
+                    {
                         $chunks[] = $nc;
-                        if ($nc instanceof Token) {
+                        if ($nc instanceof Token)
+                        {
                             continue;
                         }
 
-                        if ($nc->char === $n->char) {
+                        if ($nc->char === $n->char)
+                        {
                             break;
                         }
                     }
@@ -157,22 +168,28 @@ 
                     $chunks[] = $n;
 
                     $multiline = false;
-                    if ($src->lookaheadByte(1) === '/' || $src->lookaheadByte(1) === '*') {
-                        if ($src->lookaheadByte(1) === '*') {
+                    if ($src->lookaheadByte(1) === '/' || $src->lookaheadByte(1) === '*')
+                    {
+                        if ($src->lookaheadByte(1) === '*')
+                        {
                             $multiline = true;
                         }
 
                         $chunks[] = $src->next();
 
                         // language inclusions allow nested strings
-                        while ($nc = $src->next()) {
-                            if ($nc instanceof Token) {
+                        while ($nc = $src->next())
+                        {
+                            if ($nc instanceof Token)
+                            {
                                 continue;
                             }
 
-                            if ($nc->char === '<') {
+                            if ($nc->char === '<')
+                            {
                                 $tag = (clone $this)->parseGrammar($src);
-                                if ($tag === null || $this->tagName($tag) !== $verbatim) {
+                                if ($tag === null || $this->tagName($tag) !== $verbatim)
+                                {
                                     $src->replay($n->offset);
                                     break;
                                 }
@@ -183,12 +200,16 @@ 
 
                             $chunks[] = $nc;
 
-                            if ($multiline) {
-                                if ($nc->char === '*' && $src->lookaheadByte(1) === '/') {
+                            if ($multiline)
+                            {
+                                if ($nc->char === '*' && $src->lookaheadByte(1) === '/')
+                                {
                                     $chunks[] = $src->next();
                                     break;
                                 }
-                            } elseif ($nc->char === "\n") {
+                            }
+                            elseif ($nc->char === "\n")
+                            {
                                 break;
                             }
                         }
@@ -199,7 +220,8 @@ 
                 case '<':
                     // tag beginning?
                     $tag = (clone $this)->parseGrammar($src);
-                    if ($tag === null || $this->tagName($tag) !== $verbatim) {
+                    if ($tag === null || $this->tagName($tag) !== $verbatim)
+                    {
                         $chunks[] = $n;
                         $src->replay($n->offset);
                         break;
@@ -223,8 +245,10 @@ 
      */
     private function tagName(array $tag): string
     {
-        foreach ($tag as $token) {
-            if ($token->type === self::TYPE_KEYWORD) {
+        foreach ($tag as $token)
+        {
+            if ($token->type === self::TYPE_KEYWORD)
+            {
                 return strtolower($token->content);
             }
         }
@@ -242,28 +266,34 @@ 
             new Token(self::TYPE_OPEN, $src->getOffset(), '<')
         ];
 
-        if ($src->lookaheadByte() === '/') {
+        if ($src->lookaheadByte() === '/')
+        {
             $this->tokens[0]->type = self::TYPE_OPEN_SHORT;
             $this->tokens[0]->content .= $src->next()->char;
         }
 
-        while ($n = $src->next()) {
-            if ($this->attribute !== []) {
+        while ($n = $src->next())
+        {
+            if ($this->attribute !== [])
+            {
                 $this->attribute[] = $n;
 
-                if ($n instanceof Byte && $n->char === $this->attribute[0]->char) {
+                if ($n instanceof Byte && $n->char === $this->attribute[0]->char)
+                {
                     $this->flushAttribute();
                 }
 
                 continue;
             }
 
-            if ($n instanceof Token) {
+            if ($n instanceof Token)
+            {
                 $this->keyword[] = $n;
                 continue;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
                 case '`':
@@ -281,7 +311,8 @@ 
                     break;
 
                 case '/':
-                    if ($src->lookaheadByte() === '>') {
+                    if ($src->lookaheadByte() === '>')
+                    {
                         $this->flush();
                         $this->tokens[] = new Token(
                             self::TYPE_CLOSE_SHORT,
@@ -305,7 +336,8 @@ 
                     break 2;
 
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
                         $this->flushKeyword();
                         $this->whitespace[] = $n;
                         break;
@@ -313,7 +345,8 @@ 
                     $this->flushWhitespace();
 
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char))
+                    {
                         // unexpected char
                         return null;
                     }
@@ -322,7 +355,8 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid())
+        {
             return null;
         }
 
@@ -335,17 +369,21 @@ 
     private function isValid(): bool
     {
         // tag is too short or does not have name keyword
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3)
+        {
             return false;
         }
 
         $last = $this->tokens[count($this->tokens) - 1];
-        if ($last->type !== self::TYPE_CLOSE && $last->type !== self::TYPE_CLOSE_SHORT) {
+        if ($last->type !== self::TYPE_CLOSE && $last->type !== self::TYPE_CLOSE_SHORT)
+        {
             return false;
         }
 
-        foreach ($this->tokens as $token) {
-            switch ($token->type) {
+        foreach ($this->tokens as $token)
+        {
+            switch ($token->type)
+            {
                 case self::TYPE_WHITESPACE:
                     // ignore
                     continue 2;
@@ -376,7 +414,8 @@ 
      */
     private function flushWhitespace(): void
     {
-        if ($this->whitespace === []) {
+        if ($this->whitespace === [])
+        {
             return;
         }
 
@@ -389,7 +428,8 @@ 
      */
     private function flushKeyword(): void
     {
-        if ($this->keyword === []) {
+        if ($this->keyword === [])
+        {
             return;
         }
 
@@ -402,7 +442,8 @@ 
      */
     private function flushAttribute(): void
     {
-        if ($this->attribute === []) {
+        if ($this->attribute === [])
+        {
             return;
         }
 

src/Stempler/src/Lexer/Grammar/InlineGrammar.php

Spacing +23 added lines, -23 removed lines

@@ -48,14 +48,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;
             }
 
             $binding = (clone $this)->parseGrammar($src, $n->offset);
-            if ($binding === null) {
+            if ($binding === null){
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -71,7 +71,7 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token){
             case self::TYPE_OPEN_TAG:
                 return 'INLINE:OPEN_TAG';
             case self::TYPE_CLOSE_TAG:
@@ -95,27 +95,27 @@ 
     private function parseGrammar(Buffer $src, int $offset): ?array
     {
         $this->tokens = [
-            new Token(self::TYPE_OPEN_TAG, $offset, '$' . $src->next()->char)
+            new Token(self::TYPE_OPEN_TAG, $offset, '$'.$src->next()->char)
         ];
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte){
                 // no other grammars are allowed
                 return null;
             }
 
-            switch ($n->char) {
+            switch ($n->char){
                 case '"':
                 case "'":
-                    if ($this->default === null) {
+                    if ($this->default === null){
                         // " and ' not allowed in names
                         return null;
                     }
 
                     $this->default[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next()){
                         $this->default[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char){
                             break;
                         }
                     }
@@ -148,17 +148,17 @@ 
                     break;
 
                 default:
-                    if ($this->default !== null) {
+                    if ($this->default !== null){
                         // default allows spaces
                         $this->default[] = $n;
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (preg_match(self::REGEXP_KEYWORD, $n->char)){
                         $this->name[] = $n;
                         break;
                     }
@@ -167,7 +167,7 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid()){
             return null;
         }
 
@@ -179,25 +179,25 @@ 
      */
     private function isValid(): bool
     {
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3){
             return false;
         }
 
         $hasName = false;
         $hasDefault = null;
-        foreach ($this->tokens as $token) {
-            if ($token->type === self::TYPE_NAME) {
+        foreach ($this->tokens as $token){
+            if ($token->type === self::TYPE_NAME){
                 $hasName = true;
                 continue;
             }
 
-            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null) {
+            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null){
                 $hasDefault = false;
                 continue;
             }
 
-            if ($token->type === self::TYPE_DEFAULT) {
-                if ($hasDefault === true) {
+            if ($token->type === self::TYPE_DEFAULT){
+                if ($hasDefault === true){
                     // multiple default value
                     return false;
                 }
@@ -214,7 +214,7 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === []){
             return;
         }
 
@@ -227,7 +227,7 @@ 
      */
     private function flushDefault(): void
     {
-        if ($this->default === [] || $this->default === null) {
+        if ($this->default === [] || $this->default === null){
             return;
         }
 

Braces +44 added lines, -22 removed lines

@@ -48,14 +48,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;
             }
 
             $binding = (clone $this)->parseGrammar($src, $n->offset);
-            if ($binding === null) {
+            if ($binding === null)
+            {
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -71,7 +74,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_OPEN_TAG:
                 return 'INLINE:OPEN_TAG';
             case self::TYPE_CLOSE_TAG:
@@ -98,24 +102,30 @@ 
             new Token(self::TYPE_OPEN_TAG, $offset, '$' . $src->next()->char)
         ];
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte)
+            {
                 // no other grammars are allowed
                 return null;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
-                    if ($this->default === null) {
+                    if ($this->default === null)
+                    {
                         // " and ' not allowed in names
                         return null;
                     }
 
                     $this->default[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next())
+                    {
                         $this->default[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char)
+                        {
                             break;
                         }
                     }
@@ -148,17 +158,20 @@ 
                     break;
 
                 default:
-                    if ($this->default !== null) {
+                    if ($this->default !== null)
+                    {
                         // default allows spaces
                         $this->default[] = $n;
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (preg_match(self::REGEXP_KEYWORD, $n->char))
+                    {
                         $this->name[] = $n;
                         break;
                     }
@@ -167,7 +180,8 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid())
+        {
             return null;
         }
 
@@ -179,25 +193,31 @@ 
      */
     private function isValid(): bool
     {
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3)
+        {
             return false;
         }
 
         $hasName = false;
         $hasDefault = null;
-        foreach ($this->tokens as $token) {
-            if ($token->type === self::TYPE_NAME) {
+        foreach ($this->tokens as $token)
+        {
+            if ($token->type === self::TYPE_NAME)
+            {
                 $hasName = true;
                 continue;
             }
 
-            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null) {
+            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null)
+            {
                 $hasDefault = false;
                 continue;
             }
 
-            if ($token->type === self::TYPE_DEFAULT) {
-                if ($hasDefault === true) {
+            if ($token->type === self::TYPE_DEFAULT)
+            {
+                if ($hasDefault === true)
+                {
                     // multiple default value
                     return false;
                 }
@@ -214,7 +234,8 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === [])
+        {
             return;
         }
 
@@ -227,7 +248,8 @@ 
      */
     private function flushDefault(): void
     {
-        if ($this->default === [] || $this->default === null) {
+        if ($this->default === [] || $this->default === null)
+        {
             return;
         }
 

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;