Skip to content

Commit

Permalink
Add Laravel 6 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
mpociot committed Sep 4, 2019
1 parent 68a7db8 commit 3da60b1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ build
composer.lock
docs
vendor
coverage
coverage
.phpunit.result.cache
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
],
"require": {
"php": "^7.1",
"illuminate/container": "^5.7|^5.8",
"illuminate/database": "^5.7|^5.8",
"illuminate/log": "^5.7|^5.8",
"illuminate/routing": "^5.7|^5.8",
"illuminate/support": "^5.7|^5.8",
"illuminate/container": "^5.7|^5.8|^6.0",
"illuminate/database": "^5.7|^5.8|^6.0",
"illuminate/log": "^5.7|^5.8|^6.0",
"illuminate/routing": "^5.7|^5.8|^6.0",
"illuminate/support": "^5.7|^5.8|^6.0",
"willdurand/email-reply-parser": "^2.8",
"zbateson/mail-mime-parser": "^1.1"
},
"require-dev": {
"mockery/mockery": "^1.2",
"orchestra/testbench": "^3.7|^3.8",
"phpunit/phpunit": "^7.0",
"orchestra/testbench": "^3.7|^3.8|^4.0",
"phpunit/phpunit": "^7.0|^8.0",
"zendframework/zend-mail": "^2.10"
},
"autoload": {
Expand Down
3 changes: 2 additions & 1 deletion src/InboundEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use EmailReplyParser\EmailReplyParser;
use Illuminate\Contracts\Mail\Mailable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use ZBateson\MailMimeParser\Header\AddressHeader;
use ZBateson\MailMimeParser\Message as MimeMessage;
use ZBateson\MailMimeParser\Header\Part\AddressPart;
Expand Down Expand Up @@ -42,7 +43,7 @@ public static function fromMessage($message)

public function id(): string
{
return $this->message()->getHeaderValue('Message-Id', str_random());
return $this->message()->getHeaderValue('Message-Id', Str::random());
}

public function date(): Carbon
Expand Down

0 comments on commit 3da60b1

Please sign in to comment.