Skip to content

Commit 79b4614

Browse files
authored
Merge pull request #19 from laravel-notification-channels/laravel-10
2 parents 472e005 + 1a43773 commit 79b4614

File tree

3 files changed

+41
-4
lines changed

3 files changed

+41
-4
lines changed

.github/workflows/tests.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: tests
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
laravel:
9+
runs-on: ubuntu-latest
10+
strategy:
11+
fail-fast: true
12+
matrix:
13+
laravel: [ 9.*, 10.* ]
14+
php: [ 8.0, 8.1 ]
15+
exclude:
16+
- laravel: 10.*
17+
php: 8.0
18+
name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }}
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v3
22+
23+
- name: Setup PHP
24+
uses: shivammathur/setup-php@v2
25+
with:
26+
php-version: ${{ matrix.php }}
27+
tools: composer:v2
28+
29+
- name: Install dependencies
30+
run: |
31+
composer require --dev --no-update laravel/framework:"${{ matrix.laravel }}"
32+
composer install --prefer-dist --no-interaction --no-progress
33+
env:
34+
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
35+
- name: Run tests
36+
run: ./vendor/bin/phpunit
37+

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"ext-json": "*",
1515
"guzzlehttp/guzzle": "^6.2 || ^7.0",
1616
"guzzlehttp/psr7": "^1.0 || ^2.0",
17-
"laravel/framework": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
17+
"laravel/framework": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
1818
},
1919
"require-dev": {
2020
"mockery/mockery": "^1.3.1",
21-
"orchestra/testbench": "^3.5 || ^4.0 || ^5.0 || ^6.0",
21+
"orchestra/testbench": "^3.5 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
2222
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.0"
2323
},
2424
"autoload": {

src/Pushwoosh.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
namespace NotificationChannels\Pushwoosh;
44

55
use GuzzleHttp\ClientInterface;
6-
use function GuzzleHttp\json_decode;
7-
use function GuzzleHttp\json_encode;
86
use GuzzleHttp\Psr7\Request;
97
use Illuminate\Contracts\Events\Dispatcher;
108
use NotificationChannels\Pushwoosh\Concerns\DetectsPushwooshErrors;
119
use NotificationChannels\Pushwoosh\Events\UnknownDevices;
1210
use NotificationChannels\Pushwoosh\Exceptions\PushwooshException;
1311
use Throwable;
12+
use function GuzzleHttp\json_decode;
13+
use function GuzzleHttp\json_encode;
1414

1515
class Pushwoosh
1616
{

0 commit comments

Comments
 (0)