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

…into updates
beyondcode · Feb 23, 2024 · a2f3571 · a2f3571
2 parents 7e8d6bc + 550efcf
commit a2f3571
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/src/CreatesMailers.php b/src/CreatesMailers.php
@@ -16,7 +16,9 @@ protected function createLaravel6Mailer($app)
         // on the mailer. This allows us to resolve mailer classes via containers
         // for maximum testability on said classes instead of passing Closures.
         $mailer = new Mailer(
-            $app['view'], $app['swift.mailer'], $app['events']
+            $app['view'],
+            $app['swift.mailer'],
+            $app['events']
         );
 
         if ($app->bound('queue')) {
@@ -45,7 +47,10 @@ protected function createLaravel7Mailer($app)
         // on the mailer. This allows us to resolve mailer classes via containers
         // for maximum testability on said classes instead of passing Closures.
         $mailer = new Laravel7Mailer(
-            'smtp', $app['view'], $swiftMailer, $app['events']
+            'smtp',
+            $app['view'],
+            $swiftMailer,
+            $app['events']
         );
 
         if ($app->bound('queue')) {
@@ -78,7 +83,10 @@ protected function createLaravel9Mailer($app)
         // on the mailer. This allows us to resolve mailer classes via containers
         // for maximum testability on said classes instead of passing Closures.
         $mailer = new Laravel7Mailer(
-            'smtp', $app['view'], $symfonyTransport, $app['events']
+            'smtp',
+            $app['view'],
+            $symfonyTransport,
+            $app['events']
         );
 
         if ($app->bound('queue')) {
@@ -105,9 +113,10 @@ protected function getConfig($name = 'smtp')
     /**
      * Set a global address on the mailer by type.
      *
-     * @param  \Illuminate\Mail\Mailer  $mailer
-     * @param  array  $config
-     * @param  string  $type
+     * @param \Illuminate\Mail\Mailer $mailer
+     * @param array                   $config
+     * @param string                  $type
+     *
      * @return void
      */
     protected function setGlobalAddress($mailer, array $config, $type)

diff --git a/src/HeloLaravelServiceProvider.php b/src/HeloLaravelServiceProvider.php
@@ -16,7 +16,7 @@ class HeloLaravelServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if ($this->app->runningUnitTests() || ! $this->app['config']['helo.is_enabled']) {
+        if ($this->app->runningUnitTests() || !$this->app['config']['helo.is_enabled']) {
             return;
         }
 
@@ -73,7 +73,7 @@ protected function bootMailable()
 
     private function version($app = null): int
     {
-        if (! $app) {
+        if (!$app) {
             $app = $this->app;
         }
 

diff --git a/src/MailManager.php b/src/MailManager.php
@@ -11,7 +11,7 @@ class MailManager extends LaravelMailManager implements FactoryContract
 
     public function mailer($name = null)
     {
-        if (! $name) {
+        if (!$name) {
             return $this->createLaravel9Mailer($this->app);
         }
 

diff --git a/src/Mailer.php b/src/Mailer.php
@@ -16,7 +16,7 @@ class Mailer extends LaravelMailer implements MailerContract
     public function send($view, array $data = [], $callback = null)
     {
         if ($view instanceof Mailable
-            && ! $view instanceof ShouldQueue
+            && !$view instanceof ShouldQueue
         ) {
             $this->applyDebugHeaders($view);
         }
@@ -33,7 +33,7 @@ protected function applyDebugHeaders(Mailable $mailable)
 
             $viewFile = $this->getMailableViewFile($mailable);
 
-            if (! is_null($viewFile)) {
+            if (!is_null($viewFile)) {
                 $view = $this->getMailableView($viewFile);
                 $viewContent = $this->getMailableViewContent($view);
                 $viewData = $this->getMailableViewData($mailable);
@@ -62,7 +62,7 @@ protected function getMailableProperty($mailable, string $property)
 
     protected function getMailableViewFile(Mailable $mailable)
     {
-        if (! is_null($markdown = $this->getMailableProperty($mailable, 'markdown'))) {
+        if (!is_null($markdown = $this->getMailableProperty($mailable, 'markdown'))) {
             return $markdown;
         }
 
@@ -86,7 +86,7 @@ protected function getMailableViewData(Mailable $mailable)
         $clonedData = $cloner->cloneVar($mailable->buildViewData());
 
         return $dumper->dump($clonedData, true, [
-            'maxDepth' => 3,
+            'maxDepth'        => 3,
             'maxStringLength' => 160,
         ]);
     }

diff --git a/tests/HeloTest.php b/tests/HeloTest.php
@@ -18,8 +18,7 @@
     Mail::assertSent(TestMail::class);
 });
 
-test('plain text mails work correctly', function ()
-{
+test('plain text mails work correctly', function () {
     Mail::fake();
 
     Mail::to('[email protected]')->send(new TestMail(true));