spiral / framework

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

Spacing +31 added lines, -31 removed lines

@@ -39,39 +39,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();
@@ -93,7 +93,7 @@ 
      */
     public function getIterator(): \Generator
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new \LogicException('Directive not parsed');
         }
 
@@ -113,8 +113,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;
             }
         }
@@ -127,8 +127,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;
             }
         }
@@ -141,7 +141,7 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === []){
             return;
         }
 
@@ -159,17 +159,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;
                     }
                 }
@@ -178,15 +178,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();
@@ -205,7 +205,7 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === []){
             return;
         }
 
@@ -215,7 +215,7 @@ 
 
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new \LogicException('Directive not parsed');
         }
 
@@ -231,12 +231,12 @@ 
 
         // A directive must have at least one keyword
         // Without it, it's just a char
-        if (\count($tokens) === 1 && $tokens[0]->content === self::DIRECTIVE_CHAR) {
+        if (\count($tokens) === 1 && $tokens[0]->content === self::DIRECTIVE_CHAR){
             return false;
         }
 
-        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;
             }
 
@@ -244,18 +244,18 @@ 
         }
 
         $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;
             }
         }
 
-        if ($body !== null) {
+        if ($body !== null){
             return false;
         }
 

Braces +63 added lines, -31 removed lines

@@ -39,39 +39,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();
@@ -93,7 +102,8 @@ 
      */
     public function getIterator(): \Generator
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new \LogicException('Directive not parsed');
         }
 
@@ -113,8 +123,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;
             }
         }
@@ -127,8 +139,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;
             }
         }
@@ -141,7 +155,8 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === [])
+        {
             return;
         }
 
@@ -159,17 +174,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;
                     }
                 }
@@ -178,15 +198,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();
@@ -205,7 +228,8 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === [])
+        {
             return;
         }
 
@@ -215,7 +239,8 @@ 
 
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new \LogicException('Directive not parsed');
         }
 
@@ -231,12 +256,15 @@ 
 
         // A directive must have at least one keyword
         // Without it, it's just a char
-        if (\count($tokens) === 1 && $tokens[0]->content === self::DIRECTIVE_CHAR) {
+        if (\count($tokens) === 1 && $tokens[0]->content === self::DIRECTIVE_CHAR)
+        {
             return false;
         }
 
-        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;
             }
 
@@ -244,18 +272,22 @@ 
         }
 
         $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;
             }
         }
 
-        if ($body !== null) {
+        if ($body !== null)
+        {
             return false;
         }
 

src/Stempler/src/Lexer/Buffer.php

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
         /** @internal */
         private readonly \Generator $generator,
         private int $offset = 0,
-    ) {
+    ){
     }
 
     /**
@@ -32,7 +32,7 @@ 
      */
     public function getIterator(): \Traversable
     {
-        while ($n = $this->next()) {
+        while ($n = $this->next()){
             yield $n;
         }
     }
@@ -42,20 +42,20 @@ 
         return $this->offset;
     }
 
-    public function next(): Byte|Token|null
+    public function next(): Byte | Token | null
     {
-        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 && $n->offset !== null) {
+        if ($n !== null && $n->offset !== null){
             $this->offset = $n->offset;
         }
 
@@ -68,10 +68,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;
             }
         }
@@ -82,14 +82,14 @@ 
     /**
      * Get next generator value without advancing the position.
      */
-    public function lookahead(): Byte|Token|null
+    public function lookahead(): Byte | Token | null
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== []){
             return $this->replay[0];
         }
 
         $n = $this->next();
-        if ($n !== null) {
+        if ($n !== null){
             \array_unshift($this->replay, $n);
         }
 
@@ -105,20 +105,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);
         }
 
@@ -130,8 +130,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;
             }
         }

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

Spacing +25 added lines, -25 removed lines

@@ -46,7 +46,7 @@ 
 
     public function __construct(
         private readonly ?DirectiveRendererInterface $directiveRenderer = null,
-    ) {
+    ){
         $this->echo = new BracesGrammar(
             '{{',
             '}}',
@@ -67,33 +67,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;
 
@@ -107,7 +107,7 @@ 
 
                     $src->replay($directive->getLastOffset());
                     continue;
-                } else {
+                }else{
                     // When we found directive char but it's not a directive, we need to clean the replay buffer
                     // because it may contain extra tokens that we don't need to return back to the stream
                     $src->cleanReplay();
@@ -118,15 +118,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;
                 }
@@ -158,20 +158,20 @@ 
         };
     }
 
-    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) {
-            $value = \trim((string) $value, '\'" ');
-            switch ($option) {
+        foreach ($this->fetchOptions($body) as $option => $value){
+            $value = \trim((string)$value, '\'" ');
+            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('{!!');
@@ -208,10 +208,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;
@@ -219,7 +219,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;
@@ -228,7 +228,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 +43 added lines, -20 removed lines

@@ -67,13 +67,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) ||
@@ -85,11 +88,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())
@@ -107,7 +114,9 @@ 
 
                     $src->replay($directive->getLastOffset());
                     continue;
-                } else {
+                }
+                else
+                {
                     // When we found directive char but it's not a directive, we need to clean the replay buffer
                     // because it may contain extra tokens that we don't need to return back to the stream
                     $src->cleanReplay();
@@ -118,15 +127,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;
                 }
@@ -160,18 +174,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((string) $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('{!!');
@@ -208,10 +226,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;
@@ -219,7 +240,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;
@@ -228,7 +250,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;