Skip to content

Commit

Permalink
Merge pull request #632 from creative-commoners/pulls/3/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 1e8c034 + 7947405 commit 3b733d5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
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

0 comments on commit 3b733d5

Please sign in to comment.