ENH Don't use deprecated method (#3006)

This commit is contained in:
Guy Sartorelli 2024-09-19 14:06:39 +12:00 committed by GitHub
parent 24bb95d3bf
commit 4b3e1f09bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 8 deletions

View File

@ -29,6 +29,6 @@ class CMSBatchAction_Archive extends CMSBatchAction
public function applicablePages($ids) public function applicablePages($ids)
{ {
// canArchive() is deprecated, not $this->applicablePagesHelper() // canArchive() is deprecated, not $this->applicablePagesHelper()
return Deprecation::withNoReplacement(fn() => $this->applicablePagesHelper($ids, 'canArchive')); return Deprecation::withSuppressedNotice(fn() => $this->applicablePagesHelper($ids, 'canArchive'));
} }
} }

View File

@ -20,7 +20,7 @@ class CMSBatchAction_Restore extends CMSBatchAction
{ {
public function __construct() public function __construct()
{ {
Deprecation::withNoReplacement(function () { Deprecation::withSuppressedNotice(function () {
Deprecation::notice('5.3.0', 'Will be removed without equivalent functionality to replace it', Deprecation::SCOPE_CLASS); Deprecation::notice('5.3.0', 'Will be removed without equivalent functionality to replace it', Deprecation::SCOPE_CLASS);
}); });
} }

View File

@ -1998,7 +1998,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
if (!$record || !$record->exists()) { if (!$record || !$record->exists()) {
throw new HTTPResponse_Exception("Bad record ID #$id", 404); throw new HTTPResponse_Exception("Bad record ID #$id", 404);
} }
$canArchive = Deprecation::withNoReplacement(fn() => $record->canArchive()); $canArchive = Deprecation::withSuppressedNotice(fn() => $record->canArchive());
if (!$canArchive) { if (!$canArchive) {
return Security::permissionFailure(); return Security::permissionFailure();
} }

View File

@ -49,7 +49,7 @@ class LinkablePlugin implements ModelQueryPlugin
public function __construct() public function __construct()
{ {
Deprecation::withNoReplacement(function () { Deprecation::withSuppressedNotice(function () {
Deprecation::notice('5.3.0', 'Will be moved to the silverstripe/graphql module', Deprecation::SCOPE_CLASS); Deprecation::notice('5.3.0', 'Will be moved to the silverstripe/graphql module', Deprecation::SCOPE_CLASS);
}); });
} }

View File

@ -13,7 +13,7 @@ class Resolver
{ {
public function __construct() public function __construct()
{ {
Deprecation::withNoReplacement(function () { Deprecation::withSuppressedNotice(function () {
Deprecation::notice('5.3.0', 'Will be moved to the silverstripe/graphql module', Deprecation::SCOPE_CLASS); Deprecation::notice('5.3.0', 'Will be moved to the silverstripe/graphql module', Deprecation::SCOPE_CLASS);
}); });
} }

View File

@ -2578,7 +2578,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
// If a page is on any stage it can be archived // If a page is on any stage it can be archived
if (($isOnDraft || $isPublished)) { if (($isOnDraft || $isPublished)) {
$canArchive = Deprecation::withNoReplacement(fn() => $this->canArchive()); $canArchive = Deprecation::withSuppressedNotice(fn() => $this->canArchive());
if ($canArchive) { if ($canArchive) {
$title = $isPublished $title = $isPublished
? _t('SilverStripe\\CMS\\Controllers\\CMSMain.UNPUBLISH_AND_ARCHIVE', 'Unpublish and archive') ? _t('SilverStripe\\CMS\\Controllers\\CMSMain.UNPUBLISH_AND_ARCHIVE', 'Unpublish and archive')

View File

@ -18,10 +18,10 @@ abstract class SiteTreeExtension extends DataExtension
{ {
public function __construct() public function __construct()
{ {
// Wrapping with Deprecation::withNoReplacement() to avoid triggering deprecation notices // Wrapping with Deprecation::withSuppressedNotice() to avoid triggering deprecation notices
// as we are unable to update existing subclasses of this class until a new major // as we are unable to update existing subclasses of this class until a new major
// unless we add in the pointless empty methods that are in this class // unless we add in the pointless empty methods that are in this class
Deprecation::withNoReplacement(function () { Deprecation::withSuppressedNotice(function () {
$class = Extension::class; $class = Extension::class;
Deprecation::notice('5.3.0', "Subclass $class instead", Deprecation::SCOPE_CLASS); Deprecation::notice('5.3.0', "Subclass $class instead", Deprecation::SCOPE_CLASS);
}); });