spiral / framework

src/Stempler/src/Compiler/Renderer/DynamicRenderer.php

Spacing +7 added lines, -7 removed lines

@@ -19,12 +19,12 @@ 
     public function __construct(
         private readonly ?DirectiveRendererInterface $directiveRenderer = null,
         private readonly string $defaultFilter = self::DEFAULT_FILTER
-    ) {
+    ){
     }
 
     public function render(Compiler $compiler, Compiler\Result $result, NodeInterface $node): bool
     {
-        switch (true) {
+        switch (true){
             case $node instanceof Output:
                 $this->output($result, $node);
                 return true;
@@ -41,9 +41,9 @@ 
      */
     private function directive(Compiler\Result $source, Directive $directive): void
     {
-        if ($this->directiveRenderer instanceof \Spiral\Stempler\Directive\DirectiveRendererInterface) {
+        if ($this->directiveRenderer instanceof \Spiral\Stempler\Directive\DirectiveRendererInterface){
             $result = $this->directiveRenderer->render($directive);
-            if ($result !== null) {
+            if ($result !== null){
                 $source->push($result, $directive->getContext());
                 return;
             }
@@ -57,15 +57,15 @@ 
 
     private function output(Compiler\Result $source, Output $output): void
     {
-        if ($output->rawOutput) {
-            $source->push(\sprintf('<?php echo %s; ?>', \trim((string) $output->body)), $output->getContext());
+        if ($output->rawOutput){
+            $source->push(\sprintf('<?php echo %s; ?>', \trim((string)$output->body)), $output->getContext());
             return;
         }
 
         $filter = $output->filter ?? $this->defaultFilter;
 
         $source->push(
-            \sprintf(\sprintf('<?php echo %s; ?>', $filter), \trim((string) $output->body)),
+            \sprintf(\sprintf('<?php echo %s; ?>', $filter), \trim((string)$output->body)),
             $output->getContext()
         );
     }

Braces +8 added lines, -4 removed lines

@@ -24,7 +24,8 @@ 
 
     public function render(Compiler $compiler, Compiler\Result $result, NodeInterface $node): bool
     {
-        switch (true) {
+        switch (true)
+        {
             case $node instanceof Output:
                 $this->output($result, $node);
                 return true;
@@ -41,9 +42,11 @@ 
      */
     private function directive(Compiler\Result $source, Directive $directive): void
     {
-        if ($this->directiveRenderer instanceof \Spiral\Stempler\Directive\DirectiveRendererInterface) {
+        if ($this->directiveRenderer instanceof \Spiral\Stempler\Directive\DirectiveRendererInterface)
+        {
             $result = $this->directiveRenderer->render($directive);
-            if ($result !== null) {
+            if ($result !== null)
+            {
                 $source->push($result, $directive->getContext());
                 return;
             }
@@ -57,7 +60,8 @@ 
 
     private function output(Compiler\Result $source, Output $output): void
     {
-        if ($output->rawOutput) {
+        if ($output->rawOutput)
+        {
             $source->push(\sprintf('<?php echo %s; ?>', \trim((string) $output->body)), $output->getContext());
             return;
         }

src/Stempler/src/Compiler/Result.php

Spacing +7 added lines, -7 removed lines

@@ -24,22 +24,22 @@ 
 
     public function withinContext(?Context $ctx, callable $body): void
     {
-        if (!$ctx instanceof \Spiral\Stempler\Parser\Context || $ctx->getPath() === null) {
+        if (!$ctx instanceof \Spiral\Stempler\Parser\Context || $ctx->getPath() === null){
             $body($this);
             return;
         }
 
-        try {
+        try{
             $this->parent = Location::fromContext($ctx, $this->parent);
             $body($this);
-        } finally {
+        }finally{
             $this->parent = $this->parent->parent;
         }
     }
 
     public function push(string $content, ?Context $ctx = null): void
     {
-        if ($ctx instanceof \Spiral\Stempler\Parser\Context && $ctx->getPath() !== null) {
+        if ($ctx instanceof \Spiral\Stempler\Parser\Context && $ctx->getPath() !== null){
             $this->locations[\strlen($this->content)] = Location::fromContext($ctx, $this->parent);
         }
 
@@ -59,8 +59,8 @@ 
         $paths = [];
 
         // We can scan top level only
-        foreach ($this->locations as $loc) {
-            if (!\in_array($loc->path, $paths, true)) {
+        foreach ($this->locations as $loc){
+            if (!\in_array($loc->path, $paths, true)){
                 $paths[] = $loc->path;
             }
         }
@@ -75,7 +75,7 @@ 
     {
         $locations = [];
 
-        foreach ($this->locations as $offset => $location) {
+        foreach ($this->locations as $offset => $location){
             $locations[$offset] = $location;
         }
 

Braces +15 added lines, -7 removed lines

@@ -24,22 +24,27 @@ 
 
     public function withinContext(?Context $ctx, callable $body): void
     {
-        if (!$ctx instanceof \Spiral\Stempler\Parser\Context || $ctx->getPath() === null) {
+        if (!$ctx instanceof \Spiral\Stempler\Parser\Context || $ctx->getPath() === null)
+        {
             $body($this);
             return;
         }
 
-        try {
+        try
+        {
             $this->parent = Location::fromContext($ctx, $this->parent);
             $body($this);
-        } finally {
+        }
+        finally
+        {
             $this->parent = $this->parent->parent;
         }
     }
 
     public function push(string $content, ?Context $ctx = null): void
     {
-        if ($ctx instanceof \Spiral\Stempler\Parser\Context && $ctx->getPath() !== null) {
+        if ($ctx instanceof \Spiral\Stempler\Parser\Context && $ctx->getPath() !== null)
+        {
             $this->locations[\strlen($this->content)] = Location::fromContext($ctx, $this->parent);
         }
 
@@ -59,8 +64,10 @@ 
         $paths = [];
 
         // We can scan top level only
-        foreach ($this->locations as $loc) {
-            if (!\in_array($loc->path, $paths, true)) {
+        foreach ($this->locations as $loc)
+        {
+            if (!\in_array($loc->path, $paths, true))
+            {
                 $paths[] = $loc->path;
             }
         }
@@ -75,7 +82,8 @@ 
     {
         $locations = [];
 
-        foreach ($this->locations as $offset => $location) {
+        foreach ($this->locations as $offset => $location)
+        {
             $locations[$offset] = $location;
         }
 

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

Spacing +24 added lines, -24 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 instanceof \Spiral\Stempler\Directive\DirectiveRendererInterface
                             && !$this->directiveRenderer->hasDirective($directive->getKeyword())
-                        ) {
+                        ){
                             // directive opening char
                             yield $n;
 
@@ -114,15 +114,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;
                 }
@@ -154,20 +154,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('{!!');
@@ -204,10 +204,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;
@@ -215,7 +215,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;
@@ -224,7 +224,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 +40 added lines, -19 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 instanceof \Spiral\Stempler\Directive\DirectiveRendererInterface
                             && !$this->directiveRenderer->hasDirective($directive->getKeyword())
@@ -114,15 +121,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;
                 }
@@ -156,18 +168,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('{!!');
@@ -204,10 +220,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;
@@ -215,7 +234,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;
@@ -224,7 +244,8 @@ 
                     $keyword = \trim($token->content, $token->content[0]);
                     break;
                 case DeclareGrammar::TYPE_COMMA:
-                    if ($keyword !== null) {
+                    if ($keyword !== null)
+                    {
                         $options[$keyword] = null;
                         $keyword = null;
                         break;

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

Spacing +12 added lines, -12 removed lines

@@ -16,14 +16,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 instanceof \Spiral\Stempler\Lexer\Token) {
+            $php = $this->parseGrammar($n->char.$src->nextBytes(), $n->offset);
+            if (!$php instanceof \Spiral\Stempler\Lexer\Token){
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -45,25 +45,25 @@ 
     private function parseGrammar(string $content, int $offset): ?Token
     {
         $tokens = null;
-        foreach (\token_get_all($content) as $token) {
-            if ($tokens === null && !$this->is($token, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO])) {
+        foreach (\token_get_all($content) as $token){
+            if ($tokens === null && !$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;
             }
@@ -76,9 +76,9 @@ 
         return $token;
     }
 
-    private function is(array|string $token, array $type): bool
+    private function is(array | string $token, array $type): bool
     {
-        if (!\is_array($token)) {
+        if (!\is_array($token)){
             return false;
         }
 

Braces +20 added lines, -10 removed lines

@@ -16,14 +16,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 instanceof \Spiral\Stempler\Lexer\Token) {
+            if (!$php instanceof \Spiral\Stempler\Lexer\Token)
+            {
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -45,25 +48,31 @@ 
     private function parseGrammar(string $content, int $offset): ?Token
     {
         $tokens = null;
-        foreach (\token_get_all($content) as $token) {
-            if ($tokens === null && !$this->is($token, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO])) {
+        foreach (\token_get_all($content) as $token)
+        {
+            if ($tokens === null && !$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;
             }
@@ -78,7 +87,8 @@ 
 
     private function is(array|string $token, array $type): bool
     {
-        if (!\is_array($token)) {
+        if (!\is_array($token))
+        {
             return false;
         }
 

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

Spacing +11 added lines, -11 removed lines

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

Braces +22 added lines, -11 removed lines

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

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

Spacing +16 added lines, -16 removed lines

@@ -54,7 +54,7 @@ 
 
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type){
             case HTMLGrammar::TYPE_OPEN:
             case HTMLGrammar::TYPE_OPEN_SHORT:
                 $this->node = new Tag(new Parser\Context($token, $parser->getPath()));
@@ -63,12 +63,12 @@ 
                 break;
 
             case HTMLGrammar::TYPE_KEYWORD:
-                if ($this->node->name === null) {
+                if ($this->node->name === null){
                     $this->node->name = $this->parseToken($parser, $token);
                     return;
                 }
 
-                if ($this->attr instanceof \Spiral\Stempler\Node\HTML\Attr && !$this->attr->value instanceof Nil) {
+                if ($this->attr instanceof \Spiral\Stempler\Node\HTML\Attr && !$this->attr->value instanceof Nil){
                     $this->attr->value = $this->parseToken($parser, $token);
                     $this->attr = null;
                     break;
@@ -84,7 +84,7 @@ 
                 break;
 
             case HTMLGrammar::TYPE_EQUAL:
-                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr) {
+                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr){
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -93,7 +93,7 @@ 
                 break;
 
             case HTMLGrammar::TYPE_ATTRIBUTE:
-                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr) {
+                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr){
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -103,9 +103,9 @@ 
                         \str_starts_with($this->attr->name, 'on')
                         || \in_array($this->attr->name, self::VERBATIM_ATTRIBUTES, true)
                     )
-                ) {
+                ){
                     $this->attr->value = $this->parseVerbatim($parser, $token);
-                } else {
+                }else{
                     $this->attr->value = $this->parseToken($parser, $token);
                 }
 
@@ -119,8 +119,8 @@ 
                 break;
 
             case HTMLGrammar::TYPE_CLOSE:
-                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) {
-                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) {
+                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT){
+                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name){
                         /**
                          * TODO issue #767
                          * @link https://github.com/spiral/framework/issues/767
@@ -133,10 +133,10 @@ 
                     }
 
                     $asm->close();
-                } elseif (\in_array($this->node->name, self::VOID_TAGS)) {
+                } elseif (\in_array($this->node->name, self::VOID_TAGS)){
                     $this->node->void = true;
                     $asm->push($this->node);
-                } else {
+                }else{
                     $asm->open($this->node, 'nodes');
                 }
                 $this->flush();
@@ -148,9 +148,9 @@ 
                 break;
 
             default:
-                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) {
+                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim){
                     $node = $this->parseToken($parser, $token);
-                    if (\is_string($node)) {
+                    if (\is_string($node)){
                         $node = new Raw($node, new Parser\Context($token, $parser->getPath()));
                     }
 
@@ -173,11 +173,11 @@ 
     {
         $verbatim = new Verbatim(new Parser\Context($token, $parser->getPath()));
 
-        if ($token->tokens === []) {
-            if ($token->content) {
+        if ($token->tokens === []){
+            if ($token->content){
                 $verbatim->nodes[] = $token->content;
             }
-        } else {
+        }else{
             /**
              * TODO issue #767
              * @link https://github.com/spiral/framework/issues/767

Braces +34 added lines, -15 removed lines

@@ -54,7 +54,8 @@ 
 
     public function handle(Parser $parser, Assembler $asm, Token $token): void
     {
-        switch ($token->type) {
+        switch ($token->type)
+        {
             case HTMLGrammar::TYPE_OPEN:
             case HTMLGrammar::TYPE_OPEN_SHORT:
                 $this->node = new Tag(new Parser\Context($token, $parser->getPath()));
@@ -63,12 +64,14 @@ 
                 break;
 
             case HTMLGrammar::TYPE_KEYWORD:
-                if ($this->node->name === null) {
+                if ($this->node->name === null)
+                {
                     $this->node->name = $this->parseToken($parser, $token);
                     return;
                 }
 
-                if ($this->attr instanceof \Spiral\Stempler\Node\HTML\Attr && !$this->attr->value instanceof Nil) {
+                if ($this->attr instanceof \Spiral\Stempler\Node\HTML\Attr && !$this->attr->value instanceof Nil)
+                {
                     $this->attr->value = $this->parseToken($parser, $token);
                     $this->attr = null;
                     break;
@@ -84,7 +87,8 @@ 
                 break;
 
             case HTMLGrammar::TYPE_EQUAL:
-                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr) {
+                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr)
+                {
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -93,7 +97,8 @@ 
                 break;
 
             case HTMLGrammar::TYPE_ATTRIBUTE:
-                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr) {
+                if (!$this->attr instanceof \Spiral\Stempler\Node\HTML\Attr)
+                {
                     throw new SyntaxException('unexpected attribute token', $token);
                 }
 
@@ -105,7 +110,9 @@ 
                     )
                 ) {
                     $this->attr->value = $this->parseVerbatim($parser, $token);
-                } else {
+                }
+                else
+                {
                     $this->attr->value = $this->parseToken($parser, $token);
                 }
 
@@ -119,8 +126,10 @@ 
                 break;
 
             case HTMLGrammar::TYPE_CLOSE:
-                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT) {
-                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name) {
+                if ($this->token->type == HTMLGrammar::TYPE_OPEN_SHORT)
+                {
+                    if (!$asm->getNode() instanceof Tag || $asm->getNode()->name !== $this->node->name)
+                    {
                         /**
                          * TODO issue #767
                          * @link https://github.com/spiral/framework/issues/767
@@ -133,10 +142,14 @@ 
                     }
 
                     $asm->close();
-                } elseif (\in_array($this->node->name, self::VOID_TAGS)) {
+                }
+                elseif (\in_array($this->node->name, self::VOID_TAGS))
+                {
                     $this->node->void = true;
                     $asm->push($this->node);
-                } else {
+                }
+                else
+                {
                     $asm->open($this->node, 'nodes');
                 }
                 $this->flush();
@@ -148,9 +161,11 @@ 
                 break;
 
             default:
-                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim) {
+                if ($asm->getNode() instanceof Mixin || $asm->getNode() instanceof Verbatim)
+                {
                     $node = $this->parseToken($parser, $token);
-                    if (\is_string($node)) {
+                    if (\is_string($node))
+                    {
                         $node = new Raw($node, new Parser\Context($token, $parser->getPath()));
                     }
 
@@ -173,11 +188,15 @@ 
     {
         $verbatim = new Verbatim(new Parser\Context($token, $parser->getPath()));
 
-        if ($token->tokens === []) {
-            if ($token->content) {
+        if ($token->tokens === [])
+        {
+            if ($token->content)
+            {
                 $verbatim->nodes[] = $token->content;
             }
-        } else {
+        }
+        else
+        {
             /**
              * TODO issue #767
              * @link https://github.com/spiral/framework/issues/767

src/Prototype/src/Traits/PrototypeTrait.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
     public function __get(string $name): mixed
     {
         $container = ContainerScope::getContainer();
-        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(PrototypeRegistry::class)) {
+        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(PrototypeRegistry::class)){
             throw new ScopeException(
                 \sprintf('Unable to resolve prototyped dependency `%s`, invalid container scope', $name)
             );
@@ -34,7 +34,7 @@ 
             $target === null ||
             $target instanceof \Throwable ||
             $target->type->fullName === null
-        ) {
+        ){
             throw new PrototypeException(
                 \sprintf('Undefined prototype property `%s`', $name),
                 0,

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
     public function __get(string $name): mixed
     {
         $container = ContainerScope::getContainer();
-        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(PrototypeRegistry::class)) {
+        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(PrototypeRegistry::class))
+        {
             throw new ScopeException(
                 \sprintf('Unable to resolve prototyped dependency `%s`, invalid container scope', $name)
             );

src/Prototype/src/ClassNode/ConflictResolver/Namespaces.php

Spacing +24 added lines, -24 removed lines

@@ -11,7 +11,7 @@ 
 {
     public function __construct(
         private readonly Sequences $sequences
-    ) {
+    ){
     }
 
     public function resolve(ClassNode $definition): void
@@ -32,8 +32,8 @@ 
 
     private function getReservedNamespacesWithAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if (!$stmt->alias) {
+        foreach ($definition->getStmts() as $stmt){
+            if (!$stmt->alias){
                 continue;
             }
 
@@ -45,8 +45,8 @@ 
 
     private function getReservedNamespacesWithoutAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if ($stmt->alias || isset($namespaces[$stmt->shortName])) {
+        foreach ($definition->getStmts() as $stmt){
+            if ($stmt->alias || isset($namespaces[$stmt->shortName])){
                 continue;
             }
 
@@ -59,12 +59,12 @@ 
     private function initiateCounters(array $namespaces): array
     {
         $counters = [];
-        foreach ($namespaces as $shortName => $fullName) {
+        foreach ($namespaces as $shortName => $fullName){
             $namespace = $this->parseNamespace($shortName, $fullName);
 
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name])){
                 $counters[$namespace->name][$namespace->sequence] = $namespace;
-            } else {
+            }else{
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -74,52 +74,52 @@ 
 
     private function resolveImportsNamespaces(ClassNode $definition, array $counters): void
     {
-        if (!$definition->hasConstructor && $definition->constructorParams) {
-            foreach ($definition->constructorParams as $param) {
+        if (!$definition->hasConstructor && $definition->constructorParams){
+            foreach ($definition->constructorParams as $param){
                 //no type (or type is internal), do nothing
-                if (empty($param->type) || $param->isBuiltIn()) {
+                if (empty($param->type) || $param->isBuiltIn()){
                     continue;
                 }
 
                 $namespace = $this->parseNamespaceFromType($param->type);
-                if (isset($counters[$namespace->name])) {
-                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace)) {
+                if (isset($counters[$namespace->name])){
+                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace)){
                         continue;
                     }
 
                     $sequence = $this->sequences->find(\array_keys($counters[$namespace->name]), $namespace->sequence);
-                    if ($sequence !== $namespace->sequence) {
+                    if ($sequence !== $namespace->sequence){
                         $namespace->sequence = $sequence;
 
                         $param->type->alias = $namespace->fullName();
                     }
 
                     $counters[$namespace->name][$sequence] = $namespace;
-                } else {
+                }else{
                     $counters[$namespace->name] = [$namespace->sequence => $namespace];
                 }
             }
         }
 
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency){
             $namespace = $this->parseNamespaceFromType($dependency->type);
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name])){
                 $alreadyImported = $this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace);
-                if ($alreadyImported instanceof \Spiral\Prototype\ClassNode\ConflictResolver\NamespaceEntity) {
+                if ($alreadyImported instanceof \Spiral\Prototype\ClassNode\ConflictResolver\NamespaceEntity){
                     $dependency->type->alias = $alreadyImported->fullName();
 
                     continue;
                 }
 
                 $sequence = $this->sequences->find(\array_keys($counters[$namespace->name]), $namespace->sequence);
-                if ($sequence !== $namespace->sequence) {
+                if ($sequence !== $namespace->sequence){
                     $namespace->sequence = $sequence;
 
                     $dependency->type->alias = $namespace->fullName();
                 }
 
                 $counters[$namespace->name][$sequence] = $namespace;
-            } else {
+            }else{
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -130,8 +130,8 @@ 
      */
     private function getAlreadyImportedNamespace(array $counters, NamespaceEntity $namespace): ?NamespaceEntity
     {
-        foreach ($counters as $counter) {
-            if ($counter->equals($namespace)) {
+        foreach ($counters as $counter){
+            if ($counter->equals($namespace)){
                 return $counter;
             }
         }
@@ -146,9 +146,9 @@ 
 
     private function parseNamespace(string $shortName, string $fullName): NamespaceEntity
     {
-        if (\preg_match("/\d+$/", $shortName, $match)) {
+        if (\preg_match("/\d+$/", $shortName, $match)){
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0){
                 return NamespaceEntity::createWithSequence(
                     Utils::trimTrailingDigits($shortName, $sequence),
                     $fullName,

Braces +49 added lines, -23 removed lines

@@ -32,8 +32,10 @@ 
 
     private function getReservedNamespacesWithAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if (!$stmt->alias) {
+        foreach ($definition->getStmts() as $stmt)
+        {
+            if (!$stmt->alias)
+            {
                 continue;
             }
 
@@ -45,8 +47,10 @@ 
 
     private function getReservedNamespacesWithoutAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if ($stmt->alias || isset($namespaces[$stmt->shortName])) {
+        foreach ($definition->getStmts() as $stmt)
+        {
+            if ($stmt->alias || isset($namespaces[$stmt->shortName]))
+            {
                 continue;
             }
 
@@ -59,12 +63,16 @@ 
     private function initiateCounters(array $namespaces): array
     {
         $counters = [];
-        foreach ($namespaces as $shortName => $fullName) {
+        foreach ($namespaces as $shortName => $fullName)
+        {
             $namespace = $this->parseNamespace($shortName, $fullName);
 
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name]))
+            {
                 $counters[$namespace->name][$namespace->sequence] = $namespace;
-            } else {
+            }
+            else
+            {
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -74,52 +82,66 @@ 
 
     private function resolveImportsNamespaces(ClassNode $definition, array $counters): void
     {
-        if (!$definition->hasConstructor && $definition->constructorParams) {
-            foreach ($definition->constructorParams as $param) {
+        if (!$definition->hasConstructor && $definition->constructorParams)
+        {
+            foreach ($definition->constructorParams as $param)
+            {
                 //no type (or type is internal), do nothing
-                if (empty($param->type) || $param->isBuiltIn()) {
+                if (empty($param->type) || $param->isBuiltIn())
+                {
                     continue;
                 }
 
                 $namespace = $this->parseNamespaceFromType($param->type);
-                if (isset($counters[$namespace->name])) {
-                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace)) {
+                if (isset($counters[$namespace->name]))
+                {
+                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace))
+                    {
                         continue;
                     }
 
                     $sequence = $this->sequences->find(\array_keys($counters[$namespace->name]), $namespace->sequence);
-                    if ($sequence !== $namespace->sequence) {
+                    if ($sequence !== $namespace->sequence)
+                    {
                         $namespace->sequence = $sequence;
 
                         $param->type->alias = $namespace->fullName();
                     }
 
                     $counters[$namespace->name][$sequence] = $namespace;
-                } else {
+                }
+                else
+                {
                     $counters[$namespace->name] = [$namespace->sequence => $namespace];
                 }
             }
         }
 
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency)
+        {
             $namespace = $this->parseNamespaceFromType($dependency->type);
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name]))
+            {
                 $alreadyImported = $this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace);
-                if ($alreadyImported instanceof \Spiral\Prototype\ClassNode\ConflictResolver\NamespaceEntity) {
+                if ($alreadyImported instanceof \Spiral\Prototype\ClassNode\ConflictResolver\NamespaceEntity)
+                {
                     $dependency->type->alias = $alreadyImported->fullName();
 
                     continue;
                 }
 
                 $sequence = $this->sequences->find(\array_keys($counters[$namespace->name]), $namespace->sequence);
-                if ($sequence !== $namespace->sequence) {
+                if ($sequence !== $namespace->sequence)
+                {
                     $namespace->sequence = $sequence;
 
                     $dependency->type->alias = $namespace->fullName();
                 }
 
                 $counters[$namespace->name][$sequence] = $namespace;
-            } else {
+            }
+            else
+            {
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -130,8 +152,10 @@ 
      */
     private function getAlreadyImportedNamespace(array $counters, NamespaceEntity $namespace): ?NamespaceEntity
     {
-        foreach ($counters as $counter) {
-            if ($counter->equals($namespace)) {
+        foreach ($counters as $counter)
+        {
+            if ($counter->equals($namespace))
+            {
                 return $counter;
             }
         }
@@ -146,9 +170,11 @@ 
 
     private function parseNamespace(string $shortName, string $fullName): NamespaceEntity
     {
-        if (\preg_match("/\d+$/", $shortName, $match)) {
+        if (\preg_match("/\d+$/", $shortName, $match))
+        {
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0)
+            {
                 return NamespaceEntity::createWithSequence(
                     Utils::trimTrailingDigits($shortName, $sequence),
                     $fullName,

src/Models/src/Reflection/ReflectionEntity.php

Spacing +14 added lines, -14 removed lines

@@ -70,7 +70,7 @@ 
 
     public function getSecured(): mixed
     {
-        if ($this->getProperty('secured', true) === '*') {
+        if ($this->getProperty('secured', true) === '*'){
             return $this->getProperty('secured', true);
         }
 
@@ -105,8 +105,8 @@ 
     public function declaredMethods(): array
     {
         $methods = [];
-        foreach ($this->getMethods() as $method) {
-            if ($method->getDeclaringClass()->getName() != $this->getName()) {
+        foreach ($this->getMethods() as $method){
+            if ($method->getDeclaringClass()->getName() != $this->getName()){
                 continue;
             }
 
@@ -136,15 +136,15 @@ 
             self::MUTATOR_ACCESSOR => [],
         ];
 
-        foreach ((array)$this->getProperty('getters', true) as $field => $filter) {
+        foreach ((array)$this->getProperty('getters', true) as $field => $filter){
             $mutators[self::MUTATOR_GETTER][$field] = $filter;
         }
 
-        foreach ((array)$this->getProperty('setters', true) as $field => $filter) {
+        foreach ((array)$this->getProperty('setters', true) as $field => $filter){
             $mutators[self::MUTATOR_SETTER][$field] = $filter;
         }
 
-        foreach ((array)$this->getProperty('accessors', true) as $field => $filter) {
+        foreach ((array)$this->getProperty('accessors', true) as $field => $filter){
             $mutators[self::MUTATOR_ACCESSOR][$field] = $filter;
         }
 
@@ -160,7 +160,7 @@ 
      */
     public function getProperty(string $property, bool $merge = false): mixed
     {
-        if (isset($this->propertyCache[$property])) {
+        if (isset($this->propertyCache[$property])){
             //Property merging and trait events are pretty slow
             return $this->propertyCache[$property];
         }
@@ -168,28 +168,28 @@ 
         $properties = $this->reflection->getDefaultProperties();
         $constants = $this->reflection->getConstants();
 
-        if (isset($properties[$property])) {
+        if (isset($properties[$property])){
             //Read from default value
             $value = $properties[$property];
-        } elseif (isset($constants[\strtoupper($property)])) {
+        } elseif (isset($constants[\strtoupper($property)])){
             //Read from a constant
             $value = $constants[\strtoupper($property)];
-        } else {
+        }else{
             return null;
         }
 
         //Merge with parent value requested
-        if ($merge && \is_array($value) && ($parent = $this->parentReflection()) instanceof \Spiral\Models\Reflection\ReflectionEntity) {
+        if ($merge && \is_array($value) && ($parent = $this->parentReflection()) instanceof \Spiral\Models\Reflection\ReflectionEntity){
             $parentValue = $parent->getProperty($property, $merge);
 
-            if (\is_array($parentValue)) {
+            if (\is_array($parentValue)){
                 //Class values prior to parent values
                 $value = \array_merge($parentValue, $value);
             }
         }
 
         /** @psalm-suppress TypeDoesNotContainType https://github.com/vimeo/psalm/issues/9489 */
-        if (!$this->reflection->isSubclassOf(SchematicEntity::class)) {
+        if (!$this->reflection->isSubclassOf(SchematicEntity::class)){
             return $value;
         }
 
@@ -204,7 +204,7 @@ 
     {
         $parentClass = $this->reflection->getParentClass();
 
-        if (!empty($parentClass) && $parentClass->getName() != static::BASE_CLASS) {
+        if (!empty($parentClass) && $parentClass->getName() != static::BASE_CLASS){
             $parent = clone $this;
             $parent->reflection = $this->getParentClass();
 

Braces +30 added lines, -14 removed lines

@@ -70,7 +70,8 @@ 
 
     public function getSecured(): mixed
     {
-        if ($this->getProperty('secured', true) === '*') {
+        if ($this->getProperty('secured', true) === '*')
+        {
             return $this->getProperty('secured', true);
         }
 
@@ -105,8 +106,10 @@ 
     public function declaredMethods(): array
     {
         $methods = [];
-        foreach ($this->getMethods() as $method) {
-            if ($method->getDeclaringClass()->getName() != $this->getName()) {
+        foreach ($this->getMethods() as $method)
+        {
+            if ($method->getDeclaringClass()->getName() != $this->getName())
+            {
                 continue;
             }
 
@@ -136,15 +139,18 @@ 
             self::MUTATOR_ACCESSOR => [],
         ];
 
-        foreach ((array)$this->getProperty('getters', true) as $field => $filter) {
+        foreach ((array)$this->getProperty('getters', true) as $field => $filter)
+        {
             $mutators[self::MUTATOR_GETTER][$field] = $filter;
         }
 
-        foreach ((array)$this->getProperty('setters', true) as $field => $filter) {
+        foreach ((array)$this->getProperty('setters', true) as $field => $filter)
+        {
             $mutators[self::MUTATOR_SETTER][$field] = $filter;
         }
 
-        foreach ((array)$this->getProperty('accessors', true) as $field => $filter) {
+        foreach ((array)$this->getProperty('accessors', true) as $field => $filter)
+        {
             $mutators[self::MUTATOR_ACCESSOR][$field] = $filter;
         }
 
@@ -160,7 +166,8 @@ 
      */
     public function getProperty(string $property, bool $merge = false): mixed
     {
-        if (isset($this->propertyCache[$property])) {
+        if (isset($this->propertyCache[$property]))
+        {
             //Property merging and trait events are pretty slow
             return $this->propertyCache[$property];
         }
@@ -168,28 +175,36 @@ 
         $properties = $this->reflection->getDefaultProperties();
         $constants = $this->reflection->getConstants();
 
-        if (isset($properties[$property])) {
+        if (isset($properties[$property]))
+        {
             //Read from default value
             $value = $properties[$property];
-        } elseif (isset($constants[\strtoupper($property)])) {
+        }
+        elseif (isset($constants[\strtoupper($property)]))
+        {
             //Read from a constant
             $value = $constants[\strtoupper($property)];
-        } else {
+        }
+        else
+        {
             return null;
         }
 
         //Merge with parent value requested
-        if ($merge && \is_array($value) && ($parent = $this->parentReflection()) instanceof \Spiral\Models\Reflection\ReflectionEntity) {
+        if ($merge && \is_array($value) && ($parent = $this->parentReflection()) instanceof \Spiral\Models\Reflection\ReflectionEntity)
+        {
             $parentValue = $parent->getProperty($property, $merge);
 
-            if (\is_array($parentValue)) {
+            if (\is_array($parentValue))
+            {
                 //Class values prior to parent values
                 $value = \array_merge($parentValue, $value);
             }
         }
 
         /** @psalm-suppress TypeDoesNotContainType https://github.com/vimeo/psalm/issues/9489 */
-        if (!$this->reflection->isSubclassOf(SchematicEntity::class)) {
+        if (!$this->reflection->isSubclassOf(SchematicEntity::class))
+        {
             return $value;
         }
 
@@ -204,7 +219,8 @@ 
     {
         $parentClass = $this->reflection->getParentClass();
 
-        if (!empty($parentClass) && $parentClass->getName() != static::BASE_CLASS) {
+        if (!empty($parentClass) && $parentClass->getName() != static::BASE_CLASS)
+        {
             $parent = clone $this;
             $parent->reflection = $this->getParentClass();