spiral / framework

src/AnnotatedRoutes/tests/IntegrationTest.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v){
             $r = $r->withAttribute($k, $v);
         }
 
@@ -95,7 +95,7 @@ 
     public function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line){
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v)
+        {
             $r = $r->withAttribute($k, $v);
         }
 
@@ -95,7 +96,8 @@ 
     public function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line)
+        {
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

src/AnnotatedRoutes/tests/CacheTest.php

Spacing +3 added lines, -3 removed lines

@@ -28,11 +28,11 @@
 
     public function testCache(): void
     {
-        $this->assertFileExists(__DIR__ . '/App/runtime/cache/routes.php');
-        $this->assertCount(2, include __DIR__ . '/App/runtime/cache/routes.php');
+        $this->assertFileExists(__DIR__.'/App/runtime/cache/routes.php');
+        $this->assertCount(2, include __DIR__.'/App/runtime/cache/routes.php');
 
         $this->app->getConsole()->run('route:reset');
 
-        $this->assertSame(null, include __DIR__ . '/App/runtime/cache/routes.php');
+        $this->assertSame(null, include __DIR__.'/App/runtime/cache/routes.php');
     }
 }

src/AnnotatedRoutes/tests/App/runtime/cache/routes.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@ 
 <?php return array (
-  'index' => 
-  array (
+    'index' => 
+    array (
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'index',
     'group' => 'default',
     'verbs' => 
     array (
-      0 => 'GET',
+        0 => 'GET',
     ),
     'defaults' => 
     array (
@@ -15,16 +15,16 @@ 
     'middleware' => 
     array (
     ),
-  ),
-  'method' => 
-  array (
+    ),
+    'method' => 
+    array (
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'method',
     'group' => 'default',
     'verbs' => 
     array (
-      0 => 'POST',
+        0 => 'POST',
     ),
     'defaults' => 
     array (
@@ -32,5 +32,5 @@ 
     'middleware' => 
     array (
     ),
-  ),
+    ),
 );
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -1,36 +1,36 @@
-<?php return array (
+<?php return array(
   'index' => 
-  array (
+  array(
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'index',
     'group' => 'default',
     'verbs' => 
-    array (
+    array(
       0 => 'GET',
     ),
     'defaults' => 
-    array (
+    array(
     ),
     'middleware' => 
-    array (
+    array(
     ),
   ),
   'method' => 
-  array (
+  array(
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'method',
     'group' => 'default',
     'verbs' => 
-    array (
+    array(
       0 => 'POST',
     ),
     'defaults' => 
-    array (
+    array(
     ),
     'middleware' => 
-    array (
+    array(
     ),
   ),
 );
\ No newline at end of file

src/Scaffolder/src/Command/Database/EntityCommand.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
         ['name', InputArgument::REQUIRED, 'Entity name'],
         ['format', InputArgument::OPTIONAL, 'Declaration format (annotated, xml?, yaml?, php?)', 'annotated'],
     ];
-    protected const OPTIONS     = [
+    protected const OPTIONS = [
         [
             'role',
             'r',
@@ -108,7 +108,7 @@ 
         $declaration = $this->createDeclaration();
 
         $repository = trimPostfix((string)$this->argument('name'), 'repository');
-        if ($this->option('repository')) {
+        if ($this->option('repository')){
             $repositoryClass = $config->className(RepositoryCommand::ELEMENT, $repository);
             $repositoryNamespace = $config->classNamespace(RepositoryCommand::ELEMENT, $repository);
             $declaration->setRepository("\\$repositoryNamespace\\$repositoryClass");
@@ -120,8 +120,8 @@ 
         $declaration->setDatabase((string)$this->option('database'));
         $declaration->setInflection((string)$this->option('inflection'));
 
-        foreach ($this->option('field') as $field) {
-            if (strpos($field, ':') === false) {
+        foreach ($this->option('field') as $field){
+            if (strpos($field, ':') === false){
                 throw new ScaffolderException("Field definition must in 'name:type' or 'name:type' form");
             }
 
@@ -135,7 +135,7 @@ 
 
         $this->writeDeclaration($declaration);
 
-        if ($this->option('repository')) {
+        if ($this->option('repository')){
             $console->run('create:repository', [
                 'name' => $repository ?? $this->argument('name'),
             ]);
@@ -162,7 +162,7 @@ 
             AbstractDeclaration::ACCESS_PROTECTED,
             AbstractDeclaration::ACCESS_PRIVATE,
             ], true)
-        ) {
+        ){
             throw new ScaffolderException("Invalid accessibility value `$accessibility`");
         }
     }

Braces +8 added lines, -4 removed lines

@@ -108,7 +108,8 @@ 
         $declaration = $this->createDeclaration();
 
         $repository = trimPostfix((string)$this->argument('name'), 'repository');
-        if ($this->option('repository')) {
+        if ($this->option('repository'))
+        {
             $repositoryClass = $config->className(RepositoryCommand::ELEMENT, $repository);
             $repositoryNamespace = $config->classNamespace(RepositoryCommand::ELEMENT, $repository);
             $declaration->setRepository("\\$repositoryNamespace\\$repositoryClass");
@@ -120,8 +121,10 @@ 
         $declaration->setDatabase((string)$this->option('database'));
         $declaration->setInflection((string)$this->option('inflection'));
 
-        foreach ($this->option('field') as $field) {
-            if (strpos($field, ':') === false) {
+        foreach ($this->option('field') as $field)
+        {
+            if (strpos($field, ':') === false)
+            {
                 throw new ScaffolderException("Field definition must in 'name:type' or 'name:type' form");
             }
 
@@ -135,7 +138,8 @@ 
 
         $this->writeDeclaration($declaration);
 
-        if ($this->option('repository')) {
+        if ($this->option('repository'))
+        {
             $console->run('create:repository', [
                 'name' => $repository ?? $this->argument('name'),
             ]);

src/DataGrid/tests/Fixture/WriterTwo.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function write($source, SpecificationInterface $specification, Compiler $compiler)
     {
-        if (is_array($source)) {
+        if (is_array($source)){
             $source[] = self::OUTPUT;
         }
 

Braces +2 added lines, -1 removed lines

@@ -23,7 +23,8 @@
      */
     public function write($source, SpecificationInterface $specification, Compiler $compiler)
     {
-        if (is_array($source)) {
+        if (is_array($source))
+        {
             $source[] = self::OUTPUT;
         }
 

src/Stempler/src/Transform/Merge/Inject/InjectBlocks.php

Spacing +3 added lines, -3 removed lines

@@ -52,19 +52,19 @@
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if (!$node instanceof Block || $node->name === null || !$this->blocks->has($node->name)) {
+        if (!$node instanceof Block || $node->name === null || !$this->blocks->has($node->name)){
             return null;
         }
 
         $inject = $this->blocks->claim($node->name);
 
-        if ($inject instanceof QuotedValue) {
+        if ($inject instanceof QuotedValue){
             // exclude quotes
             $inject = $inject->trimvalue();
         }
 
         // mount block:parent content
-        if ($node->name !== 'parent') {
+        if ($node->name !== 'parent'){
             $traverser = new Traverser();
             $traverser->addVisitor(new InjectBlocks(new BlockClaims([
                 'parent' => $node->nodes,

Braces +6 added lines, -3 removed lines

@@ -52,19 +52,22 @@
      */
     public function leaveNode($node, VisitorContext $ctx)
     {
-        if (!$node instanceof Block || $node->name === null || !$this->blocks->has($node->name)) {
+        if (!$node instanceof Block || $node->name === null || !$this->blocks->has($node->name))
+        {
             return null;
         }
 
         $inject = $this->blocks->claim($node->name);
 
-        if ($inject instanceof QuotedValue) {
+        if ($inject instanceof QuotedValue)
+        {
             // exclude quotes
             $inject = $inject->trimvalue();
         }
 
         // mount block:parent content
-        if ($node->name !== 'parent') {
+        if ($node->name !== 'parent')
+        {
             $traverser = new Traverser();
             $traverser->addVisitor(new InjectBlocks(new BlockClaims([
                 'parent' => $node->nodes,

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