thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Utils/MethodDescriptorInterface.php

Indentation +28 added lines, -28 removed lines

@@ -4,36 +4,36 @@
 
 interface MethodDescriptorInterface
 {
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string;
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string;
 
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName();
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName();
 
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string;
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string;
 
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array;
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array;
 
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string;
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string;
 }

src/Mouf/Database/TDBM/Utils/DirectForeignKeyMethodDescriptor.php

Indentation +110 added lines, -110 removed lines

@@ -12,65 +12,65 @@ 
  */
 class DirectForeignKeyMethodDescriptor implements MethodDescriptorInterface
 {
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $fk;
-
-    private $useAlternateName = false;
-    /**
-     * @var Table
-     */
-    private $mainTable;
-
-    /**
-     * @param ForeignKeyConstraint $fk        The foreign key pointing to our bean
-     * @param Table                $mainTable The main table that is pointed to
-     */
-    public function __construct(ForeignKeyConstraint $fk, Table $mainTable)
-    {
-        $this->fk = $fk;
-        $this->mainTable = $mainTable;
-    }
-
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string
-    {
-        if (!$this->useAlternateName) {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName());
-        } else {
-            $methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName()).'By';
-
-            $camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->fk->getLocalColumns());
-
-            $methodName .= implode('And', $camelizedColumns);
-
-            return $methodName;
-        }
-    }
-
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName()
-    {
-        $this->useAlternateName = true;
-    }
-
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string
-    {
-        $code = '';
-
-        $getterCode = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $fk;
+
+	private $useAlternateName = false;
+	/**
+	 * @var Table
+	 */
+	private $mainTable;
+
+	/**
+	 * @param ForeignKeyConstraint $fk        The foreign key pointing to our bean
+	 * @param Table                $mainTable The main table that is pointed to
+	 */
+	public function __construct(ForeignKeyConstraint $fk, Table $mainTable)
+	{
+		$this->fk = $fk;
+		$this->mainTable = $mainTable;
+	}
+
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string
+	{
+		if (!$this->useAlternateName) {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName());
+		} else {
+			$methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName()).'By';
+
+			$camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->fk->getLocalColumns());
+
+			$methodName .= implode('And', $camelizedColumns);
+
+			return $methodName;
+		}
+	}
+
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName()
+	{
+		$this->useAlternateName = true;
+	}
+
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string
+	{
+		$code = '';
+
+		$getterCode = '    /**
      * Returns the list of %s pointing to this bean via the %s column.
      *
      * @return %s[]|AlterableResultIterator
@@ -82,55 +82,55 @@ 
 
 ';
 
-        $beanClass = TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getLocalTableName());
-        $code .= sprintf($getterCode,
-            $beanClass,
-            implode(', ', $this->fk->getColumns()),
-            $beanClass,
-            $this->getName(),
-            var_export($this->fk->getLocalTableName(), true),
-            var_export($this->fk->getName(), true),
-            var_export($this->fk->getLocalTableName(), true),
-            $this->getFilters($this->fk)
-        );
-
-        return $code;
-    }
-
-    private function getFilters(ForeignKeyConstraint $fk) : string
-    {
-        $counter = 0;
-        $parameters = [];
-
-        $pkColumns = $this->mainTable->getPrimaryKeyColumns();
-
-        foreach ($fk->getLocalColumns() as $columnName) {
-            $pkColumn = $pkColumns[$counter];
-            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
-            ++$counter;
-        }
-        $parametersCode = '['.implode(', ', $parameters).']';
-
-        return $parametersCode;
-    }
-
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array
-    {
-        return [TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getForeignTableName())];
-    }
-
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string
-    {
-        return '';
-    }
+		$beanClass = TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getLocalTableName());
+		$code .= sprintf($getterCode,
+			$beanClass,
+			implode(', ', $this->fk->getColumns()),
+			$beanClass,
+			$this->getName(),
+			var_export($this->fk->getLocalTableName(), true),
+			var_export($this->fk->getName(), true),
+			var_export($this->fk->getLocalTableName(), true),
+			$this->getFilters($this->fk)
+		);
+
+		return $code;
+	}
+
+	private function getFilters(ForeignKeyConstraint $fk) : string
+	{
+		$counter = 0;
+		$parameters = [];
+
+		$pkColumns = $this->mainTable->getPrimaryKeyColumns();
+
+		foreach ($fk->getLocalColumns() as $columnName) {
+			$pkColumn = $pkColumns[$counter];
+			$parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
+			++$counter;
+		}
+		$parametersCode = '['.implode(', ', $parameters).']';
+
+		return $parametersCode;
+	}
+
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array
+	{
+		return [TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getForeignTableName())];
+	}
+
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string
+	{
+		return '';
+	}
 }

src/Mouf/Database/TDBM/Utils/PivotTableMethodsDescriptor.php

Indentation +130 added lines, -130 removed lines

