From 1bef4942b8299de69d3c1d4655e5361b7140bff5 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 17 Sep 2024 13:42:45 +1200 Subject: [PATCH] API Use new names for renamed classes --- src/Authenticator.php | 2 +- src/Authenticator/LoginForm.php | 2 +- src/Model/FederatedIdentity.php | 4 ++-- src/Model/User.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Authenticator.php b/src/Authenticator.php index d2476e6..33881b5 100644 --- a/src/Authenticator.php +++ b/src/Authenticator.php @@ -9,7 +9,7 @@ use SilverStripe\Core\Environment; use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\RealMe\Authenticator\LoginHandler as RealMeLoginHandler; use SilverStripe\Security\Authenticator as AuthenticatorInterface; use SilverStripe\Security\Member; diff --git a/src/Authenticator/LoginForm.php b/src/Authenticator/LoginForm.php index 5eba9c8..ec6fb94 100644 --- a/src/Authenticator/LoginForm.php +++ b/src/Authenticator/LoginForm.php @@ -11,7 +11,7 @@ use SilverStripe\RealMe\RealMeService; use SilverStripe\Security\LoginForm as BaseLoginForm; use SilverStripe\SiteConfig\SiteConfig; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; class LoginForm extends BaseLoginForm diff --git a/src/Model/FederatedIdentity.php b/src/Model/FederatedIdentity.php index efe8c99..a9df333 100644 --- a/src/Model/FederatedIdentity.php +++ b/src/Model/FederatedIdentity.php @@ -6,7 +6,7 @@ use DOMXPath; use SilverStripe\ORM\FieldType\DBField; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\ModelData; use SilverStripe\ORM\FieldType\DBDatetime; /** @@ -28,7 +28,7 @@ * * - See this object's constructor for the XML / DOMDocument object expected to be passed during instantiation. */ -class FederatedIdentity extends ViewableData +class FederatedIdentity extends ModelData { const SOURCE_XML = 'urn:nzl:govt:ict:stds:authn:safeb64:attribute:igovt:IVS:Assertion:Identity'; const SOURCE_JSON = 'urn:nzl:govt:ict:stds:authn:safeb64:attribute:igovt:IVS:Assertion:JSON:Identity'; diff --git a/src/Model/User.php b/src/Model/User.php index 74deef4..c4f2e3a 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -6,7 +6,7 @@ use SilverStripe\RealMe\Extension\MemberExtension; use SilverStripe\RealMe\RealMeService; use SilverStripe\Security\Member; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; /** * Class RealMeUser @@ -55,7 +55,7 @@ public function isAuthenticated() /** * @return Member - * @throws \SilverStripe\ORM\ValidationException + * @throws \SilverStripe\Core\Validation\ValidationException */ public function getMember() {