refactor: introduce FoundationServiceProvider to load service providers

Author: Brian Faust

composer.json

@@ -86,10 +86,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "ARKEcosystem\\Foundation\\Providers\\UserInterfaceServiceProvider",
-                "ARKEcosystem\\Foundation\\Providers\\HermesServiceProvider",
-                "ARKEcosystem\\Foundation\\Providers\\FortifyServiceProvider",
-                "ARKEcosystem\\Foundation\\Providers\\StanServiceProvider"
+                "ARKEcosystem\\Foundation\\Providers\\FoundationServiceProvider"
             ]
         }
     },

src/Providers/FoundationServiceProvider.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ARKEcosystem\Foundation\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class FoundationServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->register(UserInterfaceServiceProvider::class);
+        $this->app->register(MarkdownServiceProvider::class);
+        $this->app->register(CommonMarkServiceProvider::class);
+        $this->app->register(HermesServiceProvider::class);
+        $this->app->register(FortifyServiceProvider::class);
+        $this->app->register(StanServiceProvider::class);
+    }
+}

tests/CommonMark/Extensions/Link/LinkRendererTest.php

@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use ARKEcosystem\Foundation\CommonMark\Extensions\Link\LinkRenderer;
-use ARKEcosystem\Foundation\Providers\CommonMarkServiceProvider;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\CommonMark\Node\Inline\Link;
 use League\CommonMark\Node\Inline\Text;

tests/UserInterface/Components/CurrencyTest.php

@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use function Spatie\Snapshots\assertMatchesSnapshot;
 use ARKEcosystem\Foundation\UserInterface\Components\Currency;
+use function Spatie\Snapshots\assertMatchesSnapshot;
 
 it('should format the given value', function (): void {
     assertMatchesSnapshot((new Currency('USD'))->render()(['slot' => 10]));

usage/commonmark.md

@@ -5,22 +5,6 @@
 ## Installation
 
 1. Publish all the assets / views with `php artisan vendor:publish --provider="ARKEcosystem\Foundation\Providers\CommonMarkServiceProvider" --tag=config`.
-2. Disable auto-discovery for all fortify packages. This step is required so that we can control the loading order of `graham-campbell/markdown` and `arkecosystem/foundation`.
-
-```json
-"extra": {
-    "laravel": {
-        "dont-discover": ["arkecosystem/foundation", "graham-campbell/markdown"]
-    }
-},
-```
-
-4. Register the service providers in this exact order. This will ensure that our package can overwrite any bindings that `graham-campbell/markdown` created.
-
-```php
-GrahamCampbell\Markdown\MarkdownServiceProvider::class,
-ARKEcosystem\Foundation\Providers\CommonMarkServiceProvider::class,
-```
 
 ## Usage
 

usage/fortify.md

@@ -5,17 +5,8 @@
 ## Installation
 
 1. Publish all the assets / views with `php artisan vendor:publish --provider="ARKEcosystem\Foundation\Providers\FortifyServiceProvider" --tag=config --tag=images`.
-2. Disable auto-discovery for all fortify packages. This step is required so that we can control the loading order of `laravel/fortify` and `arkecosystem/foundation`.
-
-```json
-"extra": {
-    "laravel": {
-        "dont-discover": ["arkecosystem/foundation", "laravel/fortify"]
-    }
-},
-```
 
-4. Required Image
+2. Required Image
 
 Projects require an image to be provided: `resources/images/auth/verify-email.svg`
 

usage/ui.md

@@ -23,13 +23,13 @@ Since this package relies on a few 3rd party packages, you will need to have the
 
 ```js
 mix.webpackConfig({
-        resolve: {
-            alias: {
-                '@ui': path.resolve(__dirname, 'vendor/arkecosystem/foundation/resources/assets/')
-            }
+    resolve: {
+        alias: {
+            '@ui': path.resolve(__dirname, 'vendor/arkecosystem/foundation/resources/assets/')
         }
-    })
-    ...
+    }
+})
+...
 ```
 
 **Protip**: instead of running step 3 manually, you can add the following to your `post-autoload-dump` property in `composer.json`: