Merge pull request #976 from creative-commoners/pulls/4/p81fix

ENH Various fixes for PHP 8.1 compatibility
silverstripe · Apr 21, 2022 · a2d7240 · a2d7240
2 parents 3c296e3 + 41fb24e
commit a2d7240
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Extensions/ElementalAreasExtension.php b/src/Extensions/ElementalAreasExtension.php
@@ -16,6 +16,7 @@
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Versioned\Versioned;
+use SilverStripe\View\ViewableData;
 
 /**
  * This extension handles most of the relationships between pages and element
@@ -327,7 +328,7 @@ public function requireDefaultRecords()
                 }
             }
 
-            $needsPublishing = Extensible::has_extension($elementalObject, Versioned::class)
+            $needsPublishing = ViewableData::has_extension($elementalObject, Versioned::class)
                 && $elementalObject->isPublished();
 
             /** @var ElementalAreasExtension $elementalObject */

diff --git a/src/Models/ElementalArea.php b/src/Models/ElementalArea.php
@@ -4,7 +4,6 @@
 
 use DNADesign\Elemental\Extensions\ElementalAreasExtension;
 use SilverStripe\Core\ClassInfo;
-use SilverStripe\Core\Extensible;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\ArrayList;
@@ -14,6 +13,7 @@
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\UnsavedRelationList;
 use SilverStripe\Versioned\Versioned;
+use SilverStripe\View\ViewableData;
 
 /**
  * Class ElementalArea
@@ -79,7 +79,7 @@ public function supportedPageTypes()
         $elementalClasses = [];
 
         foreach (ClassInfo::getValidSubClasses(DataObject::class) as $class) {
-            if (Extensible::has_extension($class, ElementalAreasExtension::class)) {
+            if (ViewableData::has_extension($class, ElementalAreasExtension::class)) {
                 $elementalClasses[] = $class;
             }
         }

diff --git a/src/TopPage/DataExtension.php b/src/TopPage/DataExtension.php
@@ -6,12 +6,12 @@
 use DNADesign\Elemental\Models\ElementalArea;
 use Page;
 use SilverStripe\Core\ClassInfo;
-use SilverStripe\Core\Extensible;
 use SilverStripe\ORM\DataExtension as BaseDataExtension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Queries\SQLUpdate;
 use SilverStripe\ORM\ValidationException;
 use SilverStripe\Versioned\Versioned;
+use SilverStripe\View\ViewableData;
 
 /**
  * Class DataExtension
@@ -380,7 +380,7 @@ protected function getTopPageTable(): string
         // Find the first ancestor table which has the extension applied
         // Note that this extension is expected to be subclassed
         foreach ($classes as $class) {
-            if (!Extensible::has_extension($class, static::class)) {
+            if (!ViewableData::has_extension($class, static::class)) {
                 continue;
             }