From 4d301e0a689f23d37e8e4e5d456b2f7a532ab29e Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Tue, 18 Feb 2025 22:43:26 +0100 Subject: [PATCH] Support for Laravel 12 (#4269) --- .github/workflows/run-tests.yml | 13 +++++++++++-- composer.json | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9ef87e567..537be5e93 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -24,10 +24,13 @@ jobs: strategy: matrix: php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4] - laravel: [11, 10, 9, 8, 7, 6, 5.8] + laravel: [12, 11, 10, 9, 8, 7, 6, 5.8] dependency-version: [prefer-stable] os: [ubuntu-latest] include: + - laravel: 12 + scout: 10.* + testbench: 10.* - laravel: 11 scout: 10.* testbench: 9.* @@ -50,6 +53,12 @@ jobs: scout: 7.1.* testbench: 3.8.* exclude: + - laravel: 12 + php: 8.1 + - laravel: 12 + php: 8.0 + - laravel: 12 + php: 7.4 - laravel: 11 php: 8.1 - laravel: 11 @@ -97,7 +106,7 @@ jobs: - laravel: 5.8 php: 8.3 - laravel: 5.8 - php: 8.4 + php: 8.4 name: PHP${{ matrix.php }} - L${{ matrix.laravel }} diff --git a/composer.json b/composer.json index 1ea0a3bd6..970e93375 100644 --- a/composer.json +++ b/composer.json @@ -23,12 +23,12 @@ "ext-json": "*", "php": "^7.0||^8.0", "phpoffice/phpspreadsheet": "^1.29.9", - "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0", + "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0||^12.0", "psr/simple-cache": "^1.0||^2.0||^3.0", "composer/semver": "^3.3" }, "require-dev": { - "orchestra/testbench": "^6.0||^7.0||^8.0||^9.0", + "orchestra/testbench": "^6.0||^7.0||^8.0||^9.0||^10.0", "predis/predis": "^1.1", "laravel/scout": "^7.0||^8.0||^9.0||^10.0" }, @@ -54,4 +54,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file