@@ -399,7 +399,7 @@ |
||
399 | 399 | * string of HTML. |
400 | 400 | * |
401 | 401 | * @param string $html HTML to scan for elements |
402 | - * @return SimpleXMLElement |
|
402 | + * @return \SimpleXMLElement |
|
403 | 403 | */ |
404 | 404 | public function findOptionElements($html) |
405 | 405 | { |
@@ -20,6 +20,9 @@ |
||
20 | 20 | |
21 | 21 | protected $id; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $link |
|
25 | + */ |
|
23 | 26 | public function __construct($gridField, $id, $link) |
24 | 27 | { |
25 | 28 | $this->gridField = $gridField; |
@@ -9,6 +9,10 @@ |
||
9 | 9 | class MemberForm extends Form |
10 | 10 | { |
11 | 11 | |
12 | + /** |
|
13 | + * @param \SilverStripe\Control\Controller $controller |
|
14 | + * @param string $name |
|
15 | + */ |
|
12 | 16 | public function __construct($controller, $name) |
13 | 17 | { |
14 | 18 | $fields = TestMember::singleton()->getCMSFields(); |
@@ -676,6 +676,8 @@ discard block |
||
676 | 676 | /** |
677 | 677 | * Execute a log-in form using Director::test(). |
678 | 678 | * Helper method for the tests above |
679 | + * @param string $email |
|
680 | + * @param string $password |
|
679 | 681 | */ |
680 | 682 | public function doTestLoginForm($email, $password, $backURL = 'test/link') |
681 | 683 | { |
@@ -697,6 +699,8 @@ discard block |
||
697 | 699 | |
698 | 700 | /** |
699 | 701 | * Helper method to execute a change password form |
702 | + * @param string $oldPassword |
|
703 | + * @param string $newPassword |
|
700 | 704 | */ |
701 | 705 | public function doTestChangepasswordForm($oldPassword, $newPassword) |
702 | 706 | { |
@@ -2,7 +2,6 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\Security\Tests; |
4 | 4 | |
5 | -use SilverStripe\Dev\Debug; |
|
6 | 5 | use SilverStripe\ORM\DataObject; |
7 | 6 | use SilverStripe\ORM\FieldType\DBDatetime; |
8 | 7 | use SilverStripe\ORM\FieldType\DBClassName; |
@@ -15,7 +14,6 @@ discard block |
||
15 | 14 | use SilverStripe\Core\Config\Config; |
16 | 15 | use SilverStripe\Core\Convert; |
17 | 16 | use SilverStripe\Dev\FunctionalTest; |
18 | -use SilverStripe\Dev\TestOnly; |
|
19 | 17 | use SilverStripe\Control\HTTPResponse; |
20 | 18 | use SilverStripe\Control\Session; |
21 | 19 | use SilverStripe\Control\Director; |
@@ -16,6 +16,9 @@ |
||
16 | 16 | Versioned::class |
17 | 17 | ); |
18 | 18 | |
19 | + /** |
|
20 | + * @param string $entropy |
|
21 | + */ |
|
19 | 22 | public function setEntropy($entropy) |
20 | 23 | { |
21 | 24 | $this->entropy = $entropy; |
@@ -889,9 +889,9 @@ discard block |
||
889 | 889 | * }); |
890 | 890 | * </code> |
891 | 891 | * |
892 | - * @param Member|null|int $member Member or member ID to log in as. |
|
892 | + * @param null|Member $member Member or member ID to log in as. |
|
893 | 893 | * Set to null or 0 to act as a logged out user. |
894 | - * @param $callback |
|
894 | + * @param \Closure $callback |
|
895 | 895 | */ |
896 | 896 | public static function actAs($member, $callback) |
897 | 897 | { |
@@ -1661,7 +1661,7 @@ discard block |
||
1661 | 1661 | * This is likely to be customized for social sites etc. with a looser permission model. |
1662 | 1662 | * |
1663 | 1663 | * @param Member $member |
1664 | - * @return bool |
|
1664 | + * @return boolean|string |
|
1665 | 1665 | */ |
1666 | 1666 | public function canView($member = null) |
1667 | 1667 | { |
@@ -1692,7 +1692,7 @@ discard block |
||
1692 | 1692 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
1693 | 1693 | * |
1694 | 1694 | * @param Member $member |
1695 | - * @return bool |
|
1695 | + * @return boolean|string |
|
1696 | 1696 | */ |
1697 | 1697 | public function canEdit($member = null) |
1698 | 1698 | { |
@@ -1727,7 +1727,7 @@ discard block |
||
1727 | 1727 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
1728 | 1728 | * |
1729 | 1729 | * @param Member $member |
1730 | - * @return bool |
|
1730 | + * @return boolean|string |
|
1731 | 1731 | */ |
1732 | 1732 | public function canDelete($member = null) |
1733 | 1733 | { |
@@ -6,16 +6,12 @@ discard block |
||
6 | 6 | use SilverStripe\Admin\LeftAndMain; |
7 | 7 | use SilverStripe\CMS\Controllers\CMSMain; |
8 | 8 | use SilverStripe\Control\Controller; |
9 | -use SilverStripe\Control\Cookie; |
|
10 | 9 | use SilverStripe\Control\Director; |
11 | 10 | use SilverStripe\Control\Email\Email; |
12 | 11 | use SilverStripe\Control\Email\Mailer; |
13 | -use SilverStripe\Control\Session; |
|
14 | 12 | use SilverStripe\Core\Convert; |
15 | 13 | use SilverStripe\Core\Injector\Injector; |
16 | -use SilverStripe\Dev\Debug; |
|
17 | 14 | use SilverStripe\Dev\Deprecation; |
18 | -use SilverStripe\Dev\SapphireTest; |
|
19 | 15 | use SilverStripe\Dev\TestMailer; |
20 | 16 | use SilverStripe\Forms\ConfirmedPasswordField; |
21 | 17 | use SilverStripe\Forms\DropdownField; |
@@ -34,9 +30,6 @@ discard block |
||
34 | 30 | use SilverStripe\ORM\Map; |
35 | 31 | use SilverStripe\ORM\ValidationException; |
36 | 32 | use SilverStripe\ORM\ValidationResult; |
37 | -use SilverStripe\View\SSViewer; |
|
38 | -use SilverStripe\View\TemplateGlobalProvider; |
|
39 | -use DateTime; |
|
40 | 33 | |
41 | 34 | /** |
42 | 35 | * The member class which represents the users of the system |
@@ -89,6 +89,9 @@ discard block |
||
89 | 89 | $this->sequentialSaveableSet = null; |
90 | 90 | } |
91 | 91 | |
92 | + /** |
|
93 | + * @param FormField[] $list |
|
94 | + */ |
|
92 | 95 | protected function collateDataFields(&$list, $saveableOnly = false) |
93 | 96 | { |
94 | 97 | if (!isset($list)) { |
@@ -198,7 +201,7 @@ discard block |
||
198 | 201 | * Removes a number of fields from a Tab/TabSet within this FieldList. |
199 | 202 | * |
200 | 203 | * @param string $tabName The name of the Tab or TabSet field |
201 | - * @param array $fields A list of fields, e.g. array('Name', 'Email') |
|
204 | + * @param string[] $fields A list of fields, e.g. array('Name', 'Email') |
|
202 | 205 | */ |
203 | 206 | public function removeFieldsFromTab($tabName, $fields) |
204 | 207 | { |
@@ -625,7 +628,7 @@ discard block |
||
625 | 628 | } |
626 | 629 | |
627 | 630 | /** |
628 | - * @param $field |
|
631 | + * @param CompositeField $field |
|
629 | 632 | * @return $this |
630 | 633 | */ |
631 | 634 | public function setContainerField($field) |
@@ -707,6 +710,7 @@ discard block |
||
707 | 710 | * the children collection. Doesn't work recursively. |
708 | 711 | * |
709 | 712 | * @param string|FormField |
713 | + * @param string $field |
|
710 | 714 | * @return int Position in children collection (first position starts with 0). |
711 | 715 | * Returns FALSE if the field can't be found. |
712 | 716 | */ |
@@ -77,7 +77,7 @@ |
||
77 | 77 | * |
78 | 78 | * @param GridField |
79 | 79 | * |
80 | - * @return array |
|
80 | + * @return string[] |
|
81 | 81 | */ |
82 | 82 | public function getActions($gridField) |
83 | 83 | { |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param array $properties |
15 | - * @return string |
|
15 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
16 | 16 | */ |
17 | 17 | public function FieldHolder($properties = array()) |
18 | 18 | { |