Skip to content

Commit

Permalink
Allow Laravel 6 (#98)
Browse files Browse the repository at this point in the history
  • Loading branch information
AshPowell authored and LKaemmerling committed Sep 17, 2019
1 parent d9a8250 commit a20c558
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: php

php:
- 7.0
- 7.1
- 7.2
- 7.3

env:
matrix:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All Notable changes to `onesignal` will be documented in this file

## 2.0.0 - Not released yet
- Add compatibility for Laravel 6
- Remove testing on old PHP versions (7.0,7.1) and test on 7.3

## 2.0.0-RC2 - 2019-02-07
- Update the underlying **berkayk/onesignal-laravel** Package to v1.0.1 ([#60](https://github.com/laravel-notification-channels/onesignal/pull/60))

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
}
],
"require": {
"php": ">=7.0.0",
"php": "^7.2.0",
"berkayk/onesignal-laravel": "^1.0.0",
"illuminate/notifications": "5.*",
"illuminate/support": "5.*"
"illuminate/notifications": "5.*|^6.0",
"illuminate/support": "5.*|^6.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/testbench": "^3.5",
"phpunit/phpunit": "^6.4"
"orchestra/testbench": "^4.0",
"phpunit/phpunit": "^8.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions tests/ChannelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ class ChannelTest extends TestCase
/** @var \NotificationChannels\OneSignal\OneSignalChannel */
protected $channel;

public function setUp()
public function setUp(): void
{
parent::setUp();
$this->oneSignal = Mockery::mock(OneSignalClient::class);

$this->channel = new OneSignalChannel($this->oneSignal);
}

public function tearDown()
public function tearDown(): void
{
Mockery::close();
parent::tearDown();
Expand Down
2 changes: 1 addition & 1 deletion tests/MessageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MessageTest extends \PHPUnit\Framework\TestCase
/** @var \NotificationChannels\OneSignal\OneSignalMessage */
protected $message;

public function setUp()
public function setUp(): void
{
parent::setUp();
$this->message = new OneSignalMessage();
Expand Down

0 comments on commit a20c558

Please sign in to comment.