API Replace Extension subclasses

silverstripe · Aug 28, 2024 · 5027862 · 5027862
1 parent c2d37cc
commit 5027862
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/RecursivePublishable.php b/src/RecursivePublishable.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\ORM\ArrayList;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\Queries\SQLUpdate;
@@ -17,9 +17,9 @@
  * Provides owns / owned_by and recursive publishing API for all objects.
  * This extension is added to DataObject by default
  *
- * @extends DataExtension<DataObject&static>
+ * @extends Extension<DataObject&static>
  */
-class RecursivePublishable extends DataExtension
+class RecursivePublishable extends Extension
 {
     /**
      * List of relationships on this object that are "owned" by this object.

diff --git a/src/Versioned.php b/src/Versioned.php
@@ -16,7 +16,6 @@
 use SilverStripe\Dev\Deprecation;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\ORM\ArrayList;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataQuery;
@@ -38,9 +37,9 @@
  * @property int $Version
  * @mixin RecursivePublishable
  *
- * @extends DataExtension<DataObject&RecursivePublishable&static>
+ * @extends Extension<DataObject&RecursivePublishable&static>
  */
-class Versioned extends DataExtension implements TemplateGlobalProvider, Resettable
+class Versioned extends Extension implements TemplateGlobalProvider, Resettable
 {
     /**
      * Versioning mode for this object.

diff --git a/tests/php/VersionableExtensionsTest/TestExtension.php b/tests/php/VersionableExtensionsTest/TestExtension.php
@@ -3,10 +3,10 @@
 namespace SilverStripe\Versioned\Tests\VersionableExtensionsTest;
 
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\Versioned\VersionableExtension;
 
-class TestExtension extends DataExtension implements VersionableExtension, TestOnly
+class TestExtension extends Extension implements VersionableExtension, TestOnly
 {
     public function isVersionedTable($table)
     {

diff --git a/tests/php/VersionedTest/PublicExtension.php b/tests/php/VersionedTest/PublicExtension.php
@@ -3,12 +3,12 @@
 namespace SilverStripe\Versioned\Tests\VersionedTest;
 
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
 /**
  * Alters stage mode of extended object to be public
  */
-class PublicExtension extends DataExtension implements TestOnly
+class PublicExtension extends Extension implements TestOnly
 {
     protected function canViewNonLive($member = null)
     {