@@ -398,7 +398,6 @@ discard block |
||
398 | 398 | * @see SQLConditionalExpression::addWhere() for syntax examples |
399 | 399 | * |
400 | 400 | * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries |
401 | - * @param mixed $where,... Unlimited additional predicates |
|
402 | 401 | * @return $this Self reference |
403 | 402 | */ |
404 | 403 | public function setWhere($where) |
@@ -485,7 +484,6 @@ discard block |
||
485 | 484 | * </code> |
486 | 485 | * |
487 | 486 | * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries |
488 | - * @param mixed $where,... Unlimited additional predicates |
|
489 | 487 | * @return $this Self reference |
490 | 488 | */ |
491 | 489 | public function addWhere($where) |
@@ -502,7 +500,6 @@ discard block |
||
502 | 500 | * @see SQLConditionalExpression::addWhere() |
503 | 501 | * |
504 | 502 | * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries |
505 | - * @param mixed $filters,... Unlimited additional predicates |
|
506 | 503 | * @return $this Self reference |
507 | 504 | */ |
508 | 505 | public function setWhereAny($filters) |
@@ -517,7 +514,6 @@ discard block |
||
517 | 514 | * @see SQLConditionalExpression::addWhere() |
518 | 515 | * |
519 | 516 | * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries |
520 | - * @param mixed $filters,... Unlimited additional predicates |
|
521 | 517 | * @return $this Self reference |
522 | 518 | */ |
523 | 519 | public function addWhereAny($filters) |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | /** |
67 | 67 | * Construct a new SQLSelect. |
68 | 68 | * |
69 | - * @param array|string $select An array of SELECT fields. |
|
69 | + * @param string $select An array of SELECT fields. |
|
70 | 70 | * @param array|string $from An array of FROM clauses. The first one should be just the table name. |
71 | 71 | * Each should be ANSI quoted. |
72 | 72 | * @param array $where An array of WHERE clauses. |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | * |
379 | 379 | * @param string $value |
380 | 380 | * @param string $defaultDirection |
381 | - * @return array A two element array: array($column, $direction) |
|
381 | + * @return string[] A two element array: array($column, $direction) |
|
382 | 382 | */ |
383 | 383 | private function getDirectionFromString($value, $defaultDirection = null) |
384 | 384 | { |
@@ -480,7 +480,6 @@ discard block |
||
480 | 480 | * @see SQLSelect::addWhere() for syntax examples |
481 | 481 | * |
482 | 482 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
483 | - * @param mixed $having,... Unlimited additional predicates |
|
484 | 483 | * @return $this Self reference |
485 | 484 | */ |
486 | 485 | public function setHaving($having) |
@@ -496,7 +495,6 @@ discard block |
||
496 | 495 | * @see SQLSelect::addWhere() for syntax examples |
497 | 496 | * |
498 | 497 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
499 | - * @param mixed $having,... Unlimited additional predicates |
|
500 | 498 | * @return $this Self reference |
501 | 499 | */ |
502 | 500 | public function addHaving($having) |
@@ -15,7 +15,7 @@ |
||
15 | 15 | /** |
16 | 16 | * Any number of foreign keys to apply to this list |
17 | 17 | * |
18 | - * @return string|array|null |
|
18 | + * @return string|null |
|
19 | 19 | */ |
20 | 20 | public function getForeignID() |
21 | 21 | { |
@@ -51,7 +51,7 @@ |
||
51 | 51 | /** |
52 | 52 | * Create a new UnsavedRelationList |
53 | 53 | * |
54 | - * @param array $baseClass |
|
54 | + * @param string $baseClass |
|
55 | 55 | * @param string $relationName |
56 | 56 | * @param string $dataClass The DataObject class used in the relation |
57 | 57 | */ |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * Find version of this object in the given stage |
159 | 159 | * |
160 | 160 | * @param string $stage |
161 | - * @return DataObject|Versioned |
|
161 | + * @return DataObject|null |
|
162 | 162 | * @throws UnexpectedDataException |
163 | 163 | */ |
164 | 164 | protected function getObjectInStage($stage) |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | |
173 | 173 | /** |
174 | 174 | * Find latest version of this object |
175 | - * @return DataObject|Versioned |
|
175 | + * @return DataObject|null |
|
176 | 176 | * @throws UnexpectedDataException |
177 | 177 | */ |
178 | 178 | protected function getObjectLatestVersion() |
@@ -1086,7 +1086,7 @@ discard block |
||
1086 | 1086 | /** |
1087 | 1087 | * Find objects in the given relationships, merging them into the given list |
1088 | 1088 | * |
1089 | - * @param array $source Config property to extract relationships from |
|
1089 | + * @param string $source Config property to extract relationships from |
|
1090 | 1090 | * @param bool $recursive True if recursive |
1091 | 1091 | * @param ArrayList $list Optional list to add items to |
1092 | 1092 | * @return ArrayList The list |
@@ -1198,7 +1198,7 @@ discard block |
||
1198 | 1198 | /** |
1199 | 1199 | * Check if the current user can delete this record from live |
1200 | 1200 | * |
1201 | - * @param null $member |
|
1201 | + * @param Member|null $member |
|
1202 | 1202 | * @return mixed |
1203 | 1203 | */ |
1204 | 1204 | public function canUnpublish($member = null) |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | * Extend permissions to include additional security for objects that are not published to live. |
1313 | 1313 | * |
1314 | 1314 | * @param Member $member |
1315 | - * @return bool|null |
|
1315 | + * @return false|null |
|
1316 | 1316 | */ |
1317 | 1317 | public function canView($member = null) |
1318 | 1318 | { |
@@ -1390,7 +1390,7 @@ discard block |
||
1390 | 1390 | * |
1391 | 1391 | * @param string $stage |
1392 | 1392 | * @param Member $member |
1393 | - * @return bool |
|
1393 | + * @return boolean|string |
|
1394 | 1394 | */ |
1395 | 1395 | public function canViewStage($stage = 'Live', $member = null) |
1396 | 1396 | { |
@@ -1459,7 +1459,7 @@ discard block |
||
1459 | 1459 | /** |
1460 | 1460 | * Determines if the current draft version is the same as live or rather, that there are no outstanding draft changes |
1461 | 1461 | * |
1462 | - * @return bool |
|
1462 | + * @return string |
|
1463 | 1463 | */ |
1464 | 1464 | public function latestPublished() |
1465 | 1465 | { |
@@ -2554,7 +2554,7 @@ discard block |
||
2554 | 2554 | /** |
2555 | 2555 | * Returns an array of possible stages. |
2556 | 2556 | * |
2557 | - * @return array |
|
2557 | + * @return string[] |
|
2558 | 2558 | */ |
2559 | 2559 | public function getVersionedStages() |
2560 | 2560 | { |
@@ -137,7 +137,7 @@ |
||
137 | 137 | * Remove a previously registered authenticator |
138 | 138 | * |
139 | 139 | * @param string $authenticator Name of the authenticator class to register |
140 | - * @return bool Returns TRUE on success, FALSE otherwise. |
|
140 | + * @return boolean|null Returns TRUE on success, FALSE otherwise. |
|
141 | 141 | */ |
142 | 142 | public static function unregister_authenticator($authenticator) |
143 | 143 | { |
@@ -409,6 +409,7 @@ |
||
409 | 409 | * Overloaded to ensure the code is always descent. |
410 | 410 | * |
411 | 411 | * @param string |
412 | + * @param string $val |
|
412 | 413 | */ |
413 | 414 | public function setCode($val) |
414 | 415 | { |
@@ -157,7 +157,7 @@ |
||
157 | 157 | * @param Form $form Optional: If passed, better error messages can be |
158 | 158 | * produced by using |
159 | 159 | * {@link Form::sessionMessage()} |
160 | - * @return bool|Member Returns FALSE if authentication fails, otherwise |
|
160 | + * @return Member|null Returns FALSE if authentication fails, otherwise |
|
161 | 161 | * the member object |
162 | 162 | * @see Security::setDefaultAdmin() |
163 | 163 | */ |