From 48aa51c40de480829f8137c0c25077a0247eadaf Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Wed, 10 Apr 2024 02:14:13 -0400 Subject: [PATCH] Laravel 11.x Compatibility (#22) * Bump dependencies for Laravel 11 * Update GitHub Actions for Laravel 11 --- .github/workflows/run-tests.yaml | 75 +++++++++++++++++--------------- composer.json | 10 ++--- 2 files changed, 46 insertions(+), 39 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 13f11d1..8ac9c18 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -1,39 +1,46 @@ name: tests on: - push: - branches: - - "**" - pull_request: - types: [ ready_for_review, synchronize, opened ] + push: + branches: + - ** + pull_request: + types: + - ready_for_review + - synchronize + - opened jobs: - build: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [8.1, 8.2] - laravel: [10.*] - - name: PHP:${{ matrix.php }} / Laravel:${{ matrix.laravel }} - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd - tools: composer:v2 - coverage: xdebug - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update --dev - composer update --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit + build: + runs-on: ubuntu-latest + + strategy: + fail-fast: true + matrix: + php: [8.1, 8.2] + laravel: ['10.*', '11.*'] + exclude: + - laravel: 11.* + php: 8.1 + + name: PHP:${{ matrix.php }} / Laravel:${{ matrix.laravel }} + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd + tools: composer:v2 + coverage: xdebug + + - name: Install dependencies + run: | + composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update --dev + composer update --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index f8a1424..ed39ff1 100644 --- a/composer.json +++ b/composer.json @@ -23,14 +23,14 @@ ], "require": { "php": "^8.1", - "illuminate/support": "^10.0", - "intervention/image": "^2.7", - "illuminate/container": "^10.0", - "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0|^11.0", + "intervention/image": "^2.7|^3.4", + "illuminate/container": "^10.0|^11.0", + "illuminate/contracts": "^10.0|^11.0", "ext-fileinfo": "*" }, "require-dev": { - "orchestra/testbench": "^8.0" + "orchestra/testbench": "^8.0|^9.0" }, "autoload": { "psr-4": {