@@ -7,99 +7,99 @@ 
 
 class PivotTableMethodsDescriptor implements MethodDescriptorInterface
 {
-    /**
-     * @var Table
-     */
-    private $pivotTable;
-
-    private $useAlternateName = false;
-
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $localFk;
-
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $remoteFk;
-
-    /**
-     * @param Table                $pivotTable The pivot table
-     * @param ForeignKeyConstraint $localFk
-     * @param ForeignKeyConstraint $remoteFk
-     */
-    public function __construct(Table $pivotTable, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
-    {
-        $this->pivotTable = $pivotTable;
-        $this->localFk = $localFk;
-        $this->remoteFk = $remoteFk;
-    }
-
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName()
-    {
-        $this->useAlternateName = true;
-    }
-
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string
-    {
-        if (!$this->useAlternateName) {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
-        } else {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
-        }
-    }
-
-    /**
-     * Returns the plural name.
-     *
-     * @return string
-     */
-    private function getPluralName() : string
-    {
-        if (!$this->useAlternateName) {
-            return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
-        } else {
-            return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
-        }
-    }
-
-    /**
-     * Returns the singular name.
-     *
-     * @return string
-     */
-    private function getSingularName() : string
-    {
-        if (!$this->useAlternateName) {
-            return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()));
-        } else {
-            return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName())).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
-        }
-    }
-
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string
-    {
-        $singularName = $this->getSingularName();
-        $pluralName = $this->getPluralName();
-        $remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->remoteFk->getForeignTableName());
-        $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
-        $pluralVariableName = $variableName.'s';
-
-        $str = '    /**
+	/**
+	 * @var Table
+	 */
+	private $pivotTable;
+
+	private $useAlternateName = false;
+
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $localFk;
+
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $remoteFk;
+
+	/**
+	 * @param Table                $pivotTable The pivot table
+	 * @param ForeignKeyConstraint $localFk
+	 * @param ForeignKeyConstraint $remoteFk
+	 */
+	public function __construct(Table $pivotTable, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
+	{
+		$this->pivotTable = $pivotTable;
+		$this->localFk = $localFk;
+		$this->remoteFk = $remoteFk;
+	}
+
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName()
+	{
+		$this->useAlternateName = true;
+	}
+
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string
+	{
+		if (!$this->useAlternateName) {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
+		} else {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
+		}
+	}
+
+	/**
+	 * Returns the plural name.
+	 *
+	 * @return string
+	 */
+	private function getPluralName() : string
+	{
+		if (!$this->useAlternateName) {
+			return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
+		} else {
+			return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
+		}
+	}
+
+	/**
+	 * Returns the singular name.
+	 *
+	 * @return string
+	 */
+	private function getSingularName() : string
+	{
+		if (!$this->useAlternateName) {
+			return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()));
+		} else {
+			return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName())).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
+		}
+	}
+
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string
+	{
+		$singularName = $this->getSingularName();
+		$pluralName = $this->getPluralName();
+		$remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->remoteFk->getForeignTableName());
+		$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+		$pluralVariableName = $variableName.'s';
+
+		$str = '    /**
      * Returns the list of %s associated to this bean via the %s pivot table.
      *
      * @return %s[]
@@ -110,9 +110,9 @@ 
     }
 ';
 
-        $getterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralName, var_export($this->remoteFk->getLocalTableName(), true));
+		$getterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralName, var_export($this->remoteFk->getLocalTableName(), true));
 
-        $str = '    /**
+		$str = '    /**
      * Adds a relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -123,9 +123,9 @@ 
     }
 ';
 
-        $adderCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
+		$adderCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Deletes the relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -136,9 +136,9 @@ 
     }
 ';
 
-        $removerCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
+		$removerCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Returns whether this bean is associated with %s via the %s pivot table.
      *
      * @param %s %s
@@ -150,9 +150,9 @@ 
     }
 ';
 
-        $hasCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
+		$hasCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Sets all relationships with %s associated to this bean via the %s pivot table.
      * Exiting relationships will be removed and replaced by the provided relationships.
      *
@@ -164,38 +164,38 @@ 
     }
 ';
 
-        $setterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralVariableName, $pluralName, $pluralVariableName, var_export($this->remoteFk->getLocalTableName(), true), $pluralVariableName);
-
-        $code = $getterCode.$adderCode.$removerCode.$hasCode.$setterCode;
-
-        return $code;
-    }
-
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array
-    {
-        return [TDBMDaoGenerator::getBeanNameFromTableName($this->remoteFk->getForeignTableName())];
-    }
-
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string
-    {
-        $remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->remoteFk->getForeignTableName());
-        $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
-
-        return '        if (!$stopRecursion) {
+		$setterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralVariableName, $pluralName, $pluralVariableName, var_export($this->remoteFk->getLocalTableName(), true), $pluralVariableName);
+
+		$code = $getterCode.$adderCode.$removerCode.$hasCode.$setterCode;
+
+		return $code;
+	}
+
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array
+	{
+		return [TDBMDaoGenerator::getBeanNameFromTableName($this->remoteFk->getForeignTableName())];
+	}
+
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string
+	{
+		$remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->remoteFk->getForeignTableName());
+		$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+
+		return '        if (!$stopRecursion) {
             $array[\''.lcfirst($this->getPluralName()).'\'] = array_map(function ('.$remoteBeanName.' '.$variableName.') {
                 return '.$variableName.'->jsonSerialize(true);
             }, $this->'.$this->getName().'());
         }
 ';
