ENH Stop using Controller::has_curr()

silverstripe · Feb 13, 2025 · dcff8c1 · dcff8c1
1 parent b7ab7b4
commit dcff8c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Schema/Storage/AbstractTypeRegistry.php b/src/Schema/Storage/AbstractTypeRegistry.php
@@ -71,9 +71,10 @@ public static function get(string $typename)
 
     private static function canRebuildOnMissing(): bool
     {
-        if (!Controller::has_curr() ||
-            !(Controller::curr() instanceof GraphQLController) ||
-            !Controller::curr()->autobuildEnabled()
+        $controller = Controller::curr();
+        if (!$controller ||
+            !($controller instanceof GraphQLController) ||
+            !$controller->autobuildEnabled()
         ) {
             return false;
         }

diff --git a/tests/Schema/AbstractTypeRegistryTest.php b/tests/Schema/AbstractTypeRegistryTest.php
@@ -37,8 +37,9 @@ protected function tearDown(): void
             $fs->remove($dir);
         }
         // ensure that any GraphqlController added to controller_stack is removed
-        if (Controller::has_curr() && (Controller::curr() instanceof GraphQLController)) {
-            Controller::curr()->popCurrent();
+        $controller = Controller::curr();
+        if ($controller instanceof GraphQLController) {
+            $controller->popCurrent();
         }
     }