thecodingmachine / database.tdbm

src/views/installStep2.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/PageIterator.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	 */
 	public function getCurrentPage()
 	{
-		return floor($this->offset / $this->limit) + 1;
+		return floor($this->offset/$this->limit)+1;
 	}
 
 	/**

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Indentation +17 added lines, -17 removed lines

@@ -547,23 +547,23 @@
 		return $sql_where;
 	}
 
-    /**
-     * Override the native php clone function for TDBMObjects
-     */
-    public function __clone(){
-        $this->_dbLoadIfNotLoaded();
-        //First lets set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-
-        // Add the current TDBMObject to the save object list
-        $this->tdbmService->_addToToSaveObjectList($this);
-
-        //Now unset the PK from the row
-        $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-        foreach ($pk_array as $pk) {
-            $this->dbRow[$pk] = null;
-        }
-    }
+	/**
+	 * Override the native php clone function for TDBMObjects
+	 */
+	public function __clone(){
+		$this->_dbLoadIfNotLoaded();
+		//First lets set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+
+		// Add the current TDBMObject to the save object list
+		$this->tdbmService->_addToToSaveObjectList($this);
+
+		//Now unset the PK from the row
+		$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+		foreach ($pk_array as $pk) {
+			$this->dbRow[$pk] = null;
+		}
+	}
 
 	/**
 	 * Returns raw database rows.

Spacing +16 added lines, -16 removed lines

@@ -95,7 +95,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);
@@ -199,7 +199,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.
@@ -210,7 +210,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];
@@ -236,7 +236,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];
@@ -256,7 +256,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];
@@ -281,7 +281,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];
@@ -306,7 +306,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];
@@ -421,13 +421,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]);
 	}
 
 	/**
@@ -496,7 +496,7 @@ 
 	 * Implement the unique JsonSerializable method
 	 * @return array
 	 */
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		// FIXME
 		$this->_dbLoadIfNotLoaded();
 		return $this->dbRow;
@@ -526,23 +526,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function getPrimaryKeyWhereStatement () {
+	private function getPrimaryKeyWhereStatement() {
 		// Let's first get the primary keys
 		$pk_table = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
 		// Now for the object_id
 		$object_id = $this->TDBMObject_id;
 		// If there is only one primary key:
-		if (count($pk_table)==1) {
+		if (count($pk_table) == 1) {
 			$sql_where = $this->db_connection->escapeDBItem($this->dbTableName).'.'.$this->db_connection->escapeDBItem($pk_table[0])."=".$this->db_connection->quoteSmart($this->TDBMObject_id);
 		} else {
 			$ids = unserialize($object_id);
-			$i=0;
+			$i = 0;
 			$sql_where_array = array();
 			foreach ($pk_table as $pk) {
 				$sql_where_array[] = $this->db_connection->escapeDBItem($this->dbTableName).'.'.$this->db_connection->escapeDBItem($pk)."=".$this->db_connection->quoteSmart($ids[$i]);
 				$i++;
 			}
-			$sql_where = implode(" AND ",$sql_where_array);
+			$sql_where = implode(" AND ", $sql_where_array);
 		}
 		return $sql_where;
 	}
@@ -550,7 +550,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;
@@ -577,7 +577,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 */

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

Spacing +15 added lines, -15 removed lines

@@ -430,7 +430,7 @@ 
 	 * @param string $className Optional: The name of the class to instanciate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
 	 * @return TDBMObject
 	 */
-	public function getNewObject($table_name, $auto_assign_id=true, $className = null) {
+	public function getNewObject($table_name, $auto_assign_id = true, $className = null) {
 		if ($this->connection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getNewObject(): No connection has been established on the database!");
 		}
@@ -464,8 +464,8 @@ 
 		$object = new $className($this, $table_name);
 
 		if ($auto_assign_id && !$this->isPrimaryKeyAutoIncrement($table_name)) {
-			$pk_table =  $this->getPrimaryKeyColumns($table_name);
-			if (count($pk_table)==1)
+			$pk_table = $this->getPrimaryKeyColumns($table_name);
+			if (count($pk_table) == 1)
 			{
 				$root_table = $this->connection->findRootSequenceTable($table_name);
 				$id = $this->connection->nextId($root_table);
@@ -475,7 +475,7 @@ 
 					$sql = "SELECT MAX(".$this->connection->escapeDBItem($pk_table[0]).") AS maxkey FROM ".$root_table;
 					$res = $this->connection->getAll($sql);
 					// NOTE: this will work only if the ID is an integer!
-					$newid = $res[0]['maxkey'] + 1;
+					$newid = $res[0]['maxkey']+1;
 					if ($newid>$id) {
 						$id = $newid;
 					}
@@ -892,9 +892,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);
@@ -1405,7 +1405,7 @@ 
 		$schemaAnalyzer = $this->schemaAnalyzer;
 
 		foreach ($tables as $currentTable) {
-			$allParents = [ $currentTable ];
+			$allParents = [$currentTable];
 			$currentFk = null;
 			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
 				$currentTable = $currentFk->getForeignTableName();
@@ -1447,7 +1447,7 @@ 
 		// Let's scan the parent tables
 		$currentTable = $table;
 
-		$parentTables = [ ];
+		$parentTables = [];
 
 		// Get parent relationship
 		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
@@ -1538,7 +1538,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));
@@ -1607,7 +1607,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);
 	}
@@ -1621,7 +1621,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);
 
@@ -1641,7 +1641,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
@@ -1670,11 +1670,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;
@@ -1694,7 +1694,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."'");

src/Mouf/Database/TDBM/TDBMObject.php

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

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
     public function rewind()
     {
         $this->_dbLoadIfNotLoaded();
-        if (count($this->dbRow) > 0) {
+        if (count($this->dbRow)>0) {
             $this->_validIterator = true;
         } else {
             $this->_validIterator = false;

src/Mouf/Database/TDBM/TDBMSchemaAnalyzer.php

Indentation +79 added lines, -79 removed lines

@@ -15,96 +15,96 @@
 class TDBMSchemaAnalyzer
 {
 
-    private $connection;
+	private $connection;
 
-    /**
-     * @var Schema
-     */
-    private $schema;
+	/**
+	 * @var Schema
+	 */
+	private $schema;
 
-    /**
-     * @var string
-     */
-    private $cachePrefix;
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
 
-    /**
-     * @var Cache
-     */
-    private $cache;
+	/**
+	 * @var Cache
+	 */
+	private $cache;
 
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
 
-    /**
-     * @param Connection $connection The DBAL DB connection to use
-     * @param Cache $cache A cache service to be used
-     * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
-     * 										 Will be automatically created if not passed.
-     */
-    public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) {
-        $this->connection = $connection;
-        $this->cache = $cache;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
+	/**
+	 * @param Connection $connection The DBAL DB connection to use
+	 * @param Cache $cache A cache service to be used
+	 * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
+	 * 										 Will be automatically created if not passed.
+	 */
+	public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) {
+		$this->connection = $connection;
+		$this->cache = $cache;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
 
-    /**
-     * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
-     * @return string
-     */
-    public function getCachePrefix() {
-        if ($this->cachePrefix === null) {
-            $this->cachePrefix = hash('md4', $this->connection->getHost()."-".$this->connection->getPort()."-".$this->connection->getDatabase()."-".$this->connection->getDriver()->getName());
-        }
-        return $this->cachePrefix;
-    }
+	/**
+	 * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
+	 * @return string
+	 */
+	public function getCachePrefix() {
+		if ($this->cachePrefix === null) {
+			$this->cachePrefix = hash('md4', $this->connection->getHost()."-".$this->connection->getPort()."-".$this->connection->getDatabase()."-".$this->connection->getDriver()->getName());
+		}
+		return $this->cachePrefix;
+	}
 
-    /**
-     * Returns the (cached) schema.
-     *
-     * @return Schema
-     */
-    public function getSchema() {
-        if ($this->schema === null) {
-            $cacheKey = $this->getCachePrefix().'_schema';
-            if ($this->cache->contains($cacheKey)) {
-                $this->schema = $this->cache->fetch($cacheKey);
-            } else {
-                $this->schema = $this->connection->getSchemaManager()->createSchema();
-                $this->cache->save($cacheKey, $this->schema);
-            }
-        }
-        return $this->schema;
-    }
+	/**
+	 * Returns the (cached) schema.
+	 *
+	 * @return Schema
+	 */
+	public function getSchema() {
+		if ($this->schema === null) {
+			$cacheKey = $this->getCachePrefix().'_schema';
+			if ($this->cache->contains($cacheKey)) {
+				$this->schema = $this->cache->fetch($cacheKey);
+			} else {
+				$this->schema = $this->connection->getSchemaManager()->createSchema();
+				$this->cache->save($cacheKey, $this->schema);
+			}
+		}
+		return $this->schema;
+	}
 
-    /**
-     * Returns the list of pivot tables linked to table $tableName
-     * @param string $tableName
-     * @return array|string[]
-     */
-    public function getPivotTableLinkedToTable($tableName) {
-        $cacheKey = $this->getCachePrefix().'_pivottables_link';
-        if ($this->cache->contains($cacheKey)) {
-            return $this->cache->fetch($cacheKey);
-        }
+	/**
+	 * Returns the list of pivot tables linked to table $tableName
+	 * @param string $tableName
+	 * @return array|string[]
+	 */
+	public function getPivotTableLinkedToTable($tableName) {
+		$cacheKey = $this->getCachePrefix().'_pivottables_link';
+		if ($this->cache->contains($cacheKey)) {
+			return $this->cache->fetch($cacheKey);
+		}
 
-        $pivotTables = [];
+		$pivotTables = [];
 
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        foreach ($junctionTables as $table) {
-            $fks = $table->getForeignKeys();
-            foreach ($fks as $fk) {
-                if ($fk->getForeignTableName() == $tableName) {
-                    $pivotTables[] = $table->getName();
-                    break;
-                }
-            }
-        }
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		foreach ($junctionTables as $table) {
+			$fks = $table->getForeignKeys();
+			foreach ($fks as $fk) {
+				if ($fk->getForeignTableName() == $tableName) {
+					$pivotTables[] = $table->getName();
+					break;
+				}
+			}
+		}
 
-        $this->cache->save($cacheKey, $pivotTables);
-        return $pivotTables;
-    }
+		$this->cache->save($cacheKey, $pivotTables);
+		return $pivotTables;
+	}
 
 
 }

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

Indentation +118 added lines, -118 removed lines

@@ -14,122 +14,122 @@ 
 class ObjectBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
 
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $foreignKey;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) {
-        parent::__construct($table);
-        $this->foreignKey = $foreignKey;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
-
-
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey() {
-        return $this->foreignKey;
-    }
-
-    /**
-     * 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 TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation() {
-        $str = "     * @param %s %s";
-        return sprintf($str, $this->getClassName(), $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName() {
-        // First, are there many column or only one?
-        // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
-            $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
-            if ($this->alternativeName) {
-                $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
-
-                $name .= 'By'.implode('And', $camelizedColumns);
-            }
-        } else {
-            $column = $this->foreignKey->getLocalColumns()[0];
-            // Let's remove any _id or id_.
-            if (strpos(strtolower($column), "id_") === 0) {
-                $column = substr($column, 3);
-            }
-            if (strrpos(strtolower($column), "_id") === strlen($column)-3) {
-                $column = substr($column, 0, strlen($column)-3);
-            }
-            $name = TDBMDaoGenerator::toCamelCase($column);
-            if ($this->alternativeName) {
-                $name .= 'Object';
-            }
-        }
-        return $name;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     * @return bool
-     */
-    public function isCompulsory() {
-        // Are all columns nullable?
-        $localColumnNames = $this->foreignKey->getLocalColumns();
-
-        foreach ($localColumnNames as $name) {
-            $column = $this->table->getColumn($name);
-            if ($column->getNotnull()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if the property is the primary key
-     * @return bool
-     */
-    public function isPrimaryKey() {
-        $fkColumns = $this->foreignKey->getLocalColumns();
-        sort($fkColumns);
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-        sort($pkColumns);
-
-        return $fkColumns == $pkColumns;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters
-     * @return string
-     */
-    public function getGetterSetterCode() {
-        $tableName = $this->table->getName();
-        $getterName = $this->getGetterName();
-        $setterName = $this->getSetterName();
-
-        $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
-
-        $str = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $foreignKey;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) {
+		parent::__construct($table);
+		$this->foreignKey = $foreignKey;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
+
+
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey() {
+		return $this->foreignKey;
+	}
+
+	/**
+	 * 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 TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation() {
+		$str = "     * @param %s %s";
+		return sprintf($str, $this->getClassName(), $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName() {
+		// First, are there many column or only one?
+		// If one column, we name the setter after it. Otherwise, we name the setter after the table name
+		if (count($this->foreignKey->getLocalColumns()) > 1) {
+			$name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
+			if ($this->alternativeName) {
+				$camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
+
+				$name .= 'By'.implode('And', $camelizedColumns);
+			}
+		} else {
+			$column = $this->foreignKey->getLocalColumns()[0];
+			// Let's remove any _id or id_.
+			if (strpos(strtolower($column), "id_") === 0) {
+				$column = substr($column, 3);
+			}
+			if (strrpos(strtolower($column), "_id") === strlen($column)-3) {
+				$column = substr($column, 0, strlen($column)-3);
+			}
+			$name = TDBMDaoGenerator::toCamelCase($column);
+			if ($this->alternativeName) {
+				$name .= 'Object';
+			}
+		}
+		return $name;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 * @return bool
+	 */
+	public function isCompulsory() {
+		// Are all columns nullable?
+		$localColumnNames = $this->foreignKey->getLocalColumns();
+
+		foreach ($localColumnNames as $name) {
+			$column = $this->table->getColumn($name);
+			if ($column->getNotnull()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if the property is the primary key
+	 * @return bool
+	 */
+	public function isPrimaryKey() {
+		$fkColumns = $this->foreignKey->getLocalColumns();
+		sort($fkColumns);
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+		sort($pkColumns);
+
+		return $fkColumns == $pkColumns;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters
+	 * @return string
+	 */
+	public function getGetterSetterCode() {
+		$tableName = $this->table->getName();
+		$getterName = $this->getGetterName();
+		$setterName = $this->getSetterName();
+
+		$referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
+
+		$str = '    /**
      * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(" and ", $this->foreignKey->getLocalColumns()).' column.
      *
      * @return '.$referencedBeanName.'
@@ -148,6 +148,6 @@ 
     }
 
 ';
-        return $str;
-    }
+		return $str;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
     public function getUpperCamelCaseName() {
         // First, are there many column or only one?
         // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
+        if (count($this->foreignKey->getLocalColumns())>1) {
             $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
             if ($this->alternativeName) {
                 $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
@@ -144,7 +144,7 @@ 
      * @param '.$referencedBeanName.' $object
      */
     public function '.$setterName.'('.$referencedBeanName.' $object = null) {
-        $this->setRef(' . var_export($this->foreignKey->getName(), true) . ', $object, '.var_export($tableName, true).');
+        $this->setRef(' . var_export($this->foreignKey->getName(), true).', $object, '.var_export($tableName, true).');
     }
 
 ';

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

Spacing +13 added lines, -13 removed lines

@@ -206,7 +206,7 @@ 
 
 }";
             $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
+            file_put_contents($possibleFileName, $str);
             @chmod($possibleFileName, 0664);
         }
     }
@@ -226,11 +226,11 @@ 
         foreach ($table->getColumns() as $column) {
             $comments = $column->getComment();
             $matches = array();
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){
+            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
                 $defaultSort = $data['column_name'];
-                if (count($matches == 3)){
+                if (count($matches == 3)) {
                     $defaultSortDirection = $matches[2];
-                }else{
+                } else {
                     $defaultSortDirection = 'ASC';
                 }
             }
@@ -416,7 +416,7 @@ 
         $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
 
         $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName ,$str);
+        file_put_contents($possibleBaseFileName, $str);
         @chmod($possibleBaseFileName, 0664);
 
         $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$className);
@@ -447,7 +447,7 @@ 
 }
 ";
             $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
+            file_put_contents($possibleFileName, $str);
             @chmod($possibleFileName, 0664);
         }
     }
@@ -523,7 +523,7 @@ 
         $possibleFileName = $this->rootPath.$possibleFileNames[0];
 
         $this->ensureDirectoryExist($possibleFileName);
-        file_put_contents($possibleFileName ,$str);
+        file_put_contents($possibleFileName, $str);
     }
 
     /**
@@ -534,7 +534,7 @@ 
      * @return string
      */
     public static function toCamelCase($str) {
-        $str = strtoupper(substr($str,0,1)).substr($str,1);
+        $str = strtoupper(substr($str, 0, 1)).substr($str, 1);
         while (true) {
             if (strpos($str, "_") === false && strpos($str, " ") === false) {
                 break;
@@ -544,9 +544,9 @@ 
             if ($pos === false) {
                 $pos = strpos($str, " ");
             }
-            $before = substr($str,0,$pos);
-            $after = substr($str,$pos+1);
-            $str = $before.strtoupper(substr($after,0,1)).substr($after,1);
+            $before = substr($str, 0, $pos);
+            $after = substr($str, $pos+1);
+            $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
         }
         return $str;
     }
@@ -627,7 +627,7 @@ 
             Type::GUID => 'string'
         ];
 
-        return isset($map[$type->getName()])?$map[$type->getName()]:$type->getName();
+        return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
     }
 
     /**
@@ -642,7 +642,7 @@ 
 
         foreach ($tables as $table) {
             $tableName = $table->getName();
-            $tableToBeanMap[$tableName] = $beanNamespace . "\\" . self::getBeanNameFromTableName($tableName);
+            $tableToBeanMap[$tableName] = $beanNamespace."\\".self::getBeanNameFromTableName($tableName);
         }
         return $tableToBeanMap;
     }

Indentation +372 added lines, -372 removed lines

@@ -20,178 +20,178 @@ 
  */
 class TDBMDaoGenerator {
 
-    /**
-     * 
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     *
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * The root directory of the project.
-     *
-     * @var string
-     */
-    private $rootPath;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * Constructor.
-     *
-     * @param Connection $dbConnection The connection to the database.
-     */
-    public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer) {
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->rootPath = __DIR__."/../../../../../../../../";
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @param string $daoFactoryClassName The classe name of the DAO factory
-     * @param string $daonamespace The namespace for the DAOs, without trailing \
-     * @param string $beannamespace The Namespace for the beans, without trailing \
-     * @param bool $storeInUtc If the generated daos should store the date in UTC timezone instead of user's timezone.
-     * @return \string[] the list of tables
-     * @throws TDBMException
-     */
-    public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc) {
-        // TODO: extract ClassNameMapper in its own package!
-        $classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
-
-        // TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
-
-        $tableList = $this->schema->getTables();
-
-        // Remove all beans and daos from junction tables
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        $junctionTableNames = array_map(function(Table $table) {
-            return $table->getName();
-        }, $junctionTables);
-
-        $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) {
-            return !in_array($table->getName(), $junctionTableNames);
-        });
-
-        foreach ($tableList as $table) {
-            $this->generateDaoAndBean($table, $daonamespace, $beannamespace, $classNameMapper, $storeInUtc);
-        }
+	/**
+	 * 
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 *
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * The root directory of the project.
+	 *
+	 * @var string
+	 */
+	private $rootPath;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Connection $dbConnection The connection to the database.
+	 */
+	public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer) {
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->rootPath = __DIR__."/../../../../../../../../";
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @param string $daoFactoryClassName The classe name of the DAO factory
+	 * @param string $daonamespace The namespace for the DAOs, without trailing \
+	 * @param string $beannamespace The Namespace for the beans, without trailing \
+	 * @param bool $storeInUtc If the generated daos should store the date in UTC timezone instead of user's timezone.
+	 * @return \string[] the list of tables
+	 * @throws TDBMException
+	 */
+	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc) {
+		// TODO: extract ClassNameMapper in its own package!
+		$classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
+
+		// TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
+
+		$tableList = $this->schema->getTables();
+
+		// Remove all beans and daos from junction tables
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		$junctionTableNames = array_map(function(Table $table) {
+			return $table->getName();
+		}, $junctionTables);
+
+		$tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) {
+			return !in_array($table->getName(), $junctionTableNames);
+		});
+
+		foreach ($tableList as $table) {
+			$this->generateDaoAndBean($table, $daonamespace, $beannamespace, $classNameMapper, $storeInUtc);
+		}
         
-        $this->generateFactory($tableList, $daoFactoryClassName, $daonamespace, $classNameMapper);
+		$this->generateFactory($tableList, $daoFactoryClassName, $daonamespace, $classNameMapper);
 
-        // Ok, let's return the list of all tables.
-        // These will be used by the calling script to create Mouf instances.
+		// Ok, let's return the list of all tables.
+		// These will be used by the calling script to create Mouf instances.
         
-        return array_map(function(Table $table) { return $table->getName(); },$tableList);
-    }
+		return array_map(function(Table $table) { return $table->getName(); },$tableList);
+	}
     
