Merge pull request #12 from InnoGE/fix-server-error-500-when-save-to-…

…sent-items-is-null fix server error 500 when save to sent items is null
InnoGE · Nov 5, 2023 · a211b30 · a211b30
2 parents 58de8a5 + defcf0f
commit a211b30
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ First you need to add a new entry to the mail drivers array in your `config/mail
         'address' => env('MAIL_FROM_ADDRESS'),
         'name' => env('MAIL_FROM_NAME'),
     ],
-    'save_to_sent_items' =>  env('MAIL_SAVE_TO_SENT_ITEMS'),
+    'save_to_sent_items' =>  env('MAIL_SAVE_TO_SENT_ITEMS', false),
 ],
 ```
 

diff --git a/config/msgraph-mail.php b/config/msgraph-mail.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -4,3 +4,8 @@ parameters:
 			message: "#^Parameter \\#1 \\$message of static method Symfony\\\\Component\\\\Mime\\\\MessageConverter\\:\\:toEmail\\(\\) expects Symfony\\\\Component\\\\Mime\\\\Message, Symfony\\\\Component\\\\Mime\\\\RawMessage given\\.$#"
 			count: 1
 			path: src/MicrosoftGraphTransport.php
+
+		-
+			message: "#^Parameter \\#2 \\$html of method InnoGE\\\\LaravelMsGraphMail\\\\MicrosoftGraphTransport\\:\\:prepareAttachments\\(\\) expects string\\|null, resource\\|string\\|null given\\.$#"
+			count: 1
+			path: src/MicrosoftGraphTransport.php
diff --git a/src/LaravelMsGraphMailServiceProvider.php b/src/LaravelMsGraphMailServiceProvider.php
@@ -18,8 +18,7 @@ public function configurePackage(Package $package): void
          * More info: https://github.com/spatie/laravel-package-tools
          */
         $package
-            ->name('laravel-msgraph-mail')
-            ->hasConfigFile();
+            ->name('laravel-msgraph-mail');
     }
 
     public function boot(): void

diff --git a/src/MicrosoftGraphTransport.php b/src/MicrosoftGraphTransport.php
@@ -52,15 +52,14 @@ protected function doSend(SentMessage $message): void
                 'sender' => $this->transformEmailAddress($envelope->getSender()),
                 'attachments' => $attachments,
             ],
-            'saveToSentItems' =>  config('mail.mailers.microsoft-graph.save_to_sent_items', false),
+            'saveToSentItems' => config('mail.mailers.microsoft-graph.save_to_sent_items', false) ?? false,
         ];
 
         $this->microsoftGraphApiService->sendMail($this->from, $payload);
     }
 
     /**
      * @param  Collection<Address>  $recipients
-     * @return array
      */
     protected function transformEmailAddresses(Collection $recipients): array
     {
@@ -69,10 +68,6 @@ protected function transformEmailAddresses(Collection $recipients): array
             ->toArray();
     }
 
-    /**
-     * @param  Address  $address
-     * @return array
-     */
     protected function transformEmailAddress(Address $address): array
     {
         return [
@@ -83,21 +78,14 @@ protected function transformEmailAddress(Address $address): array
     }
 
     /**
-     * @param  Email  $email
-     * @param  Envelope  $envelope
      * @return Collection<Address>
      */
     protected function getRecipients(Email $email, Envelope $envelope): Collection
     {
         return collect($envelope->getRecipients())
-            ->filter(fn (Address $address) => !in_array($address, array_merge($email->getCc(), $email->getBcc()), true));
+            ->filter(fn (Address $address) => ! in_array($address, array_merge($email->getCc(), $email->getBcc()), true));
     }
 
-    /**
-     * @param Email $email
-     * @param string|null $html
-     * @return array
-     */
     protected function prepareAttachments(Email $email, ?string $html): array
     {
         $attachments = [];

diff --git a/src/Services/MicrosoftGraphApiService.php b/src/Services/MicrosoftGraphApiService.php
@@ -11,9 +11,9 @@
 class MicrosoftGraphApiService
 {
     public function __construct(protected readonly string $tenantId,
-                                protected readonly string $clientId,
-                                protected readonly string $clientSecret,
-                                protected readonly int $accessTokenTtl
+        protected readonly string $clientId,
+        protected readonly string $clientSecret,
+        protected readonly int $accessTokenTtl
     ) {
     }
 

diff --git a/tests/MicrosoftGraphTransportTest.php b/tests/MicrosoftGraphTransportTest.php
@@ -20,6 +20,7 @@
             'address' => 'taylor@laravel.com',
             'name' => 'Taylor Otwell',
         ],
+        'save_to_sent_items' => null,
     ]);
     Config::set('mail.default', 'microsoft-graph');
 
@@ -318,7 +319,7 @@
                     'subject' => 'Dev Test',
                     'body' => [
                         'contentType' => 'HTML',
-                        'content' => '<b>Test</b><img src="cid:' . $inlineImageContentId . '">'.PHP_EOL,
+                        'content' => '<b>Test</b><img src="cid:'.$inlineImageContentId.'">'.PHP_EOL,
                     ],
                     'toRecipients' => [
                         [

diff --git a/tests/Stubs/TestMail.php b/tests/Stubs/TestMail.php
@@ -50,8 +50,6 @@ public function content()
 
     /**
      * Get the attachments for the message.
-     *
-     * @return array
      */
     public function attachments(): array
     {

diff --git a/tests/Stubs/TestMailWithInlineImage.php b/tests/Stubs/TestMailWithInlineImage.php
@@ -50,8 +50,6 @@ public function content()
 
     /**
      * Get the attachments for the message.
-     *
-     * @return array
      */
     public function attachments(): array
     {