@@ -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 );
@@ -65,15 +65,11 @@ public function register()
65
65
66
66
protected function bootMailable ()
67
67
{
68
- if ($ this ->version () < 10 ) {
69
- $ instance = app ()->make (Mailer::class);
68
+ $ instance = app ()->make (Mailer::class);
70
69
71
- Mail::swap ($ instance );
70
+ Mail::swap ($ instance );
72
71
73
- $ this ->app ->instance (MailerContract::class, $ instance );
74
- } else {
75
- Mail::swap (new MailManager ($ this ->app ));
76
- }
72
+ $ this ->app ->instance (MailerContract::class, $ instance );
77
73
}
78
74
79
75
private function version ($ app = null ): int
0 commit comments