From 810adddcf4e2538b0d1ed470c3a5220ffe761370 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij <45041769+jnoordsij@users.noreply.github.com> Date: Tue, 10 Jan 2023 13:13:29 +0100 Subject: [PATCH] Add Laravel 10 support (#246) * Add Laravel 10 support * Run tests for Laravel 10 * Update README to include Laravel 10 in Supported Versions * Update tests.yml Co-authored-by: Dries Vints --- .github/workflows/tests.yml | 7 +++++-- README.md | 2 +- composer.json | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a3c079..8b0ce59 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,10 @@ jobs: fail-fast: true matrix: php: ['8.0', 8.1, 8.2] - laravel: [9.x] + laravel: [9, 10] + exclude: + - php: '8.0' + laravel: 10 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -36,7 +39,7 @@ jobs: - name: Install dependencies run: | - composer require "illuminate/contracts=${{ matrix.laravel }}" --dev --no-update + composer require "illuminate/contracts=^${{ matrix.laravel }}" --dev --no-update composer update --prefer-dist --no-interaction --no-progress - name: Execute tests diff --git a/README.md b/README.md index f9e3892..3ccf8fe 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Only the latest major version of Laravel UI receives bug fixes. The table below | [1.x](https://github.com/laravel/ui/tree/1.x) | 5.8, 6.x | | [2.x](https://github.com/laravel/ui/tree/2.x) | 7.x | | [3.x](https://github.com/laravel/ui/tree/3.x) | 8.x | -| [4.x](https://github.com/laravel/ui/tree/4.x) | 9.x | +| [4.x](https://github.com/laravel/ui/tree/4.x) | 9.x, 10.x | ### Installation diff --git a/composer.json b/composer.json index f6397d9..6d3d144 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "php": "^8.0", - "illuminate/console": "^9.21", - "illuminate/filesystem": "^9.21", - "illuminate/support": "^9.21", - "illuminate/validation": "^9.21" + "illuminate/console": "^9.21|^10.0", + "illuminate/filesystem": "^9.21|^10.0", + "illuminate/support": "^9.21|^10.0", + "illuminate/validation": "^9.21|^10.0" }, "require-dev": { - "orchestra/testbench": "^7.0" + "orchestra/testbench": "^7.0|^8.0" }, "autoload": { "psr-4": {