Skip to content

Commit 481548a

Browse files
authored
Merge pull request #25 from markwalet/laravel-8-support
Laravel 8 support
2 parents 9d2ab1b + ac51d95 commit 481548a

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/cache@v1
1717
with:
1818
path: ~/.composer/cache/files
19-
key: dependencies-php-7.4-illuminate-7.*-composer-${{ hashFiles('composer.json') }}
19+
key: dependencies-php-7.4-illuminate-8.*-composer-${{ hashFiles('composer.json') }}
2020

2121
- name: Setup PHP
2222
uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
2929
run: composer update --prefer-dist --no-interaction --no-suggest
3030

3131
- name: Calculate coverage statistics
32-
run: phpunit --coverage-clover 'clover.xml'
32+
run: vendor/bin/phpunit --coverage-clover 'clover.xml'
3333

3434
- name: Send coverage statistics
3535
uses: codecov/codecov-action@v1

.github/workflows/tests.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,21 @@ jobs:
1313
strategy:
1414
fail-fast: true
1515
matrix:
16-
php: [7.2, 7.3, 7.4]
17-
illuminate: [6.*, 7.*]
18-
stability: [prefer-lowest, prefer-stable]
16+
php: [ 7.2, 7.3, 7.4 ]
17+
illuminate: [ 6.*, 7.*, 8.* ]
18+
stability: [ prefer-lowest, prefer-stable ]
1919
include:
2020
- illuminate: 6.*
2121
testbench: 4.*
2222
- illuminate: 7.*
2323
testbench: 5.*
24+
- illuminate: 8.*
25+
testbench: 6.*
2426
exclude:
2527
- php: 7.4
2628
illuminate: 6.*
29+
- php: 7.2
30+
illuminate: 8.*
2731

2832
name: P${{ matrix.php }} - I${{ matrix.illuminate }} - ${{ matrix.stability }}
2933

@@ -49,7 +53,7 @@ jobs:
4953
composer require "illuminate/console:${{ matrix.illuminate }}" --no-interaction --no-update
5054
composer require "illuminate/contracts:${{ matrix.illuminate }}" --no-interaction --no-update
5155
composer require "illuminate/support:${{ matrix.illuminate }}" --no-interaction --no-update
52-
composer require "illuminate/filesystem:${{ matrix.illuminate }}" --no-interaction --no-update
56+
composer require "illuminate/filesystem:${{ matrix.illuminate }}" --no-interaction --no-update
5357
composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5458
composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
5559

.styleci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
preset: laravel
2-
disabled:
3-
- simplified_null_return

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Release Notes
22
## [Unreleased](https://github.com/markwalet/laravel-changelog/compare/v1.4.0...master)
33

4+
### Added
5+
- Added Laravel 8 support.
6+
47
## [v1.4.0 (2020-06-22)](https://github.com/markwalet/laravel-changelog/compare/v1.3.1...v1.4.0)
58

69
### Added

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
],
1212
"require": {
1313
"php": ">=7.1.3",
14-
"illuminate/console": "6.*|7.*",
15-
"illuminate/contracts": "6.*|7.*",
16-
"illuminate/support": "6.*|7.*",
17-
"illuminate/filesystem": "6.*|7.*",
14+
"illuminate/console": "6.*|7.*|8.*",
15+
"illuminate/contracts": "6.*|7.*|8.*",
16+
"illuminate/support": "6.*|7.*|8.*",
17+
"illuminate/filesystem": "6.*|7.*|8.*",
1818
"markwalet/laravel-git-state": "~1.0",
1919
"ext-simplexml": "*",
2020
"ext-dom": "*"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "~7.0||~8.0",
24-
"orchestra/testbench": "4.*|5.*"
23+
"phpunit/phpunit": "~7.0|~8.0",
24+
"orchestra/testbench": "4.*|5.*|6.*"
2525
},
2626
"autoload": {
2727
"psr-4": {

0 commit comments

Comments
 (0)