thecodingmachine / database.tdbm

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

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
 class TDBMObjectArray extends \ArrayObject implements \JsonSerializable {
 	public function __get($var) {
 		$cnt = count($this);
-		if ($cnt==1)
+		if ($cnt == 1)
 		{
 			return $this[0]->__get($var);
 		}
@@ -44,7 +44,7 @@ 
 
 	public function __set($var, $value) {
 		$cnt = count($this);
-		if ($cnt==1)
+		if ($cnt == 1)
 		{
 			return $this[0]->__set($var, $value);
 		}
@@ -69,13 +69,13 @@ 
 	 */
     public function __call($func_name, $values) {
 
-		if (strpos($func_name,"getarray_") === 0) {
+		if (strpos($func_name, "getarray_") === 0) {
 			$column = substr($func_name, 9);
 			return $this->getarray($column);
-		} elseif (strpos($func_name,"setarray_") === 0) {
+		} elseif (strpos($func_name, "setarray_") === 0) {
 			$column = substr($func_name, 9);
 			return $this->setarray($column, $values[0]);
-		} elseif (count($this)==1) {
+		} elseif (count($this) == 1) {
 			$this[0]->__call($func_name, $values);
 		}
 		else
@@ -99,7 +99,7 @@ 
 		}
 	}
 	
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		return (array) $this;
 	}
 }

Braces +5 added lines, -10 removed lines

@@ -31,12 +31,10 @@ 
 		if ($cnt==1)
 		{
 			return $this[0]->__get($var);
-		}
-		elseif ($cnt>1)
+		} elseif ($cnt>1)
 		{
 			throw new TDBMException('Array contains many objects! Use getarray_'.$var.' to retrieve an array of '.$var);
-		}
-		else
+		} else
 		{
 			throw new TDBMException('Array contains no objects');
 		}
@@ -47,12 +45,10 @@ 
 		if ($cnt==1)
 		{
 			return $this[0]->__set($var, $value);
-		}
-		elseif ($cnt>1)
+		} elseif ($cnt>1)
 		{
 			throw new TDBMException('Array contains many objects! Use setarray_'.$var.' to set the array of '.$var);
-		}
-		else
+		} else
 		{
 			throw new TDBMException('Array contains no objects');
 		}
@@ -77,8 +73,7 @@ 
 			return $this->setarray($column, $values[0]);
 		} elseif (count($this)==1) {
 			$this[0]->__call($func_name, $values);
-		}
-		else
+		} else
 		{
 			throw new TDBMException("Method ".$func_name." not found");
 		}

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 +57 added lines, -57 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";
 	}
 
 	/**
@@ -507,10 +507,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);
@@ -545,48 +545,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 {
@@ -674,21 +674,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

Spacing +28 added lines, -28 removed lines

@@ -109,7 +109,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;
@@ -154,7 +154,7 @@ 
 	 * $TDBMObject_state = "loaded" when the object is cached in memory.
 	 * @return string
 	 */
-	public function getTDBMObjectState(){
+	public function getTDBMObjectState() {
 		return $this->TDBMObject_state;
 	}
 	
@@ -166,7 +166,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;	
 	}
 
@@ -182,7 +182,7 @@ 
 	public function loadFromRow($row, &$colsArray) {
         if ($colsArray === null) {
             foreach ($row as $key=>$value) {
-                if (strpos($key, 'tdbm_reserved_col_')!==0) {
+                if (strpos($key, 'tdbm_reserved_col_') !== 0) {
                     $colsArray[$key] = true;
                 }
             }
@@ -220,7 +220,7 @@ 
 			$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."\".");
 			}
@@ -230,8 +230,8 @@ 
 			$result->closeCursor();
 				
 			$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";
@@ -263,10 +263,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);
@@ -339,8 +339,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!
@@ -363,7 +363,7 @@ 
 				if (!$first)
 				$sql .= ',';
 				$sql .= $this->db_connection->quoteSmart($value);
-				$first=false;
+				$first = false;
 			}
 			$sql .= ')';
 
@@ -391,12 +391,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]];
 			}
 
