thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php

Doc Comments +3 added lines, -2 removed lines

@@ -138,9 +138,7 @@ 
 	 * @Action
 	 * @param string $daonamespace
 	 * @param string $beannamespace
-	 * @param int $keepSupport
 	 * @param int $storeInUtc
-	 * @param int $castDatesToDateTime
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
@@ -168,6 +166,9 @@ 
 	
 	protected $errorMsg;
 	
+	/**
+	 * @param string $msg
+	 */
 	private function displayErrorMsg($msg) {
 		$this->errorMsg = $msg;
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);

Indentation +4 added lines, -4 removed lines

@@ -109,12 +109,12 @@ 
 		$this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService");
 		
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
 			if ($autoloadNamespaces) {
 				$this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
+				$rootNamespace = $autoloadNamespaces[0];
 				$this->daoNamespace = $rootNamespace."Dao";
 				$this->beanNamespace = $rootNamespace."Dao\\Bean";
 			} else {
@@ -144,7 +144,7 @@ 
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
-    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
+	public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
 		$this->selfedit = $selfedit;
 		
 		if ($selfedit == "true") {

src/Mouf/Database/TDBM/PageIterator.php

Doc Comments +4 added lines, -1 removed lines

@@ -63,6 +63,9 @@ 
 
 	private $innerResultIterator;
 
+	/**
+	 * @param integer $offset
+	 */
 	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
 	{
 		$this->parentResult = $parentResult;
@@ -108,7 +111,7 @@ 
 	}
 
 	/**
-	 * @return int
+	 * @return double
 	 */
 	public function getCurrentPage()
 	{

src/Mouf/Database/TDBM/TDBMObject.php

Doc Comments +7 added lines

@@ -35,6 +35,9 @@ 
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
 {
 
+    /**
+     * @param string $var
+     */
     public function __get($var)
     {
         return $this->get($var);
@@ -51,6 +54,10 @@ 
         return $this->has($var);
     }
 
+    /**
+     * @param string $var
+     * @param string|null $value
+     */
     public function __set($var, $value)
     {
         $this->set($var, $value);

Indentation +113 added lines, -113 removed lines

@@ -35,117 +35,117 @@
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
 {
 
-    public function __get($var)
-    {
-        return $this->get($var);
-    }
-
-    /**
-     * Returns true if a column is set, false otherwise.
-     *
-     * @param string $var
-     * @return boolean
-     */
-    public function __isset($var)
-    {
-        return $this->has($var);
-    }
-
-    public function __set($var, $value)
-    {
-        $this->set($var, $value);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     * @param string $value
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->__set($offset, $value);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        $this->_dbLoadIfNotLoaded();
-        return isset($this->dbRow[$offset]);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     */
-    public function offsetUnset($offset)
-    {
-        $this->__set($offset, null);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return $this->__get($offset);
-    }
-
-    private $_validIterator = false;
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function rewind()
-    {
-        $this->_dbLoadIfNotLoaded();
-        if (count($this->dbRow) > 0) {
-            $this->_validIterator = true;
-        } else {
-            $this->_validIterator = false;
-        }
-        reset($this->dbRow);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function next()
-    {
-        $val = next($this->dbRow);
-        $this->_validIterator = !($val === false);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function key()
-    {
-        return key($this->dbRow);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function current()
-    {
-        return current($this->dbRow);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function valid()
-    {
-        return $this->_validIterator;
-    }
+	public function __get($var)
+	{
+		return $this->get($var);
+	}
+
+	/**
+	 * Returns true if a column is set, false otherwise.
+	 *
+	 * @param string $var
+	 * @return boolean
+	 */
+	public function __isset($var)
+	{
+		return $this->has($var);
+	}
+
+	public function __set($var, $value)
+	{
+		$this->set($var, $value);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 * @param string $value
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->__set($offset, $value);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		$this->_dbLoadIfNotLoaded();
+		return isset($this->dbRow[$offset]);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->__set($offset, null);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->__get($offset);
+	}
+
+	private $_validIterator = false;
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function rewind()
+	{
+		$this->_dbLoadIfNotLoaded();
+		if (count($this->dbRow) > 0) {
+			$this->_validIterator = true;
+		} else {
+			$this->_validIterator = false;
+		}
+		reset($this->dbRow);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function next()
+	{
+		$val = next($this->dbRow);
+		$this->_validIterator = !($val === false);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function key()
+	{
+		return key($this->dbRow);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function current()
+	{
+		return current($this->dbRow);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function valid()
+	{
+		return $this->_validIterator;
+	}
 }
\ No newline at end of file

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

Doc Comments +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
     /**
      * Returns the foreignkey the column is part of, if any. null otherwise.
      *
-     * @param Column $column
-     * @return ForeignKeyConstraint|null
+     * @return boolean
      */
     public function getForeignKey() {
         return false;

Indentation +118 added lines, -118 removed lines

@@ -12,88 +12,88 @@ 
  */
 class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Column
-     */
-    private $column;
-
-
-    public function __construct(Table $table, Column $column) {
-        parent::__construct($table);
-        $this->table = $table;
-        $this->column = $column;
-    }
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @param Column $column
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey() {
-        return false;
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation() {
-        $className = $this->getClassName();
-        $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
-
-        $str = "     * @param %s %s";
-        return sprintf($str, $paramType, $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName() {
-        return TDBMDaoGenerator::toCamelCase($this->column->getName());
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key
-     * @return null|string
-     */
-    public function getClassName() {
-        return null;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     * @return bool
-     */
-    public function isCompulsory() {
-        return $this->column->getNotnull() && !$this->column->getAutoincrement();
-    }
-
-    /**
-     * Returns true if the property is the primary key
-     * @return bool
-     */
-    public function isPrimaryKey() {
-        return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
-    }
-
-    /**
-     * Returns the PHP code for getters and setters
-     * @return string
-     */
-    public function getGetterSetterCode() {
-
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        $columnGetterName = $this->getGetterName();
-        $columnSetterName = $this->getSetterName();
-
-        if ($normalizedType == "\\DateTimeInterface") {
-            $castTo = "\\DateTimeInterface ";
-        } else {
-            $castTo = "";
-        }
-
-        $getterAndSetterCode = '    /**
+	/**
+	 * @var Column
+	 */
+	private $column;
+
+
+	public function __construct(Table $table, Column $column) {
+		parent::__construct($table);
+		$this->table = $table;
+		$this->column = $column;
+	}
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @param Column $column
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey() {
+		return false;
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation() {
+		$className = $this->getClassName();
+		$paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
+
+		$str = "     * @param %s %s";
+		return sprintf($str, $paramType, $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName() {
+		return TDBMDaoGenerator::toCamelCase($this->column->getName());
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key
+	 * @return null|string
+	 */
+	public function getClassName() {
+		return null;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 * @return bool
+	 */
+	public function isCompulsory() {
+		return $this->column->getNotnull() && !$this->column->getAutoincrement();
+	}
+
+	/**
+	 * Returns true if the property is the primary key
+	 * @return bool
+	 */
+	public function isPrimaryKey() {
+		return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters
+	 * @return string
+	 */
+	public function getGetterSetterCode() {
+
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		$columnGetterName = $this->getGetterName();
+		$columnSetterName = $this->getSetterName();
+
+		if ($normalizedType == "\\DateTimeInterface") {
+			$castTo = "\\DateTimeInterface ";
+		} else {
+			$castTo = "";
+		}
+
+		$getterAndSetterCode = '    /**
      * The getter for the "%s" column.
      *
      * @return %s
@@ -112,40 +112,40 @@ 
     }
 
 ';
-        return sprintf($getterAndSetterCode,
-            // Getter
-            $this->column->getName(),
-            $normalizedType,
-            $columnGetterName,
-            var_export($this->column->getName(), true),
-            var_export($this->table->getName(), true),
-            // Setter
-            $this->column->getName(),
-            $normalizedType,
-            $this->column->getName(),
-            $columnSetterName,
-            $castTo,
-            $this->column->getName(),
-            var_export($this->column->getName(), true),
-            $this->column->getName(),
-            var_export($this->table->getName(), true)
-        );
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        if ($normalizedType == "\\DateTimeInterface") {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."()->format('c');\n";
-        } else {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
-        }
-    }
+		return sprintf($getterAndSetterCode,
+			// Getter
+			$this->column->getName(),
+			$normalizedType,
+			$columnGetterName,
+			var_export($this->column->getName(), true),
+			var_export($this->table->getName(), true),
+			// Setter
+			$this->column->getName(),
+			$normalizedType,
+			$this->column->getName(),
+			$columnSetterName,
+			$castTo,
+			$this->column->getName(),
+			var_export($this->column->getName(), true),
+			$this->column->getName(),
+			var_export($this->table->getName(), true)
+		);
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		if ($normalizedType == "\\DateTimeInterface") {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."()->format('c');\n";
+		} else {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
+		}
+	}
 }

src/Mouf/Database/TDBM/Controllers/TdbmController.php

Indentation +3 added lines, -3 removed lines

@@ -59,10 +59,10 @@ 
 		}
 				
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
 			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
+			if ($autoloadNamespaces) {
 				$this->autoloadDetected = true;
 				$rootNamespace = $autoloadNamespaces[0];
 				$this->daoNamespace = $rootNamespace."Dao";
@@ -138,7 +138,7 @@ 
 		
 		$tdbmService = new InstanceProxy($name);
 		/* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
 
 
 		$moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);

src/Mouf/Database/TDBM/TDBMObjectStateEnum.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
  * @author David Negrier
  */
 final class TDBMObjectStateEnum extends AbstractTDBMObject {
-    const STATE_DETACHED = "detached";
-    const STATE_NEW = "new";
-    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_NOT_LOADED = "not loaded";
+	const STATE_LOADED = "loaded";
+	const STATE_DIRTY = "dirty";
+	const STATE_DELETED = "deleted";
 }

src/Mouf/Database/TDBM/ResultIterator.php

Doc Comments +8 added lines

@@ -70,6 +70,13 @@ 
 
 	private $mode;
 	
+	/**
+	 * @param string $magicSql
+	 * @param string $magicSqlCount
+	 * @param WeakrefObjectStorage $objectStorage
+	 * @param string|null $className
+	 * @param integer $mode
+	 */
 	public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
 	{
 		$this->magicSql = $magicSql;
@@ -166,6 +173,7 @@ 
 
 	/**
 	 * @param int $offset
+	 * @param integer $limit
 	 * @return PageIterator
 	 */
 	public function take($offset, $limit)

src/Mouf/Database/TDBM/TDBMService.php

Doc Comments +3 added lines, -3 removed lines

@@ -985,7 +985,7 @@ 
 	 * This is used internally by TDBM to add an object to the list of objects that have been
 	 * created/updated but not saved yet.
 	 *
-	 * @param AbstractTDBMObject $myObject
+	 * @param DbRow $myObject
 	 */
 	public function _addToToSaveObjectList(DbRow $myObject) {
 		$this->toSaveObjects[] = $myObject;
@@ -1621,7 +1621,7 @@ 
 	}
 
 	/**
-	 * @param $table
+	 * @param string $table
 	 * @param array $primaryKeys
 	 * @param array $additionalTablesFetch
 	 * @param bool $lazy Whether to perform lazy loading on this object or not.
@@ -1778,7 +1778,7 @@ 
 	/**
 	 * @param $pivotTableName
 	 * @param AbstractTDBMObject $bean
-	 * @return AbstractTDBMObject[]
+	 * @return ResultIterator
 	 */
 	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) {
 

Indentation +150 added lines, -150 removed lines

@@ -360,7 +360,7 @@ 
 			case TDBMObjectStateEnum::STATE_DETACHED:
 				throw new TDBMInvalidOperationException('Cannot delete a detached object');
 			case TDBMObjectStateEnum::STATE_NEW:
-                $this->deleteManyToManyRelationships($object);
+				$this->deleteManyToManyRelationships($object);
 				foreach ($object->_getDbRows() as $dbRow) {
 					$this->removeFromToSaveObjectList($dbRow);
 				}
@@ -371,7 +371,7 @@ 
 				}
 			case TDBMObjectStateEnum::STATE_NOT_LOADED:
 			case TDBMObjectStateEnum::STATE_LOADED:
-                $this->deleteManyToManyRelationships($object);
+				$this->deleteManyToManyRelationships($object);
 				// Let's delete db rows, in reverse order.
 				foreach (array_reverse($object->_getDbRows()) as $dbRow) {
 					$tableName = $dbRow->_getDbTableName();
@@ -389,44 +389,44 @@ 
 		$object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
 	}
 
-    /**
-     * Removes all many to many relationships for this object.
-     * @param AbstractTDBMObject $object
-     */
-    private function deleteManyToManyRelationships(AbstractTDBMObject $object) {
-        foreach ($object->_getDbRows() as $tableName => $dbRow) {
-            $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
-            foreach ($pivotTables as $pivotTable) {
-                $remoteBeans = $object->_getRelationships($pivotTable);
-                foreach ($remoteBeans as $remoteBean) {
-                    $object->_removeRelationship($pivotTable, $remoteBean);
-                }
-            }
-        }
-        $this->persistManyToManyRelationships($object);
-    }
-
-
-    /**
-     * This function removes the given object from the database. It will also remove all objects relied to the one given
-     * by parameter before all.
-     *
-     * Notice: if the object has a multiple primary key, the function will not work.
-     *
-     * @param AbstractTDBMObject $objToDelete
-     */
-    public function deleteCascade(AbstractTDBMObject $objToDelete) {
-        $this->deleteAllConstraintWithThisObject($objToDelete);
-        $this->delete($objToDelete);
-    }
-
-    /**
-     * This function is used only in TDBMService (private function)
-     * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter
-     *
-     * @param AbstractTDBMObject $obj
-     */
-    private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj) {
+	/**
+	 * Removes all many to many relationships for this object.
+	 * @param AbstractTDBMObject $object
+	 */
+	private function deleteManyToManyRelationships(AbstractTDBMObject $object) {
+		foreach ($object->_getDbRows() as $tableName => $dbRow) {
+			$pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
+			foreach ($pivotTables as $pivotTable) {
+				$remoteBeans = $object->_getRelationships($pivotTable);
+				foreach ($remoteBeans as $remoteBean) {
+					$object->_removeRelationship($pivotTable, $remoteBean);
+				}
+			}
+		}
+		$this->persistManyToManyRelationships($object);
+	}
+
+
+	/**
+	 * This function removes the given object from the database. It will also remove all objects relied to the one given
+	 * by parameter before all.
+	 *
+	 * Notice: if the object has a multiple primary key, the function will not work.
+	 *
+	 * @param AbstractTDBMObject $objToDelete
+	 */
+	public function deleteCascade(AbstractTDBMObject $objToDelete) {
+		$this->deleteAllConstraintWithThisObject($objToDelete);
+		$this->delete($objToDelete);
+	}
+
+	/**
+	 * This function is used only in TDBMService (private function)
+	 * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter
+	 *
+	 * @param AbstractTDBMObject $obj
+	 */
+	private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj) {
 		$dbRows = $obj->_getDbRows();
 		foreach ($dbRows as $dbRow) {
 			$tableName = $dbRow->_getDbTableName();
@@ -445,7 +445,7 @@ 
 				}
 			}
 		}
-    }
+	}
 
 	/**
 	 * This function performs a save() of all the objects that have been modified.
@@ -774,8 +774,8 @@ 
 	}
 
 	/**
- 	* @param array<string, string> $tableToBeanMap
- 	*/
+	 * @param array<string, string> $tableToBeanMap
+	 */
 	public function setTableToBeanMap(array $tableToBeanMap) {
 		$this->tableToBeanMap = $tableToBeanMap;
 	}
@@ -821,7 +821,7 @@ 
 
 				// Let's save all references in NEW or DETACHED state (we need their primary key)
 				foreach ($references as $fkName => $reference) {
-                    $refStatus = $reference->_getStatus();
+					$refStatus = $reference->_getStatus();
 					if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
 						$this->save($reference);
 					}
@@ -980,94 +980,94 @@ 
 			throw new TDBMInvalidOperationException("This object has been deleted. It cannot be saved.");
 		}
 
-        // Finally, let's save all the many to many relationships to this bean.
-        $this->persistManyToManyRelationships($object);
+		// Finally, let's save all the many to many relationships to this bean.
+		$this->persistManyToManyRelationships($object);
 	}
 
-    private function persistManyToManyRelationships(AbstractTDBMObject $object) {
-        foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
-            $tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
-            list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
-
-            foreach ($storage as $remoteBean) {
-                /* @var $remoteBean AbstractTDBMObject */
-                $statusArr = $storage[$remoteBean];
-                $status = $statusArr['status'];
-                $reverse = $statusArr['reverse'];
-                if ($reverse) {
-                    continue;
-                }
-
-                if ($status === 'new') {
-                    $remoteBeanStatus = $remoteBean->_getStatus();
-                    if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                        // Let's save remote bean if needed.
-                        $this->save($remoteBean);
-                    }
+	private function persistManyToManyRelationships(AbstractTDBMObject $object) {
+		foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
+			$tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
+			list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
+
+			foreach ($storage as $remoteBean) {
+				/* @var $remoteBean AbstractTDBMObject */
+				$statusArr = $storage[$remoteBean];
+				$status = $statusArr['status'];
+				$reverse = $statusArr['reverse'];
+				if ($reverse) {
+					continue;
+				}
 
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+				if ($status === 'new') {
+					$remoteBeanStatus = $remoteBean->_getStatus();
+					if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+						// Let's save remote bean if needed.
+						$this->save($remoteBean);
+					}
 
-                    $types = [];
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
 
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
+					$types = [];
 
-                    $this->connection->insert($pivotTableName, $filters, $types);
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
 
-                    // Finally, let's mark relationships as saved.
-                    $statusArr['status'] = 'loaded';
-                    $storage[$remoteBean] = $statusArr;
-                    $remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
-                    $remoteStatusArr = $remoteStorage[$object];
-                    $remoteStatusArr['status'] = 'loaded';
-                    $remoteStorage[$object] = $remoteStatusArr;
+					$this->connection->insert($pivotTableName, $filters, $types);
 
-                } elseif ($status === 'delete') {
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+					// Finally, let's mark relationships as saved.
+					$statusArr['status'] = 'loaded';
+					$storage[$remoteBean] = $statusArr;
+					$remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
+					$remoteStatusArr = $remoteStorage[$object];
+					$remoteStatusArr['status'] = 'loaded';
+					$remoteStorage[$object] = $remoteStatusArr;
 
-                    $types = [];
+				} elseif ($status === 'delete') {
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
 
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
+					$types = [];
 
-                    $this->connection->delete($pivotTableName, $filters, $types);
-
-                    // Finally, let's remove relationships completely from bean.
-                    $storage->detach($remoteBean);
-                    $remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
-                }
-            }
-        }
-    }
-
-    private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk) {
-        $localBeanPk = $this->getPrimaryKeyValues($localBean);
-        $remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
-        $localColumns = $localFk->getLocalColumns();
-        $remoteColumns = $remoteFk->getLocalColumns();
-
-        $localFilters = array_combine($localColumns, $localBeanPk);
-        $remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
-
-        return array_merge($localFilters, $remoteFilters);
-    }
-
-    /**
-     * Returns the "values" of the primary key.
-     * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
-     *
-     * @param AbstractTDBMObject $bean
-     * @return array numerically indexed array of values.
-     */
-    private function getPrimaryKeyValues(AbstractTDBMObject $bean) {
-        $dbRows = $bean->_getDbRows();
-        $dbRow = reset($dbRows);
-        return array_values($dbRow->_getPrimaryKeys());
-    }
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
+
+					$this->connection->delete($pivotTableName, $filters, $types);
+
+					// Finally, let's remove relationships completely from bean.
+					$storage->detach($remoteBean);
+					$remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
+				}
+			}
+		}
+	}
+
+	private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk) {
+		$localBeanPk = $this->getPrimaryKeyValues($localBean);
+		$remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
+		$localColumns = $localFk->getLocalColumns();
+		$remoteColumns = $remoteFk->getLocalColumns();
+
+		$localFilters = array_combine($localColumns, $localBeanPk);
+		$remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
+
+		return array_merge($localFilters, $remoteFilters);
+	}
+
+	/**
+	 * Returns the "values" of the primary key.
+	 * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 * @return array numerically indexed array of values.
+	 */
+	private function getPrimaryKeyValues(AbstractTDBMObject $bean) {
+		$dbRows = $bean->_getDbRows();
+		$dbRow = reset($dbRows);
+		return array_values($dbRow->_getPrimaryKeys());
+	}
 
 	/**
 	 * Returns a unique hash used to store the object based on its primary key.
@@ -1549,41 +1549,41 @@ 
 	 */
 	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) {
 
-        list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
-        /* @var $localFk ForeignKeyConstraint */
-        /* @var $remoteFk ForeignKeyConstraint */
-        $remoteTable = $remoteFk->getForeignTableName();
+		list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
+		/* @var $localFk ForeignKeyConstraint */
+		/* @var $remoteFk ForeignKeyConstraint */
+		$remoteTable = $remoteFk->getForeignTableName();
 
 
-        $primaryKeys = $this->getPrimaryKeyValues($bean);
-        $columnNames = array_map(function($name) use ($pivotTableName) { return $pivotTableName.'.'.$name; }, $localFk->getLocalColumns());
+		$primaryKeys = $this->getPrimaryKeyValues($bean);
+		$columnNames = array_map(function($name) use ($pivotTableName) { return $pivotTableName.'.'.$name; }, $localFk->getLocalColumns());
 
-        $filter = array_combine($columnNames, $primaryKeys);
+		$filter = array_combine($columnNames, $primaryKeys);
 
-        return $this->findObjects($remoteTable, $filter);
+		return $this->findObjects($remoteTable, $filter);
 	}
 
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean The LOCAL bean
-     * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean.
-     * @throws TDBMException
-     */
-    private function getPivotTableForeignKeys($pivotTableName, AbstractTDBMObject $bean) {
-        $fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
-        $table1 = $fks[0]->getForeignTableName();
-        $table2 = $fks[1]->getForeignTableName();
-
-        $beanTables = array_map(function(DbRow $dbRow) { return $dbRow->_getDbTableName(); }, $bean->_getDbRows());
-
-        if (in_array($table1, $beanTables)) {
-            return [$fks[0], $fks[1]];
-        } elseif (in_array($table2, $beanTables)) {
-            return [$fks[1], $fks[0]];
-        } else {
-            throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
-        }
-    }
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean The LOCAL bean
+	 * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean.
+	 * @throws TDBMException
+	 */
+	private function getPivotTableForeignKeys($pivotTableName, AbstractTDBMObject $bean) {
+		$fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
+		$table1 = $fks[0]->getForeignTableName();
+		$table2 = $fks[1]->getForeignTableName();
+
+		$beanTables = array_map(function(DbRow $dbRow) { return $dbRow->_getDbTableName(); }, $bean->_getDbRows());
+
+		if (in_array($table1, $beanTables)) {
+			return [$fks[0], $fks[1]];
+		} elseif (in_array($table2, $beanTables)) {
+			return [$fks[1], $fks[0]];
+		} else {
+			throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
+		}
+	}
 
 	/**
 	 * Returns a list of pivot tables linked to $bean.

src/Mouf/Database/TDBM/MapIterator.php

Indentation +71 added lines, -71 removed lines

@@ -9,85 +9,85 @@
  */
 class MapIterator implements Iterator {
 
-    /**
-     * @var Iterator
-     */
-    protected $iterator;
+	/**
+	 * @var Iterator
+	 */
+	protected $iterator;
 
-    /**
-     * @var callable Modifies the current item in iterator
-     */
-    protected $callable;
+	/**
+	 * @var callable Modifies the current item in iterator
+	 */
+	protected $callable;
 
-    /**
-     * @param $iterator Iterator|array
-     * @param $callable callable This can have two parameters
-     * @throws TDBMException
-     */
-    public function __construct($iterator, callable $callable) {
-        if (is_array($iterator)) {
-            $this->iterator = new \ArrayIterator($iterator);
-        }
-        elseif (!($iterator instanceof Iterator))
-        {
-            throw new TDBMException("\$iterator parameter must be an instance of Iterator");
-        }
-        else
-        {
-            $this->iterator = $iterator;
-        }
+	/**
+	 * @param $iterator Iterator|array
+	 * @param $callable callable This can have two parameters
+	 * @throws TDBMException
+	 */
+	public function __construct($iterator, callable $callable) {
+		if (is_array($iterator)) {
+			$this->iterator = new \ArrayIterator($iterator);
+		}
+		elseif (!($iterator instanceof Iterator))
+		{
+			throw new TDBMException("\$iterator parameter must be an instance of Iterator");
+		}
+		else
+		{
+			$this->iterator = $iterator;
+		}
 
-        if ($callable instanceof \Closure) {
-            // make sure there's one argument
-            $reflection = new \ReflectionObject($callable);
-            if ($reflection->hasMethod('__invoke')) {
-                $method = $reflection->getMethod('__invoke');
-                if ($method->getNumberOfParameters() !== 1) {
-                    throw new TDBMException("\$callable must accept one and only one parameter.");
-                }
-            }
-        }
+		if ($callable instanceof \Closure) {
+			// make sure there's one argument
+			$reflection = new \ReflectionObject($callable);
+			if ($reflection->hasMethod('__invoke')) {
+				$method = $reflection->getMethod('__invoke');
+				if ($method->getNumberOfParameters() !== 1) {
+					throw new TDBMException("\$callable must accept one and only one parameter.");
+				}
+			}
+		}
 
-        $this->callable = $callable;
-    }
+		$this->callable = $callable;
+	}
 
-    /**
-     * Alters the current item with $this->callable and returns a new item.
-     * Be careful with your types as we can't do static type checking here!
-     * @return mixed
-     */
-    public function current()
-    {
-        $callable = $this->callable;
-        return $callable($this->iterator->current());
-    }
+	/**
+	 * Alters the current item with $this->callable and returns a new item.
+	 * Be careful with your types as we can't do static type checking here!
+	 * @return mixed
+	 */
+	public function current()
+	{
+		$callable = $this->callable;
+		return $callable($this->iterator->current());
+	}
 
-    public function next()
-    {
-        $this->iterator->next();
-    }
+	public function next()
+	{
+		$this->iterator->next();
+	}
 
-    public function key()
-    {
-        return $this->iterator->key();
-    }
+	public function key()
+	{
+		return $this->iterator->key();
+	}
 
-    public function valid()
-    {
-        return $this->iterator->valid();
-    }
+	public function valid()
+	{
+		return $this->iterator->valid();
+	}
 
-    public function rewind()
-    {
-        $this->iterator->rewind();
-    }
+	public function rewind()
+	{
+		$this->iterator->rewind();
+	}
 
-    /**
-     * Casts the iterator to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray() {
-        return iterator_to_array($this);
-    }
+	/**
+	 * Casts the iterator to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray() {
+		return iterator_to_array($this);
+	}
 }