🩹 Fix duplicate ViewServiceProvider registration (Fixes #374)

🩹 Fix replacing default providers (Fixes #375)
roots · Jul 16, 2024 · 3313e21 · 3313e21
1 parent e42873b
commit 3313e21
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Roots/Acorn/DefaultProviders.php b/src/Roots/Acorn/DefaultProviders.php
@@ -32,6 +32,7 @@ class DefaultProviders extends DefaultProvidersBase
      */
     protected array $disallowedProviders = [
         \Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
+        \Illuminate\View\ViewServiceProvider::class,
     ];
 
     /**
@@ -43,6 +44,10 @@ public function __construct(?array $providers = null)
     {
         parent::__construct($providers);
 
+        if ($providers) {
+            return;
+        }
+
         $this->providers = Collection::make($this->providers)
             ->merge($this->acornProviders)
             ->filter(fn ($provider) => ! Str::contains($provider, $this->disallowedProviders))