@@ -515,7 +515,7 @@ |
||
| 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); |
@@ -138,9 +138,7 @@ discard block |
||
| 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 |
||
| 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); |
@@ -2,12 +2,8 @@ |
||
| 2 | 2 | namespace Mouf\Database\TDBM\Controllers; |
| 3 | 3 | |
| 4 | 4 | use Mouf\Composer\ClassNameMapper; |
| 5 | -use Mouf\MoufUtils; |
|
| 6 | - |
|
| 7 | 5 | use Mouf\Actions\InstallUtils; |
| 8 | - |
|
| 9 | 6 | use Mouf\MoufManager; |
| 10 | - |
|
| 11 | 7 | use Mouf\Html\HtmlElement\HtmlBlock; |
| 12 | 8 | use Mouf\Mvc\Splash\Controllers\Controller; |
| 13 | 9 | |
@@ -328,7 +328,7 @@ |
||
| 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); |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Mouf\Database\TDBM\Filters; |
| 3 | 3 | |
| 4 | -use Doctrine\DBAL\Driver\Connection; |
|
| 5 | - |
|
| 6 | 4 | /* |
| 7 | 5 | Copyright (C) 2006-2011 David Négrier - THE CODING MACHINE |
| 8 | 6 | |
@@ -18,7 +18,7 @@ |
||
| 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 | */ |
@@ -63,6 +63,9 @@ discard block |
||
| 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 |
||
| 108 | 111 | } |
| 109 | 112 | |
| 110 | 113 | /** |
| 111 | - * @return int |
|
| 114 | + * @return double |
|
| 112 | 115 | */ |
| 113 | 116 | public function getCurrentPage() |
| 114 | 117 | { |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | along with this program; if not, write to the Free Software |
| 19 | 19 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | -use Doctrine\DBAL\Driver\Connection; |
|
| 22 | 21 | |
| 23 | 22 | |
| 24 | 23 | /** |
@@ -35,6 +35,9 @@ discard block |
||
| 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 |
||
| 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); |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | along with this program; if not, write to the Free Software |
| 19 | 19 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | -use Doctrine\DBAL\Driver\Connection; |
|
| 22 | 21 | |
| 23 | 22 | |
| 24 | 23 | /** |
@@ -22,16 +22,12 @@ |
||
| 22 | 22 | use Doctrine\Common\Cache\Cache; |
| 23 | 23 | use Doctrine\Common\Cache\VoidCache; |
| 24 | 24 | use Doctrine\DBAL\Connection; |
| 25 | -use Doctrine\DBAL\DBALException; |
|
| 26 | -use Doctrine\DBAL\Schema\Column; |
|
| 27 | 25 | use Doctrine\DBAL\Schema\ForeignKeyConstraint; |
| 28 | -use Doctrine\DBAL\Schema\Schema; |
|
| 29 | 26 | use Mouf\Database\MagicQuery; |
| 30 | 27 | use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer; |
| 31 | 28 | use Mouf\Database\TDBM\Filters\OrderBySQLString; |
| 32 | 29 | use Mouf\Database\TDBM\Utils\TDBMDaoGenerator; |
| 33 | 30 | use Mouf\Utils\Cache\CacheInterface; |
| 34 | -use SQLParser\Node\ColRef; |
|
| 35 | 31 | |
| 36 | 32 | /** |
| 37 | 33 | * The TDBMService class is the main TDBM class. It provides methods to retrieve TDBMObject instances |
@@ -985,7 +985,7 @@ discard block |
||
| 985 | 985 | * This is used internally by TDBM to add an object to the list of objects that have been |
| 986 | 986 | * created/updated but not saved yet. |
| 987 | 987 | * |
| 988 | - * @param AbstractTDBMObject $myObject |
|
| 988 | + * @param DbRow $myObject |
|
| 989 | 989 | */ |
| 990 | 990 | public function _addToToSaveObjectList(DbRow $myObject) { |
| 991 | 991 | $this->toSaveObjects[] = $myObject; |
@@ -1621,7 +1621,7 @@ discard block |
||
| 1621 | 1621 | } |
| 1622 | 1622 | |
| 1623 | 1623 | /** |
| 1624 | - * @param $table |
|
| 1624 | + * @param string $table |
|
| 1625 | 1625 | * @param array $primaryKeys |
| 1626 | 1626 | * @param array $additionalTablesFetch |
| 1627 | 1627 | * @param bool $lazy Whether to perform lazy loading on this object or not. |
@@ -1778,7 +1778,7 @@ discard block |
||
| 1778 | 1778 | /** |
| 1779 | 1779 | * @param $pivotTableName |
| 1780 | 1780 | * @param AbstractTDBMObject $bean |
| 1781 | - * @return AbstractTDBMObject[] |
|
| 1781 | + * @return ResultIterator |
|
| 1782 | 1782 | */ |
| 1783 | 1783 | public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) { |
| 1784 | 1784 | |
@@ -27,8 +27,7 @@ |
||
| 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; |