spiral / framework

src/Prototype/src/ClassNode/ClassStmt.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
     public function __toString(): string
     {
-        if ($this->alias) {
+        if ($this->alias){
             return \sprintf('%s as %s', $this->name, $this->alias);
         }
 

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 
     public function __toString(): string
     {
-        if ($this->alias) {
+        if ($this->alias)
+        {
             return \sprintf('%s as %s', $this->name, $this->alias);
         }
 

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 !== null) {
+                if ($alreadyImported !== null){
                     $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 !== null) {
+                if ($alreadyImported !== null)
+                {
                     $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/Prototype/src/ClassNode/ConflictResolver/Names.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 {
     public function __construct(
         private readonly Sequences $sequences
-    ) {
+    ){
     }
 
     public function resolve(ClassNode $definition): void
@@ -25,7 +25,7 @@ 
     private function getConstructorReservedNames(ClassNode $definition): array
     {
         $names = \array_values($definition->constructorVars);
-        foreach ($definition->constructorParams as $param) {
+        foreach ($definition->constructorParams as $param){
             $names[] = $param->name;
         }
 
@@ -35,12 +35,12 @@ 
     private function initiateCounters(array $names): array
     {
         $counters = [];
-        foreach ($names as $name) {
+        foreach ($names as $name){
             $name = $this->parseName($name);
 
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name])){
                 $counters[$name->name][$name->sequence] = $name->fullName();
-            } else {
+            }else{
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -50,18 +50,18 @@ 
 
     private function addPostfixes(ClassNode $definition, array $counters): void
     {
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency){
             $name = $this->parseName($dependency->var);
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name])){
                 $sequence = $this->sequences->find(\array_keys($counters[$name->name]), $name->sequence);
-                if ($sequence !== $name->sequence) {
+                if ($sequence !== $name->sequence){
                     $name->sequence = $sequence;
 
                     $dependency->var = $name->fullName();
                 }
 
                 $counters[$name->name][$sequence] = $name->fullName();
-            } else {
+            }else{
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -69,9 +69,9 @@ 
 
     private function parseName(string $name): NameEntity
     {
-        if (\preg_match("/\d+$/", $name, $match)) {
+        if (\preg_match("/\d+$/", $name, $match)){
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0){
                 return NameEntity::createWithSequence(Utils::trimTrailingDigits($name, $sequence), $sequence);
             }
         }

Braces +22 added lines, -10 removed lines

@@ -25,7 +25,8 @@ 
     private function getConstructorReservedNames(ClassNode $definition): array
     {
         $names = \array_values($definition->constructorVars);
-        foreach ($definition->constructorParams as $param) {
+        foreach ($definition->constructorParams as $param)
+        {
             $names[] = $param->name;
         }
 
@@ -35,12 +36,16 @@ 
     private function initiateCounters(array $names): array
     {
         $counters = [];
-        foreach ($names as $name) {
+        foreach ($names as $name)
+        {
             $name = $this->parseName($name);
 
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name]))
+            {
                 $counters[$name->name][$name->sequence] = $name->fullName();
-            } else {
+            }
+            else
+            {
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -50,18 +55,23 @@ 
 
     private function addPostfixes(ClassNode $definition, array $counters): void
     {
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency)
+        {
             $name = $this->parseName($dependency->var);
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name]))
+            {
                 $sequence = $this->sequences->find(\array_keys($counters[$name->name]), $name->sequence);
-                if ($sequence !== $name->sequence) {
+                if ($sequence !== $name->sequence)
+                {
                     $name->sequence = $sequence;
 
                     $dependency->var = $name->fullName();
                 }
 
                 $counters[$name->name][$sequence] = $name->fullName();
-            } else {
+            }
+            else
+            {
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -69,9 +79,11 @@ 
 
     private function parseName(string $name): NameEntity
     {
-        if (\preg_match("/\d+$/", $name, $match)) {
+        if (\preg_match("/\d+$/", $name, $match))
+        {
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0)
+            {
                 return NameEntity::createWithSequence(Utils::trimTrailingDigits($name, $sequence), $sequence);
             }
         }

src/Prototype/src/ClassNode/ConflictResolver/Sequences.php

Spacing +6 added lines, -6 removed lines

@@ -14,21 +14,21 @@ 
      */
     public function find(array $sequences, int $originSequence): int
     {
-        if (empty($sequences) || $originSequence > \max($sequences)) {
+        if (empty($sequences) || $originSequence > \max($sequences)){
             return $originSequence;
         }
 
         $gaps = $this->skippedSequences($sequences);
 
-        if (isset($gaps[$originSequence])) {
+        if (isset($gaps[$originSequence])){
             return $originSequence;
         }
 
         //we do not add "1" as postfix: $var, $var2, $var3, etc
         unset($gaps[1]);
-        if (empty($gaps)) {
+        if (empty($gaps)){
             $max = \max($sequences);
-            if ($max === 0) {
+            if ($max === 0){
                 return 2;
             }
 
@@ -42,8 +42,8 @@ 
     {
         $skipped = [];
         $max = \max($sequences);
-        for ($i = 0; $i < $max; $i++) {
-            if (!\in_array($i, $sequences, true)) {
+        for ($i = 0; $i < $max; $i++){
+            if (!\in_array($i, $sequences, true)){
                 $skipped[$i] = $i;
             }
         }

Braces +12 added lines, -6 removed lines

@@ -14,21 +14,25 @@ 
      */
     public function find(array $sequences, int $originSequence): int
     {
-        if (empty($sequences) || $originSequence > \max($sequences)) {
+        if (empty($sequences) || $originSequence > \max($sequences))
+        {
             return $originSequence;
         }
 
         $gaps = $this->skippedSequences($sequences);
 
-        if (isset($gaps[$originSequence])) {
+        if (isset($gaps[$originSequence]))
+        {
             return $originSequence;
         }
 
         //we do not add "1" as postfix: $var, $var2, $var3, etc
         unset($gaps[1]);
-        if (empty($gaps)) {
+        if (empty($gaps))
+        {
             $max = \max($sequences);
-            if ($max === 0) {
+            if ($max === 0)
+            {
                 return 2;
             }
 
@@ -42,8 +46,10 @@ 
     {
         $skipped = [];
         $max = \max($sequences);
-        for ($i = 0; $i < $max; $i++) {
-            if (!\in_array($i, $sequences, true)) {
+        for ($i = 0; $i < $max; $i++)
+        {
+            if (!\in_array($i, $sequences, true))
+            {
                 $skipped[$i] = $i;
             }
         }

src/Prototype/src/Command/InjectCommand.php

Braces +25 added lines, -12 removed lines

@@ -46,7 +46,8 @@ 
     public function perform(): int
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === [])
+        {
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return self::SUCCESS;
@@ -54,18 +55,23 @@ 
 
         $targets = [];
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class)
+        {
             $proto = $this->getPrototypeProperties($class, $prototyped);
-            if (empty($proto)) {
+            if (empty($proto))
+            {
                 $modified = $this->modify($class, $proto);
-                if ($modified !== null) {
+                if ($modified !== null)
+                {
                     $targets[] = $modified;
                 }
                 continue;
             }
 
-            foreach ($proto as $target) {
-                if ($target instanceof \Throwable) {
+            foreach ($proto as $target)
+            {
+                if ($target instanceof \Throwable)
+                {
                     $targets[] = [
                         $class->getName(),
                         $target->getMessage(),
@@ -74,7 +80,8 @@ 
                     continue 2;
                 }
 
-                if ($target === null) {
+                if ($target === null)
+                {
                     continue 2;
                 }
             }
@@ -82,14 +89,17 @@ 
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
 
             $modified = $this->modify($class, $proto);
-            if ($modified !== null) {
+            if ($modified !== null)
+            {
                 $targets[] = $modified;
             }
         }
 
-        if (!empty($targets)) {
+        if (!empty($targets))
+        {
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
-            foreach ($targets as $target) {
+            foreach ($targets as $target)
+            {
                 $grid->addRow($target);
             }
 
@@ -102,7 +112,8 @@ 
     private function modify(\ReflectionClass $class, array $proto): ?array
     {
         $classDefinition = $this->extractor->extract($class->getFileName(), $proto);
-        try {
+        try
+        {
             $modified = $this->injector->injectDependencies(
                 \file_get_contents($class->getFileName()),
                 $classDefinition,
@@ -114,7 +125,9 @@ 
             \file_put_contents($class->getFileName(), $modified);
 
             return null;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             return [$class->getName(), $e->getMessage(), \sprintf('%s:L%s', $e->getFile(), $e->getLine())];
         }
     }

Spacing +12 added lines, -12 removed lines

@@ -35,7 +35,7 @@ 
     public function perform(): int
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === []){
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return self::SUCCESS;
@@ -43,18 +43,18 @@ 
 
         $targets = [];
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class){
             $proto = $this->getPrototypeProperties($class, $prototyped);
-            if (empty($proto)) {
+            if (empty($proto)){
                 $modified = $this->modify($class, $proto);
-                if ($modified !== null) {
+                if ($modified !== null){
                     $targets[] = $modified;
                 }
                 continue;
             }
 
-            foreach ($proto as $target) {
-                if ($target instanceof \Throwable) {
+            foreach ($proto as $target){
+                if ($target instanceof \Throwable){
                     $targets[] = [
                         $class->getName(),
                         $target->getMessage(),
@@ -63,7 +63,7 @@ 
                     continue 2;
                 }
 
-                if ($target === null) {
+                if ($target === null){
                     continue 2;
                 }
             }
@@ -71,14 +71,14 @@ 
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
 
             $modified = $this->modify($class, $proto);
-            if ($modified !== null) {
+            if ($modified !== null){
                 $targets[] = $modified;
             }
         }
 
-        if (!empty($targets)) {
+        if (!empty($targets)){
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
-            foreach ($targets as $target) {
+            foreach ($targets as $target){
                 $grid->addRow($target);
             }
 
@@ -91,7 +91,7 @@ 
     private function modify(\ReflectionClass $class, array $proto): ?array
     {
         $classDefinition = $this->extractor->extract($class->getFileName(), $proto);
-        try {
+        try{
             $modified = $this->injector->injectDependencies(
                 \file_get_contents($class->getFileName()),
                 $classDefinition,
@@ -101,7 +101,7 @@ 
             \file_put_contents($class->getFileName(), $modified);
 
             return null;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             return [$class->getName(), $e->getMessage(), \sprintf('%s:L%s', $e->getFile(), $e->getLine())];
         }
     }

src/Prototype/src/Annotation/Prototyped.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
      */
     public function __construct(
         public readonly string $property
-    ) {
+    ){
     }
 }

src/Models/src/DataEntity.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
             ModelSchema::MUTATOR_SETTER => static::SETTERS
         };
 
-        if (isset($target[$field])) {
+        if (isset($target[$field])){
             return $target[$field];
         }
 

Braces +2 added lines, -1 removed lines

@@ -85,7 +85,8 @@
             ModelSchema::MUTATOR_SETTER => static::SETTERS
         };
 
-        if (isset($target[$field])) {
+        if (isset($target[$field]))
+        {
             return $target[$field];
         }
 

src/Models/src/SchematicEntity.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     public function __construct(
         array $data,
         private array $schema
-    ) {
+    ){
         parent::__construct($data);
     }
 
@@ -28,7 +28,7 @@ 
 
     protected function getMutator(string $field, string $type): mixed
     {
-        if (isset($this->schema[ModelSchema::MUTATORS][$type][$field])) {
+        if (isset($this->schema[ModelSchema::MUTATORS][$type][$field])){
             return $this->schema[ModelSchema::MUTATORS][$type][$field];
         }
 

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
 
     protected function getMutator(string $field, string $type): mixed
     {
-        if (isset($this->schema[ModelSchema::MUTATORS][$type][$field])) {
+        if (isset($this->schema[ModelSchema::MUTATORS][$type][$field]))
+        {
             return $this->schema[ModelSchema::MUTATORS][$type][$field];
         }
 

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);