@@ -10,9 +10,7 @@ |
||
10 | 10 | use SilverStripe\Control\Session; |
11 | 11 | use SilverStripe\ORM\FieldType\DBDatetime; |
12 | 12 | use SilverStripe\ORM\FieldType\DBField; |
13 | -use SilverStripe\ORM\FieldType\DBHTMLText; |
|
14 | 13 | use SilverStripe\Security\Authenticator; |
15 | -use SilverStripe\Security\CMSSecurity; |
|
16 | 14 | use SilverStripe\Security\Member; |
17 | 15 | use SilverStripe\Security\Security; |
18 | 16 | use SilverStripe\Security\IdentityStore; |
@@ -5,15 +5,8 @@ |
||
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 | -use SilverStripe\Forms\FieldList; |
|
14 | -use SilverStripe\Forms\EmailField; |
|
15 | -use SilverStripe\Forms\FormAction; |
|
16 | -use SilverStripe\Security\IdentityStore; |
|
17 | 10 | use SilverStripe\Security\Member; |
18 | 11 | use SilverStripe\Security\Security; |
19 | 12 | use SilverStripe\Core\Convert; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | protected static $currentUser; |
223 | 223 | |
224 | 224 | /** |
225 | - * @return array |
|
225 | + * @return Authenticator[] |
|
226 | 226 | */ |
227 | 227 | public function getAuthenticators() |
228 | 228 | { |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | * Get all registered authenticators |
288 | 288 | * |
289 | 289 | * @param int $service The type of service that is requested |
290 | - * @return array Return an array of Authenticator objects |
|
290 | + * @return Authenticator[] Return an array of Authenticator objects |
|
291 | 291 | */ |
292 | 292 | public function getApplicableAuthenticators($service = Authenticator::LOGIN) |
293 | 293 | { |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | * Combine the given forms into a formset with a tabbed interface |
622 | 622 | * |
623 | 623 | * @param array|Form[] $forms |
624 | - * @return string |
|
624 | + * @return DBHTMLText |
|
625 | 625 | */ |
626 | 626 | protected function generateLoginFormSet($forms) |
627 | 627 | { |
@@ -1200,6 +1200,7 @@ discard block |
||
1200 | 1200 | |
1201 | 1201 | /** |
1202 | 1202 | * For the database_is_ready call to return a certain value - used for testing |
1203 | + * @param boolean $isReady |
|
1203 | 1204 | */ |
1204 | 1205 | public static function force_database_is_ready($isReady) |
1205 | 1206 | { |
@@ -1220,7 +1221,7 @@ discard block |
||
1220 | 1221 | /** |
1221 | 1222 | * Set to true to ignore access to disallowed actions, rather than returning permission failure |
1222 | 1223 | * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions() |
1223 | - * @param $flag True or false |
|
1224 | + * @param boolean $flag True or false |
|
1224 | 1225 | */ |
1225 | 1226 | public static function set_ignore_disallowed_actions($flag) |
1226 | 1227 | { |