@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | * - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full |
332 | 332 | * control over the index. |
333 | 333 | * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type |
334 | - * @param array $options Create table options (ENGINE, etc.) |
|
334 | + * @param string|null $options Create table options (ENGINE, etc.) |
|
335 | 335 | * @param array|bool $extensions List of extensions |
336 | 336 | */ |
337 | 337 | public function requireTable( |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | * |
596 | 596 | * @param string $table The table name. |
597 | 597 | * @param string $field The field name. |
598 | - * @param array|string $spec The field specification. If passed in array syntax, the specific database |
|
598 | + * @param string $spec The field specification. If passed in array syntax, the specific database |
|
599 | 599 | * driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to |
600 | 600 | * be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll |
601 | 601 | * need to take care of database abstraction in your DBField subclass. |
@@ -488,7 +488,7 @@ |
||
488 | 488 | * Cache all indexes for the given class. |
489 | 489 | * Will do nothing if already cached |
490 | 490 | * |
491 | - * @param $class |
|
491 | + * @param string $class |
|
492 | 492 | */ |
493 | 493 | protected function cacheDatabaseIndexes($class) |
494 | 494 | { |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Assets\File; |
6 | 6 | use SilverStripe\CMS\Model\SiteTree; |
7 | -use SilverStripe\Core\Config\Config; |
|
8 | 7 | use SilverStripe\CMS\Controllers\ContentController; |
9 | -use SilverStripe\ORM\Connect\MySQLSchemaManager; |
|
10 | 8 | use SilverStripe\ORM\DataExtension; |
11 | 9 | use Exception; |
12 | 10 |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * @param string|array $permissionCode Optional |
60 | 60 | * @param boolean $tryUsingSessionLogin If true, then the method with authenticate against the |
61 | 61 | * session log-in if those credentials are disabled. |
62 | - * @return bool|Member |
|
62 | + * @return null|Member |
|
63 | 63 | * @throws HTTPResponse_Exception |
64 | 64 | */ |
65 | 65 | public static function requireLogin( |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use SilverStripe\Control\HTTPResponse; |
9 | 9 | use SilverStripe\Control\HTTPResponse_Exception; |
10 | 10 | use SilverStripe\Core\Config\Configurable; |
11 | -use SilverStripe\Dev\Debug; |
|
12 | 11 | use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; |
13 | 12 | |
14 | 13 | /** |
@@ -169,7 +169,7 @@ |
||
169 | 169 | /** |
170 | 170 | * Return a link to this request handler. |
171 | 171 | * The link returned is supplied in the constructor |
172 | - * @param null $action |
|
172 | + * @param string $action |
|
173 | 173 | * @return string |
174 | 174 | */ |
175 | 175 | public function link($action = null) |
@@ -596,6 +596,7 @@ discard block |
||
596 | 596 | * Set actions that are exempt from validation |
597 | 597 | * |
598 | 598 | * @param array |
599 | + * @param string[] $actions |
|
599 | 600 | * @return $this |
600 | 601 | */ |
601 | 602 | public function setValidationExemptActions($actions) |
@@ -1045,7 +1046,7 @@ discard block |
||
1045 | 1046 | * If set to false then the form method is only used to construct the default |
1046 | 1047 | * form. |
1047 | 1048 | * |
1048 | - * @param $bool boolean |
|
1049 | + * @param boolean $bool boolean |
|
1049 | 1050 | * @return $this |
1050 | 1051 | */ |
1051 | 1052 | public function setStrictFormMethodCheck($bool) |
@@ -749,7 +749,7 @@ discard block |
||
749 | 749 | * }); |
750 | 750 | * </code> |
751 | 751 | * |
752 | - * @param Member|null|int $member Member or member ID to log in as. |
|
752 | + * @param null|Member $member Member or member ID to log in as. |
|
753 | 753 | * Set to null or 0 to act as a logged out user. |
754 | 754 | * @param callable $callback |
755 | 755 | */ |
@@ -1521,7 +1521,7 @@ discard block |
||
1521 | 1521 | * This is likely to be customized for social sites etc. with a looser permission model. |
1522 | 1522 | * |
1523 | 1523 | * @param Member $member |
1524 | - * @return bool |
|
1524 | + * @return boolean|string |
|
1525 | 1525 | */ |
1526 | 1526 | public function canView($member = null) |
1527 | 1527 | { |
@@ -1553,7 +1553,7 @@ discard block |
||
1553 | 1553 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
1554 | 1554 | * |
1555 | 1555 | * @param Member $member |
1556 | - * @return bool |
|
1556 | + * @return boolean|string |
|
1557 | 1557 | */ |
1558 | 1558 | public function canEdit($member = null) |
1559 | 1559 | { |
@@ -1590,7 +1590,7 @@ discard block |
||
1590 | 1590 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
1591 | 1591 | * |
1592 | 1592 | * @param Member $member |
1593 | - * @return bool |
|
1593 | + * @return boolean|string |
|
1594 | 1594 | */ |
1595 | 1595 | public function canDelete($member = null) |
1596 | 1596 | { |
@@ -201,12 +201,12 @@ discard block |
||
201 | 201 | |
202 | 202 | /** |
203 | 203 | * Email constructor. |
204 | - * @param string|array|null $from |
|
205 | - * @param string|array|null $to |
|
204 | + * @param string $from |
|
205 | + * @param string $to |
|
206 | 206 | * @param string|null $subject |
207 | 207 | * @param string|null $body |
208 | - * @param string|array|null $cc |
|
209 | - * @param string|array|null $bcc |
|
208 | + * @param string $cc |
|
209 | + * @param string $bcc |
|
210 | 210 | * @param string|null $returnPath |
211 | 211 | */ |
212 | 212 | public function __construct( |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | } |
293 | 293 | |
294 | 294 | /** |
295 | - * @param string|array $address |
|
295 | + * @param string $address |
|
296 | 296 | * @param string|null $name |
297 | 297 | * @return $this |
298 | 298 | */ |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | } |
370 | 370 | |
371 | 371 | /** |
372 | - * @param string|array $address |
|
372 | + * @param string $address |
|
373 | 373 | * @param string|null $name |
374 | 374 | * @return $this |
375 | 375 | */ |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | } |
402 | 402 | |
403 | 403 | /** |
404 | - * @param string|array $address |
|
404 | + * @param string $address |
|
405 | 405 | * @param string|null $name |
406 | 406 | * @return $this |
407 | 407 | */ |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | } |
434 | 434 | |
435 | 435 | /** |
436 | - * @param string|array $address |
|
436 | + * @param string $address |
|
437 | 437 | * @param string|null $name |
438 | 438 | * @return $this |
439 | 439 | */ |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | } |
451 | 451 | |
452 | 452 | /** |
453 | - * @param string|array $address |
|
453 | + * @param string $address |
|
454 | 454 | * @param string|null $name |
455 | 455 | * @return $this |
456 | 456 | */ |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | } |
463 | 463 | |
464 | 464 | /** |
465 | - * @param string|array $address |
|
465 | + * @param string $address |
|
466 | 466 | * @param string|null $name |
467 | 467 | * @return $this |
468 | 468 | */ |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | } |
569 | 569 | |
570 | 570 | /** |
571 | - * @param string|array $name The data name to add or array to names => value |
|
571 | + * @param string $name The data name to add or array to names => value |
|
572 | 572 | * @param string|null $value The value of the data to add |
573 | 573 | * @return $this |
574 | 574 | */ |
@@ -739,7 +739,7 @@ discard block |
||
739 | 739 | } |
740 | 740 | |
741 | 741 | /** |
742 | - * @return array|bool |
|
742 | + * @return boolean |
|
743 | 743 | */ |
744 | 744 | public function sendPlain() |
745 | 745 | { |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | } |
796 | 796 | |
797 | 797 | /** |
798 | - * @return Swift_MimePart|false |
|
798 | + * @return \Swift_Mime_MimeEntity |
|
799 | 799 | */ |
800 | 800 | public function findPlainPart() |
801 | 801 | { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * Only increases up to the maximum defined in {@link setMemoryLimitMax()}, |
52 | 52 | * and defaults to the 'memory_limit' setting in the PHP configuration. |
53 | 53 | * |
54 | - * @param string|float|int $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
54 | + * @param integer $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
55 | 55 | * @return bool true indicates a successful change, false a denied change. |
56 | 56 | */ |
57 | 57 | public static function increaseMemoryLimitTo($memoryLimit = -1) |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | - * @return int Memory limit in bytes |
|
99 | + * @return double Memory limit in bytes |
|
100 | 100 | */ |
101 | 101 | public static function getMemoryLimitMax() |
102 | 102 | { |