@@ -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( |
@@ -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 |
@@ -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; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Core\ClassInfo; |
| 6 | 6 | use SilverStripe\Core\Resettable; |
| 7 | -use SilverStripe\Dev\Debug; |
|
| 8 | 7 | use SilverStripe\Dev\TestOnly; |
| 9 | 8 | use SilverStripe\i18n\i18nEntityProvider; |
| 10 | 9 | use SilverStripe\ORM\DB; |
@@ -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 | { |