Merge pull request #251 from creative-commoners/pulls/6/replace-extension-subclasses

API Replace Extension subclasses
This commit is contained in:
Guy Sartorelli 2024-08-29 10:54:56 +12:00 committed by GitHub
commit 9f477d6bcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 15 deletions

View File

@ -3,7 +3,6 @@
namespace SilverStripe\ContentReview\Extensions; namespace SilverStripe\ContentReview\Extensions;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;
use SilverStripe\Admin\LeftAndMainExtension;
use SilverStripe\CMS\Controllers\CMSMain; use SilverStripe\CMS\Controllers\CMSMain;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\ContentReview\Forms\ReviewContentHandler; use SilverStripe\ContentReview\Forms\ReviewContentHandler;
@ -14,14 +13,15 @@ use SilverStripe\Control\HTTPResponse_Exception;
use SilverStripe\Forms\Form; use SilverStripe\Forms\Form;
use SilverStripe\ORM\ValidationResult; use SilverStripe\ORM\ValidationResult;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\Core\Extension;
/** /**
* CMSPageEditController extension to receive the additional action button from * CMSPageEditController extension to receive the additional action button from
* SiteTreeContentReview::updateCMSActions() * SiteTreeContentReview::updateCMSActions()
* *
* @extends LeftAndMainExtension<CMSMain> * @extends Extension<CMSMain>
*/ */
class ContentReviewCMSExtension extends LeftAndMainExtension class ContentReviewCMSExtension extends Extension
{ {
use PermissionChecker; use PermissionChecker;

View File

@ -10,12 +10,12 @@ use SilverStripe\Forms\ListboxField;
use SilverStripe\Forms\LiteralField; use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\TextareaField; use SilverStripe\Forms\TextareaField;
use SilverStripe\Forms\TextField; use SilverStripe\Forms\TextField;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\ManyManyList; use SilverStripe\ORM\ManyManyList;
use SilverStripe\Security\Group; use SilverStripe\Security\Group;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Core\Extension;
/** /**
* This extensions add a default schema for new pages and pages without a content * This extensions add a default schema for new pages and pages without a content
@ -25,9 +25,9 @@ use SilverStripe\SiteConfig\SiteConfig;
* @method ManyManyList<Group> ContentReviewGroups() * @method ManyManyList<Group> ContentReviewGroups()
* @method ManyManyList<Member> ContentReviewUsers() * @method ManyManyList<Member> ContentReviewUsers()
* *
* @extends DataExtension<SiteConfig> * @extends Extension<SiteConfig>
*/ */
class ContentReviewDefaultSettings extends DataExtension class ContentReviewDefaultSettings extends Extension
{ {
/** /**
* @config * @config

View File

@ -3,12 +3,12 @@
namespace SilverStripe\ContentReview\Extensions; namespace SilverStripe\ContentReview\Extensions;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;
use SilverStripe\Admin\LeftAndMainExtension; use SilverStripe\Core\Extension;
/** /**
* @extends LeftAndMainExtension<LeftAndMain> * @extends Extension<LeftAndMain>
*/ */
class ContentReviewLeftAndMainExtension extends LeftAndMainExtension class ContentReviewLeftAndMainExtension extends Extension
{ {
/** /**
* Append content review schema configuration * Append content review schema configuration

View File

@ -4,17 +4,17 @@ namespace SilverStripe\ContentReview\Extensions;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\ManyManyList; use SilverStripe\ORM\ManyManyList;
use SilverStripe\Security\Group; use SilverStripe\Security\Group;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Core\Extension;
/** /**
* @method ManyManyList<SiteTree> SiteTreeContentReview() * @method ManyManyList<SiteTree> SiteTreeContentReview()
* *
* @extends DataExtension<Group|Member> * @extends Extension<Group|Member>
*/ */
class ContentReviewOwner extends DataExtension class ContentReviewOwner extends Extension
{ {
/** /**
* @var array * @var array

View File

@ -24,7 +24,6 @@ use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\OptionsetField; use SilverStripe\Forms\OptionsetField;
use SilverStripe\Forms\ReadonlyField; use SilverStripe\Forms\ReadonlyField;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use SilverStripe\ORM\HasManyList; use SilverStripe\ORM\HasManyList;
@ -41,6 +40,7 @@ use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\View\Requirements; use SilverStripe\View\Requirements;
use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor; use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor;
use Symbiote\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
use SilverStripe\Core\Extension;
/** /**
* Set dates at which content needs to be reviewed and provide a report and emails to alert * Set dates at which content needs to be reviewed and provide a report and emails to alert
@ -56,9 +56,9 @@ use Symbiote\QueuedJobs\Services\QueuedJobService;
* @method ManyManyList<Member> ContentReviewUsers() * @method ManyManyList<Member> ContentReviewUsers()
* @method HasManyList<ContentReviewLog> ReviewLogs() * @method HasManyList<ContentReviewLog> ReviewLogs()
* *
* @extends DataExtension<SiteTree> * @extends Extension<SiteTree>
*/ */
class SiteTreeContentReview extends DataExtension implements PermissionProvider class SiteTreeContentReview extends Extension implements PermissionProvider
{ {
/** /**
* @var array * @var array