@@ -423,24 +423,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 ';
@@ -450,7 +450,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 {
@@ -512,8 +512,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");
 		}
@@ -624,7 +624,7 @@ 
 	 * Implement the unique JsonSerializable method
 	 * @return array
 	 */
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		$this->_dbLoadIfNotLoaded();
 		return $this->db_row;
 	}
@@ -653,23 +653,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function getPrimaryKeyWhereStatement () {
+	private function getPrimaryKeyWhereStatement() {
 		// 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($this->db_table_name).'.'.$this->db_connection->escapeDBItem($pk_table[0])."=".$this->db_connection->quoteSmart($this->TDBMObject_id);
 		} else {
 			$ids = unserialize($object_id);
-			$i=0;
+			$i = 0;
 			$sql_where_array = array();
 			foreach ($pk_table as $pk) {
 				$sql_where_array[] = $this->db_connection->escapeDBItem($this->db_table_name).'.'.$this->db_connection->escapeDBItem($pk)."=".$this->db_connection->quoteSmart($ids[$i]);
 				$i++;
 			}
-			$sql_where = implode(" AND ",$sql_where_array);
+			$sql_where = implode(" AND ", $sql_where_array);
 		}
 		return $sql_where;
 	}
@@ -677,7 +677,7 @@ 
     /**
      * Override the native php clone function for TDBMObjects
      */
-    public function __clone(){
+    public function __clone() {
         $this->_dbLoadIfNotLoaded();
         //First lets set the status to new (to enter the save function)
         $this->TDBMObject_state = "new";

Braces +30 added lines, -23 removed lines

@@ -263,10 +263,11 @@ 
 				// 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)
-				$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)."'";
+				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)."'";
+				}
 	
 	
 				throw new TDBMException($str);
@@ -348,10 +349,11 @@ 
 			if (count($pk_array)>1 && !$pk_set) {
 				$msg = "Error! You did not set the primary keys for the new object of type '$this->db_table_name'. TDBM usually assumes that the primary key is automatically set by the DB engine to the maximum value in the database. However, in this case, the '$this->db_table_name' table has a primary key on multiple columns. TDBM would be unable to find back this record after save. Please specify the primary keys for all new objects of kind '$this->db_table_name'.";
 
-				if (!$this->tdbmService->isProgramExiting())
-				throw new TDBMException($msg);
-				else
-				trigger_error($msg, E_USER_ERROR);
+				if (!$this->tdbmService->isProgramExiting()) {
+								throw new TDBMException($msg);
+				} else {
+								trigger_error($msg, E_USER_ERROR);
+				}
 			}
 			
 			$sql = 'INSERT INTO '.$this->db_connection->escapeDBItem($this->db_table_name).
@@ -360,8 +362,9 @@ 
 
 			$first = true;
 			foreach ($this->db_row as $key=>$value) {
-				if (!$first)
-				$sql .= ',';
+				if (!$first) {
+								$sql .= ',';
+				}
 				$sql .= $this->db_connection->quoteSmart($value);
 				$first=false;
 			}
@@ -378,9 +381,9 @@ 
 				//	trigger_error("program exiting");
 				trigger_error($e->getMessage(), E_USER_ERROR);
 
-				if (!$this->tdbmService->isProgramExiting())
-				throw $e;
-				else
+				if (!$this->tdbmService->isProgramExiting()) {
+								throw $e;
+				} else
 				{
 					trigger_error($e->getMessage(), E_USER_ERROR);
 				}
@@ -447,8 +450,9 @@ 
 
 			$first = true;
 			foreach ($this->db_row as $key=>$value) {
-				if (!$first)
-				$sql .= ',';
+				if (!$first) {
+								$sql .= ',';
+				}
 				$sql .= $this->db_connection->escapeDBItem($key)." = ".$this->db_connection->quoteSmart($value);
 				$first=false;
 			}
