Skip to content

Commit

Permalink
Merge pull request #561 from creative-commoners/pulls/6/replace-exten…
Browse files Browse the repository at this point in the history
…sion-subclasses

API Replace Extension subclasses
  • Loading branch information
GuySartorelli authored Aug 28, 2024
2 parents 8cfd100 + f85049b commit ef8d2b7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/Extension/AccountReset/MemberExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace SilverStripe\MFA\Extension\AccountReset;

use SilverStripe\Forms\FieldList;
use SilverStripe\ORM\DataExtension;
use SilverStripe\Core\Extension;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\Security\Member;
Expand All @@ -17,9 +17,9 @@
* @property string $AccountResetHash
* @property DBDatetime $AccountResetExpired
*
* @extends DataExtension<Member&static>
* @extends Extension<Member&static>
*/
class MemberExtension extends DataExtension
class MemberExtension extends Extension
{
private static $db = [
'AccountResetHash' => 'Varchar(160)',
Expand Down
6 changes: 3 additions & 3 deletions src/Extension/MemberExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use SilverStripe\MFA\FormField\RegisteredMFAMethodListField;
use SilverStripe\MFA\Method\MethodInterface;
use SilverStripe\MFA\Model\RegisteredMethod;
use SilverStripe\ORM\DataExtension;
use SilverStripe\Core\Extension;
use SilverStripe\ORM\HasManyList;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
Expand All @@ -26,9 +26,9 @@
* @property bool $HasSkippedMFARegistration
* @method HasManyList<RegisteredMethod> RegisteredMFAMethods()
*
* @extends DataExtension<Member&static>
* @extends Extension<Member&static>
*/
class MemberExtension extends DataExtension implements PermissionProvider
class MemberExtension extends Extension implements PermissionProvider
{
public const MFA_ADMINISTER_REGISTERED_METHODS = 'MFA_ADMINISTER_REGISTERED_METHODS';

Expand Down
6 changes: 3 additions & 3 deletions src/Extension/SiteConfigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use SilverStripe\Forms\DateField;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\OptionsetField;
use SilverStripe\ORM\DataExtension;
use SilverStripe\Core\Extension;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\View\Requirements;
Expand All @@ -18,9 +18,9 @@
* @property bool $MFARequired
* @property string $MFAGracePeriodExpires
*
* @extends DataExtension<SiteConfig>
* @extends Extension<SiteConfig>
*/
class SiteConfigExtension extends DataExtension
class SiteConfigExtension extends Extension
{
/**
* A URL that will help CMS users find out more information about multi-factor authentication
Expand Down

0 comments on commit ef8d2b7

Please sign in to comment.