From 289989555340076e7eaf24ed76f21469629a4e1b Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 11:34:54 +0100 Subject: [PATCH 1/6] Support for Laravel 9 --- .github/workflows/php.yml | 59 +++++++++++++++++++++------------------ README.md | 2 +- composer.json | 4 +-- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index e0d291d..28fe8e9 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -3,35 +3,40 @@ name: run-tests on: [push, pull_request] jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [8.1, 8.0, 7.4] - laravel: [8.*] - dependency-version: [prefer-lowest, prefer-stable] - include: - - laravel: 8.* - testbench: 6.* + test: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [8.1, 8.0, 7.4] + laravel: [9.*, 8.*] + dependency-version: [prefer-lowest, prefer-stable] + excluce: + - laravel: 9.* + php: 7.4 + include: + - laravel: 9.* + testbench: 7.* + - laravel: 8.* + testbench: 6.* - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - steps: - - name: Checkout code - uses: actions/checkout@v2 + steps: + - name: Checkout code + uses: actions/checkout@v2 - - 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, mysql, mysqli, pdo_mysql - coverage: none + - 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, mysql, mysqli, pdo_mysql + 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 --no-suggest + - 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 --no-suggest - - name: Execute tests - run: vendor/bin/phpunit + - name: Execute tests + run: vendor/bin/phpunit diff --git a/README.md b/README.md index d3fca54..713cf46 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ We proudly support the community by developing Laravel packages and giving them ## Compatibility * [Vue 2.6](https://vuejs.org/v2/guide/installation.html) and [Vue 3](https://v3.vuejs.org/guide/installation.html) -* [Laravel 8](https://laravel.com/) +* [Laravel 8 or 9](https://laravel.com/) * [Inertia.js](https://inertiajs.com/) * [Tailwind CSS v2](https://tailwindcss.com/) + [Forms plugin](https://github.com/tailwindlabs/tailwindcss-forms) * PHP 7.4 + 8.0 + 8.1 diff --git a/composer.json b/composer.json index a7e8617..11d0cd6 100644 --- a/composer.json +++ b/composer.json @@ -12,11 +12,11 @@ ], "require": { "php": "^7.4|^8.0|^8.1", - "illuminate/support": "^8.67" + "illuminate/support": "^8.67|^9.0" }, "require-dev": { "inertiajs/inertia-laravel": "^0.4.5", - "orchestra/testbench": "^6.23", + "orchestra/testbench": "^6.23|^7.0", "phpunit/phpunit": "^9.4" }, "autoload": { From 2f27576c8a77a03641226ffd56629baf10e8f0ec Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 11:36:39 +0100 Subject: [PATCH 2/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 11d0cd6..f426d71 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "illuminate/support": "^8.67|^9.0" }, "require-dev": { - "inertiajs/inertia-laravel": "^0.4.5", + "inertiajs/inertia-laravel": "^0.4.5|^0.5", "orchestra/testbench": "^6.23|^7.0", "phpunit/phpunit": "^9.4" }, From be14f5e852a3d2ceb5078421fb5fd3a44d01c922 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 11:38:19 +0100 Subject: [PATCH 3/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f426d71..9b89af2 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "illuminate/support": "^8.67|^9.0" }, "require-dev": { - "inertiajs/inertia-laravel": "^0.4.5|^0.5", + "inertiajs/inertia-laravel": "^0.5", "orchestra/testbench": "^6.23|^7.0", "phpunit/phpunit": "^9.4" }, From c0afb2e56ecb88682cce4245d26a6fa6e677e6d6 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 11:40:07 +0100 Subject: [PATCH 4/6] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 28fe8e9..420db50 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,7 @@ jobs: php: [8.1, 8.0, 7.4] laravel: [9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] - excluce: + exclude: - laravel: 9.* php: 7.4 include: From bfb342248787cff340655288263e94a443005fa9 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 11:43:37 +0100 Subject: [PATCH 5/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9b89af2..a172aeb 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": "^7.4|^8.0|^8.1", - "illuminate/support": "^8.67|^9.0" + "illuminate/support": "^8.67|^v9.0.0-beta.2" }, "require-dev": { "inertiajs/inertia-laravel": "^0.5", From 329c297bfdd5892272b992ece98a59f7c10912ff Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 11:49:36 +0100 Subject: [PATCH 6/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a172aeb..5efd13e 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": "^7.4|^8.0|^8.1", - "illuminate/support": "^8.67|^v9.0.0-beta.2" + "illuminate/support": "^8.67|^v9.0.0-beta.4" }, "require-dev": { "inertiajs/inertia-laravel": "^0.5",