Merge branch '6.0' into 6

silverstripe · Feb 13, 2025 · baba2d8 · baba2d8
2 parents b9bd8f7 + 2c8fbec
commit baba2d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/Control/Controller.php b/src/Control/Controller.php
@@ -12,6 +12,7 @@
 use SilverStripe\View\SSViewer;
 use SilverStripe\View\TemplateEngine;
 use SilverStripe\View\TemplateGlobalProvider;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * Controllers are the cornerstone of all site functionality in SilverStripe. The {@link Director}
@@ -534,6 +535,7 @@ public static function curr()
         if (Controller::$controller_stack) {
             return Controller::$controller_stack[0];
         }
+        // This user_error() will be removed in the next major version of Silverstripe CMS
         user_error("No current controller available", E_USER_WARNING);
         return null;
     }
@@ -543,9 +545,11 @@ public static function curr()
      * controller in the stack.
      *
      * @return bool
+     * @deprecated 5.4.0 Will be removed without equivalent functionality to replace it
      */
     public static function has_curr()
     {
+        Deprecation::noticeWithNoReplacment('5.4.0');
         return Controller::$controller_stack ? true : false;
     }
 

diff --git a/tests/php/Forms/GridField/GridFieldPrintButtonTest.php b/tests/php/Forms/GridField/GridFieldPrintButtonTest.php
@@ -4,6 +4,7 @@
 
 use LogicException;
 use ReflectionMethod;
+use PHPUnit\Framework\Attributes\DataProvider;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Control\Controller;
 use SilverStripe\Dev\CSSContentParser;
@@ -98,7 +99,7 @@ public function testGeneratePrintData()
         $this->assertSame($names, $foundNames);
     }
 
-    public function provideHandlePrintEscaping(): array
+    public static function provideHandlePrintEscaping(): array
     {
         return [
             // Without data columns component
@@ -193,9 +194,8 @@ public function provideHandlePrintEscaping(): array
      * Explicitly tests that the following are both true:
      * - XML entities are not double-escaped
      * - XSS attack vectors are not introduced
-     *
-     * @dataProvider provideHandlePrintEscaping
      */
+    #[DataProvider('provideHandlePrintEscaping')]
     public function testHandlePrintEscaping(string|DBField $value, bool $useGridFieldDataColumns, string $expected): void
     {
         $component = new GridFieldPrintButton();

diff --git a/tests/php/ORM/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php
@@ -2855,9 +2855,7 @@ public static function provideProvideI18nEntities(): array
         ];
     }
 
-    /**
-     * @dataProvider provideProvideI18nEntities
-     */
+    #[DataProvider('provideProvideI18nEntities')]
     public function testProvideI18nEntities(?string $classDescription, bool $expected): void
     {
         $obj = new class extends DataObject {
@@ -2870,7 +2868,7 @@ public function plural_name()
             {
                 return 'Clouds';
             }
-            public function classDescription()
+            public function classDescription(): ?string
             {
                 return $this->classDescription;
             }