update to two service providers

Author: vicgonvt

composer.json

@@ -40,7 +40,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "vicgonvt\\LaraPress\\LaraPressServiceProvider"
+                "vicgonvt\\LaraPress\\LaraPressBaseServiceProvider"
             ],
             "aliases": {
                 "LaraPress": "vicgonvt\\LaraPress\\Facades\\LaraPress"

src/LaraPressServiceProvider.php …sole/stubs/LaraPressServiceProvider.stubsrc/LaraPressServiceProvider.php renamed to src/Console/stubs/LaraPressServiceProvider.stub src/LaraPressServiceProvider.php renamed to src/Console/stubs/LaraPressServiceProvider.stub

@@ -2,9 +2,10 @@
 
 namespace App\Providers;
 
-use vicgonvt\LaraPress\LaraPressBaseServiceProvider;
+use Illuminate\Support\ServiceProvider;
+use vicgonvt\LaraPress\Facades\LaraPress;
 
-class LaraPressServiceProvider extends LaraPressBaseServiceProvider
+class LaraPressServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any package services.
@@ -13,9 +14,7 @@ class LaraPressServiceProvider extends LaraPressBaseServiceProvider
      */
     public function boot()
     {
-        parent::boot();
-
-        //
+        LaraPress::fields($this->fields());
     }
 
     /**
@@ -25,8 +24,6 @@ public function boot()
      */
     public function register()
     {
-        parent::register();
-
         //
     }
 

src/LaraPress.php

@@ -127,6 +127,11 @@ public function fields(array $fields)
         $this->fields = array_merge($this->fields, $fields);
     }
 
+    /**
+     * Get the available fields.
+     *
+     * @return array
+     */
     public function availableFields()
     {
         return $this->fields;

src/LaraPressBaseServiceProvider.php

@@ -46,7 +46,7 @@ protected function registerResources()
     protected function registerPublishing()
     {
         $this->publishes([
-            __DIR__.'/LaraPressServiceProvider.php' => app_path('Providers/LaraPressServiceProvider.php'),
+            __DIR__.'/Console/stubs/LaraPressServiceProvider.stub' => app_path('Providers/LaraPressServiceProvider.php'),
         ], 'larapress-provider');
         $this->publishes([
             __DIR__.'/../config/larapress.php' => config_path('larapress.php'),
@@ -72,7 +72,7 @@ protected function registerRoutes()
      */
     protected function registerFields()
     {
-        LaraPress::fields(array_merge([
+        LaraPress::fields([
             Field\Body::class,
             Field\Date::class,
             Field\Extra::class,
@@ -81,7 +81,7 @@ protected function registerFields()
             Field\Series::class,
             Field\Tags::class,
             Field\Title::class,
-        ], $this->fields()));
+        ]);
     }
 
     /**