From 066b938dc6eb5175f2b5212a81d57f1e73781806 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:38:42 +1200 Subject: [PATCH] API Use new names for renamed classes (#92) --- src/Authenticators/LDAPAuthenticator.php | 2 +- src/Control/LDAPDebugController.php | 4 ++-- src/Extensions/LDAPMemberExtension.php | 4 ++-- src/Forms/LDAPChangePasswordForm.php | 2 +- src/Services/LDAPService.php | 4 ++-- tests/php/Authenticators/LDAPAuthenticatorTest.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Authenticators/LDAPAuthenticator.php b/src/Authenticators/LDAPAuthenticator.php index d498c35..66ecb6a 100644 --- a/src/Authenticators/LDAPAuthenticator.php +++ b/src/Authenticators/LDAPAuthenticator.php @@ -9,7 +9,7 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\LDAP\Forms\LDAPLoginForm; use SilverStripe\LDAP\Services\LDAPService; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Authenticator; use SilverStripe\Security\Member; use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; diff --git a/src/Control/LDAPDebugController.php b/src/Control/LDAPDebugController.php index 837582f..fa41dc8 100644 --- a/src/Control/LDAPDebugController.php +++ b/src/Control/LDAPDebugController.php @@ -9,11 +9,11 @@ use SilverStripe\LDAP\Model\LDAPGateway; use SilverStripe\LDAP\Model\LDAPGroupMapping; use SilverStripe\LDAP\Services\LDAPService; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Security\Group; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; /** * Class LDAPDebugController diff --git a/src/Extensions/LDAPMemberExtension.php b/src/Extensions/LDAPMemberExtension.php index 946fabc..5bb8a85 100644 --- a/src/Extensions/LDAPMemberExtension.php +++ b/src/Extensions/LDAPMemberExtension.php @@ -10,8 +10,8 @@ use SilverStripe\Forms\TextField; use SilverStripe\LDAP\Services\LDAPService; use SilverStripe\Core\Extension; -use SilverStripe\ORM\ValidationException; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationException; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; /** diff --git a/src/Forms/LDAPChangePasswordForm.php b/src/Forms/LDAPChangePasswordForm.php index 29166bb..2b3a904 100644 --- a/src/Forms/LDAPChangePasswordForm.php +++ b/src/Forms/LDAPChangePasswordForm.php @@ -13,7 +13,7 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\TextField; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; use SilverStripe\Security\MemberAuthenticator\ChangePasswordForm; use SilverStripe\Security\Security; diff --git a/src/Services/LDAPService.php b/src/Services/LDAPService.php index a3bc970..a0a256c 100644 --- a/src/Services/LDAPService.php +++ b/src/Services/LDAPService.php @@ -19,8 +19,8 @@ use SilverStripe\LDAP\Model\LDAPGroupMapping; use SilverStripe\ORM\DataQuery; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\ValidationException; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationException; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Group; use SilverStripe\Security\Member; use SilverStripe\Security\RandomGenerator; diff --git a/tests/php/Authenticators/LDAPAuthenticatorTest.php b/tests/php/Authenticators/LDAPAuthenticatorTest.php index d24bb90..7a9e13a 100644 --- a/tests/php/Authenticators/LDAPAuthenticatorTest.php +++ b/tests/php/Authenticators/LDAPAuthenticatorTest.php @@ -11,7 +11,7 @@ use SilverStripe\LDAP\Model\LDAPGateway; use SilverStripe\LDAP\Services\LDAPService; use SilverStripe\LDAP\Tests\Model\LDAPFakeGateway; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; class LDAPAuthenticatorTest extends SapphireTest