Merge branch 'updates' of https://github.com/beyondcode/helo-laravel into updates

mechelon · mechelon · commit 34e8d9c8e604 · 2024-03-13T15:41:12.000+01:00
diff --git a/src/HeloLaravelServiceProvider.php b/src/HeloLaravelServiceProvider.php
@@ -23,7 +23,7 @@ public function boot()
         $this->bootMailable();
 
         if ($this->app->runningInConsole()) {
-            View::addNamespace('helo', __DIR__ . '/../resources/views');
+            View::addNamespace('helo', __DIR__.'/../resources/views');
         }
     }
 
@@ -38,11 +38,11 @@ public function register()
             ]);
 
             $this->publishes([
-                __DIR__ . '/../config/helo.php' => base_path('config/helo.php'),
+                __DIR__.'/../config/helo.php' => base_path('config/helo.php'),
             ], 'config');
         }
 
-        $this->mergeConfigFrom(__DIR__ . '/../config/helo.php', 'helo');
+        $this->mergeConfigFrom(__DIR__.'/../config/helo.php', 'helo');
 
         $this->app->singleton(Mailer::class, function ($app) {
             $version = $this->version($app);

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function boot()`
`23`	`23`	`$this->bootMailable();`
`24`	`24`
`25`	`25`	`if ($this->app->runningInConsole()) {`
`26`		`- View::addNamespace('helo', __DIR__ . '/../resources/views');`
	`26`	`+ View::addNamespace('helo', __DIR__.'/../resources/views');`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -38,11 +38,11 @@ public function register()`
`38`	`38`	`]);`
`39`	`39`
`40`	`40`	`$this->publishes([`
`41`		`- __DIR__ . '/../config/helo.php' => base_path('config/helo.php'),`
	`41`	`+ __DIR__.'/../config/helo.php' => base_path('config/helo.php'),`
`42`	`42`	`], 'config');`
`43`	`43`	`}`
`44`	`44`
`45`		`- $this->mergeConfigFrom(__DIR__ . '/../config/helo.php', 'helo');`
	`45`	`+ $this->mergeConfigFrom(__DIR__.'/../config/helo.php', 'helo');`
`46`	`46`
`47`	`47`	`$this->app->singleton(Mailer::class, function ($app) {`
`48`	`48`	`$version = $this->version($app);`