Merge pull request #54 from gabidj/issue-53-mail-fake-fix

mechelon · web-flow · commit 71426d969377 · 2025-07-25T14:02:47.000+02:00
Possible fix for issue #53
diff --git a/src/HeloLaravelServiceProvider.php b/src/HeloLaravelServiceProvider.php
@@ -51,10 +51,10 @@ public function register()
 
     protected function bootMailable()
     {
+        $managerInstance = app()->make(MailManager::class, ['app' => app()]);
         $instance = app()->make(Mailer::class);
 
-        Mail::swap($instance);
-
+        Mail::swap($managerInstance);
         $this->app->instance(MailerContract::class, $instance);
     }
 
diff --git a/src/MailManager.php b/src/MailManager.php
@@ -12,7 +12,7 @@ class MailManager extends LaravelMailManager implements FactoryContract
     public function mailer($name = null)
     {
         if (!$name) {
-            return $this->createLaravel9Mailer($this->app);
+            return $this->createGeneralLaravelMailer($this->app);
         }
 
         return $this->mailers[$name] = $this->get($name);

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ public function register()`
`51`	`51`
`52`	`52`	`protected function bootMailable()`
`53`	`53`	`{`
	`54`	`+ $managerInstance = app()->make(MailManager::class, ['app' => app()]);`
`54`	`55`	`$instance = app()->make(Mailer::class);`
`55`	`56`
`56`		`- Mail::swap($instance);`
`57`		`-`
	`57`	`+ Mail::swap($managerInstance);`
`58`	`58`	`$this->app->instance(MailerContract::class, $instance);`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class MailManager extends LaravelMailManager implements FactoryContract`
`12`	`12`	`public function mailer($name = null)`
`13`	`13`	`{`
`14`	`14`	`if (!$name) {`
`15`		`- return $this->createLaravel9Mailer($this->app);`
	`15`	`+ return $this->createGeneralLaravelMailer($this->app);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`return $this->mailers[$name] = $this->get($name);`