thecodingmachine / database.tdbm

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

Doc Comments +4 added lines, -2 removed lines

@@ -136,8 +136,7 @@ 
 	 * This action generates the TDBM instance, then the DAOs and Beans. 
 	 * 
 	 * @Action
-	 * @param string $name
-	 * @param bool $selfedit
+	 * @param string|boolean $selfedit
 	 */
 	public function generate($sourcedirectory, $daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit="false") {
 		$this->selfedit = $selfedit;
@@ -163,6 +162,9 @@ 
 	
 	protected $errorMsg;
 	
+	/**
+	 * @param string $msg
+	 */
 	private function displayErrorMsg($msg) {
 		$this->errorMsg = $msg;
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);

Unused Use Statements -3 removed lines

@@ -2,11 +2,8 @@
 namespace Mouf\Database\TDBM\Controllers;
 
 use Mouf\MoufUtils;
-
 use Mouf\Actions\InstallUtils;
-
 use Mouf\MoufManager;
-
 use Mouf\Html\HtmlElement\HtmlBlock;
 use Mouf\Mvc\Splash\Controllers\Controller;
 

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
 	 * @param string $name
 	 * @param bool $selfedit
 	 */
-	public function generate($sourcedirectory, $daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit="false") {
+	public function generate($sourcedirectory, $daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit = "false") {
 		$this->selfedit = $selfedit;
 		
 		if ($selfedit == "true") {

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

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * Default constructor to build the filter.
 	 * All parameters are optional and can later be set using the setters.
 	 * 
-	 * @param array<FilterInterface> $filter
+	 * @param array<FilterInterface> $filters
 	 */
 	public function __construct($filters=null) {
 		$this->filters = $filters;

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace Mouf\Database\TDBM\Filters;
 
 use Mouf\Database\TDBM\TDBMException;
-
 use Mouf\Database\DBConnection\ConnectionInterface;
 
 

Spacing +3 added lines, -3 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	 * Default constructor to build the filter.
 	 * All parameters are optional and can later be set using the setters.
 	 * 
-	 * @param array<FilterInterface> $filter
+	 * @param array<FilterInterface> $filters
 	 */
 	public function __construct($filters=null) {
 		$this->filters = $filters;

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	 * 
 	 * @param array<FilterInterface> $filter
 	 */
-	public function __construct($filters=null) {
+	public function __construct($filters = null) {
 		$this->filters = $filters;
 	}
 
@@ -90,7 +90,7 @@ 
 		}
 
 		if (count($filters_sql)>0) {
-			return '('.implode(' OR ',$filters_sql).')';
+			return '('.implode(' OR ', $filters_sql).')';
 		} else {
 			return '';
 		}
@@ -107,7 +107,7 @@ 
 		}
 		$tables = array();
 		foreach ($this->filters as $filter) {
-			$tables = array_merge($tables,$filter->getUsedTables());
+			$tables = array_merge($tables, $filter->getUsedTables());
 		}
 		// Remove tables in double.
 		$tables = array_flip(array_flip($tables));

src/Mouf/Database/TDBM/TDBMService.php

Doc Comments +7 added lines, -5 removed lines

@@ -962,7 +962,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:
@@ -1184,7 +1184,7 @@ 
 	 * @param unknown_type $table_name The name of the table queried
 	 * @param unknown_type $filter_bag The filter bag (see getObjects for complete description)
 	 * @param unknown_type $hint_path
-	 * @return integer
+	 * @return TDBMObjectArray
 	 */
 	public function getCount($table_name, $filter_bag=null, $hint_path=null) {
 		if ($this->dbConnection == null) {
@@ -1202,7 +1202,7 @@ 
 	 * @param integer $from The offset
 	 * @param integer $limit The maximum number of rows returned
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
-	 * @return string The SQL that would be executed.
+	 * @return TDBMObjectArray The SQL that would be executed.
 	 */
 	public function explainSQLGetObjects($table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $hint_path=null) 	{
 		if ($this->dbConnection == null) {
@@ -1461,7 +1461,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) {
@@ -1546,7 +1546,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) {
@@ -1661,6 +1661,8 @@ 
 	 * This function returns the HTML to draw a tree of DisplayNode.
 	 *
 	 * @param unknown_type $tree
+	 * @param integer $x
+	 * @param integer $y
 	 */
 	public function drawTree($tree, $x, $y, &$ret_width=0, &$ret_height=0) {
 

Spacing +73 added lines, -73 removed lines

@@ -123,7 +123,7 @@ 
 	private $cacheKey = "__TDBM_Cache__";
 
 	public function __construct() {
-		register_shutdown_function(array($this,"completeSaveOnExit"));
+		register_shutdown_function(array($this, "completeSaveOnExit"));
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 				$objects = $this->getObjects($table_name, $filters, null, null, null, $className);
 				if (count($objects) == 0) {
 					return null;
-				} elseif (count($objects) > 1) {
+				} elseif (count($objects)>1) {
 					throw new DuplicateRowException("Error while querying an object for table '$table_name': ".count($objects)." rows have been returned, but we should have received at most one.");
 				}
 				// Return the first and only object.
@@ -350,7 +350,7 @@ 
 		}
 
 		if (isset($this->objects[$table_name][$id])) {
-			$obj =  $this->objects[$table_name][$id];
+			$obj = $this->objects[$table_name][$id];
 			if ($className == null || is_a($obj, $className)) {
 				return $obj;
 			} else {
@@ -395,7 +395,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->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getNewObject(): No connection has been established on the database!");
 		}
@@ -425,8 +425,8 @@ 
 		}
 
 		if ($auto_assign_id && !$this->isPrimaryKeyAutoIncrement($table_name)) {
-			$pk_table =  $this->getPrimaryKeyStatic($table_name);
-			if (count($pk_table)==1)
+			$pk_table = $this->getPrimaryKeyStatic($table_name);
+			if (count($pk_table) == 1)
 			{
 				$root_table = $this->dbConnection->findRootSequenceTable($table_name);
 				$id = $this->dbConnection->nextId($root_table);
@@ -436,7 +436,7 @@ 
 					$sql = "SELECT MAX(".$this->dbConnection->escapeDBItem($pk_table[0]).") AS maxkey FROM ".$root_table;
 					$res = $this->dbConnection->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;
 					}
@@ -467,17 +467,17 @@ 
 			// Now for the object_id
 			$object_id = $object->TDBMObject_id;
 			// If there is only one primary key:
-			if (count($pk_table)==1) {
+			if (count($pk_table) == 1) {
 				$sql_where = $this->dbConnection->escapeDBItem($pk_table[0])."=".$this->dbConnection->quoteSmart($object->TDBMObject_id);
 			} else {
 				$ids = unserialize($object_id);
-				$i=0;
+				$i = 0;
 				$sql_where_array = array();
 				foreach ($pk_table as $pk) {
 					$sql_where_array[] = $this->dbConnection->escapeDBItem($pk)."=".$this->dbConnection->quoteSmart($ids[$i]);
 					$i++;
 				}
-				$sql_where = implode(" AND ",$sql_where_array);
+				$sql_where = implode(" AND ", $sql_where_array);
 			}
 
 
@@ -520,7 +520,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 TDBMObjectArray The result set of the query as a TDBMObjectArray (an array of TDBMObjects with special properties)
 	 */
-	public function getObjectsFromSQL($table_name, $sql, $from=null, $limit=null, $className=null) {
+	public function getObjectsFromSQL($table_name, $sql, $from = null, $limit = null, $className = null) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
@@ -540,17 +540,17 @@ 
 			
 			if ($firstLine) {
 				// $keysStandardCased is an optimization to avoid calling toStandardCaseColumn on every cell of every row.
-				foreach ($fullCaseRow as $key=>$value)  {
+				foreach ($fullCaseRow as $key=>$value) {
 					$keysStandardCased[$key] = $this->dbConnection->toStandardCaseColumn($key);
 				}
 				$firstLine = false;
 			}
-			foreach ($fullCaseRow as $key=>$value)  {
-				$row[$keysStandardCased[$key]]=$value;
+			foreach ($fullCaseRow as $key=>$value) {
+				$row[$keysStandardCased[$key]] = $value;
 			}
 				
 			$pk_table = $this->primary_keys[$table_name];
-			if (count($pk_table)==1)
+			if (count($pk_table) == 1)
 			{
 				if (!isset($keysStandardCased[$pk_table[0]])) {
 					throw new TDBMException("Bad SQL request passed to getObjectsFromSQL. The SQL request should return all the rows from the '$table_name' table. Could not find primary key in this set of rows. SQL request passed: ".$sql);
@@ -585,7 +585,7 @@ 
 				$this->objects[$table_name][$id]->loadFromRow($row);
 				// Check that the object fetched from cache is from the requested class.
 				if ($className != null) {
-					if (!is_subclass_of(get_class($this->objects[$table_name][$id]), $className) &&  get_class($this->objects[$table_name][$id]) != $className) {
+					if (!is_subclass_of(get_class($this->objects[$table_name][$id]), $className) && get_class($this->objects[$table_name][$id]) != $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($this->objects[$table_name][$id]).".");
 					}
 				}
@@ -593,7 +593,7 @@ 
 				// Check that the object fetched from cache is from the requested class.
 				if ($className != null) {
 					$className = ltrim($className, '\\');
-					if (!is_subclass_of(get_class($this->objects[$table_name][$id]), $className) &&  get_class($this->objects[$table_name][$id]) != $className) {
+					if (!is_subclass_of(get_class($this->objects[$table_name][$id]), $className) && get_class($this->objects[$table_name][$id]) != $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($this->objects[$table_name][$id]).".");
 					}
 				}
@@ -676,14 +676,14 @@ 
 		// Now, let's commit or rollback if needed.
 		if ($this->dbConnection != null && $this->dbConnection->hasActiveTransaction()) {
 			if ($this->commitOnQuit) {
-				try  {
+				try {
 					$this->dbConnection->commit();
 				} catch (Exception $e) {
 					echo $e->getMessage()."<br/>";
 					echo $e->getTraceAsString();
 				}
 			} else {
-				try  {
+				try {
 					$this->dbConnection->rollback();
 				} catch (Exception $e) {
 					echo $e->getMessage()."<br/>";
@@ -754,21 +754,21 @@ 
 	 * @param string $sql
 	 * @return array the result of your query
 	 */
-	public function getTransientObjectsFromSQL($sql,$classname=null) {
+	public function getTransientObjectsFromSQL($sql, $classname = null) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
-		return $this->dbConnection->getAll($sql, \PDO::FETCH_CLASS,$classname);
+		return $this->dbConnection->getAll($sql, \PDO::FETCH_CLASS, $classname);
 	}
 
 
 	private function to_explain_string($path) {
 		$msg = '';
 		foreach ($path as $constraint) {
-			if ($constraint['type']=='1*') {
+			if ($constraint['type'] == '1*') {
 				$msg .= 'Table "'.$constraint['table1'].'" points to "'.$constraint['table2'].'" through its foreign key "'.$constraint['col1'].'"\n';
 			}
-			elseif ($constraint['type']=='*1') {
+			elseif ($constraint['type'] == '*1') {
 				$msg .= 'Table "'.$constraint['table1'].'" is pointed by "'.$constraint['table2'].'" through its foreign key "'.$constraint['col2'].'"\n';
 			}
 		}
@@ -787,7 +787,7 @@ 
 		$this->loadCache();
 
 		$path = array();
-		$queue = array(array($table,array()));
+		$queue = array(array($table, array()));
 
 		//$found_paths=array();
 		$found = false;
@@ -823,7 +823,7 @@ 
 				{
 					break;
 				}
-				if ($ret==true)
+				if ($ret == true)
 				{
 
 					// Ok, we got one, we will continue a bit more until we reach the next level in the tree,
@@ -834,7 +834,7 @@ 
 				}
 
 				// At each iteration, let's check the time.
-				if ($this->trackExecutionTime && microtime(true)-self::$script_start_up_time > $max_execution_time && $max_execution_time!=0) {
+				if ($this->trackExecutionTime && microtime(true)-self::$script_start_up_time>$max_execution_time && $max_execution_time != 0) {
 					// Call check table names
 					$this->checkTablesExist($tables);
 
@@ -845,11 +845,11 @@ 
 			}
 		}
 
-		$ambiguity =false;
+		$ambiguity = false;
 		$msg = '';
 		foreach ($tables_paths as $table_path) {
 			// If any table has not been found, throw an exception
-			if (!isset($table_path['founddepth']) || $table_path['founddepth']==null) {
+			if (!isset($table_path['founddepth']) || $table_path['founddepth'] == null) {
 				// First, check if the tables do exist.
 				$this->checkTablesExist(array($table, $table_path['name']));
 				// Else, throw an error.
@@ -914,7 +914,7 @@ 
 						'table2' => $depArr['table1'],
 						'col1' => $depArr['col2'],
 						'col2' => $depArr['col1'],
-						'type' => (($depArr['type'] == '1*')?'*1':'1*')
+						'type' => (($depArr['type'] == '1*') ? '*1' : '1*')
 				);
 			}, $toRevertPath);
 			return array_reverse($invertedDependencies);
@@ -932,7 +932,7 @@ 
 	 * @param unknown_type $paths
 	 */
 	private function flatten_paths($paths) {
-		$flat_path=array();
+		$flat_path = array();
 		foreach ($paths as $path_bigarray) {
 			$path = $path_bigarray['paths'][0];
 
@@ -973,9 +973,9 @@ 
 		//echo '-'.$current_table.'-';
 		//echo '.';
 		foreach ($target_tables as $id=>$target_table) {
-			if ($target_table['name'] == $current_table && (!isset($target_table['founddepth']) || $target_table['founddepth']==null || $target_table['founddepth']==count($path))) {
+			if ($target_table['name'] == $current_table && (!isset($target_table['founddepth']) || $target_table['founddepth'] == null || $target_table['founddepth'] == count($path))) {
 				// When a path is found to a table, we mark the table as found with its depth.
-				$target_tables[$id]['founddepth']=count($path);
+				$target_tables[$id]['founddepth'] = count($path);
 
 				// Then we add the path to table to the target_tables array
 				$target_tables[$id]['paths'][] = $path;
@@ -1015,13 +1015,13 @@ 
 			$already_done = false;
 			foreach ($path as $previous_constraint)
 			{
-				if ($previous_constraint['type']=='1*' && $current_table == $previous_constraint["table2"] && $col2 == $previous_constraint["col2"] && $table1 == $previous_constraint["table1"] && $col1 == $previous_constraint["col1"])
+				if ($previous_constraint['type'] == '1*' && $current_table == $previous_constraint["table2"] && $col2 == $previous_constraint["col2"] && $table1 == $previous_constraint["table1"] && $col1 == $previous_constraint["col1"])
 				{
 					//echo "YOUHOU1! $current_table $col2";
 					$already_done = true;
 					break;
 				}
-				elseif ($previous_constraint['type']=='*1' && $current_table == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"] && $table1 == $previous_constraint["table2"] && $col1 == $previous_constraint["col2"])
+				elseif ($previous_constraint['type'] == '*1' && $current_table == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"] && $table1 == $previous_constraint["table2"] && $col1 == $previous_constraint["col2"])
 				{
 					//echo "YOUHOU2! $current_table $col2";
 					$already_done = true;
@@ -1054,13 +1054,13 @@ 
 			foreach ($path as $previous_constraint)
 			{
 				//echo "TTTT".$table2." ".$col2."AAAA".$previous_constraint["table1"]." ".$previous_constraint["col1"]."YYYY".$previous_constraint["type"]."PPP";
-				if ($previous_constraint['type']=='1*' && $table2 == $previous_constraint["table2"] && $col2 == $previous_constraint["col2"])
+				if ($previous_constraint['type'] == '1*' && $table2 == $previous_constraint["table2"] && $col2 == $previous_constraint["col2"])
 				{
 					//echo  "YOUHOU3! $table2 $col2";
 					$already_done = true;
 					break;
 				}
-				elseif ($previous_constraint['type']=='*1' && $table2 == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"])
+				elseif ($previous_constraint['type'] == '*1' && $table2 == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"])
 				{
 					//echo "YOUHOU4! $table2 $col2";
 					$already_done = true;
@@ -1170,7 +1170,7 @@ 
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
 	 * @return TDBMObjectArray A TDBMObjectArray containing the resulting objects of the query.
 	 */
-	public function getObjects($table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $className=null, $hint_path=null) {
+	public function getObjects($table_name, $filter_bag = null, $orderby_bag = null, $from = null, $limit = null, $className = null, $hint_path = null) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
@@ -1186,7 +1186,7 @@ 
 	 * @param unknown_type $hint_path
 	 * @return integer
 	 */
-	public function getCount($table_name, $filter_bag=null, $hint_path=null) {
+	public function getCount($table_name, $filter_bag = null, $hint_path = null) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
@@ -1204,7 +1204,7 @@ 
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
 	 * @return string The SQL that would be executed.
 	 */
-	public function explainSQLGetObjects($table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $hint_path=null) 	{
+	public function explainSQLGetObjects($table_name, $filter_bag = null, $orderby_bag = null, $from = null, $limit = null, $hint_path = null) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
@@ -1222,7 +1222,7 @@ 
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
 	 * @return string The SQL that would be executed.
 	 */
-	public function explainRequestAsTextGetObjects($table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $hint_path=null) 	{
+	public function explainRequestAsTextGetObjects($table_name, $filter_bag = null, $orderby_bag = null, $from = null, $limit = null, $hint_path = null) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
@@ -1243,12 +1243,12 @@ 
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
 	 * @return string The SQL that would be executed.
 	 */
-	public function explainRequestAsHTMLGetObjects($table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $hint_path=null, $x=10, $y=10) 	{
+	public function explainRequestAsHTMLGetObjects($table_name, $filter_bag = null, $orderby_bag = null, $from = null, $limit = null, $hint_path = null, $x = 10, $y = 10) {
 		if ($this->dbConnection == null) {
 			throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
 		}
 		$tree = $this->getObjectsByMode('explainTree', $table_name, $filter_bag, $orderby_bag, $from, $limit, $hint_path);
-		return $this->drawTree($tree,$x,$y);
+		return $this->drawTree($tree, $x, $y);
 	}
 
 	/**
@@ -1265,7 +1265,7 @@ 
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
 	 * @return TDBMObjectArray A TDBMObjectArray containing the resulting objects of the query.
 	 */
-	public function getObjectsByMode($mode, $table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $className=null, $hint_path=null) {
+	public function getObjectsByMode($mode, $table_name, $filter_bag = null, $orderby_bag = null, $from = null, $limit = null, $className = null, $hint_path = null) {
 		$this->completeSave();
 		$this->loadCache();
 
@@ -1304,7 +1304,7 @@ 
 			}
 		}
 
-		if (count($needed_table_array)==0)
+		if (count($needed_table_array) == 0)
 		{
 			$table_number = 1;
 			$sql = $this->dbConnection->escapeDBItem($table_name); //Make by Pierre PIV (add escapeDBItem)
@@ -1313,14 +1313,14 @@ 
 			throw new TDBMException("TODO: explainTree not implemented for only one table.");
 		}
 		else {
-			if ($hint_path!=null && $mode != 'explainTree')
+			if ($hint_path != null && $mode != 'explainTree')
 			{
 				$path = $hint_path;
 				$flat_path = $this->flatten_paths($path);
 			}
 			else
 			{
-				$full_paths = $this->static_find_paths($table_name,$needed_table_array);
+				$full_paths = $this->static_find_paths($table_name, $needed_table_array);
 
 				if ($mode == 'explainTree') {
 					return $this->getTablePathsTree($full_paths);
@@ -1373,7 +1373,7 @@ 
 			*/
 			$is_ok = true;
 			foreach ($path as $step) {
-				if ($step["type"]=="1*") {
+				if ($step["type"] == "1*") {
 					$is_ok = false;
 					break;
 				}
@@ -1398,7 +1398,7 @@ 
 				$orderby_columns_array = array_merge($orderby_columns_array, $orderby_object->toSqlStatementsArray());
 			}
 
-			$orderby_statement = ' ORDER BY '.implode(',',$orderby_columns_array);
+			$orderby_statement = ' ORDER BY '.implode(',', $orderby_columns_array);
 			$count = 0;
 			foreach ($orderby_columns_array as $id=>$orderby_statement_phrase) {
 				// Let's remove the trailing ASC or DESC and add AS tdbm_reserved_col_Xxx
@@ -1416,10 +1416,10 @@ 
 				$orderby_columns_array[$id] = $orderby_statement_phrase.' AS tdbm_reserved_col_'.$count;
 				$count++;
 			}
-			$orderby_column_statement = ', '.implode(',',$orderby_columns_array);
+			$orderby_column_statement = ', '.implode(',', $orderby_columns_array);
 		}
 
-		if ($mode=="getCount") {
+		if ($mode == "getCount") {
 			// Let's get the list of primary keys to perform a DISTINCT request.
 			$pk_table = $this->getPrimaryKeyStatic($table_name);
 				
@@ -1453,7 +1453,7 @@ 
 		if ($mode == 'explainSQL') {
 			return $sql;
 		}
-		return $this->getObjectsFromSQL($table_name, $sql,  $from, $limit, $className);
+		return $this->getObjectsFromSQL($table_name, $sql, $from, $limit, $className);
 
 	}
 
@@ -1478,19 +1478,19 @@ 
 		// Second, let's take all the objects out of the filter bag, and let's make filters from them
 		$filter_bag2 = array();
 		foreach ($filter_bag as $thing) {
-			if (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\FilterInterface')) {
+			if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\FilterInterface')) {
 				$filter_bag2[] = $thing;
-			} elseif (is_a($thing,'Mouf\\Database\\TDBM\\TDBMObject')) {
+			} elseif (is_a($thing, 'Mouf\\Database\\TDBM\\TDBMObject')) {
 				$pk_table = $thing->getPrimaryKey();
 				// If there is only one primary key:
-				if (count($pk_table)==1) {
+				if (count($pk_table) == 1) {
 					//$sql_where = "t1".$pk_table[0]."=".$this->db_connection->quoteSmart($this->TDBMObject_id);
 					$pkStr = $pk_table[0];
 					$filter_bag2[] = new EqualFilter($thing->_getDbTableName(), $pk_table[0], $thing->$pkStr);
 				} else {
 					//$ids = unserialize($this->TDBMObject_id);
 					//$i=0;
-					$filter_bag_temp_and=array();
+					$filter_bag_temp_and = array();
 					foreach ($pk_table as $pk) {
 						$filter_bag_temp_and[] = new EqualFilter($thing->_getDbTableName(), $pk, $thing->$pk);
 					}
@@ -1502,13 +1502,13 @@ 
 				//$filter_bag2[] = new EqualFilter($thing->_getDbTableName(), $primary_key, $thing->$primary_key);
 			} elseif (is_string($thing)) {
 				$filter_bag2[] = new SqlStringFilter($thing);
-			} elseif (is_a($thing,'Mouf\\Database\\TDBM\\TDBMObjectArray') && count($thing)>0) {
+			} elseif (is_a($thing, 'Mouf\\Database\\TDBM\\TDBMObjectArray') && count($thing)>0) {
 				// Get table_name and column_name
 				$filter_table_name = $thing[0]->_getDbTableName();
 				$filter_column_names = $thing[0]->getPrimaryKey();
 
 				// If there is only one primary key, we can use the InFilter
-				if (count($filter_column_names)==1) {
+				if (count($filter_column_names) == 1) {
 					$primary_keys_array = array();
 					$filter_column_name = $filter_column_names[0];
 					foreach ($thing as $TDBMObject) {
@@ -1521,7 +1521,7 @@ 
 				{
 					$filter_bag_and = array();
 					foreach ($thing as $TDBMObject) {
-						$filter_bag_temp_and=array();
+						$filter_bag_temp_and = array();
 						foreach ($filter_column_names as $pk) {
 							$filter_bag_temp_and[] = new EqualFilter($TDBMObject->_getDbTableName(), $pk, $TDBMObject->$pk);
 						}
@@ -1531,7 +1531,7 @@ 
 				}
 
 
-			} elseif (!is_a($thing,'Mouf\\Database\\TDBM\\TDBMObjectArray') && $thing!==null) {
+			} elseif (!is_a($thing, 'Mouf\\Database\\TDBM\\TDBMObjectArray') && $thing !== null) {
 				throw new TDBMException("Error in filter bag in getObjectsByFilter. An object has been passed that is neither a filter, nor a TDBMObject, nor a TDBMObjectArray, nor a string, nor null.");
 			}
 		}
@@ -1559,9 +1559,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);
@@ -1583,10 +1583,10 @@ 
 			$possible_tables = $this->dbConnection->checkTableExist($table);
 			if ($possible_tables !== true)
 			{
-				if (count($possible_tables)==1)
+				if (count($possible_tables) == 1)
 				$str = "Could not find table '$table'. Maybe you meant this table: '".$possible_tables[0]."'";
 				else
-				$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '",$possible_tables)."'";
+				$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '", $possible_tables)."'";
 				throw new TDBMException($str);
 			}
 		}
@@ -1615,16 +1615,16 @@ 
 			$current_node = $tree;
 			$found = true;
 			foreach ($path as $link) {
-				if ($found==true)
+				if ($found == true)
 				{
 					if (is_array($current_node->getChildren()))
 					{
 						foreach ($current_node->getChildren() as $child)
 						{
-							if ($link['table1']==$child->table_name &&
-							$link['col1']==$child->keyNode &&
-							$link['col2']==$child->keyParent &&
-							$link['type']==$child->link_type) {
+							if ($link['table1'] == $child->table_name &&
+							$link['col1'] == $child->keyNode &&
+							$link['col2'] == $child->keyParent &&
+							$link['type'] == $child->link_type) {
 								$current_node = $child;
 							}
 							else
@@ -1639,7 +1639,7 @@ 
 
 				}
 
-				if ($found==false)
+				if ($found == false)
 				{
 					$current_node = new DisplayNode($link['table1'], $current_node, $link['type'], $link['col2'], $link['col1']);
 					/*if ($link['type']=='*1')
@@ -1662,7 +1662,7 @@ 
 	 *
 	 * @param unknown_type $tree
 	 */
-	public function drawTree($tree, $x, $y, &$ret_width=0, &$ret_height=0) {
+	public function drawTree($tree, $x, $y, &$ret_width = 0, &$ret_height = 0) {
 
 		// Let's get the background div:
 		$treeDepth = $tree->computeDepth(1)-1;
@@ -1673,7 +1673,7 @@ 
 
 		$str = "<div style='position:absolute; left:".($x+DisplayNode::$left_start-DisplayNode::$border)."px; top:".($y+DisplayNode::$top_start-DisplayNode::$border)."px; width:".$ret_width."px; height:".$ret_height."; background-color:#EEEEEE; color: white; text-align:center;'></div>";
 
-		$str .= $tree->draw(0,0, $x, $y);
+		$str .= $tree->draw(0, 0, $x, $y);
 
 		return $str;
 
@@ -1709,10 +1709,10 @@ 
 				if ($tables === true)
 				throw new TDBMException("Could not find table primary key for table '$table'. Please define a primary key for this table.");
 				elseif ($tables !== null) {
-					if (count($tables)==1)
+					if (count($tables) == 1)
 					$str = "Could not find table '$table'. Maybe you meant this table: '".$tables[0]."'";
 					else
-					$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '",$tables)."'";
+					$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '", $tables)."'";
 					throw new TDBMException($str);
 				}
 			}

Braces +59 added lines, -55 removed lines

@@ -406,10 +406,11 @@ 
 			$data = $this->dbConnection->getTableInfo($table_name);
 		} catch (TDBMException $exception) {
 			$probable_table_name = $this->dbConnection->checkTableExist($table_name);
-			if ($probable_table_name == null)
-			throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist.");
-			else
-			throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist. Maybe you meant the table '$probable_table_name'.");
+			if ($probable_table_name == null) {
+						throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist.");
+			} else {
+						throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist. Maybe you meant the table '$probable_table_name'.");
+			}
 		}
 
 		if ($className == null) {
@@ -484,8 +485,9 @@ 
 			$sql = 'DELETE FROM '.$this->dbConnection->escapeDBItem($object->_getDbTableName()).' WHERE '.$sql_where/*.$primary_key."='".plainstring_to_dbprotected($object->TDBMObject_id)."'"*/;
 			$result = $this->dbConnection->exec($sql);
 
-			if ($result != 1)
-			throw new TDBMException("Error while deleting object from table ".$object->_getDbTableName().": ".$result." have been affected.");
+			if ($result != 1) {
+						throw new TDBMException("Error while deleting object from table ".$object->_getDbTableName().": ".$result." have been affected.");
+			}
 
 			unset ($this->objects[$object->_getDbTableName()][$object_id]);
 			$object->setTDBMObjectState("deleted");
@@ -556,8 +558,7 @@ 
 					throw new TDBMException("Bad SQL request passed to getObjectsFromSQL. The SQL request should return all the rows from the '$table_name' table. Could not find primary key in this set of rows. SQL request passed: ".$sql);
 				}
 				$id = $row[$keysStandardCased[$pk_table[0]]];
-			}
-			else
+			} else
 			{
 				// Let's generate the serialized primary key from the columns!
 				$ids = array();
@@ -767,8 +768,7 @@ 
 		foreach ($path as $constraint) {
 			if ($constraint['type']=='1*') {
 				$msg .= 'Table "'.$constraint['table1'].'" points to "'.$constraint['table2'].'" through its foreign key "'.$constraint['col1'].'"\n';
-			}
-			elseif ($constraint['type']=='*1') {
+			} elseif ($constraint['type']=='*1') {
 				$msg .= 'Table "'.$constraint['table1'].'" is pointed by "'.$constraint['table2'].'" through its foreign key "'.$constraint['col2'].'"\n';
 			}
 		}
@@ -858,8 +858,9 @@ 
 			// If any table has more than 1 way to be reached, throw an exception.
 			if (count($table_path['paths'])>1) {
 				// If this is the first ambiguity
-				if (!$ambiguity)
-				$msg .= 'An ambiguity has been found during the search. Please catch this exception and execute the $exception->explainAmbiguity() to get a nice graphical view of what you should do to solve this ambiguity.';
+				if (!$ambiguity) {
+								$msg .= 'An ambiguity has been found during the search. Please catch this exception and execute the $exception->explainAmbiguity() to get a nice graphical view of what you should do to solve this ambiguity.';
+				}
 
 				$msg .= "The table \"".$table_path['name']."\" can be reached using several different ways from the table \"$table\".\n\n";
 				$count = 0;
@@ -903,8 +904,7 @@ 
 		if (isset($this->cache['paths'][$table1][$table2]))
 		{
 			return $this->cache['paths'][$table1][$table2];
-		}
-		elseif (isset($this->cache['paths'][$table2][$table1]))
+		} elseif (isset($this->cache['paths'][$table2][$table1]))
 		{
 			// Let's revert the path!
 			$toRevertPath = $this->cache['paths'][$table2][$table1];
@@ -949,8 +949,9 @@ 
 						break;
 					}
 				}
-				if (!$found)
-				$flat_path[] = $path_step;
+				if (!$found) {
+								$flat_path[] = $path_step;
+				}
 			}
 		}
 		return $flat_path;
@@ -988,8 +989,9 @@ 
 					}
 				}
 
-				if ($found)
-				return true;
+				if ($found) {
+								return true;
+				}
 			}
 
 		}
@@ -1020,16 +1022,16 @@ 
 					//echo "YOUHOU1! $current_table $col2";
 					$already_done = true;
 					break;
-				}
-				elseif ($previous_constraint['type']=='*1' && $current_table == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"] && $table1 == $previous_constraint["table2"] && $col1 == $previous_constraint["col2"])
+				} elseif ($previous_constraint['type']=='*1' && $current_table == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"] && $table1 == $previous_constraint["table2"] && $col1 == $previous_constraint["col2"])
 				{
 					//echo "YOUHOU2! $current_table $col2";
 					$already_done = true;
 					break;
 				}
 			}
-			if ($already_done)
-			continue;
+			if ($already_done) {
+						continue;
+			}
 
 			$new_path = array_merge($path, array(array("table1"=>$table1,
 									"col1"=>$col1,
@@ -1059,16 +1061,16 @@ 
 					//echo  "YOUHOU3! $table2 $col2";
 					$already_done = true;
 					break;
-				}
-				elseif ($previous_constraint['type']=='*1' && $table2 == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"])
+				} elseif ($previous_constraint['type']=='*1' && $table2 == $previous_constraint["table1"] && $col2 == $previous_constraint["col1"])
 				{
 					//echo "YOUHOU4! $table2 $col2";
 					$already_done = true;
 					break;
 				}
 			}
-			if ($already_done)
-			continue;
+			if ($already_done) {
+						continue;
+			}
 
 			$new_path = array_merge($path, array(array("table1"=>$table2,
 									"col1"=>$col2,
@@ -1309,16 +1311,15 @@ 
 			$table_number = 1;
 			$sql = $this->dbConnection->escapeDBItem($table_name); //Make by Pierre PIV (add escapeDBItem)
 
-			if ($mode == 'explainTree')
-			throw new TDBMException("TODO: explainTree not implemented for only one table.");
-		}
-		else {
+			if ($mode == 'explainTree') {
+						throw new TDBMException("TODO: explainTree not implemented for only one table.");
+			}
+		} else {
 			if ($hint_path!=null && $mode != 'explainTree')
 			{
 				$path = $hint_path;
 				$flat_path = $this->flatten_paths($path);
-			}
-			else
+			} else
 			{
 				$full_paths = $this->static_find_paths($table_name,$needed_table_array);
 
@@ -1432,8 +1433,9 @@ 
 			$sql = "SELECT COUNT(DISTINCT $pk_str) FROM $sql";
 
 			$where_clause = $filter->toSql($this->dbConnection);
-			if ($where_clause != '')
-			$sql .= ' WHERE '.$where_clause;
+			if ($where_clause != '') {
+						$sql .= ' WHERE '.$where_clause;
+			}
 
 			// Now, let's perform the request:
 			$result = $this->dbConnection->getOne($sql, array());
@@ -1444,8 +1446,9 @@ 
 		$sql = "SELECT DISTINCT ".$this->dbConnection->escapeDBItem($table_name).".* $orderby_column_statement FROM $sql";
 
 		$where_clause = $filter->toSql($this->dbConnection);
-		if ($where_clause != '')
-		$sql .= ' WHERE '.$where_clause;
+		if ($where_clause != '') {
+				$sql .= ' WHERE '.$where_clause;
+		}
 
 		$sql .= $orderby_statement;
 
@@ -1470,8 +1473,7 @@ 
 			$filter_bag = array();
 		} elseif (!is_array($filter_bag)) {
 			$filter_bag = array($filter_bag);
-		}
-		elseif (is_a($filter_bag, 'Mouf\\Database\\TDBM\\TDBMObjectArray')) {
+		} elseif (is_a($filter_bag, 'Mouf\\Database\\TDBM\\TDBMObjectArray')) {
 			$filter_bag = array($filter_bag);
 		}
 
@@ -1553,8 +1555,9 @@ 
 		// Fourth, let's apply the same steps to the orderby_bag
 		// 4-1 orderby_bag should be an array, if it is a singleton, let's put it in an array.
 
-		if (!is_array($orderby_bag))
-		$orderby_bag = array($orderby_bag);
+		if (!is_array($orderby_bag)) {
+				$orderby_bag = array($orderby_bag);
+		}
 
 		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
 		$orderby_bag2 = array();
@@ -1583,10 +1586,11 @@ 
 			$possible_tables = $this->dbConnection->checkTableExist($table);
 			if ($possible_tables !== true)
 			{
-				if (count($possible_tables)==1)
-				$str = "Could not find table '$table'. Maybe you meant this table: '".$possible_tables[0]."'";
-				else
-				$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '",$possible_tables)."'";
+				if (count($possible_tables)==1) {
+								$str = "Could not find table '$table'. Maybe you meant this table: '".$possible_tables[0]."'";
+				} else {
+								$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '",$possible_tables)."'";
+				}
 				throw new TDBMException($str);
 			}
 		}
@@ -1626,16 +1630,15 @@ 
 							$link['col2']==$child->keyParent &&
 							$link['type']==$child->link_type) {
 								$current_node = $child;
-							}
-							else
+							} else
 							{
 								// Now, we must add the rest of the links to the tree.
 								$found = false;
 							}
 						}
+					} else {
+										$found = false;
 					}
-					else
-					$found = false;
 
 				}
 
@@ -1706,13 +1709,14 @@ 
 				// Unable to find primary key.... this is an error
 				// Let's try to be precise in error reporting. Let's try to find the table.
 				$tables = $this->dbConnection->checkTableExist($table);
-				if ($tables === true)
-				throw new TDBMException("Could not find table primary key for table '$table'. Please define a primary key for this table.");
-				elseif ($tables !== null) {
-					if (count($tables)==1)
-					$str = "Could not find table '$table'. Maybe you meant this table: '".$tables[0]."'";
-					else
-					$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '",$tables)."'";
+				if ($tables === true) {
+								throw new TDBMException("Could not find table primary key for table '$table'. Please define a primary key for this table.");
+				} elseif ($tables !== null) {
+					if (count($tables)==1) {
+										$str = "Could not find table '$table'. Maybe you meant this table: '".$tables[0]."'";
+					} else {
+										$str = "Could not find table '$table'. Maybe you meant one of those tables: '".implode("', '",$tables)."'";
+					}
 					throw new TDBMException($str);
 				}
 			}

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

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	 * @Action
 	 * //@Admin
 	 */
-	public function defaultAction($name, $selfedit="false") {
+	public function defaultAction($name, $selfedit = "false") {
 		$this->initController($name, $selfedit);
 		
 		// Fill variables
@@ -94,7 +94,7 @@ 
 	 * @param string $name
 	 * @param bool $selfedit
 	 */
-	public function generate($name, $sourcedirectory, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $keepSupport = 0, $storeInUtc = 0,$selfedit="false") {
+	public function generate($name, $sourcedirectory, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $keepSupport = 0, $storeInUtc = 0, $selfedit = "false") {
 		$this->initController($name, $selfedit);
 
 		self::generateDaos($this->moufManager, $name, $sourcedirectory, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $keepSupport, $storeInUtc);
@@ -107,7 +107,7 @@ 
 	 * This function generates the DAOs and Beans for the TDBM service passed in parameter. 
 	 * 
 	 */
-	public static function generateDaos(MoufManager $moufManager, $name, $sourcedirectory, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit="false", $keepSupport = null, $storeInUtc = null) {
+	public static function generateDaos(MoufManager $moufManager, $name, $sourcedirectory, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = "false", $keepSupport = null, $storeInUtc = null) {
 		$moufManager->setVariable("tdbmDefaultSourceDirectory_".$name, $sourcedirectory);
 		$moufManager->setVariable("tdbmDefaultDaoNamespace_".$name, $daonamespace);
 		$moufManager->setVariable("tdbmDefaultBeanNamespace_".$name, $beannamespace);

src/views/tdbmGenerate.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 <div class="control-group">
 	<label class="control-label">Keep support for previous DAOs:</label>
 	<div class="controls">
-		<input type="checkbox" name="keepSupport" <?php echo $this->keepSupport?'checked="checked"':"" ?>></input>
+		<input type="checkbox" name="keepSupport" <?php echo $this->keepSupport ? 'checked="checked"' : "" ?>></input>
 		<span class="help-block">DAOs generated before TDBM 2.3 had a different method signature. This will ensure this signature
 		is respected. Use this only if you are migrating legacy code.</span>
 	</div>
@@ -61,7 +61,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>