@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Mouf\Database\TDBM\Filters; |
| 3 | 3 | |
| 4 | -use Mouf\Database\DBConnection\ConnectionInterface; |
|
| 5 | - |
|
| 6 | 4 | /* |
| 7 | 5 | Copyright (C) 2006-2011 David Négrier - THE CODING MACHINE |
| 8 | 6 | |
@@ -4,9 +4,7 @@ |
||
| 4 | 4 | * |
| 5 | 5 | */ |
| 6 | 6 | use Mouf\MoufManager; |
| 7 | - |
|
| 8 | 7 | use Mouf\Database\TDBM\Utils\TDBMDaoGenerator; |
| 9 | - |
|
| 10 | 8 | use Mouf\MoufUtils; |
| 11 | 9 | |
| 12 | 10 | ini_set("display_errors", 1); |
@@ -170,6 +170,9 @@ |
||
| 170 | 170 | |
| 171 | 171 | protected $errorMsg; |
| 172 | 172 | |
| 173 | + /** |
|
| 174 | + * @param string $msg |
|
| 175 | + */ |
|
| 173 | 176 | private function displayErrorMsg($msg) { |
| 174 | 177 | $this->errorMsg = $msg; |
| 175 | 178 | $this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this); |
@@ -136,8 +136,7 @@ discard block |
||
| 136 | 136 | * This action generates the TDBM instance, then the DAOs and Beans. |
| 137 | 137 | * |
| 138 | 138 | * @Action |
| 139 | - * @param string $name |
|
| 140 | - * @param bool $selfedit |
|
| 139 | + * @param string|boolean $selfedit |
|
| 141 | 140 | */ |
| 142 | 141 | public function generate($sourcedirectory, $daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit="false") { |
| 143 | 142 | $this->selfedit = $selfedit; |
@@ -163,6 +162,9 @@ discard block |
||
| 163 | 162 | |
| 164 | 163 | protected $errorMsg; |
| 165 | 164 | |
| 165 | + /** |
|
| 166 | + * @param string $msg |
|
| 167 | + */ |
|
| 166 | 168 | private function displayErrorMsg($msg) { |
| 167 | 169 | $this->errorMsg = $msg; |
| 168 | 170 | $this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this); |
@@ -2,11 +2,8 @@ |
||
| 2 | 2 | namespace Mouf\Database\TDBM\Controllers; |
| 3 | 3 | |
| 4 | 4 | use Mouf\MoufUtils; |
| 5 | - |
|
| 6 | 5 | use Mouf\Actions\InstallUtils; |
| 7 | - |
|
| 8 | 6 | use Mouf\MoufManager; |
| 9 | - |
|
| 10 | 7 | use Mouf\Html\HtmlElement\HtmlBlock; |
| 11 | 8 | use Mouf\Mvc\Splash\Controllers\Controller; |
| 12 | 9 | |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | * Default constructor to build the filter. |
| 49 | 49 | * All parameters are optional and can later be set using the setters. |
| 50 | 50 | * |
| 51 | - * @param array<FilterInterface> $filter |
|
| 51 | + * @param array<FilterInterface> $filters |
|
| 52 | 52 | */ |
| 53 | 53 | public function __construct($filters=null) { |
| 54 | 54 | $this->filters = $filters; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace Mouf\Database\TDBM\Filters; |
| 3 | 3 | |
| 4 | 4 | use Mouf\Database\TDBM\TDBMException; |
| 5 | - |
|
| 6 | 5 | use Mouf\Database\DBConnection\ConnectionInterface; |
| 7 | 6 | |
| 8 | 7 | |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | * |
| 99 | 99 | * @param string $tableName |
| 100 | 100 | * @param string $columnName |
| 101 | - * @param string $value |
|
| 101 | + * @param string $value1 |
|
| 102 | 102 | */ |
| 103 | 103 | public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) { |
| 104 | 104 | $this->tableName = $tableName; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace Mouf\Database\TDBM\Filters; |
| 3 | 3 | |
| 4 | 4 | use Mouf\Database\TDBM\TDBMException; |
| 5 | - |
|
| 6 | 5 | use Mouf\Database\DBConnection\ConnectionInterface; |
| 7 | 6 | |
| 8 | 7 | /* |
@@ -84,7 +84,6 @@ |
||
| 84 | 84 | * |
| 85 | 85 | * @param string $tableName |
| 86 | 86 | * @param string $columnName |
| 87 | - * @param string $value |
|
| 88 | 87 | */ |
| 89 | 88 | public function __construct($tableName=null, $columnName=null, $order=null) { |
| 90 | 89 | $this->tableName = $tableName; |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Mouf\Database\TDBM\Filters; |
| 3 | 3 | |
| 4 | -use Mouf\Database\DBConnection\ConnectionInterface; |
|
| 5 | - |
|
| 6 | 4 | /* |
| 7 | 5 | Copyright (C) 2006-2011 David Négrier - THE CODING MACHINE |
| 8 | 6 | |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | * Default constructor to build the filter. |
| 58 | 58 | * All parameters are optional and can later be set using the setters. |
| 59 | 59 | * |
| 60 | - * @param array<FilterInterface> $filter |
|
| 60 | + * @param array<FilterInterface> $filters |
|
| 61 | 61 | */ |
| 62 | 62 | public function __construct($filters=null) { |
| 63 | 63 | $this->filters = $filters; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * false if an explicit call to save() is required. |
| 146 | 146 | * |
| 147 | 147 | * @param unknown_type $autoSave |
| 148 | - * @return boolean |
|
| 148 | + * @return boolean|null |
|
| 149 | 149 | */ |
| 150 | 150 | public function setAutoSaveMode($autoSave) { |
| 151 | 151 | $this->db_autosave = $autoSave; |
@@ -255,6 +255,9 @@ discard block |
||
| 255 | 255 | } |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | + /** |
|
| 259 | + * @param string $var |
|
| 260 | + */ |
|
| 258 | 261 | public function __get($var) { |
| 259 | 262 | $this->_dbLoadIfNotLoaded(); |
| 260 | 263 | |
@@ -307,6 +310,10 @@ discard block |
||
| 307 | 310 | return isset($this->db_row[$var]); |
| 308 | 311 | } |
| 309 | 312 | |
| 313 | + /** |
|
| 314 | + * @param string $var |
|
| 315 | + * @param string|null $value |
|
| 316 | + */ |
|
| 310 | 317 | public function __set($var, $value) { |
| 311 | 318 | $this->_dbLoadIfNotLoaded(); |
| 312 | 319 | |
@@ -525,7 +532,7 @@ discard block |
||
| 525 | 532 | * |
| 526 | 533 | * @param unknown_type $func_name |
| 527 | 534 | * @param unknown_type $values |
| 528 | - * @return unknown |
|
| 535 | + * @return TDBMObjectArray |
|
| 529 | 536 | */ |
| 530 | 537 | public function __call($func_name, $values) { |
| 531 | 538 | |