spiral / framework

src/Models/src/AbstractEntity.php

Spacing +28 added lines, -28 removed lines

@@ -79,7 +79,7 @@ 
      */
     public function hasField(string $name): bool
     {
-        if (!array_key_exists($name, $this->fields)) {
+        if (!array_key_exists($name, $this->fields)){
             return false;
         }
 
@@ -95,14 +95,14 @@ 
      */
     public function setField(string $name, $value, bool $filter = true): void
     {
-        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;
         }
 
-        if (!$filter || (is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (is_null($value) && $this->isNullable($name))){
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -112,10 +112,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);
         }
@@ -132,7 +132,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;
         }
@@ -140,7 +140,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);
         }
 
@@ -163,15 +163,15 @@ 
      */
     public function setFields($fields = [], bool $all = false)
     {
-        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 $e) {
+                }catch (AccessExceptionInterface $e){
                     //We are suppressing field setting exceptions
                 }
             }
@@ -192,7 +192,7 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach ($this->fields as $name => $field) {
+        foreach ($this->fields as $name => $field){
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -259,10 +259,10 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
-            if ($value instanceof ValueInterface) {
+        foreach ($this->fields as $field => $value){
+            if ($value instanceof ValueInterface){
                 $result[$field] = $value->getValue();
-            } else {
+            }else{
                 $result[$field] = $value;
             }
         }
@@ -355,9 +355,9 @@ 
         $value,
         array $context = []
     ): ValueInterface {
-        if (!is_string($type) || !class_exists($type)) {
+        if (!is_string($type) || !class_exists($type)){
             throw new EntityException(
-                "Unable to create accessor for field `{$name}` in " . static::class
+                "Unable to create accessor for field `{$name}` in ".static::class
             );
         }
 
@@ -377,10 +377,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 $e) {
+            }catch (\Exception $e){
                 //Trying to filter null value, every filter must support it
                 return call_user_func($getter, null);
             }
@@ -399,13 +399,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 $e) {
+            }catch (\Exception $e){
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }else{
             $this->fields[$name] = $value;
         }
     }
@@ -419,13 +419,13 @@ 
      */
     private function thoughValue($type, string $name, $value): void
     {
-        if (array_key_exists($name, $this->fields)) {
+        if (array_key_exists($name, $this->fields)){
             $field = $this->fields[$name];
-        } else {
+        }else{
             $field = null;
         }
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface)){
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

Braces +61 added lines, -27 removed lines

@@ -79,7 +79,8 @@ 
      */
     public function hasField(string $name): bool
     {
-        if (!array_key_exists($name, $this->fields)) {
+        if (!array_key_exists($name, $this->fields))
+        {
             return false;
         }
 
@@ -95,14 +96,16 @@ 
      */
     public function setField(string $name, $value, bool $filter = true): void
     {
-        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;
         }
 
-        if (!$filter || (is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (is_null($value) && $this->isNullable($name)))
+        {
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -112,10 +115,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);
         }
@@ -132,7 +138,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;
         }
@@ -140,7 +147,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);
         }
 
@@ -163,15 +171,21 @@ 
      */
     public function setFields($fields = [], bool $all = false)
     {
-        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 $e) {
+                }
+                catch (AccessExceptionInterface $e)
+                {
                     //We are suppressing field setting exceptions
                 }
             }
