ENH Stop using Controller::has_curr()

silverstripe · Feb 13, 2025 · aa35a95 · aa35a95
1 parent ee61bd5
commit aa35a95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/tests/php/VersionedGridFieldTest/TestController.php b/tests/php/VersionedGridFieldTest/TestController.php
@@ -22,8 +22,9 @@ protected function init()
     public function __construct()
     {
         parent::__construct();
-        if (Controller::has_curr()) {
-            $this->setRequest(Controller::curr()->getRequest());
+        $controller = Controller::curr();
+        if ($controller) {
+            $this->setRequest($controller->getRequest());
         }
     }
 

diff --git a/tests/php/VersionedTest.php b/tests/php/VersionedTest.php
@@ -1091,10 +1091,11 @@ public function testReadingNotPersistentWhenUseSessionFalse()
 
     protected function setUp(): void
     {
-        if (!static::$defaultController && Controller::has_curr()) {
-            static::$defaultController = Controller::curr();
+        $controller = Controller::curr();
+        if (!static::$defaultController && $controller) {
+            static::$defaultController = $controller;
         }
-        if (!Controller::has_curr() && static::$defaultController) {
+        if (!$controller && static::$defaultController) {
             static::$defaultController->pushCurrent();
         }
         parent::setUp();