Skip to content

Commit 581d430

Browse files
authored
fix: switch to GH actions + laravel 6 support (#40)
2 parents 8bda148 + 300c5c5 commit 581d430

File tree

5 files changed

+61
-56
lines changed

5 files changed

+61
-56
lines changed

.github/workflows/php.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: PHP
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
run:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
max-parallel: 15
10+
matrix:
11+
laravel-version: ['^6.0', '^7.0', '^8.0']
12+
php-versions: ['7.3', '7.4']
13+
name: PHP ${{ matrix.php-versions }} on Laravel ${{ matrix.laravel-version }}
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@master
17+
- name: Setup PHP
18+
uses: shivammathur/setup-php@master
19+
with:
20+
php-version: ${{ matrix.php-versions }}
21+
extensions: mbstring, xdebug
22+
coverage: xdebug
23+
- name: Install dependencies
24+
run: |
25+
composer require --no-update --no-interaction "illuminate/notifications:${{ matrix.laravel-version }}"
26+
composer update --no-interaction --prefer-dist --no-suggest
27+
- name: Lint composer.json
28+
run: composer validate
29+
- name: Run Tests
30+
run: composer test:ci

.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $ composer test
9494

9595
## Security
9696

97-
If you discover any security related issues, please email m.pociot@gmail.com instead of using the issue tracker.
97+
If you discover any security related issues, please email atymicq@gmail.com instead of using the issue tracker.
9898

9999
## Contributing
100100

composer.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@
88
"name": "Marcel Pociot",
99
"email": "m.pociot@gmail.com",
1010
"homepage": "http://www.marcelpociot.com"
11+
},
12+
{
13+
"name": "atymic",
14+
"email": "atymicq@gmail.com",
15+
"homepage": "https://atymic.dev"
1116
}
1217
],
1318
"require": {
1419
"php": "^7.2.5",
15-
"guzzlehttp/guzzle": "^7.0",
16-
"illuminate/notifications": "^7.0||^8.0",
17-
"illuminate/support": "^7.0||^8.0"
20+
"guzzlehttp/guzzle": "^6.2 || ^7.0",
21+
"illuminate/notifications": "^6.0 || ^7.0 || ^8.0",
22+
"illuminate/support": "^6.0 || ^7.0 || ^8.0"
1823
},
1924
"require-dev": {
2025
"mockery/mockery": "^1.3",
2126
"phpunit/phpunit": "^9.0",
22-
"orchestra/testbench": "^5.0||^6.0",
23-
"orchestra/database": "^5.0||^6.0"
27+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0"
2428
},
2529
"autoload": {
2630
"psr-4": {
@@ -33,7 +37,8 @@
3337
}
3438
},
3539
"scripts": {
36-
"test": "vendor/bin/phpunit"
40+
"test": "vendor/bin/phpunit",
41+
"test:ci": "phpunit --coverage-clover=coverage.xml"
3742
},
3843
"config": {
3944
"sort-packages": true

phpunit.xml.dist

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
verbose="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="false">
12-
<testsuites>
13-
<testsuite name=":service_name Test Suite">
14-
<directory>tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
<filter>
18-
<whitelist>
19-
<directory suffix=".php">src/</directory>
20-
</whitelist>
21-
</filter>
22-
<logging>
23-
<log type="tap" target="build/report.tap"/>
24-
<log type="junit" target="build/report.junit.xml"/>
25-
<log type="coverage-html" target="build/coverage"/>
26-
<log type="coverage-text" target="build/coverage.txt"/>
27-
<log type="coverage-clover" target="build/logs/clover.xml"/>
28-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src/</directory>
6+
</include>
7+
<report>
8+
<clover outputFile="build/logs/clover.xml"/>
9+
<html outputDirectory="build/coverage"/>
10+
<text outputFile="build/coverage.txt"/>
11+
</report>
12+
</coverage>
13+
<testsuites>
14+
<testsuite name=":service_name Test Suite">
15+
<directory>tests</directory>
16+
</testsuite>
17+
</testsuites>
18+
<logging>
19+
<junit outputFile="build/report.junit.xml"/>
20+
</logging>
2921
</phpunit>

0 commit comments

Comments
 (0)