From 07cde8e9084a420d9cbb1b44e8b81189c35a59cc Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Fri, 12 Jun 2026 21:47:10 +0200 Subject: [PATCH 1/4] fix(testing): change order of `$extensionManager->booted = true;` --- .../integration/Extend/OverrideExtensionManagerForTests.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php index 3e1b988074..595fb990a5 100644 --- a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php +++ b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php @@ -34,12 +34,12 @@ public function extend(Container $container, ?Extension $extension = null): void $container->singleton(ExtensionManager::class, ExtensionManagerIncludeCurrent::class); $extensionManager = $container->make(ExtensionManager::class); + $extensionManager->booted = true; + foreach ($this->extensions as $extension) { $extensionManager->enable($extension); } - $extensionManager->booted = true; - $extensionManager->extend($container); } } From 651acaeff6f78dbb833b9615a9ee742f7e142c54 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Fri, 12 Jun 2026 21:54:23 +0200 Subject: [PATCH 2/4] chore(testing): add type hint for $extensionManager Previously $extensionManager->booted was not recognized because the ExtensionManager itself doesn't have this property whereas `ExtensionManagerIncludeCurrent` has it --- .../src/integration/Extend/OverrideExtensionManagerForTests.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php index 595fb990a5..306065da23 100644 --- a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php +++ b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php @@ -32,6 +32,7 @@ public function extend(Container $container, ?Extension $extension = null): void $container->when(ExtensionManagerIncludeCurrent::class)->needs('$enabledIds')->give($this->extensions); if (count($this->extensions)) { $container->singleton(ExtensionManager::class, ExtensionManagerIncludeCurrent::class); + /** @var ExtensionManagerIncludeCurrent $extensionManager */ $extensionManager = $container->make(ExtensionManager::class); $extensionManager->booted = true; From 8a65132e36129d17355d3efa5e2fdd977814b0d6 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Fri, 12 Jun 2026 22:04:09 +0200 Subject: [PATCH 3/4] debugging --- .../integration/Extend/OverrideExtensionManagerForTests.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php index 306065da23..7481bdfc8b 100644 --- a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php +++ b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php @@ -35,13 +35,13 @@ public function extend(Container $container, ?Extension $extension = null): void /** @var ExtensionManagerIncludeCurrent $extensionManager */ $extensionManager = $container->make(ExtensionManager::class); - $extensionManager->booted = true; + $extensionManager->extend($container); foreach ($this->extensions as $extension) { $extensionManager->enable($extension); } - $extensionManager->extend($container); + $extensionManager->booted = true; } } } From 9f2c5b000c42c7b7bc548f73749b617417e725cf Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Fri, 12 Jun 2026 22:09:12 +0200 Subject: [PATCH 4/4] maybe --- .../src/integration/Extend/OverrideExtensionManagerForTests.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php index 7481bdfc8b..09f1b84392 100644 --- a/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php +++ b/php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php @@ -35,8 +35,10 @@ public function extend(Container $container, ?Extension $extension = null): void /** @var ExtensionManagerIncludeCurrent $extensionManager */ $extensionManager = $container->make(ExtensionManager::class); + $extensionManager->booted = true; $extensionManager->extend($container); + $extensionManager->booted = false; foreach ($this->extensions as $extension) { $extensionManager->enable($extension); }