@@ -456,10 +460,11 @@ 
 			try {
 				$this->db_connection->exec($sql);
 			} catch (TDBMException $e) {
-				if (!$this->tdbmService->isProgramExiting())
-				throw $e;
-				else
-				trigger_error($e->getMessage(), E_USER_ERROR);
+				if (!$this->tdbmService->isProgramExiting()) {
+								throw $e;
+				} else {
+								trigger_error($e->getMessage(), E_USER_ERROR);
+				}
 			}
 
 			// Let's remove this object from the $new_objects static table.
@@ -490,11 +495,13 @@ 
 	 *
 	 */
 	public function discardChanges() {
-		if ($this->TDBMObject_state == "new")
-		throw new TDBMException("You cannot call discardChanges() on an object that has been created with getNewObject and that has not yet been saved.");
+		if ($this->TDBMObject_state == "new") {
+				throw new TDBMException("You cannot call discardChanges() on an object that has been created with getNewObject and that has not yet been saved.");
+		}
 
-		if ($this->TDBMObject_state == "deleted")
-		throw new TDBMException("You cannot call discardChanges() on an object that has been deleted.");
+		if ($this->TDBMObject_state == "deleted") {
+				throw new TDBMException("You cannot call discardChanges() on an object that has been deleted.");
+		}
 			
 		$this->db_modified_state = false;
 		$this->TDBMObject_state = "not loaded";

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;

Spacing +9 added lines, -9 removed lines

@@ -86,16 +86,16 @@ 
 		
 		if ($this->fetchStarted === false) {
 			// $keysStandardCased is an optimization to avoid calling toStandardCaseColumn on every cell of every row.
-			foreach ($fullCaseRow as $key=>$value)  {
+			foreach ($fullCaseRow as $key=>$value) {
 				$this->keysStandardCased[$key] = $this->dbConnection->toStandardCaseColumn($key);
 			}
 			$this->fetchStarted = true;
 		}
-		foreach ($fullCaseRow as $key=>$value)  {
-			$row[$this->keysStandardCased[$key]]=$value;
+		foreach ($fullCaseRow as $key=>$value) {
+			$row[$this->keysStandardCased[$key]] = $value;
 		}
 		
-		if (count($this->primary_keys)==1)
+		if (count($this->primary_keys) == 1)
 		{
 			if (!isset($this->keysStandardCased[$this->primary_keys[0]])) {
 				throw new TDBMException("Bad SQL request passed to getObjectsFromSQL. The SQL request should return all the rows from the '".$this->table_name."' table. Could not find primary key in this set of rows. SQL request passed: ".$this->sql);
@@ -131,7 +131,7 @@ 
 			$obj->loadFromRow($row, $this->colsArray);
 			// Check that the object fetched from cache is from the requested class.
 			if ($this->className != null) {
-				if (!is_subclass_of(get_class($obj), $this->className) &&  get_class($obj) != $this->className) {
+				if (!is_subclass_of(get_class($obj), $this->className) && get_class($obj) != $this->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 ".$this->className." but the object available locally is of the class ".get_class($obj).".");
 				}
 			}
@@ -139,7 +139,7 @@ 
 			// Check that the object fetched from cache is from the requested class.
 			if ($this->className != null) {
 				$this->className = ltrim($this->className, '\\');
-				if (!is_subclass_of(get_class($obj), $this->className) &&  get_class($obj) != $this->className) {
+				if (!is_subclass_of(get_class($obj), $this->className) && get_class($obj) != $this->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 ".$this->className." but the object available locally is of the class ".get_class($obj).".");
 				}
 			}
@@ -185,7 +185,7 @@ 
 				$this->current = false;
 			else
 				return true;
-		}else
+		} else
 			$this->current = false;
 		return false;
 	}
@@ -209,7 +209,7 @@ 
 	 */
 	public function valid()
 	{
-		return ($this->current != false) || (($this->cursor == -1) && ($this->count() > 0));
+		return ($this->current != false) || (($this->cursor == -1) && ($this->count()>0));
 	}
 	/**
 	 * Fetches first record and rewinds the cursor
@@ -226,7 +226,7 @@ 
 	 */
 	public function hasNext()
 	{
-		return ($this->count() > 0) && (($this->cursor + 1) < $this->count());
+		return ($this->count()>0) && (($this->cursor+1)<$this->count());
 	}
 	/**
 	 * Return the next record to which this cursor points, and advance the cursor

Braces +14 added lines, -12 removed lines

@@ -101,8 +101,7 @@ 
 				throw new TDBMException("Bad SQL request passed to getObjectsFromSQL. The SQL request should return all the rows from the '".$this->table_name."' table. Could not find primary key in this set of rows. SQL request passed: ".$this->sql);
 			}
 			$id = $row[$this->keysStandardCased[$this->primary_keys[0]]];
-		}
-		else
+		} else
 		{
 			// Let's generate the serialized primary key from the columns!
 			$ids = array();
@@ -181,12 +180,14 @@ 
 		if ($this->hasNext()) {
 			$this->cursor++;
 			$this->current = $this->pdoStatement->fetch(\PDO::FETCH_ASSOC);
-			if (empty($this->current))
-				$this->current = false;
-			else
-				return true;
-		}else
-			$this->current = false;
+			if (empty($this->current)) {
+							$this->current = false;
+			} else {
+							return true;
+			}
+		} else {
+					$this->current = false;
+		}
 		return false;
 	}
 	
@@ -259,10 +260,11 @@ 
 		$all = array();
 		$this->rewind();
 		foreach ($this->pdoStatement as $id => $doc) {
-			if ($asRecords)
-				$all[$id] = $this->cast($doc);
-			else
-				$all[$id] = $doc;
+			if ($asRecords) {
+							$all[$id] = $this->cast($doc);
+			} else {
+							$all[$id] = $doc;
+			}
 		}
 		return $all;
 	}

src/Mouf/Database/TDBM/TDBMService.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Mouf\Utils\Cache\CacheInterface;
 use Mouf\Database\TDBM\Filters\FilterInterface;
 use Mouf\Database\DBConnection\ConnectionInterface;
-use Mouf\Database\DBConnection\DBConnectionException;
 use Mouf\Database\TDBM\Filters\OrFilter;
 use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
 

Doc Comments +6 added lines, -6 removed lines

@@ -695,10 +695,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|null $className
+	 * @param string $sql
 	 */
 	private function getObjectsFromSQLGenerator($result, $table_name, $className, $sql) {
 		$keysStandardCased = array();
@@ -1084,7 +1084,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:
@@ -1559,7 +1559,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) {
@@ -1624,7 +1624,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) {

Braces +60 added lines, -57 removed lines

@@ -446,10 +446,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) {
@@ -523,8 +524,9 @@ 
 			$sql = 'DELETE FROM '.$this->dbConnection->escapeDBItem($object->_getDbTableName()).' WHERE '.$sql_where;
 			$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.");
+			}
 
 			$this->objectStorage->remove($object->_getDbTableName(), $object_id);
 			$object->setTDBMObjectState("deleted");
@@ -639,8 +641,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();
@@ -724,8 +725,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();
@@ -894,8 +894,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';
 			}
 		}
@@ -983,8 +982,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;
@@ -1025,8 +1025,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];
@@ -1071,8 +1070,9 @@ 
 						break;
 					}
 				}
