@@ -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) |
@@ -5,15 +5,11 @@ |
||
| 5 | 5 | use SilverStripe\Control\Controller; |
| 6 | 6 | use SilverStripe\Control\Email\Email; |
| 7 | 7 | use SilverStripe\Control\HTTPResponse; |
| 8 | -use SilverStripe\Control\Session; |
|
| 9 | 8 | use SilverStripe\Control\RequestHandler; |
| 10 | -use SilverStripe\Core\Injector\Injector; |
|
| 11 | 9 | use SilverStripe\Forms\Form; |
| 12 | -use SilverStripe\ORM\ValidationResult; |
|
| 13 | 10 | use SilverStripe\Forms\FieldList; |
| 14 | 11 | use SilverStripe\Forms\EmailField; |
| 15 | 12 | use SilverStripe\Forms\FormAction; |
| 16 | -use SilverStripe\Security\IdentityStore; |
|
| 17 | 13 | use SilverStripe\Security\Member; |
| 18 | 14 | use SilverStripe\Security\Security; |
| 19 | 15 | use SilverStripe\Core\Convert; |
@@ -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) |
@@ -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 |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | protected static $currentUser; |
| 228 | 228 | |
| 229 | 229 | /** |
| 230 | - * @return array |
|
| 230 | + * @return Authenticator[] |
|
| 231 | 231 | */ |
| 232 | 232 | public static function getAuthenticators() |
| 233 | 233 | { |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | * Get all registered authenticators |
| 293 | 293 | * |
| 294 | 294 | * @param int $service The type of service that is requested |
| 295 | - * @return array Return an array of Authenticator objects |
|
| 295 | + * @return Authenticator[] Return an array of Authenticator objects |
|
| 296 | 296 | */ |
| 297 | 297 | public function getApplicableAuthenticators($service = Authenticator::LOGIN) |
| 298 | 298 | { |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | * Combine the given forms into a formset with a tabbed interface |
| 627 | 627 | * |
| 628 | 628 | * @param array|Form[] $forms |
| 629 | - * @return string |
|
| 629 | + * @return DBHTMLText |
|
| 630 | 630 | */ |
| 631 | 631 | protected function generateLoginFormSet($forms) |
| 632 | 632 | { |
@@ -1203,6 +1203,7 @@ discard block |
||
| 1203 | 1203 | |
| 1204 | 1204 | /** |
| 1205 | 1205 | * For the database_is_ready call to return a certain value - used for testing |
| 1206 | + * @param boolean $isReady |
|
| 1206 | 1207 | */ |
| 1207 | 1208 | public static function force_database_is_ready($isReady) |
| 1208 | 1209 | { |
@@ -1223,7 +1224,7 @@ discard block |
||
| 1223 | 1224 | /** |
| 1224 | 1225 | * Set to true to ignore access to disallowed actions, rather than returning permission failure |
| 1225 | 1226 | * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions() |
| 1226 | - * @param $flag True or false |
|
| 1227 | + * @param boolean $flag True or false |
|
| 1227 | 1228 | */ |
| 1228 | 1229 | public static function set_ignore_disallowed_actions($flag) |
| 1229 | 1230 | { |