@@ -149,7 +149,7 @@  | 
                                                    ||
| 149 | 149 | }  | 
                                                        
| 150 | 150 | |
| 151 | 151 | /**  | 
                                                        
| 152 | - * @return SS_HTTPResponse  | 
                                                        |
| 152 | + * @return \SilverStripe\Control\HTTPResponse|null  | 
                                                        |
| 153 | 153 | */  | 
                                                        
| 154 | 154 | protected function getRedirect()  | 
                                                        
| 155 | 155 |      { | 
                                                        
@@ -7,7 +7,6 @@  | 
                                                    ||
| 7 | 7 | use SilverStripe\ActiveDirectory\Model\LDAPUtil;  | 
                                                        
| 8 | 8 | use SilverStripe\Control\Controller;  | 
                                                        
| 9 | 9 | use SilverStripe\Control\Director;  | 
                                                        
| 10 | -use SilverStripe\Control\Session;  | 
                                                        |
| 11 | 10 | use SilverStripe\Core\Injector\Injector;  | 
                                                        
| 12 | 11 | use SilverStripe\Forms\Form;  | 
                                                        
| 13 | 12 | use SilverStirpe\Security\Member;  | 
                                                        
@@ -49,7 +49,7 @@  | 
                                                    ||
| 49 | 49 | |
| 50 | 50 | /**  | 
                                                        
| 51 | 51 |       * {@inheritDoc} | 
                                                        
| 52 | - * @return FieldList  | 
                                                        |
| 52 | + * @return \SilverStripe\Forms\FieldList  | 
                                                        |
| 53 | 53 | */  | 
                                                        
| 54 | 54 | public function getCMSFields()  | 
                                                        
| 55 | 55 |      { | 
                                                        
@@ -273,7 +273,7 @@ discard block  | 
                                                    ||
| 273 | 273 | * Note that these get cached in-memory per-request for performance to avoid re-querying for the same results.  | 
                                                        
| 274 | 274 | *  | 
                                                        
| 275 | 275 | * @param string $dn  | 
                                                        
| 276 | - * @param array $attributes List of specific AD attributes to return. Empty array means return everything.  | 
                                                        |
| 276 | + * @param string[] $attributes List of specific AD attributes to return. Empty array means return everything.  | 
                                                        |
| 277 | 277 | * @return array  | 
                                                        
| 278 | 278 | */  | 
                                                        
| 279 | 279 | public function getNestedGroups($dn, $attributes = [])  | 
                                                        
@@ -477,7 +477,7 @@ discard block  | 
                                                    ||
| 477 | 477 | * @param Member  | 
                                                        
| 478 | 478 | * @param array|null $data If passed, this is pre-existing AD attribute data to update the Member with.  | 
                                                        
| 479 | 479 | * If not given, the data will be looked up by the user's GUID.  | 
                                                        
| 480 | - * @return bool  | 
                                                        |
| 480 | + * @return false|null  | 
                                                        |
| 481 | 481 | */  | 
                                                        
| 482 | 482 | public function updateMemberFromLDAP(Member $member, $data = null)  | 
                                                        
| 483 | 483 |      { | 
                                                        
@@ -657,7 +657,7 @@ discard block  | 
                                                    ||
| 657 | 657 | * @param Group $group An existing Group or a new Group object  | 
                                                        
| 658 | 658 | * @param array $data LDAP group object data  | 
                                                        
| 659 | 659 | *  | 
                                                        
| 660 | - * @return bool  | 
                                                        |
| 660 | + * @return false|null  | 
                                                        |
| 661 | 661 | */  | 
                                                        
| 662 | 662 | public function updateGroupFromLDAP(Group $group, $data)  | 
                                                        
| 663 | 663 |      { | 
                                                        
@@ -79,7 +79,7 @@  | 
                                                    ||
| 79 | 79 | * Change the password  | 
                                                        
| 80 | 80 | *  | 
                                                        
| 81 | 81 | * @param array $data The user submitted data  | 
                                                        
| 82 | - * @return HTTPResponse  | 
                                                        |
| 82 | + * @return \SilverStripe\Control\HTTPResponse  | 
                                                        |
| 83 | 83 | */  | 
                                                        
| 84 | 84 | public function doChangePassword(array $data)  | 
                                                        
| 85 | 85 |      { | 
                                                        
@@ -5,7 +5,6 @@  | 
                                                    ||
| 5 | 5 | use Exception;  | 
                                                        
| 6 | 6 | use SilverStripe\Control\Director;  | 
                                                        
| 7 | 7 | use SilverStripe\Control\HTTP;  | 
                                                        
| 8 | -use SilverStripe\Control\Session;  | 
                                                        |
| 9 | 8 | use SilverStripe\Core\Config\Config;  | 
                                                        
| 10 | 9 | use SilverStripe\Core\Injector\Injector;  | 
                                                        
| 11 | 10 | use SilverStripe\Forms\TextField;  | 
                                                        
@@ -54,7 +54,7 @@  | 
                                                    ||
| 54 | 54 | /**  | 
                                                        
| 55 | 55 | * @param HTTPRequest $request  | 
                                                        
| 56 | 56 | *  | 
                                                        
| 57 | - * @return string  | 
                                                        |
| 57 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText  | 
                                                        |
| 58 | 58 | */  | 
                                                        
| 59 | 59 | public function index(HTTPRequest $request)  | 
                                                        
| 60 | 60 |      { | 
                                                        
@@ -6,13 +6,11 @@  | 
                                                    ||
| 6 | 6 | use SilverStripe\Control\Controller;  | 
                                                        
| 7 | 7 | use SilverStripe\Control\Email\Email;  | 
                                                        
| 8 | 8 | use SilverStripe\Control\HTTPRequest;  | 
                                                        
| 9 | -use SilverStripe\Control\Session;  | 
                                                        |
| 10 | 9 | use SilverStripe\Core\Config\Config;  | 
                                                        
| 11 | 10 | use SilverStripe\Core\Injector\Injector;  | 
                                                        
| 12 | 11 | use SilverStripe\ORM\ValidationResult;  | 
                                                        
| 13 | 12 | use SilverStripe\Security\Authenticator;  | 
                                                        
| 14 | 13 | use SilverStripe\Security\Member;  | 
                                                        
| 15 | -use SilverStripe\Security\MemberAuthenticator\LogoutHandler;  | 
                                                        |
| 16 | 14 | use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;  | 
                                                        
| 17 | 15 | |
| 18 | 16 | /**  | 
                                                        
@@ -82,7 +82,7 @@  | 
                                                    ||
| 82 | 82 | * @param array $data  | 
                                                        
| 83 | 83 | * @param HTTPRequest $request  | 
                                                        
| 84 | 84 | * @param ValidationResult|null $result  | 
                                                        
| 85 | - * @return null|Member  | 
                                                        |
| 85 | + * @return null|\SilverStripe\ORM\DataObject  | 
                                                        |
| 86 | 86 | * @internal param Form $form  | 
                                                        
| 87 | 87 | */  | 
                                                        
| 88 | 88 | public function authenticate(array $data, HTTPRequest $request, ValidationResult &$result = null)  | 
                                                        
@@ -55,7 +55,7 @@ discard block  | 
                                                    ||
| 55 | 55 | /**  | 
                                                        
| 56 | 56 | * Factory method for the lost password form  | 
                                                        
| 57 | 57 | *  | 
                                                        
| 58 | - * @return Form Returns the lost password form  | 
                                                        |
| 58 | + * @return LDAPChangePasswordForm Returns the lost password form  | 
                                                        |
| 59 | 59 | */  | 
                                                        
| 60 | 60 | public function ChangePasswordForm()  | 
                                                        
| 61 | 61 |      { | 
                                                        
@@ -103,7 +103,7 @@ discard block  | 
                                                    ||
| 103 | 103 | /**  | 
                                                        
| 104 | 104 | * Factory method for the lost password form  | 
                                                        
| 105 | 105 | *  | 
                                                        
| 106 | - * @return Form Returns the lost password form  | 
                                                        |
| 106 | + * @return LDAPLoginForm Returns the lost password form  | 
                                                        |
| 107 | 107 | */  | 
                                                        
| 108 | 108 | public function LostPasswordForm()  | 
                                                        
| 109 | 109 |      { | 
                                                        
@@ -7,7 +7,6 @@  | 
                                                    ||
| 7 | 7 | use SilverStripe\Control\Controller;  | 
                                                        
| 8 | 8 | use SilverStripe\Control\Director;  | 
                                                        
| 9 | 9 | use SilverStripe\Core\Convert;  | 
                                                        
| 10 | -use SilverStripe\Core\Object;  | 
                                                        |
| 11 | 10 | use SilverStripe\Core\Config\Config;  | 
                                                        
| 12 | 11 | use SilverStripe\Forms\EmailField;  | 
                                                        
| 13 | 12 | use SilverStripe\Forms\FormAction;  | 
                                                        
@@ -6,10 +6,8 @@  | 
                                                    ||
| 6 | 6 | use SilverStripe\ActiveDirectory\Services\LDAPService;  | 
                                                        
| 7 | 7 | use SilverStripe\Control\Email\Email;  | 
                                                        
| 8 | 8 | use SilverStripe\Control\RequestHandler;  | 
                                                        
| 9 | -use SilverStripe\Control\Session;  | 
                                                        |
| 10 | 9 | use SilverStripe\Core\Config\Config;  | 
                                                        
| 11 | 10 | use SilverStripe\Core\Injector\Injector;  | 
                                                        
| 12 | -use SilverStripe\Forms\FieldList;  | 
                                                        |
| 13 | 11 | use SilverStripe\Forms\LiteralField;  | 
                                                        
| 14 | 12 | use SilverStripe\Forms\RequiredFields;  | 
                                                        
| 15 | 13 | use SilverStripe\Forms\TextField;  | 
                                                        
@@ -7,7 +7,6 @@  | 
                                                    ||
| 7 | 7 | use SilverStripe\Core\Injector\Injector;  | 
                                                        
| 8 | 8 | use SilverStripe\Security\Member;  | 
                                                        
| 9 | 9 | use SilverStripe\Security\MemberAuthenticator\LoginHandler;  | 
                                                        
| 10 | -use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;  | 
                                                        |
| 11 | 10 | |
| 12 | 11 | class LDAPMemberLoginHandler extends LoginHandler  | 
                                                        
| 13 | 12 |  { |