-				if (!$found)
-				$flat_path[] = $path_step;
+				if (!$found) {
+								$flat_path[] = $path_step;
+				}
 			}
 		}
 		return $flat_path;
@@ -1107,8 +1107,9 @@ 
 					}
 				}
 
-				if ($found)
-				return true;
+				if ($found) {
+								return true;
+				}
 			}
 
 		}
@@ -1131,16 +1132,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,
@@ -1165,15 +1166,15 @@ 
 				{
 					$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"])
 				{
 					$already_done = true;
 					break;
 				}
 			}
-			if ($already_done)
-			continue;
+			if ($already_done) {
+						continue;
+			}
 
 			$new_path = array_merge($path, array(array("table1"=>$table2,
 									"col1"=>$col2,
@@ -1413,16 +1414,15 @@ 
 		{
 			$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);
 
@@ -1530,8 +1530,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());
@@ -1542,8 +1543,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;
 
@@ -1568,8 +1570,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);
 		}
 
@@ -1631,8 +1632,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();
@@ -1662,10 +1664,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);
 			}
 		}
@@ -1699,16 +1702,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;
 
 				}
 
@@ -1780,13 +1782,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);
 				}
 			}

Indentation +78 added lines, -78 removed lines

@@ -531,45 +531,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.
@@ -618,7 +618,7 @@ 
 			}
 			$keysStandardCased = array();
 			$firstLine = true;
