From dcff8c11a3d13eed1ddea203987b9f9f788b65da Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 13 Feb 2025 18:42:05 +1300 Subject: [PATCH] ENH Stop using Controller::has_curr() --- src/Schema/Storage/AbstractTypeRegistry.php | 7 ++++--- tests/Schema/AbstractTypeRegistryTest.php | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Schema/Storage/AbstractTypeRegistry.php b/src/Schema/Storage/AbstractTypeRegistry.php index a34e3c1a..8358a5fc 100644 --- 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 index 556100f2..54574a74 100644 --- 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(); } }