-    }
+	}
 }

src/Mouf/Database/TDBM/AlterableResultIterator.php

Indentation +245 added lines, -245 removed lines

@@ -14,274 +14,274 @@
  */
 class AlterableResultIterator implements Result, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var \Iterator|null
-     */
-    private $resultIterator;
+	/**
+	 * @var \Iterator|null
+	 */
+	private $resultIterator;
 
-    /**
-     * Key: the object to alter in the result set.
-     * Value: "add" => the object will be added to the resultset (if it is not found in it)
-     *        "delete" => the object will be removed from the resultset (if found).
-     *
-     * @var \SplObjectStorage
-     */
-    private $alterations;
+	/**
+	 * Key: the object to alter in the result set.
+	 * Value: "add" => the object will be added to the resultset (if it is not found in it)
+	 *        "delete" => the object will be removed from the resultset (if found).
+	 *
+	 * @var \SplObjectStorage
+	 */
+	private $alterations;
 
-    /**
-     * The result array from the result set.
-     *
-     * @var array|null
-     */
-    private $resultArray;
+	/**
+	 * The result array from the result set.
+	 *
+	 * @var array|null
+	 */
+	private $resultArray;
 
-    /**
-     * @param \Iterator|null $resultIterator
-     */
-    public function __construct(\Iterator $resultIterator = null)
-    {
-        $this->resultIterator = $resultIterator;
-        $this->alterations = new \SplObjectStorage();
-    }
+	/**
+	 * @param \Iterator|null $resultIterator
+	 */
+	public function __construct(\Iterator $resultIterator = null)
+	{
+		$this->resultIterator = $resultIterator;
+		$this->alterations = new \SplObjectStorage();
+	}
 
-    /**
-     * Sets a new iterator as the base iterator to be altered.
-     *
-     * @param \Iterator $resultIterator
-     */
-    public function setResultIterator(\Iterator $resultIterator)
-    {
-        $this->resultIterator = $resultIterator;
-        $this->resultArray = null;
-    }
+	/**
+	 * Sets a new iterator as the base iterator to be altered.
+	 *
+	 * @param \Iterator $resultIterator
+	 */
+	public function setResultIterator(\Iterator $resultIterator)
+	{
+		$this->resultIterator = $resultIterator;
+		$this->resultArray = null;
+	}
 
-    /**
-     * Returns the non altered result iterator (or null if none exist).
-     *
-     * @return \Iterator|null
-     */
-    public function getUnderlyingResultIterator()
-    {
-        return $this->resultIterator;
-    }
+	/**
+	 * Returns the non altered result iterator (or null if none exist).
+	 *
+	 * @return \Iterator|null
+	 */
+	public function getUnderlyingResultIterator()
+	{
+		return $this->resultIterator;
+	}
 
-    /**
-     * Adds an additional object to the result set (if not already available).
-     *
-     * @param $object
-     */
-    public function add($object)
-    {
-        $this->alterations->attach($object, 'add');
+	/**
+	 * Adds an additional object to the result set (if not already available).
+	 *
+	 * @param $object
+	 */
+	public function add($object)
+	{
+		$this->alterations->attach($object, 'add');
 
-        if ($this->resultArray !== null) {
-            $foundKey = array_search($object, $this->resultArray, true);
-            if ($foundKey === false) {
-                $this->resultArray[] = $object;
-            }
-        }
-    }
+		if ($this->resultArray !== null) {
+			$foundKey = array_search($object, $this->resultArray, true);
+			if ($foundKey === false) {
+				$this->resultArray[] = $object;
+			}
+		}
+	}
 
-    /**
-     * Removes an object from the result set.
-     *
-     * @param $object
-     */
-    public function remove($object)
-    {
-        $this->alterations->attach($object, 'delete');
+	/**
+	 * Removes an object from the result set.
+	 *
+	 * @param $object
+	 */
+	public function remove($object)
+	{
+		$this->alterations->attach($object, 'delete');
 
-        if ($this->resultArray !== null) {
-            $foundKey = array_search($object, $this->resultArray, true);
-            if ($foundKey !== false) {
-                unset($this->resultArray[$foundKey]);
-            }
-        }
-    }
+		if ($this->resultArray !== null) {
+			$foundKey = array_search($object, $this->resultArray, true);
+			if ($foundKey !== false) {
+				unset($this->resultArray[$foundKey]);
+			}
+		}
+	}
 
