Skip to content

Commit ac55525

Browse files
abr4xasfreekmurze
authored andcommitted
fix CI errors && Support laravel 5.5 (#32)
* fix CI errors * fix StyleCI errors * Add automatic package discovery 🚀
1 parent 2f516da commit ac55525

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.6
54
- 7.0
65
- 7.1
76

composer.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"description": "OneSignal Notifications driver",
44
"homepage": "https://github.com/laravel-notification-channels/onesignal",
55
"license": "MIT",
6-
"authors": [
7-
{
6+
"authors": [{
87
"name": "Marcel Pociot",
98
"email": "[email protected]",
109
"homepage": "http://marcelpociot.com"
@@ -18,13 +17,13 @@
1817
"require": {
1918
"php": ">=5.6.4",
2019
"berkayk/onesignal-laravel": "^0.9.3",
21-
"illuminate/notifications": "5.3.*|5.4.*",
22-
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*"
20+
"illuminate/notifications": "5.*",
21+
"illuminate/support": "5.*"
2322
},
2423
"require-dev": {
25-
"mockery/mockery": "^0.9.5",
26-
"orchestra/testbench": "3.3.x-dev",
27-
"orchestra/database": "3.3.x-dev"
24+
"mockery/mockery": "^1.0",
25+
"orchestra/testbench": "^3.5",
26+
"phpunit/phpunit": "^6.4"
2827
},
2928
"autoload": {
3029
"psr-4": {
@@ -39,6 +38,13 @@
3938
"scripts": {
4039
"test": "vendor/bin/phpunit"
4140
},
41+
"extra": {
42+
"laravel": {
43+
"providers": [
44+
"NotificationChannels\\OneSignal\\OneSignalServiceProvider"
45+
]
46+
}
47+
},
4248
"config": {
4349
"sort-packages": true
4450
}

tests/ChannelTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace NotificationChannels\OneSignal\Test;
44

5-
use GuzzleHttp\Psr7\Response;
65
use Mockery;
6+
use GuzzleHttp\Psr7\Response;
7+
use Orchestra\Testbench\TestCase;
78
use Berkayk\OneSignal\OneSignalClient;
8-
use NotificationChannels\OneSignal\Exceptions\CouldNotSendNotification;
99
use NotificationChannels\OneSignal\OneSignalChannel;
10-
use Orchestra\Testbench\TestCase;
10+
use NotificationChannels\OneSignal\Exceptions\CouldNotSendNotification;
1111

1212
class ChannelTest extends TestCase
1313
{
@@ -76,7 +76,7 @@ public function it_throws_an_exception_when_it_could_not_send_the_notification()
7676
])
7777
->andReturn($response);
7878

79-
$this->setExpectedException(CouldNotSendNotification::class);
79+
$this->expectException(CouldNotSendNotification::class);
8080

8181
$this->channel->send(new Notifiable(), new TestNotification());
8282
}

tests/MessageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use NotificationChannels\OneSignal\OneSignalMessage;
88
use NotificationChannels\OneSignal\OneSignalWebButton;
99

10-
class MessageTest extends \PHPUnit_Framework_TestCase
10+
class MessageTest extends \PHPUnit\Framework\TestCase
1111
{
1212
/** @var \NotificationChannels\OneSignal\OneSignalMessage */
1313
protected $message;

0 commit comments

Comments
 (0)