@@ -192,7 +206,8 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach ($this->fields as $name => $field) {
+        foreach ($this->fields as $name => $field)
+        {
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -259,10 +274,14 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
-            if ($value instanceof ValueInterface) {
+        foreach ($this->fields as $field => $value)
+        {
+            if ($value instanceof ValueInterface)
+            {
                 $result[$field] = $value->getValue();
-            } else {
+            }
+            else
+            {
                 $result[$field] = $value;
             }
         }
@@ -355,7 +374,8 @@ 
         $value,
         array $context = []
     ): ValueInterface {
-        if (!is_string($type) || !class_exists($type)) {
+        if (!is_string($type) || !class_exists($type))
+        {
             throw new EntityException(
                 "Unable to create accessor for field `{$name}` in " . static::class
             );
@@ -377,10 +397,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 $e) {
+            }
+            catch (\Exception $e)
+            {
                 //Trying to filter null value, every filter must support it
                 return call_user_func($getter, null);
             }
@@ -399,13 +423,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 $e) {
+            }
+            catch (\Exception $e)
+            {
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }
+        else
+        {
             $this->fields[$name] = $value;
         }
     }
@@ -419,13 +449,17 @@ 
      */
     private function thoughValue($type, string $name, $value): void
     {
-        if (array_key_exists($name, $this->fields)) {
+        if (array_key_exists($name, $this->fields))
+        {
             $field = $this->fields[$name];
-        } else {
+        }
+        else
+        {
             $field = null;
         }
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface))
+        {
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

src/Models/src/Reflection/ReflectionEntity.php

Spacing +14 added lines, -14 removed lines

@@ -92,7 +92,7 @@ 
      */
     public function getSecured()
     {
-        if ($this->getProperty('secured', true) === '*') {
+        if ($this->getProperty('secured', true) === '*'){
             return $this->getProperty('secured', true);
         }
 
@@ -139,8 +139,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;
             }
 
@@ -174,15 +174,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;
         }
 
@@ -200,7 +200,7 @@ 
      */
     public function getProperty(string $property, bool $merge = false)
     {
-        if (isset($this->propertyCache[$property])) {
+        if (isset($this->propertyCache[$property])){
             //Property merging and trait events are pretty slow
             return $this->propertyCache[$property];
         }
@@ -208,27 +208,27 @@ 
         $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) && !empty($parent = $this->parentReflection())) {
+        if ($merge && is_array($value) && !empty($parent = $this->parentReflection())){
             $parentValue = $parent->getProperty($property, $merge);
 
-            if (is_array($parentValue)) {
+            if (is_array($parentValue)){
                 //Class values prior to parent values
                 $value = array_merge($parentValue, $value);
             }
         }
 
-        if (!$this->reflection->isSubclassOf(SchematicEntity::class)) {
+        if (!$this->reflection->isSubclassOf(SchematicEntity::class)){
             return $value;
         }
 
@@ -245,7 +245,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

@@ -92,7 +92,8 @@ 
      */
     public function getSecured()
     {
-        if ($this->getProperty('secured', true) === '*') {
+        if ($this->getProperty('secured', true) === '*')
+        {
             return $this->getProperty('secured', true);
         }
 
@@ -139,8 +140,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;
             }
 
@@ -174,15 +177,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;
         }
 
@@ -200,7 +206,8 @@ 
      */
     public function getProperty(string $property, bool $merge = false)
     {
-        if (isset($this->propertyCache[$property])) {
+        if (isset($this->propertyCache[$property]))
+        {
             //Property merging and trait events are pretty slow
             return $this->propertyCache[$property];
         }
@@ -208,27 +215,35 @@ 
         $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) && !empty($parent = $this->parentReflection())) {
+        if ($merge && is_array($value) && !empty($parent = $this->parentReflection()))
+        {
             $parentValue = $parent->getProperty($property, $merge);
 
-            if (is_array($parentValue)) {
+            if (is_array($parentValue))
+            {
                 //Class values prior to parent values
                 $value = array_merge($parentValue, $value);
             }
         }
 
-        if (!$this->reflection->isSubclassOf(SchematicEntity::class)) {
+        if (!$this->reflection->isSubclassOf(SchematicEntity::class))
+        {
             return $value;
         }
 
@@ -245,7 +260,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();
 

src/Models/src/DataEntity.php

Spacing +5 added lines, -5 removed lines

@@ -72,15 +72,15 @@ 
      */
     protected function isFillable(string $field): bool
     {
-        if (static::FILLABLE === '*') {
+        if (static::FILLABLE === '*'){
             return true;
         }
 
-        if (!empty(static::FILLABLE)) {
+        if (!empty(static::FILLABLE)){
             return in_array($field, static::FILLABLE);
         }
 
-        if (static::SECURED === '*') {
+        if (static::SECURED === '*'){
             return false;
         }
 
@@ -99,7 +99,7 @@ 
     protected function getMutator(string $field, string $mutator)
     {
         $target = [];
-        switch ($mutator) {
+        switch ($mutator){
             case ModelSchema::MUTATOR_ACCESSOR:
                 $target = static::ACCESSORS;
                 break;
@@ -111,7 +111,7 @@ 
                 break;
         }
 
-        if (isset($target[$field])) {
+        if (isset($target[$field])){
             return $target[$field];
         }
 

Braces +10 added lines, -5 removed lines

@@ -72,15 +72,18 @@ 
      */
     protected function isFillable(string $field): bool
     {
-        if (static::FILLABLE === '*') {
+        if (static::FILLABLE === '*')
+        {
             return true;
         }
 
-        if (!empty(static::FILLABLE)) {
+        if (!empty(static::FILLABLE))
+        {
             return in_array($field, static::FILLABLE);
         }
 
-        if (static::SECURED === '*') {
+        if (static::SECURED === '*')
+        {
             return false;
         }
 
@@ -99,7 +102,8 @@ 
     protected function getMutator(string $field, string $mutator)
     {
         $target = [];
-        switch ($mutator) {
+        switch ($mutator)
+        {
             case ModelSchema::MUTATOR_ACCESSOR:
                 $target = static::ACCESSORS;
                 break;
@@ -111,7 +115,8 @@ 
                 break;
         }
 
-        if (isset($target[$field])) {
+        if (isset($target[$field]))
+        {
             return $target[$field];
         }
 

src/Models/src/SchematicEntity.php

Spacing +4 added lines, -4 removed lines

@@ -34,15 +34,15 @@ 
      */
     protected function isFillable(string $field): bool
     {
-        if (!empty($this->schema[ModelSchema::FILLABLE]) && $this->schema[ModelSchema::FILLABLE] === '*') {
+        if (!empty($this->schema[ModelSchema::FILLABLE]) && $this->schema[ModelSchema::FILLABLE] === '*'){
             return true;
         }
 
-        if (!empty($this->schema[ModelSchema::FILLABLE])) {
+        if (!empty($this->schema[ModelSchema::FILLABLE])){
             return in_array($field, $this->schema[ModelSchema::FILLABLE]);
         }
 
-        if (!empty($this->schema[ModelSchema::SECURED]) && $this->schema[ModelSchema::SECURED] === '*') {
+        if (!empty($this->schema[ModelSchema::SECURED]) && $this->schema[ModelSchema::SECURED] === '*'){
             return false;
         }
 
@@ -54,7 +54,7 @@ 
      */
     protected function getMutator(string $field, string $mutator)
     {
-        if (isset($this->schema[ModelSchema::MUTATORS][$mutator][$field])) {
+        if (isset($this->schema[ModelSchema::MUTATORS][$mutator][$field])){
             return $this->schema[ModelSchema::MUTATORS][$mutator][$field];
         }
 

Braces +8 added lines, -4 removed lines

@@ -34,15 +34,18 @@ 
      */
     protected function isFillable(string $field): bool
     {
-        if (!empty($this->schema[ModelSchema::FILLABLE]) && $this->schema[ModelSchema::FILLABLE] === '*') {
+        if (!empty($this->schema[ModelSchema::FILLABLE]) && $this->schema[ModelSchema::FILLABLE] === '*')
+        {
             return true;
         }
 
-        if (!empty($this->schema[ModelSchema::FILLABLE])) {
+        if (!empty($this->schema[ModelSchema::FILLABLE]))
+        {
             return in_array($field, $this->schema[ModelSchema::FILLABLE]);
         }
 
-        if (!empty($this->schema[ModelSchema::SECURED]) && $this->schema[ModelSchema::SECURED] === '*') {
+        if (!empty($this->schema[ModelSchema::SECURED]) && $this->schema[ModelSchema::SECURED] === '*')
+        {
             return false;
         }
 
@@ -54,7 +57,8 @@ 
      */
     protected function getMutator(string $field, string $mutator)
     {
-        if (isset($this->schema[ModelSchema::MUTATORS][$mutator][$field])) {
+        if (isset($this->schema[ModelSchema::MUTATORS][$mutator][$field]))
+        {
             return $this->schema[ModelSchema::MUTATORS][$mutator][$field];
         }
 

src/Models/tests/GetEntity.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     protected static function filter($v)
     {
-        if (is_array($v)) {
+        if (is_array($v)){
             throw new RuntimeException("can't be array");
         }
 

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
 
     protected static function filter($v)
     {
-        if (is_array($v)) {
+        if (is_array($v))
+        {
             throw new RuntimeException("can't be array");
         }
 

src/Models/tests/DataEntityTest.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         $this->assertEquals([], $entity->getValue());
 
         $entity['a'] = 90;
-        foreach ($entity as $key => $value) {
+        foreach ($entity as $key => $value){
             $this->assertSame('a', $key);
             $this->assertSame(90, $value);
         }

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
         $this->assertEquals([], $entity->getValue());
 
         $entity['a'] = 90;
-        foreach ($entity as $key => $value) {
+        foreach ($entity as $key => $value)
+        {
             $this->assertSame('a', $key);
             $this->assertSame(90, $value);
         }

src/Models/tests/NullableEntity.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     protected function isNullable(string $field): bool
     {
-        if (parent::isNullable($field)) {
+        if (parent::isNullable($field)){
             return true;
         }
 

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
 
     protected function isNullable(string $field): bool
     {
-        if (parent::isNullable($field)) {
+        if (parent::isNullable($field))
+        {
             return true;
         }