From 50278624fe53d85a4f4d351b695a6ae9f555d7f8 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 21 Aug 2024 09:23:26 +1200
Subject: [PATCH] API Replace Extension subclasses

---
 src/RecursivePublishable.php                          | 6 +++---
 src/Versioned.php                                     | 5 ++---
 tests/php/VersionableExtensionsTest/TestExtension.php | 4 ++--
 tests/php/VersionedTest/PublicExtension.php           | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/RecursivePublishable.php b/src/RecursivePublishable.php
index abba346a..bb52cf02 100644
--- 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
index cb1753ad..f95f38ee 100644
--- 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
index 60a41581..4eea94c9 100644
--- 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
index 2dc7c870..741e83df 100644
--- 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)
     {