Falseclock / dbd-php-entity

src/DBD/Entity/Mapper.php

Braces +49 added lines, -34 removed lines

@@ -65,8 +65,9 @@ 
         if (!isset(MapperCache::me()->fullyInstantiated[$class])) {
 
             // Check we set ANNOTATION properly in Mapper instance
-            if ($callEnforcer)
-                Enforcer::__add(__CLASS__, $class);
+            if ($callEnforcer) {
+                            Enforcer::__add(__CLASS__, $class);
+            }
 
             $self->getAllVariables();
 
@@ -113,10 +114,11 @@ 
                 if (isset($varValue[Constraint::LOCAL_COLUMN])) {
                     $constraints[$varName] = $varValue;
                 } else {
-                    if (isset($varValue[Embedded::NAME]))
-                        $embedded[$varName] = $varValue;
-                    else if (isset($varValue[Complex::TYPE]))
-                        $complex[$varName] = $varValue;
+                    if (isset($varValue[Embedded::NAME])) {
+                                            $embedded[$varName] = $varValue;
+                    } else if (isset($varValue[Complex::TYPE])) {
+                                            $complex[$varName] = $varValue;
+                    }
                 }
             }
 
@@ -126,8 +128,9 @@ 
                 MapperCache::me()->complex[$thisName][$complexName] = $this->$complexName;
             }
             // У нас может не быть комплексов
-            if (!isset(MapperCache::me()->complex[$thisName]))
-                MapperCache::me()->complex[$thisName] = [];
+            if (!isset(MapperCache::me()->complex[$thisName])) {
+                            MapperCache::me()->complex[$thisName] = [];
+            }
 
             /** ----------------------EMBEDDED------------------------ */
             foreach ($embedded as $embeddedName => $embeddedValue) {
@@ -135,8 +138,9 @@ 
                 MapperCache::me()->embedded[$thisName][$embeddedName] = $this->$embeddedName;
             }
             // У нас может не быть эмбедов
-            if (!isset(MapperCache::me()->embedded[$thisName]))
-                MapperCache::me()->embedded[$thisName] = [];
+            if (!isset(MapperCache::me()->embedded[$thisName])) {
+                            MapperCache::me()->embedded[$thisName] = [];
+            }
 
             /** ----------------------COLUMNS------------------------ */
             if (!isset(MapperCache::me()->columns[$thisName])) {
@@ -147,11 +151,13 @@ 
                 }
             }
             // У нас может не быть колонок
-            if (!isset(MapperCache::me()->columns[$thisName]))
-                MapperCache::me()->columns[$thisName] = [];
+            if (!isset(MapperCache::me()->columns[$thisName])) {
+                            MapperCache::me()->columns[$thisName] = [];
+            }
 
-            if (!isset(MapperCache::me()->baseColumns[$thisName]))
-                MapperCache::me()->baseColumns[$thisName] = [];
+            if (!isset(MapperCache::me()->baseColumns[$thisName])) {
+                            MapperCache::me()->baseColumns[$thisName] = [];
+            }
 
             /** ----------------------CONSTRAINTS------------------------ */
             $temporaryConstraints = [];
@@ -164,16 +170,18 @@ 
                     //$temporaryConstraint->localTable = $this->getTable();
 
                     // If we use View - we do not always need to define constraint fields
-                    if ($entityClass !== View::class)
-                        $temporaryConstraint->localColumn = $this->findColumnByOriginName($temporaryConstraint->localColumn);
+                    if ($entityClass !== View::class) {
+                                            $temporaryConstraint->localColumn = $this->findColumnByOriginName($temporaryConstraint->localColumn);
+                    }
 
                     $temporaryConstraints[$constraintName] = $temporaryConstraint;
                 }
             }
 
             // У нас может не быть констрейнтов
-            if (!isset(MapperCache::me()->constraints[$thisName]))
-                MapperCache::me()->constraints[$thisName] = [];
+            if (!isset(MapperCache::me()->constraints[$thisName])) {
+                            MapperCache::me()->constraints[$thisName] = [];
+            }
 
             MapperCache::me()->allVariables[$thisName] = new MapperVariables($columns, $constraints, $embedded, $complex);
 
