| @@ -77,7 +77,7 @@ | ||
| 77 | 77 | * | 
| 78 | 78 | * @param array $data | 
| 79 | 79 | * @param Form $form | 
| 80 | - * @return bool|Member|void | |
| 80 | + * @return null|\SilverStripe\ORM\DataObject | |
| 81 | 81 | * @throws HTTPResponse_Exception | 
| 82 | 82 | */ | 
| 83 | 83 | public static function authenticate($data, Form $form = null) | 
| @@ -43,7 +43,7 @@ discard block | ||
| 43 | 43 | /** | 
| 44 | 44 | * Constructor. | 
| 45 | 45 | * | 
| 46 | - * @param Controller $controller | |
| 46 | + * @param \SilverStripe\Control\Controller $controller | |
| 47 | 47 | * @param string $name method on the $controller | 
| 48 | 48 | * @param FieldList $fields | 
| 49 | 49 | * @param FieldList $actions | 
| @@ -118,7 +118,7 @@ discard block | ||
| 118 | 118 | * instead of the SecurityController | 
| 119 | 119 | * | 
| 120 | 120 | * @param array $data Submitted data | 
| 121 | - * @return SS_HTTPResponse | |
| 121 | + * @return null|\SilverStripe\Control\HTTPResponse | |
| 122 | 122 | */ | 
| 123 | 123 | public function forgotPassword($data) | 
| 124 | 124 |      { | 
| @@ -33,7 +33,7 @@ | ||
| 33 | 33 | /** | 
| 34 | 34 | * Constructor | 
| 35 | 35 | * | 
| 36 | - * @param Controller $controller | |
| 36 | + * @param \SilverStripe\Control\Controller $controller | |
| 37 | 37 | * @param string $name method on the $controller | 
| 38 | 38 | * @param FieldList $fields | 
| 39 | 39 | * @param FieldList $actions | 
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | /** | 
| 55 | 55 | * Factory method for the lost password form | 
| 56 | 56 | * | 
| 57 | - * @return Form Returns the lost password form | |
| 57 | + * @return LDAPSecurityController Returns the lost password form | |
| 58 | 58 | */ | 
| 59 | 59 | public function ChangePasswordForm() | 
| 60 | 60 |      { | 
| @@ -98,7 +98,7 @@ discard block | ||
| 98 | 98 | /** | 
| 99 | 99 | * Factory method for the lost password form | 
| 100 | 100 | * | 
| 101 | - * @return Form Returns the lost password form | |
| 101 | + * @return LDAPLoginForm Returns the lost password form | |
| 102 | 102 | */ | 
| 103 | 103 | public function LostPasswordForm() | 
| 104 | 104 |      { | 
| @@ -114,7 +114,7 @@ discard block | ||
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | 116 | /** | 
| 117 | - * @param null $action | |
| 117 | + * @param string $action | |
| 118 | 118 | * @return String | 
| 119 | 119 | */ | 
| 120 | 120 | public function Link($action = null) | 
| @@ -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 |      { | 
| @@ -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|null | |
| 83 | 83 | */ | 
| 84 | 84 | public function doChangePassword(array $data) | 
| 85 | 85 |      { | 
| @@ -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 |      { | 
| @@ -98,7 +98,7 @@ discard block | ||
| 98 | 98 | * Get the cache object used for LDAP results. Note that the default lifetime set here | 
| 99 | 99 |       * is 8 hours, but you can change that by calling Cache::set_lifetime('ldap', <lifetime in seconds>) | 
| 100 | 100 | * | 
| 101 | - * @return Zend_Cache_Frontend | |
| 101 | + * @return \Zend_Cache_Core | |
| 102 | 102 | */ | 
| 103 | 103 | public static function get_cache() | 
| 104 | 104 |      { | 
| @@ -252,7 +252,7 @@ discard block | ||
| 252 | 252 | * Note that these get cached in-memory per-request for performance to avoid re-querying for the same results. | 
| 253 | 253 | * | 
| 254 | 254 | * @param string $dn | 
| 255 | - * @param array $attributes List of specific AD attributes to return. Empty array means return everything. | |
| 255 | + * @param string[] $attributes List of specific AD attributes to return. Empty array means return everything. | |
| 256 | 256 | * @return array | 
| 257 | 257 | */ | 
| 258 | 258 | public function getNestedGroups($dn, $attributes = []) | 
| @@ -456,7 +456,7 @@ discard block | ||
| 456 | 456 | * @param Member | 
| 457 | 457 | * @param array|null $data If passed, this is pre-existing AD attribute data to update the Member with. | 
| 458 | 458 | * If not given, the data will be looked up by the user's GUID. | 
| 459 | - * @return bool | |
| 459 | + * @return false|null | |
| 460 | 460 | */ | 
| 461 | 461 | public function updateMemberFromLDAP(Member $member, $data = null) | 
| 462 | 462 |      { | 
| @@ -636,7 +636,7 @@ discard block | ||
| 636 | 636 | * @param Group $group An existing Group or a new Group object | 
| 637 | 637 | * @param array $data LDAP group object data | 
| 638 | 638 | * | 
| 639 | - * @return bool | |
| 639 | + * @return false|null | |
| 640 | 640 | */ | 
| 641 | 641 | public function updateGroupFromLDAP(Group $group, $data) | 
| 642 | 642 |      { |