-            $colsArray = null;
+			$colsArray = null;
 			while ($fullCaseRow = $result->fetch(\PDO::FETCH_ASSOC))
 			{
 				$row = array();
@@ -650,7 +650,7 @@ 
 					$id = serialize($ids);
 				}
 
-                $obj = $this->objectStorage->get($table_name,$id);
+				$obj = $this->objectStorage->get($table_name,$id);
 				if ($obj === null)
 				{
 					if ($className == null) {
@@ -663,10 +663,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) {
@@ -703,7 +703,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();
@@ -734,7 +734,7 @@ 
 				}
 				$id = serialize($ids);
 			}
-            $obj = $this->objectStorage->get($table_name, $id);
+			$obj = $this->objectStorage->get($table_name, $id);
 			if ($obj === null)
 			{
 				if ($className == null) {
@@ -747,10 +747,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) {
@@ -1455,33 +1455,33 @@ 
 
 
 		//If no $hint_path is provided, check that a path exists
-        if($hint_path === null){
-            // Now, for each needed table to perform the order by, we must verify if the relationship between the order by and the object is indeed a 1* relationship
-            foreach ($needed_table_array_for_orderby as $target_table_table) {
-                // Get the path between the main table and the target group by table
+		if($hint_path === null){
+			// Now, for each needed table to perform the order by, we must verify if the relationship between the order by and the object is indeed a 1* relationship
+			foreach ($needed_table_array_for_orderby as $target_table_table) {
+				// Get the path between the main table and the target group by table
 
-                // TODO! Pas bon!!!! Faut le quérir, hélas!
-                // Mais comment gérer ça sans plomber les perfs et en utilisant le path fourni?????
+				// TODO! Pas bon!!!! Faut le quérir, hélas!
+				// Mais comment gérer ça sans plomber les perfs et en utilisant le path fourni?????
 
-                $path = $this->getPathFromCache($table_name, $target_table_table);
+				$path = $this->getPathFromCache($table_name, $target_table_table);
 
-                /**********************************
+				/**********************************
                  * Modifier par Marc de *1 vers 1*
                  * (sur les conseils de David !)
                  */
-                $is_ok = true;
-                foreach ($path as $step) {
-                    if ($step["type"]=="1*") {
-                        $is_ok = false;
-                        break;
-                    }
-                }
-
-                if (!$is_ok) {
-                    throw new TDBMException("Error in querying database from getObjectsByFilter. You tried to order your data according to a column of the '$target_table_table' table. However, the '$target_table_table' table has a many to 1 relationship with the '$table_name' table. This means that one '$table_name' object can contain many '$target_table_table' objects. Therefore, trying to order '$table_name' objects using '$target_table_table' objects is meaningless and cannot be performed.");
-                }
-            }
-        }
+				$is_ok = true;
+				foreach ($path as $step) {
+					if ($step["type"]=="1*") {
+						$is_ok = false;
+						break;
+					}
+				}
+
+				if (!$is_ok) {
+					throw new TDBMException("Error in querying database from getObjectsByFilter. You tried to order your data according to a column of the '$target_table_table' table. However, the '$target_table_table' table has a many to 1 relationship with the '$table_name' table. This means that one '$table_name' object can contain many '$target_table_table' objects. Therefore, trying to order '$table_name' objects using '$target_table_table' objects is meaningless and cannot be performed.");
+				}
+			}
+		}
 
 		// In a SELECT DISTINCT ... ORDER BY ... clause, the orderbyed columns must appear!
 		// Therefore, we must be able to parse the Orderby columns requested, give them dummy names and remove them afterward!
@@ -1656,9 +1656,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)
@@ -1731,12 +1731,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) {
 

Spacing +69 added lines, -69 removed lines

@@ -142,7 +142,7 @@ 
 	private $cacheKey = "__TDBM_Cache__";
 	
 	public function __construct() {
-		register_shutdown_function(array($this,"completeSaveOnExit"));
+		register_shutdown_function(array($this, "completeSaveOnExit"));
 		if (extension_loaded('weakref')) {
 			$this->objectStorage = new WeakrefObjectStorage();
 		} else {
@@ -362,7 +362,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.
@@ -435,7 +435,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!");
 		}
@@ -465,8 +465,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);
@@ -476,7 +476,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;
 					}