-    /**
-     * Generates in one method call the daos and the beans for one table.
-     * 
-     * @param $tableName
-     */
-    public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
+	/**
+	 * Generates in one method call the daos and the beans for one table.
+	 * 
+	 * @param $tableName
+	 */
+	public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
 		$tableName = $table->getName();
-        $daoName = $this->getDaoNameFromTableName($tableName);
-        $beanName = $this->getBeanNameFromTableName($tableName);
-        $baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
-        $baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
-
-        $this->generateBean($beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
-        $this->generateDao($daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
-    }
+		$daoName = $this->getDaoNameFromTableName($tableName);
+		$beanName = $this->getBeanNameFromTableName($tableName);
+		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
+		$baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
+
+		$this->generateBean($beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
+		$this->generateDao($daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
+	}
     
-    /**
-     * Returns the name of the bean class from the table name.
-     * 
-     * @param $tableName
-     * @return string
-     */
-    public static function getBeanNameFromTableName($tableName) {
-        return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Bean";
-    }
+	/**
+	 * Returns the name of the bean class from the table name.
+	 * 
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getBeanNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Bean";
+	}
     
-    /**
-     * Returns the name of the DAO class from the table name.
-     * 
-     * @param $tableName
-     * @return string
-     */
-    public static function getDaoNameFromTableName($tableName) {
-        return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Dao";
-    }
+	/**
+	 * Returns the name of the DAO class from the table name.
+	 * 
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getDaoNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Dao";
+	}
     
-    /**
-     * Returns the name of the base bean class from the table name.
-     * 
-     * @param $tableName
-     * @return string
-     */
-    public static function getBaseBeanNameFromTableName($tableName) {
-        return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseBean";
-    }
-
-    /**
-     * Returns the name of the base DAO class from the table name.
-     *
-     * @param $tableName
-     * @return string
-     */
-    public static function getBaseDaoNameFromTableName($tableName) {
-        return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseDao";
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param string $className The name of the class
-     * @param string $baseClassName The name of the base class which will be extended (name only, no directory)
-     * @param string $tableName The name of the table
-     * @param string $beannamespace The namespace of the bean
-     * @param ClassNameMapper $classNameMapper
-     * @throws TDBMException
-     */
-    public function generateBean($className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
-
-        $beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema);
-
-        $str = $beanDescriptor->generatePhpCode($beannamespace);
-
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$baseClassName);
-        if (!$possibleBaseFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$className);
-        if (!$possibleFileNames) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        if (!file_exists($possibleFileName)) {
-            $tableName = $table->getName();
-
-            $str = "<?php
+	/**
+	 * Returns the name of the base bean class from the table name.
+	 * 
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getBaseBeanNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseBean";
+	}
+
+	/**
+	 * Returns the name of the base DAO class from the table name.
+	 *
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getBaseDaoNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseDao";
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param string $className The name of the class
+	 * @param string $baseClassName The name of the base class which will be extended (name only, no directory)
+	 * @param string $tableName The name of the table
+	 * @param string $beannamespace The namespace of the bean
+	 * @param ClassNameMapper $classNameMapper
+	 * @throws TDBMException
+	 */
+	public function generateBean($className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
+
+		$beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema);
+
+		$str = $beanDescriptor->generatePhpCode($beannamespace);
+
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$baseClassName);
+		if (!$possibleBaseFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$className);
+		if (!$possibleFileNames) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		if (!file_exists($possibleFileName)) {
+			$tableName = $table->getName();
+
+			$str = "<?php
 /*
  * This file has been automatically generated by TDBM.
  * You can edit this file as it will not be overwritten.
@@ -206,44 +206,44 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Writes the PHP bean DAO with simple functions to create/get/save objects.
-     *
-     * @param string $fileName The file that will be written (without the directory)
-     * @param string $className The name of the class
-     * @param string $tableName The name of the table
-     */
-    public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
-        $tableName = $table->getName();
-        $primaryKeyColumns = $table->getPrimaryKeyColumns();
-
-        $defaultSort = null;
-        foreach ($table->getColumns() as $column) {
-            $comments = $column->getComment();
-            $matches = array();
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){
-                $defaultSort = $data['column_name'];
-                if (count($matches == 3)){
-                    $defaultSortDirection = $matches[2];
-                }else{
-                    $defaultSortDirection = 'ASC';
-                }
-            }
-        }
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName ,$str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Writes the PHP bean DAO with simple functions to create/get/save objects.
+	 *
+	 * @param string $fileName The file that will be written (without the directory)
+	 * @param string $className The name of the class
+	 * @param string $tableName The name of the table
+	 */
+	public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
+		$tableName = $table->getName();
+		$primaryKeyColumns = $table->getPrimaryKeyColumns();
+
+		$defaultSort = null;
+		foreach ($table->getColumns() as $column) {
+			$comments = $column->getComment();
+			$matches = array();
+			if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){
+				$defaultSort = $data['column_name'];
+				if (count($matches == 3)){
+					$defaultSortDirection = $matches[2];
+				}else{
+					$defaultSortDirection = 'ASC';
+				}
+			}
+		}
 
-        // FIXME: lowercase tables with _ in the name should work!
-        $tableCamel = self::toSingular(self::toCamelCase($tableName));
+		// FIXME: lowercase tables with _ in the name should work!
+		$tableCamel = self::toSingular(self::toCamelCase($tableName));
         
-        $beanClassWithoutNameSpace = $beanClassName;
-        $beanClassName = $beannamespace."\\".$beanClassName;
+		$beanClassWithoutNameSpace = $beanClassName;
+		$beanClassName = $beannamespace."\\".$beanClassName;
         
-        $str = "<?php
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -330,9 +330,9 @@ 
     }
     ";
 
