thecodingmachine / database.tdbm

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

Braces +19 added lines, -14 removed lines

@@ -87,8 +87,9 @@ 
 			while (true) {
 				$result = strrpos($phrase, "'", $result+1);
 				if ($result===false) {
-					if ($sentence!='')
-					$sentence .= ',';
+					if ($sentence!='') {
+										$sentence .= ',';
+					}
 					$sentence .= $phrase;
 
 					if ($is_inside_quotes) {
@@ -98,15 +99,15 @@ 
 						$sentence = '';
 						break;
 					}
-				}
-				else
+				} else
 				{
 					$valid_result = true;
 					if ($result>0 && $phrase{$result-1}=='\\') {
 						$valid_result = false;
 					}
-					if ($valid_result)
-					$is_inside_quotes = !$is_inside_quotes;
+					if ($valid_result) {
+										$is_inside_quotes = !$is_inside_quotes;
+					}
 				}
 			}
 
@@ -132,23 +133,27 @@ 
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table) == 0)
-		    return '';
+		if (count($work_table) == 0) {
+				    return '';
+		}
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'") === 0)
-		    array_shift($work_table);
+		if (strstr($work_str,"'") === 0) {
+				    array_shift($work_table);
+		}
 			
-		if (count($work_table) == 0)
-		    return '';
+		if (count($work_table) == 0) {
+				    return '';
+		}
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
 		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
-			$work_str2 .= $str_fragment.' ';
+			if (($i % 2) == 0) {
+						$work_str2 .= $str_fragment.' ';
+			}
 			$i++;
 		}
 

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

Braces +12 added lines, -8 removed lines

@@ -99,23 +99,27 @@
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table)==0)
-		return '';
+		if (count($work_table)==0) {
+				return '';
+		}
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'")===0)
-		array_shift($work_table);
+		if (strstr($work_str,"'")===0) {
+				array_shift($work_table);
+		}
 			
-		if (count($work_table)==0)
-		return '';
+		if (count($work_table)==0) {
+				return '';
+		}
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
 		$i=0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
-			$work_str2 .= $str_fragment.' ';
+			if (($i % 2) == 0) {
+						$work_str2 .= $str_fragment.' ';
+			}
 			$i++;
 		}
 

src/Mouf/Database/TDBM/AmbiguityException.php

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

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

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

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

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

Braces +60 added lines, -57 removed lines

@@ -456,10 +456,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) {
@@ -537,8 +538,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");
@@ -665,8 +667,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();
@@ -740,8 +741,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();
@@ -910,8 +910,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';
 			}
 		}
@@ -999,8 +998,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;
@@ -1041,8 +1041,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];
@@ -1087,8 +1086,9 @@ 
 						break;
 					}
 				}
-				if (!$found)
-				$flat_path[] = $path_step;
+				if (!$found) {
+								$flat_path[] = $path_step;
+				}
 			}
 		}
 		return $flat_path;
@@ -1123,8 +1123,9 @@ 
 					}
 				}
 
-				if ($found)
-				return true;
+				if ($found) {
+								return true;
+				}
 			}
 
 		}
@@ -1146,15 +1147,15 @@ 
 				{
 					$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"])
 				{
 					$already_done = true;
 					break;
 				}
 			}
-			if ($already_done)
-			continue;
+			if ($already_done) {
+						continue;
+			}
 
 			$new_path = array_merge($path, array(array("table1"=>$table1,
 									"col1"=>$col1,
@@ -1179,15 +1180,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,
@@ -1427,16 +1428,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);
 
@@ -1540,8 +1540,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());
@@ -1552,8 +1553,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;
 
@@ -1578,8 +1580,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);
 		}
 
@@ -1641,8 +1642,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();
@@ -1672,10 +1674,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);
 			}
 		}
@@ -1709,16 +1712,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;
 
 				}
 
@@ -1790,13 +1792,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);
 				}
 			}