From 8bc3ee87f850f5586f9136ec3890d516081e20f5 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Mon, 17 Feb 2025 05:00:12 -0500 Subject: [PATCH] Laravel 12.x Compatibility (#533) * Bump dependencies for Laravel 12 * Update GitHub Actions for Laravel 12 --- .github/workflows/run-tests.yml | 85 ++++++++++++++++++--------------- composer.json | 8 ++-- 2 files changed, 50 insertions(+), 43 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a5c1c9c..31cd3bc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,43 +1,50 @@ 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.3, 8.2, 8.1] - laravel: ["^11.0", "^10.0"] - dependency-version: [prefer-lowest, prefer-stable] - include: - - laravel: "^10.0" - testbench: "^8.0" - - laravel: "^11.0" - testbench: "^9.0" - exclude: - - laravel: "^11.0" - php: 8.1 - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - 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 require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - - - name: Execute tests - run: vendor/bin/pest + test: + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + php: [8.3, 8.2, 8.1] + laravel: ['12.0', ^10.0, ^11.0] + dependency-version: [prefer-lowest, prefer-stable] + include: + - laravel: ^10.0 + testbench: ^8.0 + - laravel: ^11.0 + testbench: ^9.0 + - laravel: '12.0' + testbench: ^10.0 + exclude: + - laravel: ^11.0 + php: 8.1 + - laravel: '12.0' + php: 8.1 + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - 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 require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction + + - name: Execute tests + run: vendor/bin/pest diff --git a/composer.json b/composer.json index ab99406..8c5594e 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ ], "require": { "php": "^8.1", - "google/analytics-data": "^0.21.1", - "laravel/framework": "^10.0|^11.0", + "google/analytics-data": "^0.21.1|^0.22", + "laravel/framework": "^10.0|^11.0|^12.0", "nesbot/carbon": "^2.66|^3.1.0", "spatie/laravel-package-tools": "^1.13.7", "symfony/cache": "^6.0|^7.0" @@ -30,8 +30,8 @@ "require-dev": { "league/flysystem": "^3.0", "mockery/mockery": "^1.5", - "orchestra/testbench": "^8.0|^9.0", - "pestphp/pest": "^2.0", + "orchestra/testbench": "^8.0|^9.0|^10.0", + "pestphp/pest": "^2.0|^3.7", "spatie/ray": "^1.37" }, "autoload": {