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 Replace Extension subclasses #251

Merged
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
6 changes: 3 additions & 3 deletions src/Extensions/ContentReviewCMSExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace SilverStripe\ContentReview\Extensions;

use SilverStripe\Admin\LeftAndMain;
use SilverStripe\Admin\LeftAndMainExtension;
use SilverStripe\CMS\Controllers\CMSMain;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\ContentReview\Forms\ReviewContentHandler;
Expand All @@ -14,14 +13,15 @@
use SilverStripe\Forms\Form;
use SilverStripe\ORM\ValidationResult;
use SilverStripe\Security\Security;
use SilverStripe\Core\Extension;

/**
* CMSPageEditController extension to receive the additional action button from
* SiteTreeContentReview::updateCMSActions()
*
* @extends LeftAndMainExtension<CMSMain>
* @extends Extension<CMSMain>
*/
class ContentReviewCMSExtension extends LeftAndMainExtension
class ContentReviewCMSExtension extends Extension
{
use PermissionChecker;

Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/ContentReviewDefaultSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\TextareaField;
use SilverStripe\Forms\TextField;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\Security\Group;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Core\Extension;

/**
* This extensions add a default schema for new pages and pages without a content
Expand All @@ -25,9 +25,9 @@
* @method ManyManyList<Group> ContentReviewGroups()
* @method ManyManyList<Member> ContentReviewUsers()
*
* @extends DataExtension<SiteConfig>
* @extends Extension<SiteConfig>
*/
class ContentReviewDefaultSettings extends DataExtension
class ContentReviewDefaultSettings extends Extension
{
/**
* @config
Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/ContentReviewLeftAndMainExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
namespace SilverStripe\ContentReview\Extensions;

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
Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/ContentReviewOwner.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Forms\FieldList;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\Security\Group;
use SilverStripe\Security\Member;
use SilverStripe\Core\Extension;

/**
* @method ManyManyList<SiteTree> SiteTreeContentReview()
*
* @extends DataExtension<Group|Member>
* @extends Extension<Group|Member>
*/
class ContentReviewOwner extends DataExtension
class ContentReviewOwner extends Extension
{
/**
* @var array
Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/SiteTreeContentReview.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
use SilverStripe\Forms\OptionsetField;
use SilverStripe\Forms\ReadonlyField;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\HasManyList;
Expand All @@ -41,6 +40,7 @@
use SilverStripe\View\Requirements;
use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor;
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
Expand All @@ -56,9 +56,9 @@
* @method ManyManyList<Member> ContentReviewUsers()
* @method HasManyList<ContentReviewLog> ReviewLogs()
*
* @extends DataExtension<SiteTree>
* @extends Extension<SiteTree>
*/
class SiteTreeContentReview extends DataExtension implements PermissionProvider
class SiteTreeContentReview extends Extension implements PermissionProvider
{
/**
* @var array
Expand Down
Loading