Merge 87f4e9184e into df82162291

code/Controllers/ContentController.php

@@ -301,9 +301,7 @@ class ContentController extends Controller
      */
     public function Menu($level)
     {
-        Deprecation::withSuppressedNotice(
+        Deprecation::noticeWithNoReplacment('5.4.0', 'Use getMenu() instead. You can continue to use $Menu in templates.');
-            fn() => Deprecation::notice('5.4.0', 'Use getMenu() instead. You can continue to use $Menu in templates.')
-        );
         return $this->getMenu($level);
     }
 

tests/php/Controllers/ContentControllerTest.php

@@ -8,7 +8,6 @@ use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Versioned\Versioned;
 
@@ -205,7 +204,7 @@ class ContentControllerTest extends FunctionalTest
                 __DIR__
                 . '/themes/controllertest/templates/SilverStripe/CMS/Tests/Controllers/'
                 . 'ContentControllerTestPage_test.ss',
-                Deprecation::withSuppressedNotice(fn() => $viewer->templates())['main']
+                $viewer->templates()['main']
             );
         });
     }