@@ -506,17 +506,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);
 			}
 
 
@@ -599,7 +599,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 array|Generator|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!");
 		}
@@ -630,10 +630,10 @@ 
 					$firstLine = false;
 				}
 				foreach ($fullCaseRow as $key=>$value) {
-					$row[$keysStandardCased[$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);
@@ -650,7 +650,7 @@ 
 					$id = serialize($ids);
 				}
 
-                $obj = $this->objectStorage->get($table_name,$id);
+                $obj = $this->objectStorage->get($table_name, $id);
 				if ($obj === null)
 				{
 					if ($className == null) {
@@ -715,10 +715,10 @@ 
 				$firstLine = false;
 			}
 			foreach ($fullCaseRow as $key=>$value) {
-				$row[$keysStandardCased[$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);
@@ -813,14 +813,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/>";
@@ -881,21 +881,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';
 			}
 		}
@@ -914,7 +914,7 @@ 
 		$this->loadCache();
 
 		$path = array();
-		$queue = array(array($table,array()));
+		$queue = array(array($table, array()));
 
 		$found = false;
 		$found_depth = 0;
@@ -949,7 +949,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,
 					// just to see if there is no ambiguity
@@ -959,7 +959,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);
 
@@ -970,11 +970,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.
@@ -1036,7 +1036,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);
@@ -1054,7 +1054,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];
 
@@ -1093,9 +1093,9 @@ 
 		$path = $current_vars[1];
 
 		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;
@@ -1126,13 +1126,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;
@@ -1161,12 +1161,12 @@ 
 			$already_done = false;
 			foreach ($path as $previous_constraint)
 			{
-				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"])
 				{
 					$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"])
 				{
 					$already_done = true;
 					break;
@@ -1275,7 +1275,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!");
 		}
@@ -1291,7 +1291,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!");
 		}
@@ -1309,7 +1309,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!");
 		}
@@ -1327,7 +1327,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!");
 		}
@@ -1348,12 +1348,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);
 	}
 
 	/**
@@ -1370,7 +1370,7 @@ 
 	 * @param unknown_type $hint_path Hints to get the path for the query (expert parameter, you should leave it to null).
 	 * @return array|Generator|TDBMObjectArray An array or object 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();
 
@@ -1409,7 +1409,7 @@ 
 			}
 		}
 
-		if (count($needed_table_array)==0)
+		if (count($needed_table_array) == 0)
 		{
 			$sql = $this->dbConnection->escapeDBItem($table_name); //Make by Pierre PIV (add escapeDBItem)
 
@@ -1417,14 +1417,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);
@@ -1455,7 +1455,7 @@ 
 
 
 		//If no $hint_path is provided, check that a path exists
-        if($hint_path === null){
+        if ($hint_path === null) {
             // Now, for each needed table to perform the order by, we must verify if the relationship between the order by and the object is indeed a 1* relationship
             foreach ($needed_table_array_for_orderby as $target_table_table) {
                 // Get the path between the main table and the target group by table
@@ -1471,7 +1471,7 @@ 
                  */
                 $is_ok = true;
                 foreach ($path as $step) {
-                    if ($step["type"]=="1*") {
+                    if ($step["type"] == "1*") {
                         $is_ok = false;
                         break;
                     }
@@ -1497,7 +1497,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
@@ -1515,10 +1515,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);
 				
@@ -1552,7 +1552,7 @@ 
 		if ($mode == 'explainSQL') {
 			return $sql;
 		}
-		return $this->getObjectsFromSQL($table_name, $sql,  $from, $limit, $className);
+		return $this->getObjectsFromSQL($table_name, $sql, $from, $limit, $className);
 
 	}
 
