thecodingmachine / database.tdbm

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

Doc Comments +3 added lines

@@ -170,6 +170,9 @@
 	
 	protected $errorMsg;
 	
+	/**
+	 * @param string $msg
+	 */
 	private function displayErrorMsg($msg) {
 		$this->errorMsg = $msg;
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);

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

Doc Comments +6 added lines

@@ -84,6 +84,9 @@ 
 
 	}
 
+	/**
+	 * @param string $column
+	 */
 	private function getarray($column) {
 		$arr = array();
 		foreach ($this as $object) {
@@ -92,6 +95,9 @@ 
 		return $arr;
 	}
 
+	/**
+	 * @param string $column
+	 */
 	private function setarray($column, $value) {
 		foreach ($this as $object) {
 			$object->__set($column, $value);

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

Doc Comments +9 added lines, -2 removed lines

@@ -145,7 +145,7 @@ 
 	 * false if an explicit call to save() is required.
 	 *
 	 * @param unknown_type $autoSave
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function setAutoSaveMode($autoSave) {
 		$this->db_autosave = $autoSave;
@@ -255,6 +255,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $var
+	 */
 	public function __get($var) {
 		$this->_dbLoadIfNotLoaded();
 
@@ -307,6 +310,10 @@ 
 		return isset($this->db_row[$var]);
 	}
 	
+	/**
+	 * @param string $var
+	 * @param string|null $value
+	 */
 	public function __set($var, $value) {
 		$this->_dbLoadIfNotLoaded();
 
@@ -525,7 +532,7 @@ 
 	 *
 	 * @param unknown_type $func_name
 	 * @param unknown_type $values
-	 * @return unknown
+	 * @return TDBMObjectArray
 	 */
 	public function __call($func_name, $values) {
 

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 +8 added lines, -5 removed lines

@@ -124,7 +124,7 @@ 
 	/**
 	 * Generates in one method call the daos and the beans for one table.
 	 * 
-	 * @param $tableName
+	 * @param string $tableName
 	 */
 	public function generateDaoAndBean($tableName) {
 		//$baseClassName = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName));
@@ -427,6 +427,10 @@ 
 	 * @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 $baseFileName
+	 * @param string $beanFileName
+	 * @param string $baseClassName
+	 * @param string $beanClassName
 	 */
 	public function generateDao($fileName, $baseFileName, $beanFileName, $className, $baseClassName, $beanClassName, $tableName) {
 		$info = $this->dbConnection->getTableInfo($tableName);
@@ -697,7 +701,7 @@ 
 	/**
 	 * Generates the factory bean.
 	 * 
-	 * @param $tableList
+	 * @param string[] $tableList
 	 */
 	private function generateFactory($tableList) {
 		// For each table, let's write a property.
@@ -763,7 +767,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) {
@@ -843,7 +846,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) {
@@ -864,7 +867,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) {

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

Doc Comments +4 added lines, -2 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

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