Merge pull request #60 from laravel-notification-channels/6.0

Add support for Laravel 6.0
laravel-notification-channels · Sep 5, 2019 · 61b7270 · 61b7270
2 parents 4c696d4 + 900e838
commit 61b7270
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
 
 env:
   matrix:

diff --git a/composer.json b/composer.json
@@ -11,18 +11,18 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
-        "illuminate/config": "^5.5",
-        "illuminate/events": "^5.5",
-        "illuminate/notifications": "^5.5",
-        "illuminate/support": "^5.5",
-        "illuminate/queue": "^5.5",
+        "php": "^7.2",
+        "illuminate/config": "^6.0",
+        "illuminate/events": "^6.0",
+        "illuminate/notifications": "^6.0",
+        "illuminate/support": "^6.0",
+        "illuminate/queue": "^6.0",
         "zendframework/zendservice-apple-apns": "^1.2"
     },
     "require-dev": {
         "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~6.0",
-        "squizlabs/php_codesniffer": "~3.0"
+        "phpunit/phpunit": "~8.0",
+        "squizlabs/php_codesniffer": "~3.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -22,7 +22,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

diff --git a/tests/ApnChannelTest.php b/tests/ApnChannelTest.php
@@ -27,7 +27,7 @@ class ChannelTest extends TestCase
     /** @var ApnChannel */
     protected $channel;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = Mockery::mock(Client::class);
         $this->events = Mockery::mock(Dispatcher::class);

diff --git a/tests/ApnCredentialsTest.php b/tests/ApnCredentialsTest.php
@@ -4,7 +4,7 @@
 
 class ApnCredentialsTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/FeedbackServiceTest.php b/tests/FeedbackServiceTest.php
@@ -20,7 +20,7 @@ class FeedbackServiceTest extends TestCase
     /** @var ApnChannel */
     protected $channel;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = Mockery::mock(Client::class);
         $this->credentials = $this->getTestCredentials();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,7 +8,7 @@
 
 abstract class TestCase extends BaseTestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();