Completed
Pull Request — 3.4 (#46)
by David
13:58
created
src/Mouf/Database/TDBM/AbstractTDBMObject.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -515,7 +515,7 @@
 block discarded – undo
515 515
 	/**
516 516
 	 * Returns the tables used in the filter in an array.
517 517
 	 *
518
-	 * @return array<string>
518
+	 * @return integer[]
519 519
 	 */
520 520
 	public function getUsedTables() {
521 521
 		return array_keys($this->dbRows);
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -138,9 +138,7 @@  discard block
 block discarded – undo
138 138
 	 * @Action
139 139
 	 * @param string $daonamespace
140 140
 	 * @param string $beannamespace
141
-	 * @param int $keepSupport
142 141
 	 * @param int $storeInUtc
143
-	 * @param int $castDatesToDateTime
144 142
 	 * @param string $selfedit
145 143
 	 * @throws \Mouf\MoufException
146 144
 	 */
@@ -168,6 +166,9 @@  discard block
 block discarded – undo
168 166
 	
169 167
 	protected $errorMsg;
170 168
 	
169
+	/**
170
+	 * @param string $msg
171
+	 */
171 172
 	private function displayErrorMsg($msg) {
172 173
 		$this->errorMsg = $msg;
173 174
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/DbRow.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -328,7 +328,7 @@
 block discarded – undo
328 328
 	/**
329 329
 	 * Returns the tables used in the filter in an array.
330 330
 	 *
331
-	 * @return array<string>
331
+	 * @return string[]
332 332
 	 */
333 333
 	public function getUsedTables() {
334 334
 		return array($this->dbTableName);
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/MapIterator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
     protected $callable;
19 19
 
20 20
     /**
21
-     * @param $iterator Iterator|array
21
+     * @param InnerResultIterator $iterator Iterator|array
22 22
      * @param $callable callable This can have two parameters
23 23
      * @throws Exception
24 24
      */
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/PageIterator.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,6 +63,9 @@  discard block
 block discarded – undo
63 63
 
64 64
 	private $innerResultIterator;
65 65
 
66
+	/**
67
+	 * @param integer $offset
68
+	 */
66 69
 	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
67 70
 	{
68 71
 		$this->parentResult = $parentResult;
@@ -108,7 +111,7 @@  discard block
 block discarded – undo
108 111
 	}
109 112
 
110 113
 	/**
111
-	 * @return int
114
+	 * @return double
112 115
 	 */
113 116
 	public function getCurrentPage()
114 117
 	{
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/ResultIterator.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -70,6 +70,12 @@  discard block
 block discarded – undo
70 70
 
71 71
 	private $mode;
72 72
 	
73
+	/**
74
+	 * @param string $magicSql
75
+	 * @param string $magicSqlCount
76
+	 * @param WeakrefObjectStorage $objectStorage
77
+	 * @param string|null $className
78
+	 */
73 79
 	public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
74 80
 	{
75 81
 		$this->magicSql = $magicSql;
@@ -166,6 +172,7 @@  discard block
 block discarded – undo
166 172
 
167 173
 	/**
168 174
 	 * @param int $offset
175
+	 * @param integer $limit
169 176
 	 * @return PageIterator
170 177
 	 */
171 178
 	public function take($offset, $limit)
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/TDBMObject.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@  discard block
 block discarded – undo
35 35
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
36 36
 {
37 37
 
38
+    /**
39
+     * @param string $var
40
+     */
38 41
     public function __get($var)
39 42
     {
40 43
         return $this->get($var);
@@ -51,6 +54,10 @@  discard block
 block discarded – undo
51 54
         return $this->has($var);
52 55
     }
53 56
 
57
+    /**
58
+     * @param string $var
59
+     * @param string|null $value
60
+     */
54 61
     public function __set($var, $value)
55 62
     {
56 63
         $this->set($var, $value);
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/TDBMService.php 1 patch
Doc Comments   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -976,7 +976,7 @@  discard block
 block discarded – undo
976 976
 	 * This is used internally by TDBM to add an object to the list of objects that have been
977 977
 	 * created/updated but not saved yet.
978 978
 	 *
979
-	 * @param AbstractTDBMObject $myObject
979
+	 * @param DbRow $myObject
980 980
 	 */
981 981
 	public function _addToToSaveObjectList(DbRow $myObject) {
982 982
 		$this->toSaveObjects[] = $myObject;
@@ -1531,10 +1531,9 @@  discard block
 block discarded – undo
1531 1531
 	 * @param string|array|null $filter The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
1532 1532
 	 * @param array $parameters
1533 1533
 	 * @param string|null $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
1534
-	 * @param integer $from The offset
1535
-	 * @param integer $limit The maximum number of rows returned
1536 1534
 	 * @param array $additionalTablesFetch
1537 1535
 	 * @param string $className Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
1536
+	 * @param integer $mode
1538 1537
 	 * @return ResultIterator An object representing an array of results.
1539 1538
 	 * @throws TDBMException
1540 1539
 	 */
@@ -1613,7 +1612,7 @@  discard block
 block discarded – undo
1613 1612
 	}
1614 1613
 
1615 1614
 	/**
1616
-	 * @param $table
1615
+	 * @param string $table
1617 1616
 	 * @param array $primaryKeys
1618 1617
 	 * @param array $additionalTablesFetch
1619 1618
 	 * @param bool $lazy Whether to perform lazy loading on this object or not.
@@ -1770,7 +1769,7 @@  discard block
 block discarded – undo
1770 1769
 	/**
1771 1770
 	 * @param $pivotTableName
1772 1771
 	 * @param AbstractTDBMObject $bean
1773
-	 * @return AbstractTDBMObject[]
1772
+	 * @return ResultIterator
1774 1773
 	 */
1775 1774
 	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) {
1776 1775
 
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Utils/ScalarBeanPropertyDescriptor.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@
 block discarded – undo
27 27
     /**
28 28
      * Returns the foreignkey the column is part of, if any. null otherwise.
29 29
      *
30
-     * @param Column $column
31
-     * @return ForeignKeyConstraint|null
30
+     * @return boolean
32 31
      */
33 32
     public function getForeignKey() {
34 33
         return false;
Please login to merge, or discard this patch.