-    /**
-     * Casts the result set to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        if ($this->resultArray === null) {
-            if ($this->resultIterator !== null) {
-                $this->resultArray = iterator_to_array($this->resultIterator);
-            } else {
-                $this->resultArray = [];
-            }
+	/**
+	 * Casts the result set to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		if ($this->resultArray === null) {
+			if ($this->resultIterator !== null) {
+				$this->resultArray = iterator_to_array($this->resultIterator);
+			} else {
+				$this->resultArray = [];
+			}
 
-            foreach ($this->alterations as $obj) {
-                $action = $this->alterations->getInfo(); // return, if exists, associated with cur. obj. data; else NULL
+			foreach ($this->alterations as $obj) {
+				$action = $this->alterations->getInfo(); // return, if exists, associated with cur. obj. data; else NULL
 
-                $foundKey = array_search($obj, $this->resultArray, true);
+				$foundKey = array_search($obj, $this->resultArray, true);
 
-                if ($action === 'add' && $foundKey === false) {
-                    $this->resultArray[] = $obj;
-                } elseif ($action === 'delete' && $foundKey !== false) {
-                    unset($this->resultArray[$foundKey]);
-                }
-            }
-        }
+				if ($action === 'add' && $foundKey === false) {
+					$this->resultArray[] = $obj;
+				} elseif ($action === 'delete' && $foundKey !== false) {
+					unset($this->resultArray[$foundKey]);
+				}
+			}
+		}
 
-        return array_values($this->resultArray);
-    }
+		return array_values($this->resultArray);
+	}
 
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->toArray()[$offset]);
-    }
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->toArray()[$offset]);
+	}
 
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        return $this->toArray()[$offset];
-    }
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->toArray()[$offset];
+	}
 
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        throw new TDBMInvalidOperationException('You can set values in a TDBM result set, even in an alterable one. Use the add method instead.');
-    }
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		throw new TDBMInvalidOperationException('You can set values in a TDBM result set, even in an alterable one. Use the add method instead.');
+	}
 
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        throw new TDBMInvalidOperationException('You can unset values in a TDBM result set, even in an alterable one. Use the delete method instead.');
-    }
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		throw new TDBMInvalidOperationException('You can unset values in a TDBM result set, even in an alterable one. Use the delete method instead.');
+	}
 
-    /**
-     * @param int $offset
-     *
-     * @return \Porpaginas\Page
-     */
-    public function take($offset, $limit)
-    {
-        // TODO: replace this with a class implementing the map method.
-        return new ArrayPage(array_slice($this->toArray(), $offset, $limit), $offset, $limit, count($this->toArray()));
-    }
+	/**
+	 * @param int $offset
+	 *
+	 * @return \Porpaginas\Page
+	 */
+	public function take($offset, $limit)
+	{
+		// TODO: replace this with a class implementing the map method.
+		return new ArrayPage(array_slice($this->toArray(), $offset, $limit), $offset, $limit, count($this->toArray()));
+	}
 
-    /**
-     * Return the number of all results in the paginatable.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->toArray());
-    }
+	/**
+	 * Return the number of all results in the paginatable.
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->toArray());
+	}
 
-    /**
-     * Return an iterator over all results of the paginatable.
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        if ($this->alterations->count() === 0) {
-            if ($this->resultIterator !== null) {
-                return $this->resultIterator;
-            } else {
-                return new \ArrayIterator([]);
-            }
-        } else {
-            return new \ArrayIterator($this->toArray());
-        }
-    }
+	/**
+	 * Return an iterator over all results of the paginatable.
+	 *
+	 * @return Iterator
+	 */
+	public function getIterator()
+	{
+		if ($this->alterations->count() === 0) {
+			if ($this->resultIterator !== null) {
+				return $this->resultIterator;
+			} else {
+				return new \ArrayIterator([]);
+			}
+		} else {
+			return new \ArrayIterator($this->toArray());
+		}
+	}
 
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        return $this->toArray();
-    }
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
 
