Skip to content

Commit

Permalink
Allow Laravel 11 for composer and CI matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
@asgrim
asgrim committed Jun 4, 2024
1 parent 3c1729e commit 387b64e
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 17 deletions.
63 changes: 49 additions & 14 deletions .github/workflows/continuous-integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,17 @@ jobs:
- "8.*"
- "9.*"
- "10.*"
- "11.*"
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3" # @todo confirm which versions of Laravel will support PHP 8.3
- "8.3"
exclude:
# See - https://laravel.com/docs/9.x/releases#support-policy
# See - https://laravel.com/docs/11.x/releases#support-policy
# See - https://github.com/laravel/framework/issues/40339
# Laravel 5.5 supports PHP 7.1 - 7.4
- {laravel-version: "5.5.*", php-version: "8.0"} # Laravel 5.5.* does not support PHP 8.0+
Expand All @@ -394,11 +395,17 @@ jobs:
- {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+
- {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+
- {laravel-version: "9.*", php-version: "8.3"} # Laravel 9 does not support PHP 8.3+
# Laravel 10 supports PHP 8.1 - 8.2 @todo tbc
# Laravel 10 supports PHP 8.1 - 8.3
- {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "8.0"} # Laravel 10 requires 8.1+
# Laravel 11 supports PHP 8.2 - 8.3
- {laravel-version: "11.*", php-version: "7.2"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "7.3"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "7.4"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "8.0"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "8.1"} # Laravel 11 requires 8.2+
steps:
- uses: actions/checkout@v3
- name: "Install PHP"
Expand All @@ -421,7 +428,7 @@ jobs:
if: ${{ (matrix.php-version == '8.0' || matrix.php-version == '8.1') && (matrix.laravel-version == '8.*' || matrix.laravel-version == '9.*') }}
run: "composer require --dev spatie/laravel-ignition:^1.6 --no-update --no-interaction"
- name: "Install spatie/laravel-ignition ^2.0 (if available)"
if: ${{ (matrix.php-version == '8.1' || matrix.php-version == '8.2' || matrix.php-version == '8.3') && (matrix.laravel-version == '10.*') }}
if: ${{ (matrix.php-version == '8.1' || matrix.php-version == '8.2' || matrix.php-version == '8.3') && (matrix.laravel-version == '10.*' || matrix.laravel-version == '11.*') }}
run: "composer require --dev spatie/laravel-ignition:^2.0 --no-update --no-interaction"
- name: "Unrestrict nesbot/carbon for older PHP versions"
if: ${{ (matrix.php-version == '7.2' || matrix.php-version == '7.3' || matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1') }}
Expand All @@ -447,16 +454,17 @@ jobs:
- "8.*"
- "9.*"
- "10.*"
- "11.*"
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3" # @todo confirm which versions of Laravel will support PHP 8.3
- "8.3"
exclude:
# See - https://laravel.com/docs/9.x/releases#support-policy
# See - https://laravel.com/docs/11.x/releases#support-policy
# See - https://github.com/laravel/framework/issues/40339
# Laravel 5.5 supports PHP 7.1 - 7.4
- {laravel-version: "5.5.*", php-version: "8.0"} # Laravel 5.5.* does not support PHP 8.0+
Expand All @@ -480,11 +488,17 @@ jobs:
- {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+
- {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+
- {laravel-version: "9.*", php-version: "8.3"} # Laravel 9 does not support PHP 8.3+
# Laravel 10 supports PHP 8.1 - 8.2 @todo tbc
# Laravel 10 supports PHP 8.1 - 8.3
- {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "8.0"} # Laravel 10 requires 8.1+
# Laravel 11 supports PHP 8.2 - 8.3
- {laravel-version: "11.*", php-version: "7.2"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "7.3"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "7.4"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "8.0"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "8.1"} # Laravel 11 requires 8.2+
env:
SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }}
steps:
Expand Down Expand Up @@ -575,16 +589,17 @@ jobs:
- "8.*"
- "9.*"
- "10.*"
- "11.*"
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3" # @todo confirm which versions of Laravel will support PHP 8.2
- "8.3"
exclude:
# See - https://laravel.com/docs/9.x/releases#support-policy
# See - https://laravel.com/docs/11.x/releases#support-policy
# See - https://github.com/laravel/framework/issues/40339
# Laravel 5.5 supports PHP 7.1 - 7.4
- {laravel-version: "5.5.*", php-version: "8.0"} # Laravel 5.5.* does not support PHP 8.0+
Expand All @@ -608,11 +623,17 @@ jobs:
- {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+
- {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+
- {laravel-version: "9.*", php-version: "8.3"} # Laravel 9 does not support PHP 8.3+
# Laravel 10 supports PHP 8.1 - 8.2 @todo tbc
# Laravel 10 supports PHP 8.1 - 8.3
- {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+
- {laravel-version: "10.*", php-version: "8.0"} # Laravel 10 requires 8.1+
# Laravel 11 supports PHP 8.2 - 8.3
- {laravel-version: "11.*", php-version: "7.2"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "7.3"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "7.4"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "8.0"} # Laravel 11 requires 8.2+
- {laravel-version: "11.*", php-version: "8.1"} # Laravel 11 requires 8.2+
env:
SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }}
steps:
Expand Down Expand Up @@ -673,14 +694,15 @@ jobs:
- "8.*"
- "9.*"
- "10.*"
- "11.*"
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3" # @todo confirm which versions of Laravel will support PHP 8.2
- "8.3"
exclude:
# Lumen 5.5 supports PHP 7.1 - 7.3
- {lumen-version: "5.5.*", php-version: "7.4"} # Lumen 5.5 does not support PHP 7.4+
Expand All @@ -707,11 +729,17 @@ jobs:
- {lumen-version: "9.*", php-version: "7.3"} # Lumen 9 requires 8.0+
- {lumen-version: "9.*", php-version: "7.4"} # Lumen 9 requires 8.0+
- {lumen-version: "9.*", php-version: "8.3"} # Lumen 9 does not support PHP 8.3+
# Lumen 10 supports PHP 8.1 - 8.2 @todo tbc
# Lumen 10 supports PHP 8.1 - 8.3
- {lumen-version: "10.*", php-version: "7.2"} # Lumen 10 requires 8.1+
- {lumen-version: "10.*", php-version: "7.3"} # Lumen 10 requires 8.1+
- {lumen-version: "10.*", php-version: "7.4"} # Lumen 10 requires 8.1+
- {lumen-version: "10.*", php-version: "8.0"} # Lumen 10 requires 8.1+
# Lumen 11 supports PHP 8.2 - 8.3
- {lumen-version: "11.*", php-version: "7.2"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "7.3"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "7.4"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "8.0"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "8.1"} # Lumen 11 requires 8.2+
steps:
- uses: actions/checkout@v3
- name: "Install PHP"
Expand Down Expand Up @@ -754,14 +782,15 @@ jobs:
- "8.*"
- "9.*"
- "10.*"
- "11.*"
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3" # @todo confirm which versions of Laravel will support PHP 8.2
- "8.3"
exclude:
# Lumen 5.5 supports PHP 7.1 - 7.3
- {lumen-version: "5.5.*", php-version: "7.4"} # Lumen 5.5 does not support PHP 7.4+
Expand All @@ -788,11 +817,17 @@ jobs:
- {lumen-version: "9.*", php-version: "7.3"} # Lumen 9 requires 8.0+
- {lumen-version: "9.*", php-version: "7.4"} # Lumen 9 requires 8.0+
- {lumen-version: "9.*", php-version: "8.3"} # Lumen 9 does not support PHP 8.3+
# Lumen 10 supports PHP 8.1 - 8.2 @todo tbc
# Lumen 10 supports PHP 8.1 - 8.3
- {lumen-version: "10.*", php-version: "7.2"} # Lumen 10 requires 8.1+
- {lumen-version: "10.*", php-version: "7.3"} # Lumen 10 requires 8.1+
- {lumen-version: "10.*", php-version: "7.4"} # Lumen 10 requires 8.1+
- {lumen-version: "10.*", php-version: "8.0"} # Lumen 10 requires 8.1+
# Lumen 11 supports PHP 8.2 - 8.3
- {lumen-version: "11.*", php-version: "7.2"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "7.3"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "7.4"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "8.0"} # Lumen 11 requires 8.2+
- {lumen-version: "11.*", php-version: "8.1"} # Lumen 11 requires 8.2+
env:
SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"api-ecosystem-for-laravel/dingo-api": "^3.0|^4.0",
"doctrine/coding-standard": "^12.0",
"guzzlehttp/guzzle": "^7.4",
"laravel/framework": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
"laravel/lumen-framework": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
"laravel/framework": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"laravel/lumen-framework": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"monolog/monolog": "^1.27|^2.5|^3.0",
"nesbot/carbon": "^2.62.1 || ^3.5",
"nyholm/psr7": "^1.5",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 387b64e

Please sign in to comment.