From 14b59dc2605c716a276c847dc79ba05344befad3 Mon Sep 17 00:00:00 2001 From: Tim Geisendoerfer Date: Sat, 15 Feb 2025 21:21:28 +0100 Subject: [PATCH] Add Laravel 12 Support (#40) --- .github/workflows/run-tests.yml | 11 +++++++++-- composer.json | 14 ++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 34ec4df..86c8a9b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,10 +13,12 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.3, 8.2, 8.1] - laravel: ["^11.0", "^10.0", "^9.38"] + php: [8.4, 8.3, 8.2, 8.1] + laravel: ["^12.0", "^11.0", "^10.0", "^9.38"] stability: [prefer-lowest, prefer-stable] include: + - laravel: "^12.0" + testbench: 10.* - laravel: "^11.0" testbench: 9.* - laravel: "^10.0" @@ -26,6 +28,8 @@ jobs: exclude: - laravel: "^11.0" php: 8.1 + - laravel: "^12.0" + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -45,6 +49,9 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Remove larastan from dev dependencies + run: composer remove --dev nunomaduro/larastan + - name: Install dependencies run: | composer require 'illuminate/contracts=${{ matrix.laravel }}.0' --no-update diff --git a/composer.json b/composer.json index 6a03e63..a77ef3c 100644 --- a/composer.json +++ b/composer.json @@ -17,21 +17,19 @@ ], "require": { "php": "^8.1", - "illuminate/contracts": "^9.38|^10.0|^11.0", + "illuminate/contracts": "^9.38|^10.0|^11.0|^12.0", "spatie/laravel-package-tools": "^1.14.0", "symfony/mailer": "^6.0|^7.0" }, "require-dev": { + "composer/semver": "^3.4", "guzzlehttp/guzzle": "^7.5", "laravel/pint": "^1.0", - "nunomaduro/collision": "^6.0|^7.0|^8.0", - "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^1.21|^2.0", - "pestphp/pest-plugin-laravel": "^1.21|^2.0", + "nunomaduro/larastan": "^2.0.1|^3.0", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", + "pestphp/pest": "^1.21|^2.0|^3.0", + "pestphp/pest-plugin-laravel": "^1.21|^2.0|^3.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", "spatie/laravel-ray": "^1.26" }, "autoload": {