Merge pull request #10913 from filamentphp/fix/configure-using-octane

fix: configureUsing() Octane
filamentphp · Jan 18, 2024 · 58b586c · 58b586c
2 parents 261202d + 24d2c16
commit 58b586c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/packages/support/src/Components/ComponentManager.php b/packages/support/src/Components/ComponentManager.php
@@ -27,6 +27,11 @@ final public function __construct()
     {
     }
 
+    public static function isResolved(): bool
+    {
+        return app()->resolved(static::class);
+    }
+
     public static function register(): void
     {
         app()->scopedIf(

diff --git a/packages/support/src/Concerns/Configurable.php b/packages/support/src/Concerns/Configurable.php
@@ -9,6 +9,20 @@ trait Configurable
 {
     public static function configureUsing(Closure $modifyUsing, ?Closure $during = null, bool $isImportant = false): mixed
     {
+        if (! ($during || ComponentManager::isResolved())) {
+            app()->resolving(
+                ComponentManager::class,
+                fn (ComponentManager $manager) => $manager->configureUsing(
+                    static::class,
+                    $modifyUsing,
+                    $during,
+                    $isImportant,
+                ),
+            );
+
+            return null;
+        }
+
         return ComponentManager::resolve()->configureUsing(
             static::class,
             $modifyUsing,