Skip to content

Commit

Permalink
Merge pull request #123 from laravel-shift/l11-compatibility
Browse files Browse the repository at this point in the history
Laravel 11.x Compatibility
  • Loading branch information
mechelon committed Apr 3, 2024
2 parents 72f0786 + b9ad026 commit d660ac4
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 57 deletions.
102 changes: 53 additions & 49 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,57 @@
name: run-tests

on: [push, pull_request]
on:
- push
- pull_request

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
php: [8.0, 8.1, 8.2]
laravel: [9.*, 8.*, 10.*]
stability: [prefer-stable]
exclude:
- php: 8.0
laravel: 10.*
- php: 8.2
laravel: 8.*
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: 6.23

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

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

# - name: Setup problem matchers
# run: |
# echo "::add-matcher::${{ runner.tool_cache }}/php.json"
# echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
#
- name: Install dependencies
run: |
composer install
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
- name: Execute tests
run: vendor/bin/phpunit
test:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
php: [8.0, 8.1, 8.2]
laravel: ['8.*', '9.*', '10.*', '11.*']
stability: [prefer-stable]
exclude:
- php: 8.0
laravel: 10.*
- php: 8.2
laravel: 8.*
- laravel: 11.*
php: 8.0
- laravel: 11.*
php: 8.1
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: 6.23
- laravel: 11.*
testbench: 9.*

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

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

- name: Install dependencies
run: |
composer install
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
- name: Execute tests
run: vendor/bin/phpunit
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
],
"require": {
"php": "^8.0",
"illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"willdurand/email-reply-parser": "^2.8",
"zbateson/mail-mime-parser": "^1.1"
"zbateson/mail-mime-parser": "^1.1|^2.4"
},
"require-dev": {
"laminas/laminas-mail": "^2.13",
"mockery/mockery": "^1.2",
"orchestra/testbench": "^4.0|^5.0|^7.0|^8.0",
"phpunit/phpunit": "^7.0|^8.0|^9.3"
"orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0",
"phpunit/phpunit": "^7.0|^8.0|^9.3|^10.5"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit d660ac4

Please sign in to comment.