Merge pull request #80 from clementmas/master

mpociot · web-flow · commit 154cfe75a970 · 2021-03-15T23:57:04.000+01:00
Add PHP 8.0 support
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 7.3
   - 7.4
+  - 8.0
 
 env:
   matrix:
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "illuminate/container": "^6.0|^7.0|^8.0",
         "illuminate/database": "^6.0|^7.0|^8.0",
         "illuminate/log": "^6.0|^7.0|^8.0",
@@ -26,10 +26,10 @@
         "zbateson/mail-mime-parser": "^1.1"
     },
     "require-dev": {
+        "laminas/laminas-mail": "^2.13",
         "mockery/mockery": "^1.2",
         "orchestra/testbench": "^4.0|^5.0",
-        "phpunit/phpunit": "^7.0|^8.0",
-        "zendframework/zend-mail": "^2.10"
+        "phpunit/phpunit": "^7.0|^8.0|^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,6 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
         "sort-packages": true
diff --git a/tests/MailboxRouteCollectionTest.php b/tests/MailboxRouteCollectionTest.php
@@ -5,7 +5,7 @@
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Routing\Route;
 use BeyondCode\Mailbox\Routing\RouteCollection;
-use Zend\Mail\Message as TestMail;
+use Laminas\Mail\Message as TestMail;
 
 class MailboxRouteCollectionTest extends TestCase
 {
diff --git a/tests/MailboxRouteTest.php b/tests/MailboxRouteTest.php
@@ -4,7 +4,7 @@
 
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Routing\Route;
-use Zend\Mail\Message as TestMail;
+use Laminas\Mail\Message as TestMail;
 
 class MailboxRouteTest extends TestCase
 {

-Original file line number
+Diff line change
 php:
   - 7.3
   - 7.4
 +  - 8.0
 env:
   matrix:
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use BeyondCode\Mailbox\InboundEmail;`
`6`	`6`	`use BeyondCode\Mailbox\Routing\Route;`
`7`	`7`	`use BeyondCode\Mailbox\Routing\RouteCollection;`
`8`		`-use Zend\Mail\Message as TestMail;`
	`8`	`+use Laminas\Mail\Message as TestMail;`
`9`	`9`
`10`	`10`	`class MailboxRouteCollectionTest extends TestCase`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use BeyondCode\Mailbox\InboundEmail;`
`6`	`6`	`use BeyondCode\Mailbox\Routing\Route;`
`7`		`-use Zend\Mail\Message as TestMail;`
	`7`	`+use Laminas\Mail\Message as TestMail;`
`8`	`8`
`9`	`9`	`class MailboxRouteTest extends TestCase`
`10`	`10`	`{`