thecodingmachine / database.tdbm

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

Indentation +3 added lines, -3 removed lines

@@ -133,14 +133,14 @@
 		$work_table = explode("'", $work_str);
 
 		if (count($work_table) == 0)
-		    return '';
+			return '';
 
 		// if we start with a ', let's remove the first text
 		if (strstr($work_str,"'") === 0)
-		    array_shift($work_table);
+			array_shift($work_table);
 			
 		if (count($work_table) == 0)
-		    return '';
+			return '';
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';

src/Mouf/Database/TDBM/AmbiguityException.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	}
 
 	private function getAllPossiblePaths() {
-        return AmbiguityException::getAllPossiblePathsRec($this->paths);
+		return AmbiguityException::getAllPossiblePathsRec($this->paths);
 	}
 
 	private static function getAllPossiblePathsRec($sub_table_paths)

src/Mouf/Database/TDBM/TDBMObjectArray.php

Indentation +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 	 * @param string $func_name
 	 * @param $values
 	 * @return array|void
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    public function __call($func_name, $values) {
+	public function __call($func_name, $values) {
 
 		if (strpos($func_name,"getarray_") === 0) {
 			$column = substr($func_name, 9);

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

Doc Comments +3 added lines

@@ -170,6 +170,9 @@
 	
 	protected $errorMsg;
 	
+	/**
+	 * @param string $msg
+	 */
 	private function displayErrorMsg($msg) {
 		$this->errorMsg = $msg;
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);

Indentation +4 added lines, -4 removed lines

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

src/Mouf/Database/TDBM/TDBMObject.php

Doc Comments +8 added lines, -1 removed lines

@@ -238,6 +238,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $var
+	 */
 	public function __get($var) {
 		$this->_dbLoadIfNotLoaded();
 
@@ -290,6 +293,10 @@ 
 		return isset($this->db_row[$var]);
 	}
 	
+	/**
+	 * @param string $var
+	 * @param string|null $value
+	 */
 	public function __set($var, $value) {
 		$this->_dbLoadIfNotLoaded();
 
@@ -642,7 +649,7 @@ 
 	/**
 	 * Returns the tables used in the filter in an array.
 	 *
-	 * @return array<string>
+	 * @return string[]
 	 */
 	public function getUsedTables() {
 		return array($this->db_table_name);

Indentation +60 added lines, -60 removed lines

@@ -170,26 +170,26 @@ 
 		$this->TDBMObject_state = $state;	
 	}
 
-    /**
-     * Internal TDBM method, you should not use this.
-     * Loads the db_row property of the object from the $row array.
-     * Any row having a key starting with 'tdbm_reserved_col_' is ignored.
-     *
-     * @param array $row
-     * @param array|null $colsArray A big optimization to avoid calling strpos to many times. This array should
-     *                              contain as keys the list of interesting columns. If null, this list will be initialized.
-     */
+	/**
+	 * Internal TDBM method, you should not use this.
+	 * Loads the db_row property of the object from the $row array.
+	 * Any row having a key starting with 'tdbm_reserved_col_' is ignored.
+	 *
+	 * @param array $row
+	 * @param array|null $colsArray A big optimization to avoid calling strpos to many times. This array should
+	 *                              contain as keys the list of interesting columns. If null, this list will be initialized.
+	 */
 	public function loadFromRow($row, &$colsArray) {
-        if ($colsArray === null) {
-            foreach ($row as $key=>$value) {
-                if (strpos($key, 'tdbm_reserved_col_')!==0) {
-                    $colsArray[$key] = true;
-                }
-            }
-        }
-
-        $this->db_row = array_intersect_key($row, $colsArray);
-        $this->TDBMObject_state = "loaded";
+		if ($colsArray === null) {
+			foreach ($row as $key=>$value) {
+				if (strpos($key, 'tdbm_reserved_col_')!==0) {
+					$colsArray[$key] = true;
+				}
+			}
+		}
+
+		$this->db_row = array_intersect_key($row, $colsArray);
+		$this->TDBMObject_state = "loaded";
 	}
 
 	/**
@@ -325,9 +325,9 @@ 
 
 	/**
 	 * Saves the current object by INSERTing or UPDAT(E)ing it in the database.
-     *
-     * This method must be called only from the DAOs.
-     * @internal
+	 *
+	 * This method must be called only from the DAOs.
+	 * @internal
 	 */
 	public function save() {
 		if (!is_array($this->db_row)) {
@@ -510,10 +510,10 @@ 
 	 *
 	 * @param string $func_name
 	 * @param $values
-     * @return TDBMObjectArray A TDBMObjectArray containing the resulting objects of the query.
-     * @throws TDBMException
+	 * @return TDBMObjectArray A TDBMObjectArray containing the resulting objects of the query.
+	 * @throws TDBMException
 	 */
-    public function __call($func_name, $values) {
+	public function __call($func_name, $values) {
 
 		if (strpos($func_name,"get_") === 0) {
 			$table = substr($func_name,4);
@@ -548,48 +548,48 @@ 
 	}
 	
 		/**
-	 * Implements array behaviour for our object.
-	 * 
-	 * @param string $offset
-	 * @param string $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
+	 * @return bool
 	 */
-    public function offsetExists($offset) {
-    	$this->_dbLoadIfNotLoaded();
-        return isset($this->db_row[$offset]);
-    }
+	public function offsetExists($offset) {
+		$this->_dbLoadIfNotLoaded();
+		return isset($this->db_row[$offset]);
+	}
 	/**
 	 * Implements array behaviour for our object.
 	 * 
 	 * @param string $offset
 	 */
-    public function offsetUnset($offset) {
+	public function offsetUnset($offset) {
 		$this->__set($offset, null);
-    }
+	}
 	/**
 	 * Implements array behaviour for our object.
 	 * 
 	 * @param string $offset
-     * @return mixed|null
+	 * @return mixed|null
 	 */
-    public function offsetGet($offset) {
-        return $this->__get($offset);
-    }
+	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();
+		$this->_dbLoadIfNotLoaded();
 		if (count($this->db_row)>0) {
 			$this->_validIterator = true;
 		} else {
@@ -677,21 +677,21 @@ 
 		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->TDBMObject_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->getPrimaryKey();
-        foreach ($pk_array as $pk) {
-            $this->db_row[$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->TDBMObject_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->getPrimaryKey();
+		foreach ($pk_array as $pk) {
+			$this->db_row[$pk] = null;
+		}
+	}
 }
\ No newline at end of file

src/Mouf/Database/TDBM/TDBMObjectArrayCursorIterator.php

Doc Comments +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 	}
 	/**
 	 * Returns the current result's _id
-	 * @return string The current result's _id as a string.
+	 * @return integer The current result's _id as a string.
 	 */
 	public function key()
 	{

Indentation +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	protected $current = false;
 
-    private $colsArray = null;
+	private $colsArray = null;
 	
 	public function __construct(\PDOStatement $pdoStatement, ConnectionInterface $dbConnection, $primary_keys, $table_name, $objectStorage, $className, TDBMService $tdbmService, $sql)
 	{
@@ -73,9 +73,9 @@ 
 	 * Casts a document to a new instance specified in the $recordClass
 	 * @param array $fullCaseRow
 	 * @return Record_Abstract|false
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    protected function cast($fullCaseRow)
+	protected function cast($fullCaseRow)
 	{
 		if (!is_array($fullCaseRow)) {
 			return false;

src/Mouf/Database/TDBM/TDBMService.php

Doc Comments +7 added lines, -7 removed lines

@@ -711,10 +711,10 @@ 
 	
 	/**
 	 * Returns a generator for the database.
-	 * @param unknown $result
+	 * @param \PDOStatement $result
 	 * @param unknown $table_name
-	 * @param unknown $className
-	 * @param unknown $sql
+	 * @param string $className
+	 * @param string $sql
 	 */
 	private function getObjectsFromSQLGenerator($result, $table_name, $className, $sql) {
 		$keysStandardCased = array();
@@ -1100,7 +1100,7 @@ 
 	 * @param unknown_type $target_tables
 	 * @param unknown_type $path
 	 * @param unknown_type $queue
-	 * @return unknown
+	 * @return boolean
 	 */
 	private function find_paths_iter(&$target_tables, &$path, &$queue) {
 		// Get table to look at:
@@ -1569,7 +1569,7 @@ 
 	 * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
 	 * and gives back a proper Filter object.
 	 *
-	 * @param unknown_type $filter_bag
+	 * @param unknown_type|null $filter_bag
 	 * @return FilterInterface
 	 */
 	public function buildFilterFromFilterBag($filter_bag) {
@@ -1634,7 +1634,7 @@ 
 	 * Takes in input an order_bag (which can be about anything from a string to an array of OrderByColumn objects... see above from documentation),
 	 * and gives back an array of OrderByColumn / OrderBySQLString objects.
 	 *
-	 * @param unknown_type $orderby_bag
+	 * @param unknown_type|null $orderby_bag
 	 * @return array
 	 */
 	public function buildOrderArrayFromOrderBag($orderby_bag) {
@@ -1851,7 +1851,7 @@ 
 	 * @param bool $support If the generated daos should keep support for old functions (eg : getUserList and getList)
 	 * @param bool $storeInUtc If the generated daos should store the date in UTC timezone instead of user's timezone.
 	 * @param bool $castDatesToDateTime
-	 * @return \string[] the list of tables
+	 * @return string[] the list of tables
 	 */
 	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $support, $storeInUtc, $castDatesToDateTime) {
 		$tdbmDaoGenerator = new TDBMDaoGenerator($this->dbConnection);

Indentation +59 added lines, -59 removed lines

@@ -545,45 +545,45 @@ 
 		}
 	}
 
-    /**
-     * 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 TDBMObject $objToDelete
-     */
-    public function deleteCascade(TDBMObject $objToDelete) {
-        $this->deleteAllConstraintWithThisObject($objToDelete);
-        $this->deleteObject($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->dbConnection->escapeDBItem($obj->_getDbTableName());
-        $constraints = $this->dbConnection->getConstraintsFromTable($tableFrom);
-        foreach ($constraints as $constraint) {
-            $tableTo = $this->dbConnection->escapeDBItem($constraint["table1"]);
-            $colFrom = $this->dbConnection->escapeDBItem($constraint["col2"]);
-            $colTo = $this->dbConnection->escapeDBItem($constraint["col1"]);
-            $idVarName = $this->dbConnection->escapeDBItem($obj->getPrimaryKey()[0]);
-            $idValue = $this->dbConnection->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 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 TDBMObject $objToDelete
+	 */
+	public function deleteCascade(TDBMObject $objToDelete) {
+		$this->deleteAllConstraintWithThisObject($objToDelete);
+		$this->deleteObject($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->dbConnection->escapeDBItem($obj->_getDbTableName());
+		$constraints = $this->dbConnection->getConstraintsFromTable($tableFrom);
+		foreach ($constraints as $constraint) {
+			$tableTo = $this->dbConnection->escapeDBItem($constraint["table1"]);
+			$colFrom = $this->dbConnection->escapeDBItem($constraint["col2"]);
+			$colTo = $this->dbConnection->escapeDBItem($constraint["col1"]);
+			$idVarName = $this->dbConnection->escapeDBItem($obj->getPrimaryKey()[0]);
+			$idValue = $this->dbConnection->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);
+			}
+		}
+	}
 
 	/**
 	 * The getObjectsFromSQL is used to retrieve objects from the database using a full SQL query.
@@ -644,7 +644,7 @@ 
 			}
 			$keysStandardCased = array();
 			$firstLine = true;
-            $colsArray = null;
+			$colsArray = null;
 			while ($fullCaseRow = $result->fetch(\PDO::FETCH_ASSOC))
 			{
 				$row = array();
@@ -676,17 +676,17 @@ 
 					$id = serialize($ids);
 				}
 
-                $obj = $this->objectStorage->get($table_name,$id);
+				$obj = $this->objectStorage->get($table_name,$id);
 				if ($obj === null)
 				{
 					if (!is_a($className, "Mouf\\Database\\TDBM\\TDBMObject", true)) {
 						throw new TDBMException("Error while calling TDBM: The class ".$className." should extend TDBMObject.");
 					}
 					$obj = new $className($this, $table_name, $id);
-                    $obj->loadFromRow($row, $colsArray);
-                    $this->objectStorage->set($table_name, $id, $obj);
+					$obj->loadFromRow($row, $colsArray);
+					$this->objectStorage->set($table_name, $id, $obj);
 				} elseif ($obj->_getStatus() == "not loaded") {
-                    $obj->loadFromRow($row, $colsArray);
+					$obj->loadFromRow($row, $colsArray);
 					// Check that the object fetched from cache is from the requested class.
 					if (!is_a($obj, $className)) {
 						throw new TDBMException("Error while calling TDBM: An object fetched from database is already present in TDBM cache and they do not share the same class. You requested the object to be of the class ".$className." but the object available locally is of the class ".get_class($obj).".");
@@ -719,7 +719,7 @@ 
 	private function getObjectsFromSQLGenerator($result, $table_name, $className, $sql) {
 		$keysStandardCased = array();
 		$firstLine = true;
-        $colsArray = null;
+		$colsArray = null;
 		while ($fullCaseRow = $result->fetch(\PDO::FETCH_ASSOC))
 		{
 			$row = array();
@@ -750,7 +750,7 @@ 
 				}
 				$id = serialize($ids);
 			}
-            $obj = $this->objectStorage->get($table_name, $id);
+			$obj = $this->objectStorage->get($table_name, $id);
 			if ($obj === null)
 			{
 				if ($className == null) {
@@ -763,10 +763,10 @@ 
 				} else {
 					throw new TDBMException("Error while casting TDBMObject to class, the parameter passed is not a string. Value passed: ".$className);
 				}
-                $obj->loadFromRow($row, $colsArray);
-                $this->objectStorage->set($table_name, $id, $obj);
+				$obj->loadFromRow($row, $colsArray);
+				$this->objectStorage->set($table_name, $id, $obj);
 			} elseif ($obj->_getStatus() == "not loaded") {
-                $obj->loadFromRow($row, $colsArray);
+				$obj->loadFromRow($row, $colsArray);
 				// Check that the object fetched from cache is from the requested class.
 				if ($className != null) {
 					if (!is_subclass_of(get_class($obj), $className) && get_class($obj) != $className) {
@@ -1665,9 +1665,9 @@ 
 	 * Throws a TDBMException if one of those table does not exist.
 	 *
 	 * @param array $tables
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    private function checkTablesExist($tables) {
+	private function checkTablesExist($tables) {
 		foreach ($tables as $table) {
 			$possible_tables = $this->dbConnection->checkTableExist($table);
 			if ($possible_tables !== true)
@@ -1740,12 +1740,12 @@ 
 	 * This function returns the HTML to draw a tree of DisplayNode.
 	 *
 	 * @param DisplayNode $tree
-     * @param int $x
-     * @param int $y
-     * @param int $ret_width
-     * @param int $ret_height
-     *
-     * @return string
+	 * @param int $x
+	 * @param int $y
+	 * @param int $ret_width
+	 * @param int $ret_height
+	 *
+	 * @return string
 	 */
 	public function drawTree($tree, $x, $y, &$ret_width=0, &$ret_height=0) {
 
@@ -1859,8 +1859,8 @@ 
 	}
 
 	/**
- 	* @param array<string, string> $tableToBeanMap
- 	*/
+	 * @param array<string, string> $tableToBeanMap
+	 */
 	public function setTableToBeanMap(array $tableToBeanMap) {
 		$this->tableToBeanMap = $tableToBeanMap;
 	}

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

Doc Comments +14 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param bool $support If the generated daos should keep support for old functions (eg : getUserList and getList)
 	 * @param bool $storeInUtc If the generated daos should store the date in UTC timezone instead of user's timezone.
 	 * @param bool $castDatesToDateTime Whether dates are converted to DateTimeImmutable or to timestamp
-	 * @return \string[] the list of tables
+	 * @return string[] the list of tables
 	 * @throws TDBMException
 	 */
 	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $support, $storeInUtc, $castDatesToDateTime) {
@@ -84,7 +84,12 @@ 
 	/**
 	 * Generates in one method call the daos and the beans for one table.
 	 * 
-	 * @param $tableName
+	 * @param string $tableName
+	 * @param string $daonamespace
+	 * @param string $beannamespace
+	 * @param boolean $support
+	 * @param boolean $storeInUtc
+	 * @param boolean $castDatesToDateTime
 	 */
 	public function generateDaoAndBean($tableName, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $support, $storeInUtc, $castDatesToDateTime) {
 		$daoName = $this->getDaoNameFromTableName($tableName);
@@ -412,9 +417,10 @@ 
 	/**
 	 * 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
+	 * @param string $baseClassName
+	 * @param string $beanClassName
 	 */
 	public function generateDao($className, $baseClassName, $beanClassName, $tableName, ClassNameMapper $classNameMapper, $support) {
 		$info = $this->dbConnection->getTableInfo($tableName);
@@ -702,7 +708,9 @@ 
 	/**
 	 * Generates the factory bean.
 	 * 
-	 * @param $tableList
+	 * @param string[] $tableList
+	 * @param string $daoFactoryClassName
+	 * @param string $daoNamespace
 	 */
 	private function generateFactory($tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper) {
 		// For each table, let's write a property.
@@ -774,7 +782,6 @@ 
 	 * Transforms the property name in a setter name.
 	 * For instance, phone => getPhone or name => getName
 	 *
-	 * @param string $methodName
 	 * @return string
 	 */
 	public static function getSetterNameForPropertyName($propertyName) {
@@ -854,7 +861,7 @@ 
 	 * Tries to put string to the singular form (if it is plural).
 	 * Obviously, this can't be perfect, be we do the best we can.
 	 * 
-	 * @param $str string
+	 * @param string $str string
 	 * @return string
 	 */
 	public static function toSingular($str) {
@@ -875,7 +882,7 @@ 
 	 * Put the first letter of the string in lower case.
 	 * Very useful to transform a class name into a variable name.
 	 * 
-	 * @param $str string
+	 * @param string $str string
 	 * @return string
 	 */
 	public static function toVariableName($str) {

Indentation +62 added lines, -62 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $support, $storeInUtc, $castDatesToDateTime) {
 		// TODO: migrate $this->daoNamespace to $daonamespace that is passed in parameter!
-        $classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
+		$classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
 
 		$this->daoNamespace = $daonamespace;
 		$this->beanNamespace = $beannamespace;
@@ -91,10 +91,10 @@ 
 		$beanName = $this->getBeanNameFromTableName($tableName);
 		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
 
-        $connection = $this->dbConnection;
-        if ($connection instanceof CachedConnection){
-            $connection->cacheService->purgeAll();
-        }
+		$connection = $this->dbConnection;
+		if ($connection instanceof CachedConnection){
+			$connection->cacheService->purgeAll();
+		}
 		
 		$this->generateBean($beanName, $baseBeanName, $tableName, $beannamespace, $classNameMapper, $storeInUtc, $castDatesToDateTime);
 		$this->generateDao($daoName, $daoName."Base", $beanName, $tableName, $classNameMapper, $support);
@@ -130,16 +130,16 @@ 
 		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseBean";
 	}
 
-    /**
-     * 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
-     */
+	/**
+	 * 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, $tableName, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc, $castDatesToDateTime) {
 		$table = $this->dbConnection->getTableFromDbModel($tableName);
 
@@ -367,25 +367,25 @@ 
 		$str .= "}
 ?>";
 
-        $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];
+		$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);
+		$this->ensureDirectoryExist($possibleBaseFileName);
 		file_put_contents($possibleBaseFileName, $str);
 		@chmod($possibleBaseFileName, 0664);
 
 
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$className);
-        if (!$possibleFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$className.'" is not autoloadable.');
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$className);
+		if (!$possibleFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$className.'" is not autoloadable.');
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
 
-        if (!file_exists($possibleFileName)) {
+		if (!file_exists($possibleFileName)) {
 			$str = "<?php
 /*
  * This file has been automatically generated by TDBM.
@@ -403,7 +403,7 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
+			$this->ensureDirectoryExist($possibleFileName);
 			file_put_contents($possibleFileName ,$str);
 			@chmod($possibleFileName, 0664);
 		}
@@ -659,21 +659,21 @@ 
 }
 ?>";
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$baseClassName);
-        if (!$possibleBaseFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$baseClassName);
+		if (!$possibleBaseFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
 
-        $this->ensureDirectoryExist($possibleBaseFileName);
+		$this->ensureDirectoryExist($possibleBaseFileName);
 		file_put_contents($possibleBaseFileName ,$str);
 		@chmod($possibleBaseFileName, 0664);
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$className);
-        if (!$possibleFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$className);
+		if (!$possibleFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
 		
 		// Now, let's generate the "editable" class
 		if (!file_exists($possibleFileName)) {
@@ -693,7 +693,7 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
+			$this->ensureDirectoryExist($possibleFileName);
 			file_put_contents($possibleFileName ,$str);
 			@chmod($possibleFileName, 0664);
 		}
@@ -760,13 +760,13 @@ 
 }
 ?>';
 
-        $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];
+		$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);
+		$this->ensureDirectoryExist($possibleFileName);
 		file_put_contents($possibleFileName ,$str);
 	}
 	
@@ -882,22 +882,22 @@ 
 		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;
-            }
-        }
-    }
+	/**
+	 * 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

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

Indentation +3 added lines, -3 removed lines

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