From 37a394122bcc8f8b929167b44ccbcc6146323eb6 Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 15:05:53 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 11 --- composer.json | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 275598c..a254e1d 100644 --- a/composer.json +++ b/composer.json @@ -27,16 +27,16 @@ ], "require": { "php": "8.1.*|8.2.*", - "illuminate/contracts": "^9.0|^10.0", - "livewire/livewire": "^2.0" + "illuminate/contracts": "^9.0|^10.0|^11.0", + "livewire/livewire": "^2.0|^3.4" }, "require-dev": { "ext-pdo": "*", - "brianium/paratest": "^6.4", + "brianium/paratest": "^6.4|^7.4", "laravel/pint": "^1.1", - "nunomaduro/collision": "^6.0", + "nunomaduro/collision": "^6.0|^8.0", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", "phpmd/phpmd": "^2.11" }, "autoload": { @@ -51,11 +51,18 @@ } }, "scripts": { - "pint": ["vendor/bin/pint"], + "pint": [ + "vendor/bin/pint" + ], "phpmd": "vendor/bin/phpmd config,src,tests text phpmd.xml", "phpstan": "vendor/bin/phpstan analyse --memory-limit=2G", - "phpunit" : "vendor/bin/phpunit", - "test": ["@pint", "@phpmd", "@phpstan", "@phpunit"] + "phpunit": "vendor/bin/phpunit", + "test": [ + "@pint", + "@phpmd", + "@phpstan", + "@phpunit" + ] }, "extra": { "laravel": { From e92db3921e9b7566beddb377a7530e44f56c692d Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 15:05:53 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11 --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bbc288..9ff4bcc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,19 +9,23 @@ on: jobs: build: - runs-on: ubuntu-latest strategy: fail-fast: true matrix: php: ['8.1', '8.2'] - laravel: ['9.*', '10.*'] + laravel: ['9.*', '10.*', '11.*'] include: - - laravel: '9.*' - testbench: '7.*' - - laravel: '10.*' - testbench: '8.*' + - laravel: 9.* + testbench: 7.* + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: '8.1' name: P${{ matrix.php }} - L${{ matrix.laravel }} @@ -47,29 +51,25 @@ jobs: composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --prefer-dist --no-interaction - # Lower PHP and laravel versions. - - name: PHPUnit without code coverage - if: matrix.php != '8.2' || matrix.laravel != '10.*' + if: "matrix.php != '8.2' || matrix.laravel != '10.*'" run: vendor/bin/phpunit --no-coverage - # Last PHP and laravel versions. - - name: Code analysis - if: matrix.php == '8.2' && matrix.laravel == '10.*' + if: "matrix.php == '8.2' && matrix.laravel == '10.*'" run: | vendor/bin/pint --test -vvv vendor/bin/phpmd config,src,tests text phpmd.xml vendor/bin/phpstan analyse - name: PHPUnit with code coverage - if: matrix.php == '8.2' && matrix.laravel == '10.*' + if: "matrix.php == '8.2' && matrix.laravel == '10.*'" run: | mkdir -p build/logs vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml - name: Code coverage upload to Coveralls - if: env.COVERALLS_REPO_TOKEN && matrix.php == '8.2' && matrix.laravel == '10.*' + if: "env.COVERALLS_REPO_TOKEN && matrix.php == '8.2' && matrix.laravel == '10.*'" env: COVERALLS_RUN_LOCALLY: 1 COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}