Merge pull request #44 from mailjet/php8

php 8 support
mailjet · Dec 22, 2020 · e168d36 · e168d36
2 parents 703ed57 + 11d9063
commit e168d36
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: php
 php:
 - '7.1'
 - '7.2'
+- '8.0'
 before_install:
 - composer install --dev -v --prefer-source
 script:

diff --git a/composer.json b/composer.json
@@ -23,16 +23,16 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.1.3|^8.0",
         "laravel/framework": "~5.1|^6.0|^7.0|^8.0",
         "mailjet/mailjet-apiv3-php": "^1.2",
         "mailjet/mailjet-swiftmailer": "^2.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~7.0",
-        "orchestra/testbench": "3.6"
+        "mockery/mockery": "0.9.*|^1.0",
+        "phpunit/phpunit": "~7.0|^8.0",
+        "orchestra/testbench": "3.6|^4.0|^5.0|^6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.phar b/composer.phar
diff --git a/tests/Providers/CampaignDraftServiceProviderTest.php b/tests/Providers/CampaignDraftServiceProviderTest.php
@@ -20,7 +20,7 @@ class CampaignDraftServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Providers/CampaignServiceProviderTest.php b/tests/Providers/CampaignServiceProviderTest.php
@@ -20,7 +20,7 @@ class CampaigntServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Providers/ContactMetadataServiceProviderTest.php b/tests/Providers/ContactMetadataServiceProviderTest.php
@@ -20,7 +20,7 @@ class ContactMetadataServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Providers/ContactsListServiceProviderTest.php b/tests/Providers/ContactsListServiceProviderTest.php
@@ -20,7 +20,7 @@ class ContactsListServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Providers/EventCallbackUrlServiceProviderTest.php b/tests/Providers/EventCallbackUrlServiceProviderTest.php
@@ -20,7 +20,7 @@ class EventCallbackUrlServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Providers/MailjetClientServiceProviderTest.php b/tests/Providers/MailjetClientServiceProviderTest.php
@@ -20,7 +20,7 @@ class MailjetClientServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Providers/TemplateServiceProviderTest.php b/tests/Providers/TemplateServiceProviderTest.php
@@ -20,7 +20,7 @@ class TemplateServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setUpMocks();
 

diff --git a/tests/Services/MailjetServiceTest.php b/tests/Services/MailjetServiceTest.php
@@ -21,7 +21,7 @@ class MailjetServiceTest extends TestCase
      */
     private $mailjetService;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ language: php @@
     php:
     - '7.1'
     - '7.2'
+    - '8.0'
     before_install:
     - composer install --dev -v --prefer-source
     script:
@@ Expand Down @@