thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/AmbiguityException.php

Indentation +1 added lines, -1 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 	public function explainAmbiguity() {
 		$all_paths = $this->getAllPossiblePaths();
 
-		$i=0;
+		$i = 0;
 		$width_px = 0;
 		$height_px = 0;
 		$global_height_px = 0;
@@ -50,11 +50,11 @@ 
 
 	private static function getAllPossiblePathsRec($sub_table_paths)
 	{
-		if (count($sub_table_paths)==0)
+		if (count($sub_table_paths) == 0)
 		return array();
 
 		$table_path = array_shift($sub_table_paths);
-		$possible_sub_paths =  AmbiguityException::getAllPossiblePathsRec($sub_table_paths);
+		$possible_sub_paths = AmbiguityException::getAllPossiblePathsRec($sub_table_paths);
 		$return_table_paths = array();
 		foreach ($table_path['paths'] as $path) {
 			if (count($possible_sub_paths)>0)

Braces +5 added lines, -4 removed lines

@@ -50,8 +50,9 @@ 
 
 	private static function getAllPossiblePathsRec($sub_table_paths)
 	{
-		if (count($sub_table_paths)==0)
-		return array();
+		if (count($sub_table_paths)==0) {
+				return array();
+		}
 
 		$table_path = array_shift($sub_table_paths);
 		$possible_sub_paths =  AmbiguityException::getAllPossiblePathsRec($sub_table_paths);
@@ -63,9 +64,9 @@ 
 				{
 					$return_table_paths[] = array_merge(array(array('paths'=>array($path))), $possible_sub_path);
 				}
+			} else {
+						$return_table_paths[] = array(array('paths'=>array($path)));
 			}
-			else
-			$return_table_paths[] = array(array('paths'=>array($path)));
 		}
 		return $return_table_paths;
 	}

src/Mouf/Database/TDBM/TDBMObjectArray.php

Indentation +2 added lines, -2 removed lines

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

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/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/GreaterFilter.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

src/Mouf/Database/TDBM/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";