🩹 Fix default provider discrepancies (#385)

roots · Jul 16, 2024 · 7b8b7ef · 7b8b7ef
2 parents e42873b + a324c53
commit 7b8b7ef
Show file tree

Hide file tree

Showing 2 changed files with 18 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,12 @@ public function __construct(?array $providers = null)
     {
         parent::__construct($providers);
 
+        $this->providers = array_unique($this->providers);
+
+        if ($providers) {
+            return;
+        }
+
         $this->providers = Collection::make($this->providers)
             ->merge($this->acornProviders)
             ->filter(fn ($provider) => ! Str::contains($provider, $this->disallowedProviders))

diff --git a/tests/Application/DefaultProvidersTest.php b/tests/Application/DefaultProvidersTest.php
@@ -13,3 +13,14 @@
 
     expect($providers->toArray())->toBe(array_unique($providers->toArray()));
 });
+
+it('replaces default providers', function () {
+    $providers = \Roots\Acorn\ServiceProvider::defaultProviders()->replace([
+        \Roots\Acorn\Providers\AcornServiceProvider::class => BootableServiceProvider::class,
+    ]);
+
+    expect($providers->toArray())
+        ->toContain(BootableServiceProvider::class)
+        ->not()
+        ->toContain(\Roots\Acorn\Providers\AcornServiceProvider::class);
+});