@@ -1577,17 +1577,17 @@ 
 		// 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_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) {
@@ -1600,7 +1600,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);
 						}
@@ -1610,7 +1610,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.");
 			}
 		}
@@ -1638,9 +1638,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);
@@ -1663,10 +1663,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);
 			}
 		}
@@ -1689,16 +1689,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
@@ -1713,7 +1713,7 @@ 
 
 				}
 
-				if ($found==false)
+				if ($found == false)
 				{
 					$current_node = new DisplayNode($link['table1'], $current_node, $link['type'], $link['col2'], $link['col1']);
 				}
@@ -1738,7 +1738,7 @@ 
      *
      * @return string
 	 */
-	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;
@@ -1749,7 +1749,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;
 	}
@@ -1784,10 +1784,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/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";

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 			if ($this->link_type == "*1")
 			{
 				echo "Table $this->table_name points to table ".$this->parent_node->table_name." through its foreign key on column $this->keyNode that points to column $this->keyParent<br />";
-			}
-			else if ($this->link_type == "1*")
+			} else if ($this->link_type == "1*")
 			{
 				echo "Table $this->table_name is pointed by table ".$this->parent_node->table_name." by its foreign key on column $this->keyParent that points to column $this->keyNode<br />";
 			}

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

Braces +4 added lines, -3 removed lines

@@ -426,7 +426,7 @@ 
 				$defaultSort = $data['column_name'];
 				if (count($matches == 3)){
 					$defaultSortDirection = $matches[2];
-				}else{
+				} else{
 					$defaultSortDirection = 'ASC';
 				}
 			}
