thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/InnerResultArray.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
 
 	private function toIndex($offset) {
-		if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
+		if ($offset<0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
 			throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
 		}
 		if ($this->statement === null) {

src/Mouf/Database/TDBM/InnerResultIterator.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

src/Mouf/Database/TDBM/ResultIterator.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

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/views/tdbmGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 <div class="control-group">
 	<label class="control-label">Store dates / timestamps in UTC:</label>
 	<div class="controls">
-		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input>
+		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input>
 		<span class="help-block">Select this option if you want timestamps to be stored in UTC.
 		If your application supports several time zones, you should select this option to store all dates in
 		the same time zone.</span>

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

Unused Use Statements -5 removed lines

@@ -22,16 +22,11 @@
 use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\Cache\VoidCache;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
-use Doctrine\DBAL\Schema\Schema;
 use Mouf\Database\MagicQuery;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
 use Mouf\Database\TDBM\Filters\OrderBySQLString;
 use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
-use Mouf\Utils\Cache\CacheInterface;
-use SQLParser\Node\ColRef;
 
 /**
  * The TDBMService class is the main TDBM class. It provides methods to retrieve TDBMObject instances

Spacing +11 added lines, -11 removed lines

@@ -699,9 +699,9 @@ 
 		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
 		$orderby_bag2 = array();
 		foreach ($orderby_bag as $thing) {
-			if (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
+			if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
 				$orderby_bag2[] = $thing;
-			} elseif (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
+			} elseif (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
 				$orderby_bag2[] = $thing;
 			} elseif (is_string($thing)) {
 				$orderby_bag2[] = new OrderBySQLString($thing);
@@ -1204,7 +1204,7 @@ 
 		$schemaAnalyzer = $this->schemaAnalyzer;
 
 		foreach ($tables as $currentTable) {
-			$allParents = [ $currentTable ];
+			$allParents = [$currentTable];
 			$currentFk = null;
 			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
 				$currentTable = $currentFk->getForeignTableName();
@@ -1246,7 +1246,7 @@ 
 		// Let's scan the parent tables
 		$currentTable = $table;
 
-		$parentTables = [ ];
+		$parentTables = [];
 
 		// Get parent relationship
 		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
@@ -1336,7 +1336,7 @@ 
 	 * @return ResultIterator An object representing an array of results.
 	 * @throws TDBMException
 	 */
-	public function findObjects($mainTable, $filter=null, array $parameters = array(), $orderString=null, array $additionalTablesFetch = array(), $mode = null, $className=null) {
+	public function findObjects($mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, $className = null) {
 		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
 		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
 			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
@@ -1405,7 +1405,7 @@ 
 			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
 		}
 
-		$mode = $mode?:$this->mode;
+		$mode = $mode ?: $this->mode;
 
 		return new ResultIterator($sql, $countSql, $parameters, $columnDescList, $this->objectStorage, $className, $this, $this->magicQuery, $mode);
 	}
@@ -1419,7 +1419,7 @@ 
 	 * @return AbstractTDBMObject
 	 * @throws TDBMException
 	 */
-	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className=null) {
+	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className = null) {
 		$primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
 		$hash = $this->getObjectHash($primaryKeys);
 
@@ -1439,7 +1439,7 @@ 
 			// Only allowed if no inheritance.
 			if (count($tables) === 1) {
 				if ($className === null) {
-					$className = isset($this->tableToBeanMap[$table])?$this->tableToBeanMap[$table]:"Mouf\\Database\\TDBM\\TDBMObject";
+					$className = isset($this->tableToBeanMap[$table]) ? $this->tableToBeanMap[$table] : "Mouf\\Database\\TDBM\\TDBMObject";
 				}
 
 				// Let's construct the bean
@@ -1468,11 +1468,11 @@ 
 	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters.
 	 * @throws TDBMException
 	 */
-	public function findObject($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
+	public function findObject($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
 		$objects = $this->findObjects($mainTable, $filterString, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
 		$page = $objects->take(0, 2);
 		$count = $page->count();
-		if ($count > 1) {
+		if ($count>1) {
 			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
 		} elseif ($count === 0) {
 			return null;
@@ -1492,7 +1492,7 @@ 
 	 * @return AbstractTDBMObject The object we want
 	 * @throws TDBMException
 	 */
-	public function findObjectOrFail($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
+	public function findObjectOrFail($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
 		$bean = $this->findObject($mainTable, $filterString, $parameters, $additionalTablesFetch, $className);
 		if ($bean === null) {
 			throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");

Braces +3 added lines, -2 removed lines

@@ -693,8 +693,9 @@
 		// Fourth, let's apply the same steps to the orderby_bag
 		// 4-1 orderby_bag should be an array, if it is a singleton, let's put it in an array.
 
-		if (!is_array($orderby_bag))
-		$orderby_bag = array($orderby_bag);
+		if (!is_array($orderby_bag)) {
+				$orderby_bag = array($orderby_bag);
+		}
 
 		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
 		$orderby_bag2 = array();

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

Braces +2 added lines, -4 removed lines

@@ -27,12 +27,10 @@
     public function __construct($iterator, callable $callable) {
         if (is_array($iterator)) {
             $this->iterator = new \ArrayIterator($iterator);
-        }
-        elseif (!($iterator instanceof Iterator))
+        } elseif (!($iterator instanceof Iterator))
         {
             throw new TDBMException("\$iterator parameter must be an instance of Iterator");
-        }
-        else
+        } else
         {
             $this->iterator = $iterator;
         }

src/Mouf/Database/TDBM/DbRow.php

Spacing +5 added lines, -5 removed lines

@@ -94,7 +94,7 @@ 
 	 * @throws TDBMException
 	 * @throws TDBMInvalidOperationException
 	 */
-	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys=array(), TDBMService $tdbmService=null, array $dbRow = array()) {
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array()) {
 		$this->object = $object;
 		$this->dbTableName = $table_name;
 
@@ -141,7 +141,7 @@ 
 	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
 	 * @param string $state
 	 */
-	public function _setStatus($state){
+	public function _setStatus($state) {
 		$this->status = $state;
 	}
 
@@ -163,7 +163,7 @@ 
 			$sql = "SELECT * FROM ".$connection->quoteIdentifier($this->dbTableName)." WHERE ".$sql_where;
 			$result = $connection->executeQuery($sql, $parameters);
 
-			if ($result->rowCount()==0)
+			if ($result->rowCount() == 0)
 			{
 				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" with ID \"".$this->TDBMObject_id."\".");
 			}
@@ -326,7 +326,7 @@ 
     /**
      * Override the native php clone function for TDBMObjects
      */
-    public function __clone(){
+    public function __clone() {
         $this->_dbLoadIfNotLoaded();
         //First lets set the status to new (to enter the save function)
         $this->status = TDBMObjectStateEnum::STATE_NEW;
@@ -358,7 +358,7 @@ 
             $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
             $localColumns = $fk->getLocalColumns();
 
-            for ($i=0, $count=count($localColumns); $i<$count; $i++) {
+            for ($i = 0, $count = count($localColumns); $i<$count; $i++) {
                 $dbRow[$localColumns[$i]] = $pkValues[$i];
             }
         }

Indentation +52 added lines, -52 removed lines

@@ -247,36 +247,36 @@ 
 	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);
-        }
+		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) {
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 * @return AbstractTDBMObject|null
+	 */
+	public function getRef($foreignKeyName) {
 		if (isset($this->references[$foreignKeyName])) {
 			return $this->references[$foreignKeyName];
 		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
-            // If the object is new and has no property, then it has to be empty.
-            return null;
-        } else {
-            $this->_dbLoadIfNotLoaded();
+			// If the object is new and has no property, then it has to be empty.
+			return null;
+		} else {
+			$this->_dbLoadIfNotLoaded();
 
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			// 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) {
-                $values[] = $this->dbRow[$column];
-            }
+			$values = [];
+			foreach ($fk->getLocalColumns() as $column) {
+				$values[] = $this->dbRow[$column];
+			}
 
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
 
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
 		}
 	}
 
@@ -323,26 +323,26 @@ 
 		return array($this->dbTableName);
 	}
 
-    /**
-     * Override the native php clone function for TDBMObjects
-     */
-    public function __clone(){
+	/**
+	 * 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->status = TDBMObjectStateEnum::STATE_DETACHED;
 
 		$this->primaryKeys = null;
 
-        //Now unset the PK from the row
+		//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.
@@ -350,35 +350,35 @@ 
 	 * @return array
 	 */
 	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);
-            $refDbRows = $reference->_getDbRows();
-            $firstRefDbRow = reset($refDbRows);
-            $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-            $localColumns = $fk->getLocalColumns();
-
-            for ($i=0, $count=count($localColumns); $i<$count; $i++) {
-                $dbRow[$localColumns[$i]] = $pkValues[$i];
-            }
-        }
+		// 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);
+			$refDbRows = $reference->_getDbRows();
+			$firstRefDbRow = reset($refDbRows);
+			$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
+			$localColumns = $fk->getLocalColumns();
+
+			for ($i=0, $count=count($localColumns); $i<$count; $i++) {
+				$dbRow[$localColumns[$i]] = $pkValues[$i];
+			}
+		}
 
 		return $dbRow;
 	}
 
-    /**
-     * Returns references array.
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getReferences() {
-        return $this->references;
-    }
+	/**
+	 * Returns references array.
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getReferences() {
+		return $this->references;
+	}
 
-    /**
+	/**
 	 * @return array
 	 */
 	public function _getPrimaryKeys()

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

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

Indentation +100 added lines, -100 removed lines

@@ -13,104 +13,104 @@
 abstract class AbstractBeanPropertyDescriptor
 {
 
-    /**
-     * @var Table
-     */
-    protected $table;
-
-    /**
-     * Whether to use the more complex name in case of conflict.
-     * @var bool
-     */
-    protected $alternativeName = false;
-
-    /**
-     * @param Table $table
-     */
-    public function __construct(Table $table)
-    {
-        $this->table = $table;
-    }
-
-
-    /**
-     * Use the more complex name in case of conflict.
-     */
-    public function useAlternativeName()
-    {
-        $this->alternativeName = true;
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key
-     * @return null|string
-     */
-    abstract public function getClassName();
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    abstract public function getParamAnnotation();
-
-    public function getVariableName() {
-        return '$'.$this->getLowerCamelCaseName();
-    }
-
-    public function getLowerCamelCaseName() {
-        return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
-    }
-
-    abstract public function getUpperCamelCaseName();
-
-    public function getSetterName() {
-        return 'set'.$this->getUpperCamelCaseName();
-    }
-
-    public function getGetterName() {
-        return 'get'.$this->getUpperCamelCaseName();
-    }
-
-    /**
-     * Returns the PHP code used in the ben constructor for this property.
-     * @return string
-     */
-    public function getConstructorAssignCode() {
-        $str = '        $this->%s(%s);';
-        return sprintf($str, $this->getSetterName(), $this->getVariableName());
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     * @return bool
-     */
-    abstract public function isCompulsory();
-
-    /**
-     * Returns true if the property is the primary key
-     * @return bool
-     */
-    abstract public function isPrimaryKey();
-
-    /**
-     * @return Table
-     */
-    public function getTable()
-    {
-        return $this->table;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters
-     * @return string
-     */
-    abstract public function getGetterSetterCode();
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    abstract public function getJsonSerializeCode();
+	/**
+	 * @var Table
+	 */
+	protected $table;
+
+	/**
+	 * Whether to use the more complex name in case of conflict.
+	 * @var bool
+	 */
+	protected $alternativeName = false;
+
+	/**
+	 * @param Table $table
+	 */
+	public function __construct(Table $table)
+	{
+		$this->table = $table;
+	}
+
+
+	/**
+	 * Use the more complex name in case of conflict.
+	 */
+	public function useAlternativeName()
+	{
+		$this->alternativeName = true;
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key
+	 * @return null|string
+	 */
+	abstract public function getClassName();
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	abstract public function getParamAnnotation();
+
+	public function getVariableName() {
+		return '$'.$this->getLowerCamelCaseName();
+	}
+
+	public function getLowerCamelCaseName() {
+		return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
+	}
+
+	abstract public function getUpperCamelCaseName();
+
+	public function getSetterName() {
+		return 'set'.$this->getUpperCamelCaseName();
+	}
+
+	public function getGetterName() {
+		return 'get'.$this->getUpperCamelCaseName();
+	}
+
+	/**
+	 * Returns the PHP code used in the ben constructor for this property.
+	 * @return string
+	 */
+	public function getConstructorAssignCode() {
+		$str = '        $this->%s(%s);';
+		return sprintf($str, $this->getSetterName(), $this->getVariableName());
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 * @return bool
+	 */
+	abstract public function isCompulsory();
+
+	/**
+	 * Returns true if the property is the primary key
+	 * @return bool
+	 */
+	abstract public function isPrimaryKey();
+
+	/**
+	 * @return Table
+	 */
+	public function getTable()
+	{
+		return $this->table;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters
+	 * @return string
+	 */
+	abstract public function getGetterSetterCode();
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	abstract public function getJsonSerializeCode();
 }
\ No newline at end of file

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Indentation +6 added lines, -6 removed lines

@@ -537,10 +537,10 @@ 
 		return $sql_where;
 	}
 
-    /**
-     * Override the native php clone function for TDBMObjects
-     */
-    public function __clone() {
+	/**
+	 * Override the native php clone function for TDBMObjects
+	 */
+	public function __clone() {
 		// Let's clone the many to many relationships
 		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
 			$pivotTableList = array_keys($this->relationships);
@@ -566,10 +566,10 @@ 
 		}
 
 		// Let's set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
 
 
-    }
+	}
 
 	/**
 	 * Returns raw database rows.

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
 	 * @throws TDBMException
 	 * @throws TDBMInvalidOperationException
 	 */
-	public function __construct($tableName=null, array $primaryKeys=array(), TDBMService $tdbmService=null) {
+	public function __construct($tableName = null, array $primaryKeys = array(), TDBMService $tdbmService = null) {
 		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
 		if (!empty($tableName)) {
 			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
@@ -159,7 +159,7 @@ 
 	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
 	 * @param string $state
 	 */
-	public function _setStatus($state){
+	public function _setStatus($state) {
 		$this->status = $state;
 
 		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
@@ -170,7 +170,7 @@ 
 
 	public function get($var, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -196,7 +196,7 @@ 
 	 */
 	public function has($var, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -216,7 +216,7 @@ 
 	
 	public function set($var, $value, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -241,7 +241,7 @@ 
 	 */
 	public function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -266,7 +266,7 @@ 
 	 */
 	public function getRef($foreignKeyName, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -382,13 +382,13 @@ 
 	 */
 	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status) {
 		$storage = $this->getRelationshipStorage($pivotTableName);
-		$storage->attach($remoteBean, [ 'status' => $status, 'reverse' => false ]);
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
 		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
 			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
 		}
 
 		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
-		$remoteStorage->attach($this, [ 'status' => $status, 'reverse' => true ]);
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
 	}
 
 	/**
@@ -458,7 +458,7 @@ 
 				$metadata = $storage[$remoteBean];
 
 				$remoteStorage = $remoteBean->getRelationshipStorage($pivotTable);
-				$remoteStorage->attach($this, [ 'status' => $metadata['status'], 'reverse' => !$metadata['reverse'] ]);
+				$remoteStorage->attach($this, ['status' => $metadata['status'], 'reverse' => !$metadata['reverse']]);
 			}
 		}
 
@@ -485,7 +485,7 @@ 
 	private function registerTable($tableName) {
 		$dbRow = new DbRow($this, $tableName);
 
-		if (in_array($this->status, [ TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY ])) {
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
 			// Let's get the primary key for the new table
 			$anotherDbRow = array_values($this->dbRows)[0];
 			/* @var $anotherDbRow DbRow */