Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 12.x Compatibility #948

Open
wants to merge 2 commits into
base: v4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ name: Lint

on:
push:
branches: [master]
branches:
- master
pull_request:

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
php:
- 8.1
php: [8.1, '8.2', '8.3', '8.4']

name: Lint code (PHP ${{ matrix.php }})

steps:
- uses: actions/checkout@v3

- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
Expand All @@ -35,5 +37,5 @@ jobs:

- name: Lint code
env:
COMPOSER_MEMORY_LIMIT: "-1"
COMPOSER_MEMORY_LIMIT: '-1'
run: composer lint
33 changes: 17 additions & 16 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,30 @@ name: Tests

on:
push:
branches: [master, v4]
branches:
- master
- v4
pull_request:

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
php:
- '8.2'
- '8.1'
- '8.0'
deps:
- highest
php: ['8.2', '8.1', '8.0']
deps: [highest]
include:
- {php: '8.0', deps: lowest}
- {php: '8.1', deps: dingo}
- php: '8.0'
deps: lowest
- php: '8.1'
deps: dingo

name: Tests (PHP ${{ matrix.php }} - ${{ matrix.deps }})

steps:
- uses: actions/checkout@v3

- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
Expand All @@ -32,26 +34,25 @@ jobs:
coverage: xdebug

- name: Install dependencies
if: ${{ matrix.deps == 'highest' }}
if: "${{ matrix.deps == 'highest' }}"
run: composer update

- name: Install dependencies (Dingo)
if: ${{ matrix.deps == 'dingo' }}
if: "${{ matrix.deps == 'dingo' }}"
run: COMPOSER=composer.dingo.json composer update --prefer-stable

- name: Install dependencies (lowest)
if: ${{ matrix.deps == 'lowest' }}
if: "${{ matrix.deps == 'lowest' }}"
run: COMPOSER=composer.lowest.json composer update --prefer-stable


- name: Execute tests (Laravel/Lumen)
run: composer test-ci
if: ${{ matrix.deps == 'highest' }}
if: "${{ matrix.deps == 'highest' }}"

- name: Execute tests (Lowest)
run: COMPOSER=composer.lowest.json composer test-ci
if: ${{ matrix.deps == 'lowest' }}
if: "${{ matrix.deps == 'lowest' }}"

- name: Execute tests (Dingo)
run: COMPOSER=composer.dingo.json composer test-ci
if: ${{ matrix.deps == 'dingo' }}
if: "${{ matrix.deps == 'dingo' }}"
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"ext-pdo": "*",
"erusev/parsedown": "1.7.4",
"fakerphp/faker": "^1.9.1",
"illuminate/console": "^8.0|^9.0|^10.0|^11.0",
"illuminate/routing": "^8.0|^9.0|^10.0|^11.0",
"illuminate/support": "^8.0|^9.0|^10.0|^11.0",
"illuminate/console": "^8.0|^9.0|^10.0|^11.0|^12.0",
"illuminate/routing": "^8.0|^9.0|^10.0|^11.0|^12.0",
"illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0",
"league/flysystem": "^1.1.4|^2.1.1|^3.0",
"mpociot/reflection-docblock": "^1.0.1",
"nikic/php-parser": "^5.0",
Expand All @@ -36,18 +36,18 @@
"symfony/yaml": "^5.4|^6.0|^7.0"
},
"require-dev": {
"brianium/paratest": "^6.0",
"brianium/paratest": "^6.0|^7.8",
"dms/phpunit-arraysubset-asserts": "^0.4",
"laravel/legacy-factories": "^1.3.0",
"laravel/lumen-framework": "^8.0|^9.0|^10.0",
"league/fractal": "^0.20",
"nikic/fast-route": "^1.3",
"orchestra/testbench": "^6.0|^7.0|^8.0",
"pestphp/pest": "^1.21",
"phpstan/phpstan": "^1.0",
"phpunit/phpunit": "^9.0|^10.0",
"symfony/css-selector": "^5.4|^6.0",
"symfony/dom-crawler": "^5.4|^6.0"
"orchestra/testbench": "^6.0|^7.0|^8.0|^10.0",
"pestphp/pest": "^1.21|^3.7",
"phpstan/phpstan": "^1.0|^2.1",
"phpunit/phpunit": "^9.0|^10.0|^11.5.3",
"symfony/css-selector": "^5.4|^6.0|^7.2",
"symfony/dom-crawler": "^5.4|^6.0|^7.2"
},
"autoload": {
"psr-4": {
Expand Down
Loading