Skip to content

Commit

Permalink
Merge pull request #183 from ciungulete/SupportLaravel9
Browse files Browse the repository at this point in the history
Add support for Laravel 9
  • Loading branch information
sandervanhooft authored Jan 31, 2022
2 parents 0bac3f6 + fb8af57 commit 31b7a56
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.4, 8.0, 8.1]
laravel: [^7.0, ^8.0]
exclude:
- php: 8.1
laravel: ^7.0
php: ['8.0', 8.1]
laravel: [8, 9]

name: P${{ matrix.php }} - L${{ matrix.laravel }}

Expand All @@ -34,8 +31,8 @@ jobs:

- name: Install dependencies
run: |
composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
composer update --prefer-dist --no-interaction --no-progress
composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
composer update --prefer-dist --no-interaction --no-progress --ignore-platform-reqs
- name: Execute tests
run: vendor/bin/phpunit --verbose
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,17 @@
"socialite"
],
"require": {
"php": "^7.2|^8.0",
"illuminate/support": "^6.0|^7.0|^8.0",
"php": "^7.3|^8.0",
"illuminate/support": "^8.0|^9.0",
"mollie/mollie-api-php": "^2.40",
"ext-json": "*"
},
"require-dev": {
"graham-campbell/testbench": "^5.5",
"graham-campbell/testbench": "^5.0",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^7.5|^8.0",
"laravel/socialite": "^4.0|^5.0",
"phpunit/phpunit": "^9.0",
"laravel/socialite": "^5.0",
"friendsofphp/php-cs-fixer": "^3.0"

},
"suggest": {
"laravel/socialite": "Use Mollie Connect (OAuth) to authenticate via Laravel Socialite with the Mollie API. This is needed for some endpoints."
Expand Down Expand Up @@ -83,5 +82,7 @@
"scripts": {
"test": "./vendor/bin/phpunit tests",
"format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}

0 comments on commit 31b7a56

Please sign in to comment.