@@ -205,14 +213,17 @@ 
      */
     private function checkProperty($varValue, string $varName): void
     {
-        if (is_null($varValue))
-            throw new EntityException(sprintf("property '\$%s' of %s is null", $varName, get_class($this)));
+        if (is_null($varValue)) {
+                    throw new EntityException(sprintf("property '\$%s' of %s is null", $varName, get_class($this)));
+        }
 
-        if (!is_array($varValue))
-            throw new EntityException(sprintf("property '\$%s' of %s is not array", $varName, get_class($this)));
+        if (!is_array($varValue)) {
+                    throw new EntityException(sprintf("property '\$%s' of %s is not array", $varName, get_class($this)));
+        }
 
-        if (count($varValue) == 0)
-            throw new EntityException(sprintf("property '\$%s' of %s does not have definitions", $varName, get_class($this)));
+        if (count($varValue) == 0) {
+                    throw new EntityException(sprintf("property '\$%s' of %s does not have definitions", $varName, get_class($this)));
+        }
     }
 
     /**
@@ -296,8 +307,9 @@ 
     {
         $keys = [];
         foreach (MapperCache::me()->columns[$this->name()] as $columnName => $column) {
-            if (isset($column->key) and $column->key === true)
-                $keys[$columnName] = $column;
+            if (isset($column->key) and $column->key === true) {
+                            $keys[$columnName] = $column;
+            }
         }
 
         return $keys;
@@ -331,8 +343,9 @@ 
      */
     public function __get($name)
     {
-        if (!property_exists($this, $name))
-            throw new EntityException(sprintf("Can't find property '\$%s' of '%s'", $name, get_class($this)));
+        if (!property_exists($this, $name)) {
+                    throw new EntityException(sprintf("Can't find property '\$%s' of '%s'", $name, get_class($this)));
+        }
 
         return $this->$name;
     }