@@ -836,8 +836,9 @@ 
 	public static function toCamelCase($str) {
 		$str = strtoupper(substr($str,0,1)).substr($str,1);
 		while (true) {
-			if (strpos($str, "_") === false && strpos($str, " ") === false)
-				break;
+			if (strpos($str, "_") === false && strpos($str, " ") === false) {
+							break;
+			}
 				
 			$pos = strpos($str, "_");
 			if ($pos === false) {

Doc Comments +10 added lines, -6 removed lines

@@ -91,7 +91,9 @@ 
 	/**
 	 * Generates in one method call the daos and the beans for one table.
 	 * 
-	 * @param $tableName
+	 * @param string $tableName
+	 * @param string $daonamespace
+	 * @param string $beannamespace
 	 */
 	public function generateDaoAndBean($tableName, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
 		$daoName = $this->getDaoNameFromTableName($tableName);
@@ -406,9 +408,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) {
 		$info = $this->dbConnection->getTableInfo($tableName);
@@ -696,7 +699,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.
@@ -768,7 +773,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) {
@@ -848,7 +852,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) {
@@ -869,7 +873,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

@@ -66,7 +66,7 @@ 
 	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $support, $storeInUtc) {
 		// TODO: migrate $this->daoNamespace to $daonamespace that is passed in parameter!
 
-        $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+		$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
 		$this->daoNamespace = $daonamespace;
 		$this->beanNamespace = $beannamespace;
@@ -98,10 +98,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);
 		$this->generateDao($daoName, $daoName."Base", $beanName, $tableName, $classNameMapper);
@@ -137,16 +137,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) {
 		$table = $this->dbConnection->getTableFromDbModel($tableName);
 
@@ -361,25 +361,25 @@ 
 		$str .= "}
 ?>";
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$baseClassName);
-        if (!$possibleBaseFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = __DIR__.'/../../../../../../../../'.$possibleBaseFileNames[0];
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$baseClassName);
+		if (!$possibleBaseFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = __DIR__.'/../../../../../../../../'.$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 = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$className);
+		if (!$possibleFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace."\\".$className.'" is not autoloadable.');
+		}
+		$possibleFileName = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
 
-        if (!file_exists($possibleFileName)) {
+		if (!file_exists($possibleFileName)) {
 			$str = "<?php
 /*
  * This file has been automatically generated by TDBM.
@@ -397,7 +397,7 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
+			$this->ensureDirectoryExist($possibleFileName);
 			file_put_contents($possibleFileName ,$str);
 			@chmod($possibleFileName, 0664);
 		}
@@ -653,21 +653,21 @@ 
 }
 ?>";
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$baseClassName);
-        if (!$possibleBaseFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = __DIR__.'/../../../../../../../../'.$possibleBaseFileNames[0];
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$baseClassName);
+		if (!$possibleBaseFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = __DIR__.'/../../../../../../../../'.$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 = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$className);
+		if (!$possibleFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
+		}
+		$possibleFileName = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
 		
 		// Now, let's generate the "editable" class
 		if (!file_exists($possibleFileName)) {
@@ -687,7 +687,7 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
+			$this->ensureDirectoryExist($possibleFileName);
 			file_put_contents($possibleFileName ,$str);
 			@chmod($possibleFileName, 0664);
 		}
@@ -754,13 +754,13 @@ 
 }
 ?>';
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace."\\".$daoFactoryClassName);
-        if (!$possibleFileNames) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace."\\".$daoFactoryClassName.'" is not autoloadable.');
-        }
-        $possibleFileName = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace."\\".$daoFactoryClassName);
+		if (!$possibleFileNames) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace."\\".$daoFactoryClassName.'" is not autoloadable.');
+		}
+		$possibleFileName = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
 
-        $this->ensureDirectoryExist($possibleFileName);
+		$this->ensureDirectoryExist($possibleFileName);
 		file_put_contents($possibleFileName ,$str);
 	}
 	
@@ -876,20 +876,20 @@ 
 		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;
+			}
+		}
+	}
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -99,7 +99,7 @@ 
 		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
 
         $connection = $this->dbConnection;
-        if ($connection instanceof CachedConnection){
+        if ($connection instanceof CachedConnection) {
             $connection->cacheService->purgeAll();
         }
 		
@@ -197,7 +197,7 @@ 
 		if($date === null)
 			return null;
 		else
-			return strtotime($date'.($this->storeInUtc?'.\' UTC\'':'').');
+			return strtotime($date'.($this->storeInUtc ? '.\' UTC\'' : '').');
 	}
 	
 	/**
@@ -287,7 +287,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);
 	}
 	
 	/**
@@ -306,10 +306,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;
@@ -340,7 +340,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.'");
 	}
 	
 	/**
@@ -398,7 +398,7 @@ 
 
 }";
             $this->ensureDirectoryExist($possibleFileName);
-			file_put_contents($possibleFileName ,$str);
+			file_put_contents($possibleFileName, $str);
 			@chmod($possibleFileName, 0664);
 		}
 	}
@@ -416,11 +416,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';
 				}
 			}
@@ -660,7 +660,7 @@ 
         $possibleBaseFileName = __DIR__.'/../../../../../../../../'.$possibleBaseFileNames[0];
 
         $this->ensureDirectoryExist($possibleBaseFileName);
-		file_put_contents($possibleBaseFileName ,$str);
+		file_put_contents($possibleBaseFileName, $str);
 		@chmod($possibleBaseFileName, 0664);
 
         $possibleFileNames = $classNameMapper->getPossibleFileNames($this->daoNamespace."\\".$className);
@@ -688,7 +688,7 @@ 
 
 }";
             $this->ensureDirectoryExist($possibleFileName);
-			file_put_contents($possibleFileName ,$str);
+			file_put_contents($possibleFileName, $str);
 			@chmod($possibleFileName, 0664);
 		}
 	}
@@ -761,7 +761,7 @@ 
         $possibleFileName = __DIR__.'/../../../../../../../../'.$possibleFileNames[0];
 
         $this->ensureDirectoryExist($possibleFileName);
-		file_put_contents($possibleFileName ,$str);
+		file_put_contents($possibleFileName, $str);
 	}
 	
 	/**
@@ -828,7 +828,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;
@@ -837,9 +837,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/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>

src/Mouf/Database/TDBM/Filters/EqualFilter.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;