Skip to content

Commit

Permalink
πŸ§‘β€πŸ’» Improve handling of DefaultProviders
Browse files Browse the repository at this point in the history
πŸ§‘β€πŸ’» Allow the `FoundationServiceProvider` to get registered
  • Loading branch information
Log1x committed Jul 16, 2024
1 parent 875c214 commit ece19fc
Showing 1 changed file with 19 additions and 6 deletions.
25 changes: 19 additions & 6 deletions src/Roots/Acorn/DefaultProviders.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,36 @@

use Illuminate\Support\Collection;
use Illuminate\Support\DefaultProviders as DefaultProvidersBase;
use Illuminate\Support\Str;

class DefaultProviders extends DefaultProvidersBase
{
/**
* The Acorn providers.
*
* @var array
*/
protected $acornProviders = [
protected array $acornProviders = [
\Roots\Acorn\Assets\AssetsServiceProvider::class,
\Roots\Acorn\Filesystem\FilesystemServiceProvider::class,
\Roots\Acorn\Providers\AcornServiceProvider::class,
\Roots\Acorn\Providers\QueueServiceProvider::class,
\Roots\Acorn\View\ViewServiceProvider::class,
];

/**
* The additional framework providers.
*/
protected array $additionalProviders = [
\Illuminate\Foundation\Providers\ComposerServiceProvider::class,
\Illuminate\Database\MigrationServiceProvider::class,
];

/**
* The disallowed providers.
*/
protected array $disallowedProviders = [
\Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
];

/**
* Create a new default provider collection.
*
Expand All @@ -31,9 +45,8 @@ public function __construct(?array $providers = null)

$this->providers = Collection::make($this->providers)
->merge($this->acornProviders)
->filter(fn ($provider) => ! str_contains($provider, 'Illuminate\\Foundation\\'))
->push('Illuminate\\Foundation\\Providers\\ComposerServiceProvider')
->push('Illuminate\\Database\\MigrationServiceProvider')
->filter(fn ($provider) => ! Str::contains($provider, $this->disallowedProviders))
->merge($this->additionalProviders)
->unique()
->all();
}
Expand Down

0 comments on commit ece19fc

Please sign in to comment.