@@ -362,8 +375,9 @@ 
     public function getVarNameByColumn(Column $column)
     {
         foreach ($this->getOriginFieldNames() as $varName => $originFieldName) {
-            if ($originFieldName == $column->name)
-                return $varName;
+            if ($originFieldName == $column->name) {
+                            return $varName;
+            }
         }
 
         throw new EntityException(sprintf("Seems column '%s' does not belong to this mapper", $column->name));
@@ -376,11 +390,12 @@ 
     {
         $thisName = $this->name();
         if (!isset(MapperCache::me()->originFieldNames[$thisName])) {
-            if (count($this->getColumns()))
-                foreach ($this->getColumns() as $columnName => $column)
+            if (count($this->getColumns())) {
+                            foreach ($this->getColumns() as $columnName => $column)
                     MapperCache::me()->originFieldNames[$thisName][$columnName] = $column->name;
-            else
-                MapperCache::me()->originFieldNames[$thisName] = [];
+            } else {
+                            MapperCache::me()->originFieldNames[$thisName] = [];
+            }
 
         }
 

src/DBD/Entity/Table.php

Braces +6 added lines, -4 removed lines

@@ -60,12 +60,14 @@
 
         foreach ($mapper->getColumns() as $column) {
             $table->columns[] = $column;
-            if ($column->key)
-                $table->keys[] = $column;
+            if ($column->key) {
+                            $table->keys[] = $column;
+            }
         }
 
-        foreach ($mapper->getConstraints() as $constraint)
-            $table->constraints[] = $constraint;
+        foreach ($mapper->getConstraints() as $constraint) {
+                    $table->constraints[] = $constraint;
+        }
 
         return $table;
     }

src/DBD/Entity/Entity.php

Braces +52 added lines, -36 removed lines

@@ -61,8 +61,9 @@ 
 
         $calledClass = get_class($this);
 
-        if (!$this instanceof SyntheticEntity)
-            Enforcer::__add(__CLASS__, $calledClass);
+        if (!$this instanceof SyntheticEntity) {
+                    Enforcer::__add(__CLASS__, $calledClass);
+        }
 
         try {
             $map = self::map();
@@ -86,8 +87,9 @@ 
 
             // У нас может быть цепочка классов, где какой-то конечный уже не имеет интерфейса OnlyDeclaredPropertiesEntity
             // соответственно нам надо собрать все переменные всех дочерних классов, даже если они расширяют друг друга
-            if ($this instanceof OnlyDeclaredPropertiesEntity)
-                $this->collectDeclarationsOnly(new ReflectionObject($this), $calledClass);
+            if ($this instanceof OnlyDeclaredPropertiesEntity) {
+                            $this->collectDeclarationsOnly(new ReflectionObject($this), $calledClass);
+            }
         }
 
         if ($this instanceof OnlyDeclaredPropertiesEntity) {
@@ -102,13 +104,15 @@ 
         if ($this instanceof FullEntity or $this instanceof StrictlyFilledEntity) {
             $checkAgainst = array_merge($map->getColumns(), $map->getComplex(), $map->getEmbedded(), $map->getConstraints());
             foreach (get_object_vars($this) as $propertyName => $propertyDefaultValue) {
-                if (!array_key_exists($propertyName, $checkAgainst) && $propertyName != 'rawData')
-                    throw new EntityException(sprintf("Strict Entity %s has unmapped property '%s'", $calledClass, $propertyName));
+                if (!array_key_exists($propertyName, $checkAgainst) && $propertyName != 'rawData') {
+                                    throw new EntityException(sprintf("Strict Entity %s has unmapped property '%s'", $calledClass, $propertyName));
+                }
             }
         }
 
-        if (is_null($this->rawData))
-            return;
+        if (is_null($this->rawData)) {
+                    return;
+        }
 
         // Если мы определяем класс с интерфейсом OnlyDeclaredPropertiesEntity и экстендим его
         // то по сути мы не можем знать какие переменные классам нам обязательны к обработке.
@@ -116,8 +120,9 @@ 
         //if($this instanceof OnlyDeclaredPropertiesEntity and !$reflectionObject->isFinal())
         //	throw new EntityException("Class " . $reflectionObject->getParentClass()->getShortName() . " which implements OnlyDeclaredPropertiesEntity interface must be final");
 
-        if ($currentLevel <= $maxLevels)
-            $this->setModelData($map, $maxLevels, $currentLevel);
+        if ($currentLevel <= $maxLevels) {
+                    $this->setModelData($map, $maxLevels, $currentLevel);
+        }
     }
 
     /**
@@ -132,17 +137,19 @@ 
         /** @var Mapper $mapClass */
         $mapClass = $calledClass . Mapper::POSTFIX;
 
-        if (!class_exists($mapClass, false))
-            throw new EntityException(sprintf("Class %s does not have Map definition", $calledClass));
+        if (!class_exists($mapClass, false)) {
+                    throw new EntityException(sprintf("Class %s does not have Map definition", $calledClass));
+        }
 
         /** @noinspection PhpUnhandledExceptionInspection */
         $reflection = new ReflectionClass($calledClass);
         $interfaces = $reflection->getInterfaces();
 
-        if (isset($interfaces[SyntheticEntity::class]))
-            return $mapClass::meWithoutEnforcer();
-        else
-            return $mapClass::me();
+        if (isset($interfaces[SyntheticEntity::class])) {
+                    return $mapClass::meWithoutEnforcer();
+        } else {
+                    return $mapClass::me();
+        }
     }
 
     /**
@@ -156,15 +163,17 @@ 
 
             $declaringClass = $property->getDeclaringClass();
 
-            if ($declaringClass->name == $calledClass || $declaringClass->name == $parentClass)
-                EntityCache::$mapCache[$calledClass][EntityCache::DECLARED_PROPERTIES][$property->name] = true;
+            if ($declaringClass->name == $calledClass || $declaringClass->name == $parentClass) {
+                            EntityCache::$mapCache[$calledClass][EntityCache::DECLARED_PROPERTIES][$property->name] = true;
+            }
         }
 
         $parentClass = $reflectionObject->getParentClass();
         $parentInterfaces = $parentClass->getInterfaces();
 
-        if (isset($parentInterfaces[OnlyDeclaredPropertiesEntity::class]))
-            $this->collectDeclarationsOnly($parentClass, $calledClass, $parentClass->name);
+        if (isset($parentInterfaces[OnlyDeclaredPropertiesEntity::class])) {
+                    $this->collectDeclarationsOnly($parentClass, $calledClass, $parentClass->name);
+        }
 
         /** If we have defined declaredProperties key, we must exclude some keys from reverseMap and arrayMap */
         if (isset(EntityCache::$mapCache[$calledClass][EntityCache::DECLARED_PROPERTIES])) {
@@ -243,14 +252,16 @@ 
         foreach ($this->rawData as $originColumnName => &$columnValue) {
 
             /** process only if Entity class has such field declaration */
-            if (!isset($fieldMapping[$originColumnName]))
-                continue;
+            if (!isset($fieldMapping[$originColumnName])) {
+                            continue;
+            }
 
             /** @var string $property name of field declaration in Entity class */
             $property = $fieldMapping[$originColumnName];
 
-            if (!property_exists($this, $property))
-                continue;
+            if (!property_exists($this, $property)) {
+                            continue;
+            }
 
             /** Note: Function names are case-insensitive, though it is usually good form to call functions as they appear in their declaration. */
             $setterMethod = "set{$property}";
@@ -258,8 +269,9 @@ 
             /** @var Column $fieldDefinition */
             $fieldDefinition = $mapper->$property;
 
-            if (is_null($columnValue) and $fieldDefinition->nullable === false)
-                throw new EntityException(sprintf("Column %s of %s shouldn't accept null values according Mapper definition", $originColumnName, $calledClass));
+            if (is_null($columnValue) and $fieldDefinition->nullable === false) {
+                            throw new EntityException(sprintf("Column %s of %s shouldn't accept null values according Mapper definition", $originColumnName, $calledClass));
+            }
 
             /** We can define setter method for field definition in Entity class, so let's check it first */
             if (method_exists($this, $setterMethod)) {
@@ -274,8 +286,9 @@ 
                      * But some times we need to have default value for column in case of $rowData has null value
                      * In this case we should not override default value if $columnValue is null
                      */
-                    if (!isset($this->$property) and isset($columnValue))
-                        $this->$property = &$columnValue;
+                    if (!isset($this->$property) and isset($columnValue)) {
+                                            $this->$property = &$columnValue;
+                    }
                 }
             }
         }
@@ -295,8 +308,9 @@ 
             $embeddings = MapperCache::me()->embedded[$map->name()];
             $missingColumns = [];
             foreach ($embeddings as $embedding) {
-                if ($embedding->name !== false and !array_key_exists($embedding->name, $this->rawData))
-                    $missingColumns[] = $embedding->name;
+                if ($embedding->name !== false and !array_key_exists($embedding->name, $this->rawData)) {
+                                    $missingColumns[] = $embedding->name;
+                }
             }
             if (count($missingColumns) > 0) {
                 throw new EntityException(sprintf("Seems you forgot to select columns for FullEntity or StrictlyFilledEntity '%s': %s",
@@ -328,8 +342,9 @@ 
                     if ($embeddedValue->isIterable) {
                         $iterables = [];
                         if (isset($this->rawData[$embeddedValue->name]) and !is_null($this->rawData[$embeddedValue->name])) {
-                            foreach ($this->rawData[$embeddedValue->name] as $value)
-                                $iterables[] = new $embeddedValue->entityClass($value, $maxLevels, $currentLevel);
+                            foreach ($this->rawData[$embeddedValue->name] as $value) {
+                                                            $iterables[] = new $embeddedValue->entityClass($value, $maxLevels, $currentLevel);
+                            }
 
                             $this->$embeddedName = $iterables;
                         }
@@ -356,10 +371,11 @@ 
             //if (!property_exists($this, $complexName) or isset(EntityCache::$mapCache[get_called_class()][EntityCache::UNSET_PROPERTIES][$complexName]))
             //    continue;
 
-            if ($currentLevel <= $maxLevels)
-                $this->$complexName = new $complexValue->complexClass($this->rawData, $maxLevels, $currentLevel);
-            else
-                unset($this->$complexName);
+            if ($currentLevel <= $maxLevels) {
+                            $this->$complexName = new $complexValue->complexClass($this->rawData, $maxLevels, $currentLevel);
+            } else {
+                            unset($this->$complexName);
+            }
         }
     }
 

src/DBD/Entity/Column.php

Braces +3 added lines, -2 removed lines

@@ -93,7 +93,8 @@
             }
         }
 
-        if (is_null($this->name))
-            throw new EntityException(sprintf("columns not set: %s. Check that Embedded and Complex fields are protected type.", json_encode($columnNameOrArray)));
+        if (is_null($this->name)) {
+                    throw new EntityException(sprintf("columns not set: %s. Check that Embedded and Complex fields are protected type.", json_encode($columnNameOrArray)));
+        }
     }
 }

src/DBD/Entity/Embedded.php

Braces +3 added lines, -2 removed lines

@@ -73,7 +73,8 @@
             }
         }
 
-        if (is_null($this->name))
-            throw new EntityException("Embedded name not set");
+        if (is_null($this->name)) {
+                    throw new EntityException("Embedded name not set");
+        }
     }
 }

src/DBD/Entity/Complex.php

Braces +3 added lines, -2 removed lines

@@ -56,7 +56,8 @@
             }
         }
 
-        if (is_null($this->complexClass))
-            throw new EntityException("Complex className not set");
+        if (is_null($this->complexClass)) {
+                    throw new EntityException("Complex className not set");
+        }
     }
 }

src/DBD/Entity/Common/Utils.php

Braces +3 added lines, -2 removed lines

@@ -65,8 +65,9 @@
      */
     public static function convertBoolVar($variable): ?bool
     {
-        if (is_string($variable))
-            $variable = strtolower(trim($variable));
+        if (is_string($variable)) {
+                    $variable = strtolower(trim($variable));
+        }
 
         switch ($variable) {
             case 't':