@@ -20,7 +20,6 @@ |
||
| 20 | 20 | use SilverStripe\Security\RememberLoginHash; |
| 21 | 21 | use SilverStripe\Security\Member_Validator; |
| 22 | 22 | use SilverStripe\Security\Tests\MemberTest\FieldsExtension; |
| 23 | -use SilverStripe\Control\HTTPRequest; |
|
| 24 | 23 | |
| 25 | 24 | class MemberTest extends FunctionalTest |
| 26 | 25 | { |
@@ -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) |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | protected static $currentUser; |
| 227 | 227 | |
| 228 | 228 | /** |
| 229 | - * @return array |
|
| 229 | + * @return Authenticator[] |
|
| 230 | 230 | */ |
| 231 | 231 | public static function getAuthenticators() |
| 232 | 232 | { |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | * Get all registered authenticators |
| 292 | 292 | * |
| 293 | 293 | * @param int $service The type of service that is requested |
| 294 | - * @return array Return an array of Authenticator objects |
|
| 294 | + * @return Authenticator[] Return an array of Authenticator objects |
|
| 295 | 295 | */ |
| 296 | 296 | public function getApplicableAuthenticators($service = Authenticator::LOGIN) |
| 297 | 297 | { |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | * Combine the given forms into a formset with a tabbed interface |
| 623 | 623 | * |
| 624 | 624 | * @param $forms |
| 625 | - * @return string |
|
| 625 | + * @return DBHTMLText |
|
| 626 | 626 | */ |
| 627 | 627 | protected function generateLoginFormSet($forms) |
| 628 | 628 | { |
@@ -1206,6 +1206,7 @@ discard block |
||
| 1206 | 1206 | |
| 1207 | 1207 | /** |
| 1208 | 1208 | * For the database_is_ready call to return a certain value - used for testing |
| 1209 | + * @param boolean $isReady |
|
| 1209 | 1210 | */ |
| 1210 | 1211 | public static function force_database_is_ready($isReady) |
| 1211 | 1212 | { |
@@ -1226,7 +1227,7 @@ discard block |
||
| 1226 | 1227 | /** |
| 1227 | 1228 | * Set to true to ignore access to disallowed actions, rather than returning permission failure |
| 1228 | 1229 | * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions() |
| 1229 | - * @param $flag True or false |
|
| 1230 | + * @param boolean $flag True or false |
|
| 1230 | 1231 | */ |
| 1231 | 1232 | public static function set_ignore_disallowed_actions($flag) |
| 1232 | 1233 | { |
@@ -26,7 +26,6 @@ |
||
| 26 | 26 | use SilverStripe\View\ArrayData; |
| 27 | 27 | use SilverStripe\View\SSViewer; |
| 28 | 28 | use SilverStripe\View\TemplateGlobalProvider; |
| 29 | -use Subsite; |
|
| 30 | 29 | |
| 31 | 30 | /** |
| 32 | 31 | * Implements a basic security model |
@@ -53,6 +53,7 @@ |
||
| 53 | 53 | * @param array $data Form submitted data |
| 54 | 54 | * @param ValidationResult $result |
| 55 | 55 | * @param Member|null This third parameter is used in the CMSAuthenticator(s) |
| 56 | + * @param Member $member |
|
| 56 | 57 | * @return Member Found member, regardless of successful login |
| 57 | 58 | */ |
| 58 | 59 | protected function authenticateMember($data, &$result = null, $member = null) |