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 #632

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/AssetControlExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
use SilverStripe\Core\Injector\Injector;
use SilverStripe\ORM\DataObject;
use SilverStripe\Versioned\Versioned;
use SilverStripe\ORM\DataExtension;
use SilverStripe\Security\Member;
use SilverStripe\Core\Extension;

/**
* This class provides the necessary business logic to ensure that any assets attached
Expand All @@ -24,9 +24,9 @@
* Assets which are no longer referenced will be flushed via explicit delete calls
* to the underlying filesystem.
*
* @extends DataExtension<DataObject&Versioned>
* @extends Extension<DataObject&Versioned>
*/
class AssetControlExtension extends DataExtension
class AssetControlExtension extends Extension
{
/**
* When archiving versioned dataobjects, should assets be archived with them?
Expand Down
2 changes: 1 addition & 1 deletion src/ImageManipulation.php
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ public function variantName($format, $arg = null)
* This means we have to use a whitelist of "known formats", based on methods
* available on the {@link Image} class as the "main" user of this trait.
* The one exception to this is the variant for swapping file extensions, which is explicitly allowed.
* This class is commonly decorated with additional manipulation methods through {@link DataExtension}.
* This class is commonly decorated with additional manipulation methods through {@link Extension}.
*
* @param $variantName
* @return array|null An array of arguments passed to {@link variantName}. The first item is the "format".
Expand Down
6 changes: 3 additions & 3 deletions src/Shortcodes/FileLinkTracking.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
use SilverStripe\Assets\File;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\FormScaffolder;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\ORM\ManyManyThroughList;
use SilverStripe\Versioned\Versioned;
use SilverStripe\View\Parsers\HTMLValue;
use SilverStripe\Core\Extension;

/**
* Adds tracking of links in any HTMLText fields which reference SiteTree or File items.
Expand All @@ -24,9 +24,9 @@
* only be enabled for the Stage record.
*
* @method ManyManyThroughList<File> FileTracking()
* @extends DataExtension<DataObject&static>
* @extends Extension<DataObject&static>
*/
class FileLinkTracking extends DataExtension
class FileLinkTracking extends Extension
{
/**
* @var FileLinkTrackingParser
Expand Down
Loading