-        if (count($primaryKeyColumns) === 1) {
-            $primaryKeyColumn = $primaryKeyColumns[0];
-            $str .= "
+		if (count($primaryKeyColumns) === 1) {
+			$primaryKeyColumn = $primaryKeyColumns[0];
+			$str .= "
     /**
      * Get $beanClassWithoutNameSpace specified by its ID (its primary key)
      * If the primary key does not exist, an exception is thrown.
@@ -347,8 +347,8 @@ 
         return \$this->tdbmService->findObjectByPk('$tableName', ['$primaryKeyColumn' => \$id], [], \$lazyLoading);
     }
     ";
-        }
-        $str .= "
+		}
+		$str .= "
     /**
      * Deletes the $beanClassWithoutNameSpace passed in parameter.
      *
@@ -409,29 +409,29 @@ 
 }
 ";
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$baseClassName);
-        if (!$possibleBaseFileNames) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName ,$str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$className);
-        if (!$possibleFileNames) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$baseClassName);
+		if (!$possibleBaseFileNames) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName ,$str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$className);
+		if (!$possibleFileNames) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
         
-        // Now, let's generate the "editable" class
-        if (!file_exists($possibleFileName)) {
-            $str = "<?php
+		// Now, let's generate the "editable" class
+		if (!file_exists($possibleFileName)) {
+			$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -448,23 +448,23 @@ 
 
 }
 ";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName ,$str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
 
 
 
-    /**
-     * Generates the factory bean.
-     * 
-     * @param Table[] $tableList
-     */
-    private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper) {
-        // For each table, let's write a property.
+	/**
+	 * Generates the factory bean.
+	 * 
+	 * @param Table[] $tableList
+	 */
+	private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper) {
+		// For each table, let's write a property.
         
-        $str = "<?php
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -481,12 +481,12 @@ 
 {
 ";
 
-        foreach ($tableList as $table) {
-            $tableName = $table->getName();
-            $daoClassName = $this->getDaoNameFromTableName($tableName);
-            $daoInstanceName = self::toVariableName($daoClassName);
+		foreach ($tableList as $table) {
+			$tableName = $table->getName();
+			$daoClassName = $this->getDaoNameFromTableName($tableName);
+			$daoInstanceName = self::toVariableName($daoClassName);
             
-            $str .= '    /**
+			$str .= '    /**
      * @var '.$daoClassName.'
      */
     private $'.$daoInstanceName.';
@@ -511,141 +511,141 @@ 
     }
     
 ';
-        }
+		}
         
         
-        $str .= '
+		$str .= '
 }
 ';
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace."\\".$daoFactoryClassName);
-        if (!$possibleFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace."\\".$daoFactoryClassName.'" is not autoloadable.');
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        $this->ensureDirectoryExist($possibleFileName);
-        file_put_contents($possibleFileName ,$str);
-    }
-
-    /**
-     * Transforms a string to camelCase (except the first letter will be uppercase too).
-     * Underscores and spaces are removed and the first letter after the underscore is uppercased.
-     * 
-     * @param $str string
-     * @return string
-     */
-    public static function toCamelCase($str) {
-        $str = strtoupper(substr($str,0,1)).substr($str,1);
-        while (true) {
-            if (strpos($str, "_") === false && strpos($str, " ") === false) {
-                break;
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace."\\".$daoFactoryClassName);
+		if (!$possibleFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace."\\".$daoFactoryClassName.'" is not autoloadable.');
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		$this->ensureDirectoryExist($possibleFileName);
+		file_put_contents($possibleFileName ,$str);
+	}
+
+	/**
+	 * Transforms a string to camelCase (except the first letter will be uppercase too).
+	 * Underscores and spaces are removed and the first letter after the underscore is uppercased.
+	 * 
+	 * @param $str string
+	 * @return string
+	 */
+	public static function toCamelCase($str) {
+		$str = strtoupper(substr($str,0,1)).substr($str,1);
+		while (true) {
+			if (strpos($str, "_") === false && strpos($str, " ") === false) {
+				break;
 			}
                 
-            $pos = strpos($str, "_");
-            if ($pos === false) {
-                $pos = strpos($str, " ");
-            }
-            $before = substr($str,0,$pos);
-            $after = substr($str,$pos+1);
-            $str = $before.strtoupper(substr($after,0,1)).substr($after,1);
-        }
-        return $str;
-    }
+			$pos = strpos($str, "_");
+			if ($pos === false) {
+				$pos = strpos($str, " ");
+			}
+			$before = substr($str,0,$pos);
+			$after = substr($str,$pos+1);
+			$str = $before.strtoupper(substr($after,0,1)).substr($after,1);
+		}
+		return $str;
+	}
     
