Skip to content

Commit

Permalink
Support for Laravel 10 (#427)
Browse files Browse the repository at this point in the history
* Add support for Laravel 10

* Add Laravel 10 test support

* Add PHPUnit 10 config

* remove PHPUnit 10

* wip

* exclude PHP 8.1/8.2 for lower Laravel versions

* wip

* Update composer.json

---------

Co-authored-by: Barry vd. Heuvel <[email protected]>
  • Loading branch information
timrspratt and barryvdh authored Feb 16, 2023
1 parent f4968ef commit 639345c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
24 changes: 22 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
laravel: ['6', '7', '8', '9' ]
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
laravel: [ '6', '7', '8', '9', '10' ]
exclude:
- php: '7.2'
laravel: '8'
Expand All @@ -26,6 +26,18 @@ jobs:
laravel: '6'
- php: '8.1'
laravel: '7'
- php: '8.2'
laravel: '6'
- php: '8.2'
laravel: '7'
- php: '7.2'
laravel: '10'
- php: '7.3'
laravel: '10'
- php: '7.4'
laravel: '10'
- php: '8.0'
laravel: '10'

name: PHP ${{ matrix.php }}; Laravel ${{ matrix.laravel }}

Expand Down Expand Up @@ -75,6 +87,14 @@ jobs:
command: composer require "laravel/framework:9.*" "phpunit/phpunit:^9.3.7" --no-update --no-interaction
if: "matrix.laravel == '9'"

- name: Select Laravel 10
uses: nick-invision/retry@v1
with:
timeout_minutes: 5
max_attempts: 5
command: composer require "laravel/framework:10.*" "phpunit/phpunit:^9.3.7" --no-update --no-interaction
if: "matrix.laravel == '10'"

- name: Install PHP Dependencies
uses: nick-invision/retry@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"require": {
"php": "^7.2.5 || ^8.0",
"twig/twig": "~3.0",
"illuminate/support": "^6|^7|^8|^9",
"illuminate/view": "^6|^7|^8|^9"
"illuminate/support": "^6|^7|^8|^9|^10",
"illuminate/view": "^6|^7|^8|^9|^10"
},
"require-dev": {
"ext-json": "*",
"laravel/framework": "^6|^7|^8|^9",
"laravel/framework": "^6|^7|^8|^9|^10",
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.7",
"squizlabs/php_codesniffer": "^3.6"
Expand All @@ -38,7 +38,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "0.13-dev"
"dev-master": "0.14-dev"
},
"laravel": {
"providers": [
Expand Down

0 comments on commit 639345c

Please sign in to comment.