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.

Sign up for GitHub

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

ENH Various fixes for PHP 8.1 compatibility #976

Merged
merged 1 commit into from
Apr 21, 2022
+6 −5
Merged

ENH Various fixes for PHP 8.1 compatibility #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Extensions/ElementalAreasExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions src/Models/ElementalArea.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -14,6 +13,7 @@
use SilverStripe\ORM\HasManyList;
use SilverStripe\ORM\UnsavedRelationList;
use SilverStripe\Versioned\Versioned;
use SilverStripe\View\ViewableData;

/**
* Class ElementalArea
Expand Down Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/TopPage/DataExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down