[11.x] Flush RegisterProviders bootstrapper state between tests (#4…

…9719) * [11.x] Flush `RegisterProviders` bootstrapper state between tests. Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update RegisterProviders.php * Update TestCase.php --------- Signed-off-by: Mior Muhammad Zaki <[email protected]> Co-authored-by: Taylor Otwell <[email protected]>
laravel · Jan 17, 2024 · 53e3246 · 53e3246
1 parent f630b39
commit 53e3246
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php b/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php
@@ -79,4 +79,16 @@ public static function merge(array $providers, ?string $bootstrapProviderPath =
             array_merge(static::$merge, $providers)
         )));
     }
+
+    /**
+     * Flush the bootstrapper's global state.
+     *
+     * @return void
+     */
+    public static function flushState()
+    {
+        static::$bootstrapProviderPath = null;
+
+        static::$merge = [];
+    }
 }
diff --git a/src/Illuminate/Foundation/Testing/TestCase.php b/src/Illuminate/Foundation/Testing/TestCase.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Bootstrap\HandleExceptions;
+use Illuminate\Foundation\Bootstrap\RegisterProviders;
 use Illuminate\Foundation\Console\AboutCommand;
 use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Illuminate\Foundation\Http\Middleware\TrimStrings;
@@ -248,6 +249,7 @@ protected function tearDown(): void
         ConvertEmptyStringsToNull::flushState();
         HandleExceptions::flushState();
         Queue::createPayloadUsing(null);
+        RegisterProviders::flushState();
         Sleep::fake(false);
         TrimStrings::flushState();