thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Filters/OrderByColumn.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	 * @param string $columnName
 	 * @param string $order
 	 */
-	public function __construct($tableName=null, $columnName=null, $order=null) {
+	public function __construct($tableName = null, $columnName = null, $order = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->order = $order;

src/Mouf/Database/TDBM/Filters/NotFilter.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 * 
 	 * @param FilterInterface $filter
 	 */
-	public function __construct($filter=null) {
+	public function __construct($filter = null) {
 		$this->filter = $filter;
 	}
 

src/Mouf/Database/TDBM/Filters/SqlStringFilter.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 	 * 
 	 * @param string $sqlString
 	 */
-	public function __construct($sqlString=null) {
+	public function __construct($sqlString = null) {
 		$this->sqlString = $sqlString;
 	}
 
@@ -95,32 +95,32 @@ 
 		// First, let's remove all the stuff in quotes:
 
 		// Let's remove all the \' found
-		$work_str = str_replace("\\'",'',$this->sqlString);
+		$work_str = str_replace("\\'", '', $this->sqlString);
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table)==0)
+		if (count($work_table) == 0)
 		return '';
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'")===0)
+		if (strstr($work_str, "'") === 0)
 		array_shift($work_table);
 			
-		if (count($work_table)==0)
+		if (count($work_table) == 0)
 		return '';
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
-		$i=0;
+		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
+			if (($i%2) == 0)
 			$work_str2 .= $str_fragment.' ';
 			$i++;
 		}
 
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
 
 		$tables_used = $capture_result[1];
 		// remove doubles:

Braces +12 added lines, -8 removed lines

@@ -99,23 +99,27 @@
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table)==0)
-		return '';
+		if (count($work_table)==0) {
+				return '';
+		}
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'")===0)
-		array_shift($work_table);
+		if (strstr($work_str,"'")===0) {
+				array_shift($work_table);
+		}
 			
-		if (count($work_table)==0)
-		return '';
+		if (count($work_table)==0) {
+				return '';
+		}
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
 		$i=0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
-			$work_str2 .= $str_fragment.' ';
+			if (($i % 2) == 0) {
+						$work_str2 .= $str_fragment.' ';
+			}
 			$i++;
 		}
 

src/Mouf/Database/TDBM/Filters/AndFilter.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 	 * 
 	 * @param array<FilterInterface> $filters
 	 */
-	public function __construct(array $filters=array()) {
+	public function __construct(array $filters = array()) {
 		$this->filters = $filters;
 	}
 
@@ -91,7 +91,7 @@ 
 		}
 
 		if (count($filters_sql)>0) {
-			return '('.implode(' AND ',$filters_sql).')';
+			return '('.implode(' AND ', $filters_sql).')';
 		} else {
 			return '';
 		}
@@ -114,7 +114,7 @@ 
 				throw new TDBMException("Error in AndFilter: One of the parameters is not a filter.");
 			}
 			
-			$tables = array_merge($tables,$filter->getUsedTables());
+			$tables = array_merge($tables, $filter->getUsedTables());
 		}
 		// Remove tables in double.
 		$tables = array_flip(array_flip($tables));

src/Mouf/Database/TDBM/Filters/FilterUtils.php

Indentation +10 added lines, -10 removed lines

@@ -9,14 +9,14 @@
  */
 class FilterUtils
 {
-    /**
-     * @param string|null|DateTimeInterface $value
-     */
-    public static function valueToSql($value, Connection $dbConnection) {
-        if ($value instanceof DateTimeInterface) {
-            return "'".$value->format('Y-m-d H:i:s')."'";
-        } else {
-            return $dbConnection->quote($value);
-        }
-    }
+	/**
+	 * @param string|null|DateTimeInterface $value
+	 */
+	public static function valueToSql($value, Connection $dbConnection) {
+		if ($value instanceof DateTimeInterface) {
+			return "'".$value->format('Y-m-d H:i:s')."'";
+		} else {
+			return $dbConnection->quote($value);
+		}
+	}
 }

src/Mouf/Database/TDBM/Filters/BetweenFilter.php

Indentation +4 added lines, -4 removed lines

@@ -98,8 +98,8 @@ 
 	 * 
 	 * @param string $tableName
 	 * @param string $columnName
