spiral / framework

src/Models/src/AbstractEntity.php

Spacing +26 added lines, -26 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function __construct(
         private array $fields = []
-    ) {
+    ){
     }
 
     /**
@@ -48,7 +48,7 @@ 
 
     public function hasField(string $name): bool
     {
-        if (!\array_key_exists($name, $this->fields)) {
+        if (!\array_key_exists($name, $this->fields)){
             return false;
         }
 
@@ -62,14 +62,14 @@ 
      */
     public function setField(string $name, mixed $value, bool $filter = true): self
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface){
             //In case of non scalar values filters must be bypassed (check accessor compatibility?)
             $this->fields[$name] = clone $value;
 
             return $this;
         }
 
-        if (!$filter || (\is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (\is_null($value) && $this->isNullable($name))){
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -79,10 +79,10 @@ 
         //Checking if field have accessor
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if ($accessor !== null) {
+        if ($accessor !== null){
             //Setting value thought associated accessor
             $this->thoughValue($accessor, $name, $value);
-        } else {
+        }else{
             //Setting value thought setter filter (if any)
             $this->setMutated($name, $value);
         }
@@ -99,7 +99,7 @@ 
     {
         $value = $this->hasField($name) ? $this->fields[$name] : $default;
 
-        if ($value instanceof ValueInterface || (\is_null($value) && $this->isNullable($name))) {
+        if ($value instanceof ValueInterface || (\is_null($value) && $this->isNullable($name))){
             //Direct access to value when value is accessor or null and declared as nullable
             return $value;
         }
@@ -107,7 +107,7 @@ 
         //Checking if field have accessor (decorator)
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if (!empty($accessor)) {
+        if (!empty($accessor)){
             return $this->fields[$name] = $this->createValue($accessor, $name, $value);
         }
 
@@ -126,15 +126,15 @@ 
      */
     public function setFields(iterable $fields = [], bool $all = false): self
     {
-        if (!\is_array($fields) && !$fields instanceof \Traversable) {
+        if (!\is_array($fields) && !$fields instanceof \Traversable){
             return $this;
         }
 
-        foreach ($fields as $name => $value) {
-            if ($all || $this->isFillable($name)) {
-                try {
+        foreach ($fields as $name => $value){
+            if ($all || $this->isFillable($name)){
+                try{
                     $this->setField($name, $value, true);
-                } catch (AccessExceptionInterface) {
+                }catch (AccessExceptionInterface){
                     // We are suppressing field setting exceptions
                 }
             }
@@ -151,7 +151,7 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach (\array_keys($this->fields) as $name) {
+        foreach (\array_keys($this->fields) as $name){
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -199,7 +199,7 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
+        foreach ($this->fields as $field => $value){
             $result[$field] = $value instanceof ValueInterface ? $value->getValue() : $value;
         }
 
@@ -275,9 +275,9 @@ 
         mixed $value,
         array $context = []
     ): ValueInterface {
-        if (!\is_string($type) || !\class_exists($type)) {
+        if (!\is_string($type) || !\class_exists($type)){
             throw new EntityException(
-                \sprintf('Unable to create accessor for field `%s` in ', $name) . static::class
+                \sprintf('Unable to create accessor for field `%s` in ', $name).static::class
             );
         }
 
@@ -292,10 +292,10 @@ 
     {
         $getter = $this->getMutator($name, ModelSchema::MUTATOR_GETTER);
 
-        if ($filter && !empty($getter)) {
-            try {
+        if ($filter && !empty($getter)){
+            try{
                 return \call_user_func($getter, $value);
-            } catch (\Exception) {
+            }catch (\Exception){
                 //Trying to filter null value, every filter must support it
                 return \call_user_func($getter, null);
             }
@@ -311,13 +311,13 @@ 
     {
         $setter = $this->getMutator($name, ModelSchema::MUTATOR_SETTER);
 
-        if (!empty($setter)) {
-            try {
+        if (!empty($setter)){
+            try{
                 $this->fields[$name] = \call_user_func($setter, $value);
-            } catch (\Exception) {
+            }catch (\Exception){
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }else{
             $this->fields[$name] = $value;
         }
     }
@@ -327,11 +327,11 @@ 
      *
      * @param string|array $type Accessor definition (implementation specific).
      */
-    private function thoughValue(array|string $type, string $name, mixed $value): void
+    private function thoughValue(array | string $type, string $name, mixed $value): void
     {
         $field = $this->fields[$name] ?? null;
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface)){
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

Braces +51 added lines, -23 removed lines

@@ -48,7 +48,8 @@ 
 
     public function hasField(string $name): bool
     {
-        if (!\array_key_exists($name, $this->fields)) {
+        if (!\array_key_exists($name, $this->fields))
+        {
             return false;
         }
 
@@ -62,14 +63,16 @@ 
      */
     public function setField(string $name, mixed $value, bool $filter = true): self
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface)
+        {
             //In case of non scalar values filters must be bypassed (check accessor compatibility?)
             $this->fields[$name] = clone $value;
 
             return $this;
         }
 
-        if (!$filter || (\is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (\is_null($value) && $this->isNullable($name)))
+        {
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -79,10 +82,13 @@ 
         //Checking if field have accessor
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if ($accessor !== null) {
+        if ($accessor !== null)
+        {
             //Setting value thought associated accessor
             $this->thoughValue($accessor, $name, $value);
-        } else {
+        }
+        else
+        {
             //Setting value thought setter filter (if any)
             $this->setMutated($name, $value);
         }
@@ -99,7 +105,8 @@ 
     {
         $value = $this->hasField($name) ? $this->fields[$name] : $default;
 
-        if ($value instanceof ValueInterface || (\is_null($value) && $this->isNullable($name))) {
+        if ($value instanceof ValueInterface || (\is_null($value) && $this->isNullable($name)))
+        {
             //Direct access to value when value is accessor or null and declared as nullable
             return $value;
         }
@@ -107,7 +114,8 @@ 
         //Checking if field have accessor (decorator)
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if (!empty($accessor)) {
+        if (!empty($accessor))
+        {
             return $this->fields[$name] = $this->createValue($accessor, $name, $value);
         }
 
@@ -126,15 +134,21 @@ 
      */
     public function setFields(iterable $fields = [], bool $all = false): self
     {
-        if (!\is_array($fields) && !$fields instanceof \Traversable) {
+        if (!\is_array($fields) && !$fields instanceof \Traversable)
+        {
             return $this;
         }
 
-        foreach ($fields as $name => $value) {
-            if ($all || $this->isFillable($name)) {
-                try {
+        foreach ($fields as $name => $value)
+        {
+            if ($all || $this->isFillable($name))
+            {
+                try
+                {
                     $this->setField($name, $value, true);
-                } catch (AccessExceptionInterface) {
+                }
+                catch (AccessExceptionInterface)
+                {
                     // We are suppressing field setting exceptions
                 }
             }
@@ -151,7 +165,8 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach (\array_keys($this->fields) as $name) {
+        foreach (\array_keys($this->fields) as $name)
+        {
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -199,7 +214,8 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
+        foreach ($this->fields as $field => $value)
+        {
             $result[$field] = $value instanceof ValueInterface ? $value->getValue() : $value;
         }
 
@@ -275,7 +291,8 @@ 
         mixed $value,
         array $context = []
     ): ValueInterface {
-        if (!\is_string($type) || !\class_exists($type)) {
+        if (!\is_string($type) || !\class_exists($type))
+        {
             throw new EntityException(
                 \sprintf('Unable to create accessor for field `%s` in ', $name) . static::class
             );
@@ -292,10 +309,14 @@ 
     {
         $getter = $this->getMutator($name, ModelSchema::MUTATOR_GETTER);
 
-        if ($filter && !empty($getter)) {
-            try {
+        if ($filter && !empty($getter))
+        {
+            try
+            {
                 return \call_user_func($getter, $value);
-            } catch (\Exception) {
+            }
+            catch (\Exception)
+            {
                 //Trying to filter null value, every filter must support it
                 return \call_user_func($getter, null);
             }
@@ -311,13 +332,19 @@ 
     {
         $setter = $this->getMutator($name, ModelSchema::MUTATOR_SETTER);
 
-        if (!empty($setter)) {
-            try {
+        if (!empty($setter))
+        {
+            try
+            {
                 $this->fields[$name] = \call_user_func($setter, $value);
-            } catch (\Exception) {
+            }
+            catch (\Exception)
+            {
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }
+        else
+        {
             $this->fields[$name] = $value;
         }
     }
@@ -331,7 +358,8 @@ 
     {
         $field = $this->fields[$name] ?? null;
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface))
+        {
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

src/Tokenizer/src/ScopedClassLocator.php

Spacing +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 {
     public function __construct(
         private readonly Tokenizer $tokenizer
-    ) {
+    ){
     }
 
-    public function getScopedClasses(string $scope, object|string|null $target = null): array
+    public function getScopedClasses(string $scope, object | string | null $target = null): array
     {
         return $this->tokenizer->scopedClassLocator($scope)->getClasses($target);
     }

src/Tokenizer/src/ClassesInterface.php

Spacing +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
      *                                          results.
      * @return array<class-string, ReflectionClass>
      */
-    public function getClasses(object|string|null $target = null): array;
+    public function getClasses(object | string | null $target = null): array;
 }

src/Tokenizer/src/Traits/TargetTrait.php

Spacing +3 added lines, -3 removed lines

@@ -16,13 +16,13 @@
     {
         $traits = [];
 
-        do {
+        do{
             $traits = \array_merge(\class_uses($class), $traits);
             $class = \get_parent_class($class);
-        } while ($class !== false);
+        }while ($class !== false);
 
         //Traits from traits
-        foreach (\array_flip($traits) as $trait) {
+        foreach (\array_flip($traits) as $trait){
             $traits = \array_merge(\class_uses($trait), $traits);
         }
 

Braces +4 added lines, -2 removed lines

@@ -16,13 +16,15 @@
     {
         $traits = [];
 
-        do {
+        do
+        {
             $traits = \array_merge(\class_uses($class), $traits);
             $class = \get_parent_class($class);
         } while ($class !== false);
 
         //Traits from traits
-        foreach (\array_flip($traits) as $trait) {
+        foreach (\array_flip($traits) as $trait)
+        {
             $traits = \array_merge(\class_uses($trait), $traits);
         }
 

src/Tokenizer/src/InvocationLocator.php

Spacing +10 added lines, -10 removed lines

@@ -21,8 +21,8 @@ 
     public function getInvocations(\ReflectionFunctionAbstract $function): array
     {
         $result = [];
-        foreach ($this->availableInvocations($function->getName()) as $invocation) {
-            if ($this->isTargeted($invocation, $function)) {
+        foreach ($this->availableInvocations($function->getName()) as $invocation){
+            if ($this->isTargeted($invocation, $function)){
                 $result[] = $invocation;
             }
         }
@@ -39,12 +39,12 @@ 
     protected function availableInvocations(string $signature = ''): \Generator
     {
         $signature = \strtolower(\trim($signature, '\\'));
-        foreach ($this->availableReflections() as $reflection) {
-            foreach ($reflection->getInvocations() as $invocation) {
+        foreach ($this->availableReflections() as $reflection){
+            foreach ($reflection->getInvocations() as $invocation){
                 if (
                     !empty($signature)
                     && \strtolower(\trim($invocation->getName(), '\\')) !== $signature
-                ) {
+                ){
                     continue;
                 }
 
@@ -55,14 +55,14 @@ 
 
     protected function isTargeted(ReflectionInvocation $invocation, \ReflectionFunctionAbstract $function): bool
     {
-        if ($function instanceof \ReflectionFunction) {
+        if ($function instanceof \ReflectionFunction){
             return !$invocation->isMethod();
         }
 
-        try {
+        try{
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
-            if ($this->debug) {
+        }catch (LocatorException $e){
+            if ($this->debug){
                 throw $e;
             }
 
@@ -74,7 +74,7 @@ 
          */
         $target = $function->getDeclaringClass();
 
-        if ($target->isTrait()) {
+        if ($target->isTrait()){
             //Let's compare traits
             return \in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }

Braces +19 added lines, -9 removed lines

@@ -21,8 +21,10 @@ 
     public function getInvocations(\ReflectionFunctionAbstract $function): array
     {
         $result = [];
-        foreach ($this->availableInvocations($function->getName()) as $invocation) {
-            if ($this->isTargeted($invocation, $function)) {
+        foreach ($this->availableInvocations($function->getName()) as $invocation)
+        {
+            if ($this->isTargeted($invocation, $function))
+            {
                 $result[] = $invocation;
             }
         }
@@ -39,8 +41,10 @@ 
     protected function availableInvocations(string $signature = ''): \Generator
     {
         $signature = \strtolower(\trim($signature, '\\'));
-        foreach ($this->availableReflections() as $reflection) {
-            foreach ($reflection->getInvocations() as $invocation) {
+        foreach ($this->availableReflections() as $reflection)
+        {
+            foreach ($reflection->getInvocations() as $invocation)
+            {
                 if (
                     !empty($signature)
                     && \strtolower(\trim($invocation->getName(), '\\')) !== $signature
@@ -55,14 +59,19 @@ 
 
     protected function isTargeted(ReflectionInvocation $invocation, \ReflectionFunctionAbstract $function): bool
     {
-        if ($function instanceof \ReflectionFunction) {
+        if ($function instanceof \ReflectionFunction)
+        {
             return !$invocation->isMethod();
         }
 
-        try {
+        try
+        {
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
-            if ($this->debug) {
+        }
+        catch (LocatorException $e)
+        {
+            if ($this->debug)
+            {
                 throw $e;
             }
 
@@ -74,7 +83,8 @@ 
          */
         $target = $function->getDeclaringClass();
 
-        if ($target->isTrait()) {
+        if ($target->isTrait())
+        {
             //Let's compare traits
             return \in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }

src/Tokenizer/src/ScopedClassesInterface.php

Spacing +1 added lines, -1 removed lines

@@ -17,5 +17,5 @@
      *                                    results.
      * @return \ReflectionClass[]
      */
-    public function getScopedClasses(string $scope, object|string|null $target = null): array;
+    public function getScopedClasses(string $scope, object | string | null $target = null): array;
 }

src/Tokenizer/src/Reflection/ReflectionArgument.php

Spacing +15 added lines, -15 removed lines

@@ -14,10 +14,10 @@ 
     /**
      * Argument types.
      */
-    public const CONSTANT   = 'constant';   //Scalar constant and not variable.
-    public const VARIABLE   = 'variable';   //PHP variable
+    public const CONSTANT   = 'constant'; //Scalar constant and not variable.
+    public const VARIABLE   = 'variable'; //PHP variable
     public const EXPRESSION = 'expression'; //PHP code (expression).
-    public const STRING     = 'string';     //Simple scalar string, can be fetched using stringValue().
+    public const STRING     = 'string'; //Simple scalar string, can be fetched using stringValue().
 
     /**
      * New instance of ReflectionArgument.
@@ -28,7 +28,7 @@ 
     public function __construct(
         private string $type,
         private readonly string $value
-    ) {
+    ){
     }
 
     public function getType(): string
@@ -48,7 +48,7 @@ 
      */
     public function stringValue(): string
     {
-        if ($this->type !== self::STRING) {
+        if ($this->type !== self::STRING){
             throw new ReflectionException(
                 \sprintf("Unable to represent value as string, value type is '%s'", $this->type)
             );
@@ -69,33 +69,33 @@ 
         $level = 0;
 
         $result = [];
-        foreach ($tokens as $token) {
-            if ($token[ReflectionFile::TOKEN_TYPE] === T_WHITESPACE) {
+        foreach ($tokens as $token){
+            if ($token[ReflectionFile::TOKEN_TYPE] === T_WHITESPACE){
                 continue;
             }
 
-            if (empty($definition)) {
+            if (empty($definition)){
                 $definition = ['type' => self::EXPRESSION, 'value' => '', 'tokens' => []];
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] === '(' || $token[ReflectionFile::TOKEN_TYPE] === '[') {
+            if ($token[ReflectionFile::TOKEN_TYPE] === '(' || $token[ReflectionFile::TOKEN_TYPE] === '['){
                 ++$level;
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] === ')' || $token[ReflectionFile::TOKEN_TYPE] === ']') {
+            if ($token[ReflectionFile::TOKEN_TYPE] === ')' || $token[ReflectionFile::TOKEN_TYPE] === ']'){
                 --$level;
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($level) {
+            if ($level){
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] === ',') {
+            if ($token[ReflectionFile::TOKEN_TYPE] === ','){
                 $result[] = self::createArgument($definition);
                 $definition = null;
                 continue;
@@ -106,9 +106,9 @@ 
         }
 
         //Last argument
-        if (\is_array($definition)) {
+        if (\is_array($definition)){
             $definition = self::createArgument($definition);
-            if (!empty($definition->getType())) {
+            if (!empty($definition->getType())){
                 $result[] = $definition;
             }
         }
@@ -126,7 +126,7 @@ 
     {
         $result = new static(self::EXPRESSION, $definition['value']);
 
-        if (\count($definition['tokens']) == 1) {
+        if (\count($definition['tokens']) == 1){
             $result->type = match ($definition['tokens'][0][0]) {
                 T_VARIABLE => self::VARIABLE,
                 T_LNUMBER, T_DNUMBER => self::CONSTANT,

Braces +22 added lines, -11 removed lines

@@ -48,7 +48,8 @@ 
      */
     public function stringValue(): string
     {
-        if ($this->type !== self::STRING) {
+        if ($this->type !== self::STRING)
+        {
             throw new ReflectionException(
                 \sprintf("Unable to represent value as string, value type is '%s'", $this->type)
             );
@@ -69,33 +70,40 @@ 
         $level = 0;
 
         $result = [];
-        foreach ($tokens as $token) {
-            if ($token[ReflectionFile::TOKEN_TYPE] === T_WHITESPACE) {
+        foreach ($tokens as $token)
+        {
+            if ($token[ReflectionFile::TOKEN_TYPE] === T_WHITESPACE)
+            {
                 continue;
             }
 
-            if (empty($definition)) {
+            if (empty($definition))
+            {
                 $definition = ['type' => self::EXPRESSION, 'value' => '', 'tokens' => []];
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] === '(' || $token[ReflectionFile::TOKEN_TYPE] === '[') {
+            if ($token[ReflectionFile::TOKEN_TYPE] === '(' || $token[ReflectionFile::TOKEN_TYPE] === '[')
+            {
                 ++$level;
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] === ')' || $token[ReflectionFile::TOKEN_TYPE] === ']') {
+            if ($token[ReflectionFile::TOKEN_TYPE] === ')' || $token[ReflectionFile::TOKEN_TYPE] === ']')
+            {
                 --$level;
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($level) {
+            if ($level)
+            {
                 $definition['value'] .= $token[ReflectionFile::TOKEN_CODE];
                 continue;
             }
 
-            if ($token[ReflectionFile::TOKEN_TYPE] === ',') {
+            if ($token[ReflectionFile::TOKEN_TYPE] === ',')
+            {
                 $result[] = self::createArgument($definition);
                 $definition = null;
                 continue;
@@ -106,9 +114,11 @@ 
         }
 
         //Last argument
-        if (\is_array($definition)) {
+        if (\is_array($definition))
+        {
             $definition = self::createArgument($definition);
-            if (!empty($definition->getType())) {
+            if (!empty($definition->getType()))
+            {
                 $result[] = $definition;
             }
         }
@@ -126,7 +136,8 @@ 
     {
         $result = new static(self::EXPRESSION, $definition['value']);
 
-        if (\count($definition['tokens']) == 1) {
+        if (\count($definition['tokens']) == 1)
+        {
             $result->type = match ($definition['tokens'][0][0]) {
                 T_VARIABLE => self::VARIABLE,
                 T_LNUMBER, T_DNUMBER => self::CONSTANT,

src/Tokenizer/src/Reflection/ReflectionInvocation.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         private readonly array $arguments,
         private readonly string $source,
         private readonly int $level
-    ) {
+    ){
     }
 
     /**
@@ -113,7 +113,7 @@ 
      */
     public function getArgument(int $index): ReflectionArgument
     {
-        if (!isset($this->arguments[$index])) {
+        if (!isset($this->arguments[$index])){
             throw new ReflectionException(\sprintf("No such argument with index '%d'", $index));
         }
 

Braces +2 added lines, -1 removed lines

@@ -113,7 +113,8 @@
      */
     public function getArgument(int $index): ReflectionArgument
     {
-        if (!isset($this->arguments[$index])) {
+        if (!isset($this->arguments[$index]))
+        {
             throw new ReflectionException(\sprintf("No such argument with index '%d'", $index));
         }
 

src/Tokenizer/src/InvocationLocatorInjector.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 {
     public function __construct(
         private readonly Tokenizer $tokenizer
-    ) {
+    ){
     }
 
     /**