-    /**
-     * Tries to put string to the singular form (if it is plural).
-     * We assume the table names are in english.
-     *
-     * @param $str string
-     * @return string
-     */
-    public static function toSingular($str) {
-        return Inflector::get('en')->singularize($str);
-    }
+	/**
+	 * Tries to put string to the singular form (if it is plural).
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 * @return string
+	 */
+	public static function toSingular($str) {
+		return Inflector::get('en')->singularize($str);
+	}
     
-    /**
-     * Put the first letter of the string in lower case.
-     * Very useful to transform a class name into a variable name.
-     * 
-     * @param $str string
-     * @return string
-     */
-    public static function toVariableName($str) {
-        return strtolower(substr($str, 0, 1)).substr($str, 1);
-    }
-
-    /**
-     * Ensures the file passed in parameter can be written in its directory.
-     * @param string $fileName
-     */
-    private function ensureDirectoryExist($fileName) {
-        $dirName = dirname($fileName);
-        if (!file_exists($dirName)) {
-            $old = umask(0);
-            $result = mkdir($dirName, 0775, true);
-            umask($old);
-            if ($result == false) {
-                echo "Unable to create directory: ".$dirName.".";
-                exit;
-            }
-        }
-    }
-
-    /**
-     * @param string $rootPath
-     */
-    public function setRootPath($rootPath)
-    {
-        $this->rootPath = $rootPath;
-    }
-
-    /**
-     * Transforms a DBAL type into a PHP type (for PHPDoc purpose)
-     *
-     * @param Type $type The DBAL type
-     * @return string The PHP type
-     */
-    public static function dbalTypeToPhpType(Type $type) {
-        $map = [
-            Type::TARRAY => 'array',
-            Type::SIMPLE_ARRAY => 'array',
-            Type::JSON_ARRAY => 'array',
-            Type::BIGINT => 'string',
-            Type::BOOLEAN => 'bool',
-            Type::DATETIME => '\DateTimeInterface',
-            Type::DATETIMETZ => '\DateTimeInterface',
-            Type::DATE => '\DateTimeInterface',
-            Type::TIME => '\DateTimeInterface',
-            Type::DECIMAL => 'float',
-            Type::INTEGER => 'int',
-            Type::OBJECT => 'string',
-            Type::SMALLINT => 'int',
-            Type::STRING => 'string',
-            Type::TEXT => 'string',
-            Type::BINARY => 'string',
-            Type::BLOB => 'string',
-            Type::FLOAT => 'float',
-            Type::GUID => 'string'
-        ];
-
-        return isset($map[$type->getName()])?$map[$type->getName()]:$type->getName();
-    }
-
-    /**
-     *
-     * @param string $beanNamespace
-     * @return \string[] Returns a map mapping table name to beans name
-     */
-    public function buildTableToBeanMap($beanNamespace) {
-        $tableToBeanMap = [];
-
-        $tables = $this->schema->getTables();
-
-        foreach ($tables as $table) {
-            $tableName = $table->getName();
-            $tableToBeanMap[$tableName] = $beanNamespace . "\\" . self::getBeanNameFromTableName($tableName);
-        }
-        return $tableToBeanMap;
-    }
+	/**
+	 * Put the first letter of the string in lower case.
+	 * Very useful to transform a class name into a variable name.
+	 * 
+	 * @param $str string
+	 * @return string
+	 */
+	public static function toVariableName($str) {
+		return strtolower(substr($str, 0, 1)).substr($str, 1);
+	}
+
+	/**
+	 * Ensures the file passed in parameter can be written in its directory.
+	 * @param string $fileName
+	 */
+	private function ensureDirectoryExist($fileName) {
+		$dirName = dirname($fileName);
+		if (!file_exists($dirName)) {
+			$old = umask(0);
+			$result = mkdir($dirName, 0775, true);
+			umask($old);
+			if ($result == false) {
+				echo "Unable to create directory: ".$dirName.".";
+				exit;
+			}
+		}
+	}
+
+	/**
+	 * @param string $rootPath
+	 */
+	public function setRootPath($rootPath)
+	{
+		$this->rootPath = $rootPath;
+	}
+
+	/**
+	 * Transforms a DBAL type into a PHP type (for PHPDoc purpose)
+	 *
+	 * @param Type $type The DBAL type
+	 * @return string The PHP type
+	 */
+	public static function dbalTypeToPhpType(Type $type) {
+		$map = [
+			Type::TARRAY => 'array',
+			Type::SIMPLE_ARRAY => 'array',
+			Type::JSON_ARRAY => 'array',
+			Type::BIGINT => 'string',
+			Type::BOOLEAN => 'bool',
+			Type::DATETIME => '\DateTimeInterface',
+			Type::DATETIMETZ => '\DateTimeInterface',
+			Type::DATE => '\DateTimeInterface',
+			Type::TIME => '\DateTimeInterface',
+			Type::DECIMAL => 'float',
+			Type::INTEGER => 'int',
+			Type::OBJECT => 'string',
+			Type::SMALLINT => 'int',
+			Type::STRING => 'string',
+			Type::TEXT => 'string',
+			Type::BINARY => 'string',
+			Type::BLOB => 'string',
+			Type::FLOAT => 'float',
+			Type::GUID => 'string'
+		];
+
+		return isset($map[$type->getName()])?$map[$type->getName()]:$type->getName();
+	}
+
+	/**
+	 *
+	 * @param string $beanNamespace
+	 * @return \string[] Returns a map mapping table name to beans name
+	 */
+	public function buildTableToBeanMap($beanNamespace) {
+		$tableToBeanMap = [];
+
+		$tables = $this->schema->getTables();
+
+		foreach ($tables as $table) {
+			$tableName = $table->getName();
+			$tableToBeanMap[$tableName] = $beanNamespace . "\\" . self::getBeanNameFromTableName($tableName);
+		}
+		return $tableToBeanMap;
+	}
 }

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

Indentation +101 added lines, -101 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,23 +112,23 @@ 
     }
 
 ';
-        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)
-        );
-    }
+		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)
+		);
+	}
 }