-     * @param string $value1
-     * @param string $value2
+	 * @param string $value1
+	 * @param string $value2
 	 */
 	public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) {
 		$this->tableName = $tableName;
@@ -113,9 +113,9 @@ 
 	 *
 	 * @param Connection $dbConnection
 	 * @return string
-     * @throws \Mouf\Database\TDBM\TDBMException
+	 * @throws \Mouf\Database\TDBM\TDBMException
 	 */
-    public function toSql(Connection $dbConnection) {
+	public function toSql(Connection $dbConnection) {
 		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
 			return "";
 		}

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
      * @param string $value1
      * @param string $value2
 	 */
-	public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) {
+	public function __construct($tableName = null, $columnName = null, $value1 = null, $value2 = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->value1 = $value1;

src/Mouf/Database/TDBM/Filters/OrFilter.php

Indentation +20 added lines, -20 removed lines

@@ -68,9 +68,9 @@ 
 	 *
 	 * @param Connection $dbConnection
 	 * @return string
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    public function toSql(Connection $dbConnection) {
+	public function toSql(Connection $dbConnection) {
 		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
 			return "";
 		}
@@ -102,22 +102,22 @@ 
 	 *
 	 * @return array<string>
 	 */
-    public function getUsedTables() {
-        if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
-            return array();
-        }
-
-        $tables = array();
-        foreach ($this->filters as $filter) {
-
-            if (!$filter instanceof FilterInterface) {
-                throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
-            }
-
-            $tables = array_merge($tables,$filter->getUsedTables());
-        }
-        // Remove tables in double.
-        $tables = array_flip(array_flip($tables));
-        return $tables;
-    }
+	public function getUsedTables() {
+		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
+			return array();
+		}
+
+		$tables = array();
+		foreach ($this->filters as $filter) {
+
+			if (!$filter instanceof FilterInterface) {
+				throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
+			}
+
+			$tables = array_merge($tables,$filter->getUsedTables());
+		}
+		// Remove tables in double.
+		$tables = array_flip(array_flip($tables));
+		return $tables;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	 * 
 	 * @param array<FilterInterface> $filters
 	 */
-	public function __construct(array $filters=array()) {
+	public function __construct(array $filters = array()) {
 		$this->filters = $filters;
 	}
 
@@ -91,7 +91,7 @@ 
 		}
 
 		if (count($filters_sql)>0) {
-			return '('.implode(' OR ',$filters_sql).')';
+			return '('.implode(' OR ', $filters_sql).')';
 		} else {
 			return '';
 		}
@@ -114,7 +114,7 @@ 
                 throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
             }
 
-            $tables = array_merge($tables,$filter->getUsedTables());
+            $tables = array_merge($tables, $filter->getUsedTables());
         }
         // Remove tables in double.
         $tables = array_flip(array_flip($tables));

src/Mouf/Database/TDBM/Filters/DifferentFilter.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	 * @param string $columnName
 	 * @param string $value
 	 */
-	public function __construct($tableName=null, $columnName=null, $value=null) {
+	public function __construct($tableName = null, $columnName = null, $value = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->value = $value;

src/Mouf/Database/TDBM/TDBMService.php

Indentation +168 added lines, -168 removed lines

@@ -510,7 +510,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);
 				}
@@ -521,7 +521,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();
@@ -541,63 +541,63 @@ 
 		$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 TDBMObject $obj
-     * @return TDBMObjectArray
-     */
-    private function deleteAllConstraintWithThisObject(TDBMObject $obj) {
-        $tableFrom = $this->connection->escapeDBItem($obj->_getDbTableName());
-        $constraints = $this->connection->getConstraintsFromTable($tableFrom);
-        foreach ($constraints as $constraint) {
-            $tableTo = $this->connection->escapeDBItem($constraint["table1"]);
-            $colFrom = $this->connection->escapeDBItem($constraint["col2"]);
-            $colTo = $this->connection->escapeDBItem($constraint["col1"]);
-            $idVarName = $this->connection->escapeDBItem($obj->getPrimaryKey()[0]);
-            $idValue = $this->connection->quoteSmart($obj->TDBMObject_id);
-            $sql = "SELECT DISTINCT ".$tableTo.".*"
-                    ." FROM ".$tableFrom
-                    ." LEFT JOIN ".$tableTo." ON ".$tableFrom.".".$colFrom." = ".$tableTo.".".$colTo
-                    ." WHERE ".$tableFrom.".".$idVarName."=".$idValue;
-            $result = $this->getObjectsFromSQL($constraint["table1"], $sql);
-            foreach ($result as $tdbmObj) {
-                $this->deleteCascade($tdbmObj);
-            }
-        }
-    }
+	/**
+	 * 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 TDBMObject $obj
+	 * @return TDBMObjectArray
+	 */
+	private function deleteAllConstraintWithThisObject(TDBMObject $obj) {
+		$tableFrom = $this->connection->escapeDBItem($obj->_getDbTableName());
+		$constraints = $this->connection->getConstraintsFromTable($tableFrom);
+		foreach ($constraints as $constraint) {
+			$tableTo = $this->connection->escapeDBItem($constraint["table1"]);
+			$colFrom = $this->connection->escapeDBItem($constraint["col2"]);
+			$colTo = $this->connection->escapeDBItem($constraint["col1"]);
+			$idVarName = $this->connection->escapeDBItem($obj->getPrimaryKey()[0]);
+			$idValue = $this->connection->quoteSmart($obj->TDBMObject_id);
+			$sql = "SELECT DISTINCT ".$tableTo.".*"
+					." FROM ".$tableFrom
+					." LEFT JOIN ".$tableTo." ON ".$tableFrom.".".$colFrom." = ".$tableTo.".".$colTo
+					." WHERE ".$tableFrom.".".$idVarName."=".$idValue;
+			$result = $this->getObjectsFromSQL($constraint["table1"], $sql);
+			foreach ($result as $tdbmObj) {
+				$this->deleteCascade($tdbmObj);
+			}
+		}
+	}
 
 	/**
 	 * This function performs a save() of all the objects that have been modified.
@@ -997,8 +997,8 @@ 
 	}
 
 	/**
- 	* @param array<string, string> $tableToBeanMap
- 	*/
+	 * @param array<string, string> $tableToBeanMap
+	 */
 	public function setTableToBeanMap(array $tableToBeanMap) {
 		$this->tableToBeanMap = $tableToBeanMap;
 	}
@@ -1045,7 +1045,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);
 					}
@@ -1204,94 +1204,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 = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
 
-                    $this->connection->insert($pivotTableName, $filters, $types);
+					$this->connection->insert($pivotTableName, $filters, $types);
 
-                    // 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;
+					// 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;
 
-                } elseif ($status === 'delete') {
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+				} elseif ($status === 'delete') {
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
 
-                    $types = [];
+					$types = [];
 
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
+					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);
+				}
+			}
+		}
+	}
 
-                    $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());
-    }
+	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.
@@ -1774,39 +1774,39 @@ 
 	 */
 	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}");
-        }
-    }
+	/**
+	 * @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}");
+		}
+	}
 }

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();