thecodingmachine / database.tdbm

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

Doc Comments +3 added lines, -2 removed lines

@@ -138,9 +138,7 @@ 
 	 * @Action
 	 * @param string $daonamespace
 	 * @param string $beannamespace
-	 * @param int $keepSupport
 	 * @param int $storeInUtc
-	 * @param int $castDatesToDateTime
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
@@ -168,6 +166,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/PageIterator.php

Doc Comments +4 added lines, -1 removed lines

@@ -63,6 +63,9 @@ 
 
 	private $innerResultIterator;
 
+	/**
+	 * @param integer $offset
+	 */
 	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
 	{
 		$this->parentResult = $parentResult;
@@ -108,7 +111,7 @@ 
 	}
 
 	/**
-	 * @return int
+	 * @return double
 	 */
 	public function getCurrentPage()
 	{

src/Mouf/Database/TDBM/TDBMObject.php

Doc Comments +7 added lines

@@ -35,6 +35,9 @@ 
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
 {
 
+    /**
+     * @param string $var
+     */
     public function __get($var)
     {
         return $this->get($var);
@@ -51,6 +54,10 @@ 
         return $this->has($var);
     }
 
+    /**
+     * @param string $var
+     * @param string|null $value
+     */
     public function __set($var, $value)
     {
         $this->set($var, $value);

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

Doc Comments +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
     /**
      * Returns the foreignkey the column is part of, if any. null otherwise.
      *
-     * @param Column $column
-     * @return ForeignKeyConstraint|null
+     * @return boolean
      */
     public function getForeignKey() {
         return false;

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

Braces +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
                 $defaultSort = $data['column_name'];
                 if (count($matches == 3)){
                     $defaultSortDirection = $matches[2];
-                }else{
+                } else{
                     $defaultSortDirection = 'ASC';
                 }
             }

Doc Comments +10 added lines, -5 removed lines

@@ -47,7 +47,6 @@ 
     /**
      * Constructor.
      *
-     * @param Connection $dbConnection The connection to the database.
      */
     public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer) {
         $this->schemaAnalyzer = $schemaAnalyzer;
@@ -100,6 +99,9 @@ 
      * Generates in one method call the daos and the beans for one table.
      * 
      * @param $tableName
+     * @param string $daonamespace
+     * @param string $beannamespace
+     * @param boolean $storeInUtc
      */
     public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
 		$tableName = $table->getName();
@@ -135,7 +137,7 @@ 
     /**
      * Returns the name of the base bean class from the table name.
      * 
-     * @param $tableName
+     * @param string $tableName
      * @return string
      */
     public static function getBaseBeanNameFromTableName($tableName) {
@@ -145,7 +147,7 @@ 
     /**
      * Returns the name of the base DAO class from the table name.
      *
-     * @param $tableName
+     * @param string $tableName
      * @return string
      */
     public static function getBaseDaoNameFromTableName($tableName) {
@@ -215,9 +217,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 $table The name of the table
+     * @param string $baseClassName
+     * @param string $beanClassName
      */
     public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
         $tableName = $table->getName();
@@ -461,6 +464,8 @@ 
      * Generates the factory bean.
      * 
      * @param Table[] $tableList
+     * @param string $daoFactoryClassName
+     * @param string $daoNamespace
      */
     private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper) {
         // For each table, let's write a property.

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

Doc Comments +8 added lines

@@ -70,6 +70,13 @@ 
 
 	private $mode;
 	
+	/**
+	 * @param string $magicSql
+	 * @param string $magicSqlCount
+	 * @param WeakrefObjectStorage $objectStorage
+	 * @param string|null $className
+	 * @param integer $mode
+	 */
 	public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
 	{
 		$this->magicSql = $magicSql;
@@ -166,6 +173,7 @@ 
 
 	/**
 	 * @param int $offset
+	 * @param integer $limit
 	 * @return PageIterator
 	 */
 	public function take($offset, $limit)

src/Mouf/Database/TDBM/TDBMService.php

Doc Comments +3 added lines, -3 removed lines

@@ -985,7 +985,7 @@ 
 	 * This is used internally by TDBM to add an object to the list of objects that have been
 	 * created/updated but not saved yet.
 	 *
-	 * @param AbstractTDBMObject $myObject
+	 * @param DbRow $myObject
 	 */
 	public function _addToToSaveObjectList(DbRow $myObject) {
 		$this->toSaveObjects[] = $myObject;
@@ -1621,7 +1621,7 @@ 
 	}
 
 	/**
-	 * @param $table
+	 * @param string $table
 	 * @param array $primaryKeys
 	 * @param array $additionalTablesFetch
 	 * @param bool $lazy Whether to perform lazy loading on this object or not.
@@ -1778,7 +1778,7 @@ 
 	/**
 	 * @param $pivotTableName
 	 * @param AbstractTDBMObject $bean
-	 * @return AbstractTDBMObject[]
+	 * @return ResultIterator
 	 */
 	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) {
 

Braces +3 added lines, -2 removed lines

@@ -693,8 +693,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();