Skip to content

Commit

Permalink
Merge branch 'main' into test-individual-mail-sender
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/MicrosoftGraphTransport.php
#	src/Services/MicrosoftGraphApiService.php
  • Loading branch information
geisi committed Nov 28, 2023
2 parents f5ee576 + a211b30 commit e70e319
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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),
],
```

Expand Down
6 changes: 0 additions & 6 deletions config/msgraph-mail.php

This file was deleted.

5 changes: 5 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions src/LaravelMsGraphMailServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/MicrosoftGraphTransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'address' => '[email protected]',
'name' => 'Taylor Otwell',
],
'save_to_sent_items' => null,
]);
Config::set('mail.default', 'microsoft-graph');

Expand Down

0 comments on commit e70e319

Please sign in to comment.