API Use new names for renamed classes

silverstripe · Sep 17, 2024 · f876f88 · f876f88
1 parent 3e439b5
commit f876f88
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/Authenticator/LoginHandler.php b/src/Authenticator/LoginHandler.php
@@ -19,8 +19,8 @@
 use SilverStripe\MFA\Service\EnforcementManager;
 use SilverStripe\MFA\Service\MethodRegistry;
 use SilverStripe\MFA\Service\SchemaGenerator;
-use SilverStripe\ORM\ValidationException;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationException;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\IdentityStore;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\MemberAuthenticator\LoginHandler as BaseLoginHandler;

diff --git a/src/Controller/AdminRegistrationController.php b/src/Controller/AdminRegistrationController.php
@@ -16,7 +16,7 @@
 use SilverStripe\MFA\Service\MethodRegistry;
 use SilverStripe\MFA\Service\RegisteredMethodManager;
 use SilverStripe\MFA\State\AvailableMethodDetailsInterface;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 use SilverStripe\Security\SecurityToken;

diff --git a/src/Extension/AccountReset/SecurityExtension.php b/src/Extension/AccountReset/SecurityExtension.php
@@ -16,7 +16,7 @@
 use SilverStripe\MFA\JSONResponse;
 use SilverStripe\MFA\RequestHandler\BaseHandlerTrait;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 

diff --git a/src/Report/EnabledMembers.php b/src/Report/EnabledMembers.php
@@ -9,7 +9,7 @@
 use SilverStripe\Forms\TextField;
 use SilverStripe\MFA\Model\RegisteredMethod;
 use SilverStripe\MFA\Service\MethodRegistry;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\Reports\Report;
 use SilverStripe\Security\Member;

diff --git a/src/RequestHandler/RegistrationHandlerTrait.php b/src/RequestHandler/RegistrationHandlerTrait.php
@@ -11,7 +11,7 @@
 use SilverStripe\MFA\State\RegisteredMethodDetailsInterface;
 use SilverStripe\MFA\State\Result;
 use SilverStripe\MFA\Store\StoreInterface;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\SecurityToken;
 
 /**
@@ -73,7 +73,7 @@ public function createStartRegistrationResponse(
      * @param MethodInterface $method
      * @param HTTPRequest $request
      * @return Result
-     * @throws \SilverStripe\ORM\ValidationException
+     * @throws \SilverStripe\Core\Validation\ValidationException
      */
     public function completeRegistrationRequest(
         StoreInterface $store,

diff --git a/src/Service/RegisteredMethodManager.php b/src/Service/RegisteredMethodManager.php
@@ -65,7 +65,7 @@ public function getFromMember(Member $member, MethodInterface $method): ?Registe
      * @param MethodInterface $method
      * @param mixed $data
      * @return bool Whether the method was added/replace
-     * @throws \SilverStripe\ORM\ValidationException
+     * @throws \SilverStripe\Core\Validation\ValidationException
      */
     public function registerForMember(Member $member, MethodInterface $method, $data = null): bool
     {
@@ -144,7 +144,7 @@ public function canRemoveMethod(Member $member, MethodInterface $method): bool
      * @param Member&MemberExtension $member
      * @param MethodInterface $method
      * @return bool Returns false if the given method is not registered for the member
-     * @throws \SilverStripe\ORM\ValidationException
+     * @throws \SilverStripe\Core\Validation\ValidationException
      */
     public function deleteFromMember(Member $member, MethodInterface $method): bool
     {

diff --git a/tests/php/Controller/AdminRegistrationControllerTest.php b/tests/php/Controller/AdminRegistrationControllerTest.php
@@ -19,7 +19,7 @@
 use SilverStripe\MFA\State\AvailableMethodDetails;
 use SilverStripe\MFA\Store\SessionStore;
 use SilverStripe\MFA\Tests\Stub\BasicMath\Method as BasicMathMethod;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 use SilverStripe\Security\SecurityToken;