Update capsule provider booting and registration (fixing view:cache)

area17 · Jun 7, 2021 · 5a086a3 · 5a086a3
1 parent d066e3d
commit 5a086a3
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/CapsulesServiceProvider.php b/src/CapsulesServiceProvider.php
@@ -28,18 +28,14 @@ protected function mergeTwillConfig()
     }
 
     public function register()
-    {
-        $this->registerConfig();
-    }
-
-    protected function registerConfig()
     {
         $this->registerManager();
-
         $this->mergeTwillConfig();
+    }
 
+    public function boot()
+    {
         $this->registerCapsules();
-
         $this->registerViewPaths();
     }
 
@@ -57,14 +53,16 @@ protected function registerCapsule($capsule)
 
     public function registerViewPaths()
     {
-        $callback = function ($view) {
-            $view->addLocation(config('twill.capsules.path'));
-        };
+        if (file_exists(config('twill.capsules.path'))) {
+            $callback = function ($view) {
+                $view->addLocation(config('twill.capsules.path'));
+            };
 
-        $this->app->afterResolving('view', $callback);
+            $this->app->afterResolving('view', $callback);
 
-        if ($this->app->resolved('view')) {
-            $callback($this->app->make('view'), $this->app);
+            if ($this->app->resolved('view')) {
+                $callback($this->app->make('view'), $this->app);
+            }
         }
     }