-    /**
-     * Returns only one value (the first) of the result set.
-     * Returns null if no value exists.
-     *
-     * @return mixed|null
-     */
-    public function first()
-    {
-        $page = $this->take(0, 1);
-        foreach ($page as $bean) {
-            return $bean;
-        }
+	/**
+	 * Returns only one value (the first) of the result set.
+	 * Returns null if no value exists.
+	 *
+	 * @return mixed|null
+	 */
+	public function first()
+	{
+		$page = $this->take(0, 1);
+		foreach ($page as $bean) {
+			return $bean;
+		}
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * Returns a new iterator mapping any call using the $callable function.
-     *
-     * @param callable $callable
-     *
-     * @return MapIterator
-     */
-    public function map(callable $callable)
-    {
-        return new MapIterator($this->getIterator(), $callable);
-    }
+	/**
+	 * Returns a new iterator mapping any call using the $callable function.
+	 *
+	 * @param callable $callable
+	 *
+	 * @return MapIterator
+	 */
+	public function map(callable $callable)
+	{
+		return new MapIterator($this->getIterator(), $callable);
+	}
 }

src/Mouf/Database/TDBM/TDBMInheritanceException.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
  */
 class TDBMInheritanceException extends TDBMException
 {
-    public static function create(array $tables) : TDBMInheritanceException
-    {
-        return new self(sprintf('The tables (%s) cannot be linked by an inheritance relationship. Does your data set contains multiple children for one parent row? (multiple inheritance is not supported by TDBM)', implode(', ', $tables)));
-    }
+	public static function create(array $tables) : TDBMInheritanceException
+	{
+		return new self(sprintf('The tables (%s) cannot be linked by an inheritance relationship. Does your data set contains multiple children for one parent row? (multiple inheritance is not supported by TDBM)', implode(', ', $tables)));
+	}
 
-    public static function extendException(TDBMInheritanceException $e, TDBMService $tdbmService, array $beanData) : TDBMInheritanceException
-    {
-        $pks = [];
-        foreach ($beanData as $table => $row) {
-            $primaryKeyColumns = $tdbmService->getPrimaryKeyColumns($table);
-            foreach ($primaryKeyColumns as $columnName) {
-                if ($row[$columnName] !== null) {
-                    $pks[] = $table.'.'.$columnName.' => '.var_export($row[$columnName], true);
-                }
-            }
-        }
+	public static function extendException(TDBMInheritanceException $e, TDBMService $tdbmService, array $beanData) : TDBMInheritanceException
+	{
+		$pks = [];
+		foreach ($beanData as $table => $row) {
+			$primaryKeyColumns = $tdbmService->getPrimaryKeyColumns($table);
+			foreach ($primaryKeyColumns as $columnName) {
+				if ($row[$columnName] !== null) {
+					$pks[] = $table.'.'.$columnName.' => '.var_export($row[$columnName], true);
+				}
+			}
+		}
 
-        throw new self($e->getMessage().' (row in error: '.implode(', ', $pks).')', 0, $e);
-    }
+		throw new self($e->getMessage().' (row in error: '.implode(', ', $pks).')', 0, $e);
+	}
 }

src/Mouf/Database/TDBM/TDBMCyclicReferenceException.php

Indentation +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@
 
 class TDBMCyclicReferenceException extends TDBMException
 {
-    public static function createCyclicReference(string $tableName, AbstractTDBMObject $object) : TDBMCyclicReferenceException
-    {
-        return new self(sprintf("You are trying a grape of objects that reference each other. Unable to save object '%s' in table '%s'. It is already in the process of being saved.", get_class($object), $tableName));
-    }
+	public static function createCyclicReference(string $tableName, AbstractTDBMObject $object) : TDBMCyclicReferenceException
+	{
+		return new self(sprintf("You are trying a grape of objects that reference each other. Unable to save object '%s' in table '%s'. It is already in the process of being saved.", get_class($object), $tableName));
+	}
 
-    public static function extendCyclicReference(TDBMCyclicReferenceException $e, string $tableName, AbstractTDBMObject $object, string $fkName) : TDBMCyclicReferenceException
-    {
-        return new self($e->getMessage().sprintf(" This object is referenced by an object of type '%s' (table '%s') via foreign key '%s'", get_class($object), $tableName, $fkName), $e->getCode(), $e);
-    }
+	public static function extendCyclicReference(TDBMCyclicReferenceException $e, string $tableName, AbstractTDBMObject $object, string $fkName) : TDBMCyclicReferenceException
+	{
+		return new self($e->getMessage().sprintf(" This object is referenced by an object of type '%s' (table '%s') via foreign key '%s'", get_class($object), $tableName, $fkName), $e->getCode(), $e);
+	}
 }

src/Mouf/Database/TDBM/TDBMMissingReferenceException.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class TDBMMissingReferenceException extends TDBMException
 {
-    public static function referenceDeleted(string $tableName, AbstractTDBMObject $reference) : TDBMMissingReferenceException
-    {
-        return new self(sprintf("Unable to save object in table '%s'. Your object references an object of type '%s' that is deleted.", $tableName, get_class($reference)));
-    }
+	public static function referenceDeleted(string $tableName, AbstractTDBMObject $reference) : TDBMMissingReferenceException
+	{
+		return new self(sprintf("Unable to save object in table '%s'. Your object references an object of type '%s' that is deleted.", $tableName, get_class($reference)));
+	}
 }

src/Mouf/Database/TDBM/DbRow.php

Indentation +384 added lines, -384 removed lines

@@ -27,170 +27,170 @@ 
  */
 class DbRow
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * The object containing this db row.
-     *
-     * @var AbstractTDBMObject
-     */
-    private $object;
-
-    /**
-     * The name of the table the object if issued from.
-     *
-     * @var string
-     */
-    private $dbTableName;
-
-    /**
-     * The array of columns returned from database.
-     *
-     * @var array
-     */
-    private $dbRow = array();
-
-    /**
-     * @var AbstractTDBMObject[]
-     */
-    private $references = array();
-
-    /**
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * The values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @var array An array of column => value
-     */
-    private $primaryKeys;
-
-    /**
-     * You should never call the constructor directly. Instead, you should use the
-     * TDBMService class that will create TDBMObjects for you.
-     *
-     * Used with id!=false when we want to retrieve an existing object
-     * and id==false if we want a new object
-     *
-     * @param AbstractTDBMObject $object      The object containing this db row
-     * @param string             $table_name
-     * @param array              $primaryKeys
-     * @param TDBMService        $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
-    {
-        $this->object = $object;
-        $this->dbTableName = $table_name;
-
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        if ($tdbmService === null) {
-            if (!empty($primaryKeys)) {
-                throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
-            }
-        } else {
-            $this->tdbmService = $tdbmService;
-
-            if (!empty($primaryKeys)) {
-                $this->_setPrimaryKeys($primaryKeys);
-                if (!empty($dbRow)) {
-                    $this->dbRow = $dbRow;
-                    $this->status = TDBMObjectStateEnum::STATE_LOADED;
-                } else {
-                    $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                }
-                $tdbmService->_addToCache($this);
-            } else {
-                $this->status = TDBMObjectStateEnum::STATE_NEW;
-                $this->tdbmService->_addToToSaveObjectList($this);
-            }
-        }
-    }
-
-    public function _attach(TDBMService $tdbmService)
-    {
-        if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
-        }
-        $this->tdbmService = $tdbmService;
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        $this->tdbmService->_addToToSaveObjectList($this);
-    }
-
-    /**
-     * Sets the state of the TDBM Object
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @param string $state
-     */
-    public function _setStatus($state)
-    {
-        $this->status = $state;
-    }
-
-    /**
-     * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
-     * If the object is in state 'not loaded', this method performs a query in database to load the object.
-     *
-     * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
-     * cannot be found).
-     */
-    public function _dbLoadIfNotLoaded()
-    {
-        if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
-            $connection = $this->tdbmService->getConnection();
-
-            /// buildFilterFromFilterBag($filter_bag)
-            list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
-
-            $sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
-            $result = $connection->executeQuery($sql, $parameters);
-
-            if ($result->rowCount() === 0) {
-                throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
-            }
-
-            $row = $result->fetch(\PDO::FETCH_ASSOC);
-
-            $this->dbRow = [];
-            $types = $this->tdbmService->_getColumnTypesForTable($this->dbTableName);
-
-            foreach ($row as $key => $value) {
-                $this->dbRow[$key] = $types[$key]->convertToPHPValue($value, $connection->getDatabasePlatform());
-            }
-
-            $result->closeCursor();
-
-            $this->status = TDBMObjectStateEnum::STATE_LOADED;
-        }
-    }
-
-    public function get($var)
-    {
-        $this->_dbLoadIfNotLoaded();
-
-        // Let's first check if the key exist.
-        if (!isset($this->dbRow[$var])) {
-            /*
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * The object containing this db row.
+	 *
+	 * @var AbstractTDBMObject
+	 */
+	private $object;
+
+	/**
+	 * The name of the table the object if issued from.
+	 *
+	 * @var string
+	 */
+	private $dbTableName;
+
+	/**
+	 * The array of columns returned from database.
+	 *
+	 * @var array
+	 */
+	private $dbRow = array();
+
+	/**
+	 * @var AbstractTDBMObject[]
+	 */
+	private $references = array();
+
+	/**
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @var string
+	 */
+	private $status;
+
+	/**
+	 * The values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @var array An array of column => value
+	 */
+	private $primaryKeys;
+
+	/**
+	 * You should never call the constructor directly. Instead, you should use the
+	 * TDBMService class that will create TDBMObjects for you.
+	 *
+	 * Used with id!=false when we want to retrieve an existing object
+	 * and id==false if we want a new object
+	 *
+	 * @param AbstractTDBMObject $object      The object containing this db row
+	 * @param string             $table_name
+	 * @param array              $primaryKeys
+	 * @param TDBMService        $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
+	{
+		$this->object = $object;
+		$this->dbTableName = $table_name;
+
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		if ($tdbmService === null) {
+			if (!empty($primaryKeys)) {
+				throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
+			}
+		} else {
+			$this->tdbmService = $tdbmService;
+
+			if (!empty($primaryKeys)) {
+				$this->_setPrimaryKeys($primaryKeys);
+				if (!empty($dbRow)) {
+					$this->dbRow = $dbRow;
+					$this->status = TDBMObjectStateEnum::STATE_LOADED;
+				} else {
+					$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				}
+				$tdbmService->_addToCache($this);
+			} else {
+				$this->status = TDBMObjectStateEnum::STATE_NEW;
+				$this->tdbmService->_addToToSaveObjectList($this);
+			}
+		}
+	}
+
+	public function _attach(TDBMService $tdbmService)
+	{
+		if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
+		}
+		$this->tdbmService = $tdbmService;
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		$this->tdbmService->_addToToSaveObjectList($this);
+	}
+
+	/**
+	 * Sets the state of the TDBM Object
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @param string $state
+	 */
+	public function _setStatus($state)
+	{
+		$this->status = $state;
+	}
+
+	/**
+	 * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
+	 * If the object is in state 'not loaded', this method performs a query in database to load the object.
+	 *
+	 * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
+	 * cannot be found).
+	 */
+	public function _dbLoadIfNotLoaded()
+	{
+		if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
+			$connection = $this->tdbmService->getConnection();
+
+			/// buildFilterFromFilterBag($filter_bag)
+			list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
+
+			$sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
+			$result = $connection->executeQuery($sql, $parameters);
+
+			if ($result->rowCount() === 0) {
+				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
+			}
+
+			$row = $result->fetch(\PDO::FETCH_ASSOC);
+
+			$this->dbRow = [];
+			$types = $this->tdbmService->_getColumnTypesForTable($this->dbTableName);
+
+			foreach ($row as $key => $value) {
+				$this->dbRow[$key] = $types[$key]->convertToPHPValue($value, $connection->getDatabasePlatform());
+			}
+
+			$result->closeCursor();
+
+			$this->status = TDBMObjectStateEnum::STATE_LOADED;
+		}
+	}
+
+	public function get($var)
+	{
+		$this->_dbLoadIfNotLoaded();
+
+		// Let's first check if the key exist.
+		if (!isset($this->dbRow[$var])) {
+			/*
             // Unable to find column.... this is an error if the object has been retrieved from database.
             // If it's a new object, well, that may not be an error after all!
             // Let's check if the column does exist in the table
@@ -210,39 +210,39 @@ 
             $str = "Could not find column \"$var\" in table \"$this->dbTableName\". Maybe you meant one of those columns: '".implode("', '",$result_array)."'";
 
             throw new TDBMException($str);*/
-            return;
-        }
-
-        $value = $this->dbRow[$var];
-        if ($value instanceof \DateTime) {
-            if (method_exists('DateTimeImmutable', 'createFromMutable')) { // PHP 5.6+ only
-                return \DateTimeImmutable::createFromMutable($value);
-            } else {
-                return new \DateTimeImmutable($value->format('c'));
-            }
-        }
-
-        return $this->dbRow[$var];
-    }
-
-    /**
-     * Returns true if a column is set, false otherwise.
-     *
-     * @param string $var
-     *
-     * @return bool
-     */
-    /*public function has($var) {
+			return;
+		}
+
+		$value = $this->dbRow[$var];
+		if ($value instanceof \DateTime) {
+			if (method_exists('DateTimeImmutable', 'createFromMutable')) { // PHP 5.6+ only
+				return \DateTimeImmutable::createFromMutable($value);
+			} else {
+				return new \DateTimeImmutable($value->format('c'));
+			}
+		}
+
+		return $this->dbRow[$var];
+	}
+
+	/**
+	 * Returns true if a column is set, false otherwise.
+	 *
+	 * @param string $var
+	 *
+	 * @return bool
+	 */
+	/*public function has($var) {
         $this->_dbLoadIfNotLoaded();
 
         return isset($this->dbRow[$var]);
     }*/
 
-    public function set($var, $value)
-    {
-        $this->_dbLoadIfNotLoaded();
+	public function set($var, $value)
+	{
+		$this->_dbLoadIfNotLoaded();
 
-        /*
+		/*
         // Ok, let's start by checking the column type
         $type = $this->db_connection->getColumnType($this->dbTableName, $var);
 
@@ -252,198 +252,198 @@ 
         }
         */
 
-        /*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
+		/*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
             throw new TDBMException("Error! Changing primary key value is forbidden.");*/
-        $this->dbRow[$var] = $value;
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
-    {
-        $this->references[$foreignKeyName] = $bean;
-
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function getRef($foreignKeyName)
-    {
-        if (array_key_exists($foreignKeyName, $this->references)) {
-            return $this->references[$foreignKeyName];
-        } elseif ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->tdbmService === null) {
-            // If the object is new and has no property, then it has to be empty.
-            return;
-        } else {
-            $this->_dbLoadIfNotLoaded();
-
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-
-            $values = [];
-            foreach ($fk->getLocalColumns() as $column) {
-                if (!isset($this->dbRow[$column])) {
-                    return;
-                }
-                $values[] = $this->dbRow[$column];
-            }
-
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
-
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
-        }
-    }
-
-    /**
-     * Returns the name of the table this object comes from.
-     *
-     * @return string
-     */
-    public function _getDbTableName()
-    {
-        return $this->dbTableName;
-    }
-
-    /**
-     * Method used internally by TDBM. You should not use it directly.
-     * This method returns the status of the TDBMObject.
-     * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @return string
-     */
-    public function _getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Override the native php clone function for TDBMObjects.
-     */
-    public function __clone()
-    {
-        // Let's load the row (before we lose the ID!)
-        $this->_dbLoadIfNotLoaded();
-
-        //Let's set the status to detached
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        $this->primaryKeys = [];
-
-        //Now unset the PK from the row
-        if ($this->tdbmService) {
-            $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-            foreach ($pk_array as $pk) {
-                $this->dbRow[$pk] = null;
-            }
-        }
-    }
-
-    /**
-     * Returns raw database row.
-     *
-     * @return array
-     *
-     * @throws TDBMMissingReferenceException
-     */
-    public function _getDbRow()
-    {
-        // Let's merge $dbRow and $references
-        $dbRow = $this->dbRow;
-
-        foreach ($this->references as $foreignKeyName => $reference) {
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-            $localColumns = $fk->getLocalColumns();
-
-            if ($reference !== null) {
-                $refDbRows = $reference->_getDbRows();
-                $firstRefDbRow = reset($refDbRows);
-                if ($firstRefDbRow->_getStatus() == TDBMObjectStateEnum::STATE_DELETED) {
-                    throw TDBMMissingReferenceException::referenceDeleted($this->dbTableName, $reference);
-                }
-                $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-                for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
-                    $dbRow[$localColumns[$i]] = $pkValues[$i];
-                }
-            } else {
-                for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
-                    $dbRow[$localColumns[$i]] = null;
-                }
-            }
-        }
-
-        return $dbRow;
-    }
-
-    /**
-     * Returns references array.
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getReferences()
-    {
-        return $this->references;
-    }
-
-    /**
-     * Returns the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @return array
-     */
-    public function _getPrimaryKeys()
-    {
-        return $this->primaryKeys;
-    }
-
-    /**
-     * Sets the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @param array $primaryKeys
-     */
-    public function _setPrimaryKeys(array $primaryKeys)
-    {
-        $this->primaryKeys = $primaryKeys;
-        foreach ($this->primaryKeys as $column => $value) {
-            $this->dbRow[$column] = $value;
-        }
-    }
-
-    /**
-     * Returns the TDBMObject this bean is associated to.
-     *
-     * @return AbstractTDBMObject
-     */
-    public function getTDBMObject()
-    {
-        return $this->object;
-    }
-
-    /**
-     * Sets the TDBMObject this bean is associated to.
-     * Only used when cloning.
-     *
-     * @param AbstractTDBMObject $object
-     */
-    public function setTDBMObject(AbstractTDBMObject $object)
-    {
-        $this->object = $object;
-    }
+		$this->dbRow[$var] = $value;
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
+	{
+		$this->references[$foreignKeyName] = $bean;
+
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function getRef($foreignKeyName)
+	{
+		if (array_key_exists($foreignKeyName, $this->references)) {
+			return $this->references[$foreignKeyName];
+		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->tdbmService === null) {
+			// If the object is new and has no property, then it has to be empty.
+			return;
+		} else {
+			$this->_dbLoadIfNotLoaded();
+
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+
+			$values = [];
+			foreach ($fk->getLocalColumns() as $column) {
+				if (!isset($this->dbRow[$column])) {
+					return;
+				}
+				$values[] = $this->dbRow[$column];
+			}
+
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
+
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
+		}
+	}
+
+	/**
+	 * Returns the name of the table this object comes from.
+	 *
+	 * @return string
+	 */
+	public function _getDbTableName()
+	{
+		return $this->dbTableName;
+	}
+
+	/**
+	 * Method used internally by TDBM. You should not use it directly.
+	 * This method returns the status of the TDBMObject.
+	 * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @return string
+	 */
+	public function _getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * Override the native php clone function for TDBMObjects.
+	 */
+	public function __clone()
+	{
+		// Let's load the row (before we lose the ID!)
+		$this->_dbLoadIfNotLoaded();
+
+		//Let's set the status to detached
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		$this->primaryKeys = [];
+
+		//Now unset the PK from the row
+		if ($this->tdbmService) {
+			$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+			foreach ($pk_array as $pk) {
+				$this->dbRow[$pk] = null;
+			}
+		}
+	}
+
+	/**
+	 * Returns raw database row.
+	 *
+	 * @return array
+	 *
+	 * @throws TDBMMissingReferenceException
+	 */
+	public function _getDbRow()
+	{
+		// Let's merge $dbRow and $references
+		$dbRow = $this->dbRow;
+
+		foreach ($this->references as $foreignKeyName => $reference) {
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			$localColumns = $fk->getLocalColumns();
+
+			if ($reference !== null) {
+				$refDbRows = $reference->_getDbRows();
+				$firstRefDbRow = reset($refDbRows);
+				if ($firstRefDbRow->_getStatus() == TDBMObjectStateEnum::STATE_DELETED) {
+					throw TDBMMissingReferenceException::referenceDeleted($this->dbTableName, $reference);
+				}
+				$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
+				for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+					$dbRow[$localColumns[$i]] = $pkValues[$i];
+				}
+			} else {
+				for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+					$dbRow[$localColumns[$i]] = null;
+				}
+			}
+		}
+
+		return $dbRow;
+	}
+
+	/**
+	 * Returns references array.
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getReferences()
+	{
+		return $this->references;
+	}
+
+	/**
+	 * Returns the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeys()
+	{
+		return $this->primaryKeys;
+	}
+
+	/**
+	 * Sets the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @param array $primaryKeys
+	 */
+	public function _setPrimaryKeys(array $primaryKeys)
+	{
+		$this->primaryKeys = $primaryKeys;
+		foreach ($this->primaryKeys as $column => $value) {
+			$this->dbRow[$column] = $value;
+		}
+	}
+
+	/**
+	 * Returns the TDBMObject this bean is associated to.
+	 *
+	 * @return AbstractTDBMObject
+	 */
+	public function getTDBMObject()
+	{
+		return $this->object;
+	}
+
+	/**
+	 * Sets the TDBMObject this bean is associated to.
+	 * Only used when cloning.
+	 *
+	 * @param AbstractTDBMObject $object
+	 */
+	public function setTDBMObject(AbstractTDBMObject $object)
+	{
+		$this->object = $object;
+	}
 }

src/Mouf/Database/TDBM/TDBMObjectStateEnum.php

Indentation +7 added lines, -7 removed lines

@@ -27,11 +27,11 @@
  */
 final class TDBMObjectStateEnum
 {
-    const STATE_DETACHED = 'detached';
-    const STATE_NEW = 'new';
-    const STATE_SAVING = 'saving';
-    const STATE_NOT_LOADED = 'not loaded';
-    const STATE_LOADED = 'loaded';
-    const STATE_DIRTY = 'dirty';
-    const STATE_DELETED = 'deleted';
+	const STATE_DETACHED = 'detached';
+	const STATE_NEW = 'new';
+	const STATE_SAVING = 'saving';
+	const STATE_NOT_LOADED = 'not loaded';
+	const STATE_LOADED = 'loaded';
+	const STATE_DIRTY = 'dirty';
+	const STATE_DELETED = 'deleted';
 }