thecodingmachine / database.tdbm

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

src/Mouf/Database/TDBM/DisplayNode.php

Spacing +14 added lines, -14 removed lines

@@ -33,8 +33,8 @@ 
 	public static $box_height = 30;
 	public static $interspace_width = 10;
 	public static $interspace_height = 50;
-	public static $text_height=13;
-	public static $border =2;
+	public static $text_height = 13;
+	public static $border = 2;
 
 
 	private $parent_node;
@@ -46,7 +46,7 @@ 
 
 	public $width;
 
-	public function __construct($table_name, $parent_node=null, $link_type=null, $keyParent=null, $keyNode=null) {
+	public function __construct($table_name, $parent_node = null, $link_type = null, $keyParent = null, $keyNode = null) {
 		$this->table_name = $table_name;
 		if ($parent_node !== null) {
 			$this->parent_node = $parent_node;
@@ -83,7 +83,7 @@ 
 	}
 
 	public function computeWidth() {
-		if (!is_array($this->children) || count($this->children)==0) {
+		if (!is_array($this->children) || count($this->children) == 0) {
 			$this->width = 1;
 			return 1;
 		} else {
@@ -97,13 +97,13 @@ 
 	}
 
 	public function computeDepth($my_depth) {
-		if (!is_array($this->children) || count($this->children)==0) {
+		if (!is_array($this->children) || count($this->children) == 0) {
 			return $my_depth+1;
 		} else {
 			$max = 0;
 			foreach ($this->children as $child) {
-				$depth = $my_depth + $child->computeDepth($my_depth);
-				if ($depth > $max) {
+				$depth = $my_depth+$child->computeDepth($my_depth);
+				if ($depth>$max) {
 					$max = $depth;
 				}
 			}
@@ -113,23 +113,23 @@ 
 
 	public function draw($x, $y, $left_px, $top_px) {
 
-		$mybox_width_px = $this->width*DisplayNode::$box_width + ($this->width-1)*DisplayNode::$interspace_width;
-		$my_x_px = $left_px + DisplayNode::$left_start + $x*(DisplayNode::$box_width + DisplayNode::$interspace_width);
-		$my_y_px = $top_px + DisplayNode::$top_start + $y*(DisplayNode::$box_height + DisplayNode::$interspace_height);
+		$mybox_width_px = $this->width*DisplayNode::$box_width+($this->width-1)*DisplayNode::$interspace_width;
+		$my_x_px = $left_px+DisplayNode::$left_start+$x*(DisplayNode::$box_width+DisplayNode::$interspace_width);
+		$my_y_px = $top_px+DisplayNode::$top_start+$y*(DisplayNode::$box_height+DisplayNode::$interspace_height);
 
 		// White background first
 		$str = "<div style='position:absolute; left:".$my_x_px."px; top:".$my_y_px."px; width:".$mybox_width_px."px; height:".DisplayNode::$box_height."; background-color:gray; color: white; text-align:center; border:".DisplayNode::$border."px solid black'>\n<b>".$this->table_name."</b></div>";
 
 		if ($this->keyParent != null) {
-			$my_x_px_line = $my_x_px + DisplayNode::$box_width/2;
-			$my_y_px_line = $my_y_px - DisplayNode::$interspace_height;
+			$my_x_px_line = $my_x_px+DisplayNode::$box_width/2;
+			$my_y_px_line = $my_y_px-DisplayNode::$interspace_height;
 			$str .= "<div style='position:absolute; left:".$my_x_px_line."px; top:".($my_y_px_line+DisplayNode::$border)."px; width:2px; height:".(DisplayNode::$interspace_height-DisplayNode::$border)."; background-color:black; '></div>\n";
 
-			$top_key = ($this->link_type=='1*')?'* fk:':'1 pk:';
+			$top_key = ($this->link_type == '1*') ? '* fk:' : '1 pk:';
 			$top_key .= '<i>'.$this->keyParent.'</i>';
 
 
-			$bottom_key = ($this->link_type=='*1')?'* fk:':'1 pk:';
+			$bottom_key = ($this->link_type == '*1') ? '* fk:' : '1 pk:';
 			$bottom_key .= '<i>'.$this->keyParent.'</i>';
 
 			$str .= "<div style='position:absolute; left:".($my_x_px_line+2)."px; top:".($my_y_px_line+DisplayNode::$border*2)."px; background-color:#EEEEEE; font-size: 10px'>$top_key</div>\n";

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

Spacing +17 added lines, -17 removed lines

@@ -133,7 +133,7 @@ 
 		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
 
         $connection = $this->dbConnection;
-        if ($connection instanceof CachedConnection){
+        if ($connection instanceof CachedConnection) {
             $connection->cacheService->purgeAll();
         }
 		
@@ -231,7 +231,7 @@ 
 		if($date === null)
 			return null;
 		else
-			return strtotime($date'.($this->storeInUtc?'.\' UTC\'':'').');
+			return strtotime($date'.($this->storeInUtc ? '.\' UTC\'' : '').');
 	}
 	
 	/**
@@ -321,7 +321,7 @@ 
 		if ($this->'.$array["col1"].' == null) {
 			return null;
 		}
-		return $this->tdbmService->getObject("'.$array["table2"].'", $this->'.$array["col1"].', "'.str_replace("\\","\\\\",$this->beanNamespace).'\\\\'.$referencedBeanName.'", true);
+		return $this->tdbmService->getObject("'.$array["table2"].'", $this->'.$array["col1"].', "'.str_replace("\\", "\\\\", $this->beanNamespace).'\\\\'.$referencedBeanName.'", true);
 	}
 	
 	/**
@@ -340,10 +340,10 @@ 
 		
 		// Now, let's implement the shortcuts to the getter of objects.
 		// Shortcuts are used to save typing. They are available only if a referenced table is referenced only once by our tables.
-		foreach($referencedTablesList as $referrencedTable=>$number) {
+		foreach ($referencedTablesList as $referrencedTable=>$number) {
 			if ($number == 1) {
 				foreach ($constraints as $array) {
-					if ($array['table2'] ==$referrencedTable) {
+					if ($array['table2'] == $referrencedTable) {
 						$columnName = $array['col1'];
 						$targetColumnName = $array['col2'];
 						break;
@@ -374,7 +374,7 @@ 
 		if ($this->'.$array["col1"].' == null) {
 			return null;
 		}
-		return $this->tdbmService->getObject("'.$array["table2"].'", $this->'.$array["col1"].', "'.str_replace("\\","\\\\",$this->beanNamespace).'\\\\'.$referencedBeanName.'");
+		return $this->tdbmService->getObject("'.$array["table2"].'", $this->'.$array["col1"].', "'.str_replace("\\", "\\\\", $this->beanNamespace).'\\\\'.$referencedBeanName.'");
 	}
 	
 	/**
@@ -416,7 +416,7 @@ 
 {
 
 }";
-			file_put_contents($this->beanDirectory.$fileName ,$str);
+			file_put_contents($this->beanDirectory.$fileName, $str);
 			@chmod($this->beanDirectory.$fileName, 0664);
 		}
 	}
@@ -434,11 +434,11 @@ 
 		foreach ($info as $index => $data) {
 			$comments = $data['column_comment'];
 			$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';
 				}
 			}
@@ -667,7 +667,7 @@ 
 
 		
 
-		file_put_contents($this->daoDirectory.$baseFileName ,$str);
+		file_put_contents($this->daoDirectory.$baseFileName, $str);
 		@chmod($this->daoDirectory.$baseFileName, 0664);
 		
 		// Now, let's generate the "editable" class
@@ -689,7 +689,7 @@ 
 {
 
 }";
-			file_put_contents($this->daoDirectory.$fileName ,$str);
+			file_put_contents($this->daoDirectory.$fileName, $str);
 			@chmod($this->daoDirectory.$fileName, 0664);
 		}
 	}
@@ -756,7 +756,7 @@ 
 ?>';
 		
 		//$daoDirectory = dirname(__FILE__)."/../../../../../dao/";
-		file_put_contents($this->daoDirectory.$this->daoFactoryClassName.'.php' ,$str);
+		file_put_contents($this->daoDirectory.$this->daoFactoryClassName.'.php', $str);
 	}
 	
 	/**
@@ -823,7 +823,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;
@@ -832,9 +832,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;
 	}

src/Mouf/Database/TDBM/TDBMService.php

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

src/Mouf/Database/TDBM/TDBMObject.php

Spacing +27 added lines, -27 removed lines

@@ -113,7 +113,7 @@ 
 	 * @param string $table_name
 	 * @param mixed $id
 	 */
-	public function __construct(TDBMService $tdbmService, $table_name, $id=false) {
+	public function __construct(TDBMService $tdbmService, $table_name, $id = false) {
 		$this->tdbmService = $tdbmService;
 		$this->db_connection = $this->tdbmService->getConnection();
 		$this->db_table_name = $table_name;
@@ -159,7 +159,7 @@ 
 	 * $TDBMObject_state = "loaded" when the object is cached in memory.
 	 * @return string
 	 */
-	public function getTDBMObjectState(){
+	public function getTDBMObjectState() {
 		return $this->TDBMObject_state;
 	}
 	
@@ -171,7 +171,7 @@ 
 	 * $TDBMObject_state = "loaded" when the object is cached in memory.
 	 * @param string $state
 	 */
-	public function setTDBMObjectState($state){
+	public function setTDBMObjectState($state) {
 		$this->TDBMObject_state = $state;	
 	}
 	
@@ -184,8 +184,8 @@ 
 	 */
 	public function loadFromRow($row) {
 		foreach ($row as $key=>$value) {
-			if (strpos($key, 'tdbm_reserved_col_')!==0) {
-				$this->db_row[$key]=$value;
+			if (strpos($key, 'tdbm_reserved_col_') !== 0) {
+				$this->db_row[$key] = $value;
 			}
 		}
 
@@ -219,24 +219,24 @@ 
 			// 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($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($pk)."=".$this->db_connection->quoteSmart($ids[$i]);
 					$i++;
 				}
-				$sql_where = implode(" AND ",$sql_where_array);
+				$sql_where = implode(" AND ", $sql_where_array);
 			}
 
 			$sql = "SELECT * FROM ".$this->db_connection->escapeDBItem($this->db_table_name)." WHERE ".$sql_where;
 			$result = $this->db_connection->query($sql);
 
 
-			if ($result->rowCount()==0)
+			if ($result->rowCount() == 0)
 			{
 				throw new TDBMException("Could not retrieve object from table \"$this->db_table_name\" with ID \"".$this->TDBMObject_id."\".");
 			}
@@ -247,8 +247,8 @@ 
 			$result = null;
 				
 			$this->db_row = array();
-			foreach ($fullCaseRow[0] as $key=>$value)  {
-				$this->db_row[$this->db_connection->toStandardCaseColumn($key)]=$value;
+			foreach ($fullCaseRow[0] as $key=>$value) {
+				$this->db_row[$this->db_connection->toStandardCaseColumn($key)] = $value;
 			}
 			
 			$this->TDBMObject_state = "loaded";
@@ -280,10 +280,10 @@ 
 				// Let's try to be accurate in error reporting. The checkColumnExist returns an array of closest matches.
 				$result_array = $column_exist;
 				
-				if (count($result_array)==1)
+				if (count($result_array) == 1)
 				$str = "Could not find column \"$var\" in table \"$this->db_table_name\". Maybe you meant this column: '".$result_array[0]."'";
 				else
-				$str = "Could not find column \"$var\" in table \"$this->db_table_name\". Maybe you meant one of those columns: '".implode("', '",$result_array)."'";
+				$str = "Could not find column \"$var\" in table \"$this->db_table_name\". Maybe you meant one of those columns: '".implode("', '", $result_array)."'";
 	
 	
 				throw new TDBMException($str);
@@ -356,8 +356,8 @@ 
 			$pk_array = $this->getPrimaryKey();
 			
 			foreach ($pk_array as $pk) {
-				if (isset($this->db_row[$pk]) && $this->db_row[$pk]!==null) {
-					$pk_set=true;
+				if (isset($this->db_row[$pk]) && $this->db_row[$pk] !== null) {
+					$pk_set = true;
 				}
 			}
 			// if there are many columns for the PK, and none is set, we have no way to find the object back!
@@ -380,7 +380,7 @@ 
 				if (!$first)
 				$sql .= ',';
 				$sql .= $this->db_connection->quoteSmart($value);
-				$first=false;
+				$first = false;
 			}
 			$sql .= ')';
 
@@ -408,12 +408,12 @@ 
 
 			// If there is only one column for the primary key, and if it has not been filled, let's find it.
 			// We assume this is the biggest ID in the database
-			if (count($pk_array)==1 && !$pk_set) {
+			if (count($pk_array) == 1 && !$pk_set) {
 				// FIXME: for PostgreSQL or MSSQL, the getInsertId call is not thread safe
 				// We should start a transaction before the insert
-				$this->TDBMObject_id = $this->db_connection->getInsertId($this->db_table_name,$pk_array[0]);
+				$this->TDBMObject_id = $this->db_connection->getInsertId($this->db_table_name, $pk_array[0]);
 				$this->db_row[$pk_array[0]] = $this->TDBMObject_id;
-			} elseif (count($pk_array)==1 && $pk_set) {
+			} elseif (count($pk_array) == 1 && $pk_set) {
 				$this->TDBMObject_id = $this->db_row[$pk_array[0]];
 			}
 
@@ -440,24 +440,24 @@ 
 			
 			// Let's add this object to the list of objects in cache.
 			$this->tdbmService->_addToCache($this);
-		} else if ($this->TDBMObject_state == "loaded" && $this->db_modified_state==true) {
+		} else if ($this->TDBMObject_state == "loaded" && $this->db_modified_state == true) {
 			//$primary_key = $this->getPrimaryKey();
 			// Let's first get the primary keys
 			$pk_table = $this->getPrimaryKey();
 			// 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($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($pk)."=".$this->db_connection->quoteSmart($ids[$i]);
 					$i++;
 				}
-				$sql_where = implode(" AND ",$sql_where_array);
+				$sql_where = implode(" AND ", $sql_where_array);
 			}
 
 			$sql = 'UPDATE '.$this->db_connection->escapeDBItem($this->db_table_name).' SET ';
@@ -467,7 +467,7 @@ 
 				if (!$first)
 				$sql .= ',';
 				$sql .= $this->db_connection->escapeDBItem($key)." = ".$this->db_connection->quoteSmart($value);
-				$first=false;
+				$first = false;
 			}
 			$sql .= ' WHERE '.$sql_where/*$primary_key."='".$this->db_row[$primary_key]."'"*/;
 			try {
@@ -529,8 +529,8 @@ 
 	 */
 	public function __call($func_name, $values) {
 
-		if (strpos($func_name,"get_") === 0) {
-			$table = substr($func_name,4);
+		if (strpos($func_name, "get_") === 0) {
+			$table = substr($func_name, 4);
 		} else {
 			throw new TDBMException("Method ".$func_name." not found");
 		}
@@ -640,7 +640,7 @@ 
 	 * Implement the unique JsonSerializable method
 	 * @return array
 	 */
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		$this->_dbLoadIfNotLoaded();
 		return $this->db_row;
 	}