Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API Use new names for renamed classes #566

Open
wants to merge 1 commit into
base: 6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Authenticator/LoginHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/AdminRegistrationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Extension/AccountReset/SecurityExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Report/EnabledMembers.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/RequestHandler/RegistrationHandlerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/Service/RegisteredMethodManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/php/Controller/AdminRegistrationControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading