Merge branch '5.4' into 5

Author: github-actions[bot]

src/Dev/Deprecation.php

@@ -464,7 +464,7 @@ public static function noticeWithNoReplacment(
         int $scope = Deprecation::SCOPE_METHOD
     ): void {
         if ($message === '') {
-            $message = 'Will be removed without equivalent functionality to replace it.';
+            $message = 'Will be removed without equivalent functionality to replace it in a future major release.';
         }
         Deprecation::withSuppressedNotice(
             fn() => Deprecation::notice($atVersion, $message, $scope)

tests/php/Dev/DeprecationTest.php

@@ -105,7 +105,7 @@ public function testNoticeNoReplacement()
     {
         $message = implode(' ', [
             'SilverStripe\Dev\Tests\DeprecationTest->myDeprecatedMethodNoReplacement is deprecated.',
-            'Will be removed without equivalent functionality to replace it.',
+            'Will be removed without equivalent functionality to replace it in a future major release.',
             'Called from SilverStripe\Dev\Tests\DeprecationTest->testNoticeNoReplacement.'
         ]);
         $this->expectDeprecation();

tests/php/Dev/DeprecationTest/DeprecationTestObject.php

@@ -14,7 +14,7 @@ public function __construct()
         Deprecation::withSuppressedNotice(function () {
             Deprecation::notice(
                 '1.2.3',
-                'Some class message in a future major release',
+                'Some class message',
                 Deprecation::SCOPE_CLASS
             );
         });