Skip to content

Commit

Permalink
Merge pull request #301 from laravel/feat/back-compatibility-L10-comp…
Browse files Browse the repository at this point in the history
…onents

[develop] Keeps supporting older illuminate components
  • Loading branch information
nunomaduro authored Jan 12, 2024
2 parents ee5b650 + 5d8e03a commit 97a0784
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3]
laravel: [10, 11]

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

steps:
- name: Checkout code
Expand All @@ -33,7 +34,9 @@ jobs:
coverage: none

- name: Install dependencies
run: composer install --no-interaction --prefer-dist
run: |
composer require "laravel/framework=^${{ matrix.laravel }}" --no-update
composer update --prefer-dist --no-interaction --no-progress
- name: Execute tests
run: vendor/bin/phpunit
Expand All @@ -45,8 +48,9 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3]
laravel: [10, 11]

name: PHP ${{ matrix.php }} - Windows
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Windows

steps:
- name: Set git to use LF
Expand All @@ -67,7 +71,9 @@ jobs:
coverage: none

- name: Install dependencies
run: composer install --no-interaction --prefer-dist
run: |
composer require "laravel/framework=~${{ matrix.laravel }}" --no-update
composer update --prefer-dist --no-interaction --no-progress
- name: Execute tests
run: vendor/bin/phpunit
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
],
"require": {
"php": "^8.2",
"illuminate/filesystem": "^11.0",
"illuminate/support": "^11.0",
"illuminate/filesystem": "^10.20|^11.0",
"illuminate/support": "^10.20|^11.0",
"laravel/prompts": "^0.1",
"symfony/console": "^7.0",
"symfony/process": "^7.0"
"symfony/console": "^6.2|^7.0",
"symfony/process": "^6.2|^7.0"
},
"require-dev": {
"phpstan/phpstan": "^1.10",
Expand Down

0 comments on commit 97a0784

Please sign in to comment.