@@ -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 | */ |
87 | 87 | public function authenticate(array $data, HTTPRequest $request, ValidationResult &$result = null) |
88 | 88 | { |
@@ -6,10 +6,8 @@ |
||
6 | 6 | use SilverStripe\Control\Controller; |
7 | 7 | use Silverstripe\Control\Director; |
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 | -use SilverStripe\Forms\Form; |
|
13 | 11 | use SilverStripe\ORM\ValidationResult; |
14 | 12 | use SilverStripe\Security\Authenticator; |
15 | 13 | use SilverStripe\Security\Member; |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | * Note that these get cached in-memory per-request for performance to avoid re-querying for the same results. |
286 | 286 | * |
287 | 287 | * @param string $dn |
288 | - * @param array $attributes List of specific AD attributes to return. Empty array means return everything. |
|
288 | + * @param string[] $attributes List of specific AD attributes to return. Empty array means return everything. |
|
289 | 289 | * @return array |
290 | 290 | */ |
291 | 291 | public function getNestedGroups($dn, $attributes = []) |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | * If not given, the data will be looked up by the user's GUID. |
500 | 500 | * @param bool $updateGroups controls whether to run the resource-intensive group update function as well. This is |
501 | 501 | * skipped during login to reduce load. |
502 | - * @return bool |
|
502 | + * @return false|null |
|
503 | 503 | * @internal param $Member |
504 | 504 | */ |
505 | 505 | public function updateMemberFromLDAP(Member $member, $data = null, $updateGroups = true) |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | * @param Group $group An existing Group or a new Group object |
700 | 700 | * @param array $data LDAP group object data |
701 | 701 | * |
702 | - * @return bool |
|
702 | + * @return false|null |
|
703 | 703 | */ |
704 | 704 | public function updateGroupFromLDAP(Group $group, $data) |
705 | 705 | { |
@@ -2,17 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\ActiveDirectory\Forms; |
4 | 4 | |
5 | -use Exception; |
|
6 | 5 | use SilverStripe\ActiveDirectory\Authenticators\LDAPAuthenticator; |
7 | 6 | use SilverStripe\ActiveDirectory\Services\LDAPService; |
8 | -use SilverStripe\Control\Director; |
|
9 | -use SilverStripe\Control\HTTP; |
|
10 | -use SilverStripe\Control\HTTPResponse; |
|
11 | 7 | use SilverStripe\Core\Config\Config; |
12 | 8 | use SilverStripe\Core\Injector\Injector; |
13 | 9 | use SilverStripe\Forms\FieldList; |
14 | 10 | use SilverStripe\Forms\TextField; |
15 | -use SilverStripe\ORM\ValidationResult; |
|
16 | 11 | use SilverStripe\Security\Member; |
17 | 12 | use SilverStripe\Security\MemberAuthenticator\ChangePasswordForm; |
18 | 13 | use SilverStripe\Security\Security; |