From 38a8dca87d58b952b8eecf142a6c4a1d34fa46e2 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Sat, 10 Feb 2024 19:33:48 +0600 Subject: [PATCH 01/12] chore: add support for laravel 11 --- .github/workflows/run-tests.yml | 7 ++++++- composer.json | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2b9548f7b..e89676f3d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,11 +10,16 @@ jobs: matrix: os: [ubuntu-latest] php: [8.1, 8.2, 8.3] - laravel: [10.*] + laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: ^8.20 + - laravel: 11.* + testbench: ^9.0 + exclude: + - laravel: 11.* + php: ^8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index d88cf764a..712bd080c 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require" : { "php": "^8.1", - "illuminate/contracts": "^10.0", + "illuminate/contracts": "^10.0|^11.0", "phpdocumentor/type-resolver": "^1.5", "spatie/laravel-package-tools": "^1.9.0", "spatie/php-structure-discoverer": "^2.0" @@ -30,7 +30,7 @@ "nesbot/carbon": "^2.63", "nette/php-generator": "^3.5", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^8.0", + "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.31", "pestphp/pest-plugin-laravel": "^2.0", "phpbench/phpbench": "^1.2", From 21a5adc8389e41c8af576babb1cb5eb3aed34ffc Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Mon, 12 Feb 2024 22:47:37 +0600 Subject: [PATCH 02/12] chore: bump inertia laravel adaptor --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 712bd080c..2eed075a9 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "require-dev" : { "fakerphp/faker": "^1.14", "friendsofphp/php-cs-fixer": "^3.0", - "inertiajs/inertia-laravel": "^0.6.3", + "inertiajs/inertia-laravel": "^0.6.11", "mockery/mockery": "^1.6", "nesbot/carbon": "^2.63", "nette/php-generator": "^3.5", From 8dd16424393f4d42ed964b8ce9cdd5e6eec00f6c Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 10:14:42 +0600 Subject: [PATCH 03/12] chore: use inertia-laravel 1.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2eed075a9..2f3f88166 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "require-dev" : { "fakerphp/faker": "^1.14", "friendsofphp/php-cs-fixer": "^3.0", - "inertiajs/inertia-laravel": "^0.6.11", + "inertiajs/inertia-laravel": "^1.x-dev", "mockery/mockery": "^1.6", "nesbot/carbon": "^2.63", "nette/php-generator": "^3.5", From 5e861c89c5f8cc58edae631e3a66058dc35feafb Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 10:40:27 +0600 Subject: [PATCH 04/12] chore: update phpunit.xml --- phpunit.xml.dist | 64 +++++++++++++++++--------------------------- phpunit.xml.dist.bak | 42 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 phpunit.xml.dist.bak diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 84f177600..e00355b91 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,42 +1,26 @@ - - - - tests - - - - - ./src - - - - - - - - - - - - - + + + + tests + + + + + + + + + + + + + + + + + + ./src + + diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak new file mode 100644 index 000000000..84f177600 --- /dev/null +++ b/phpunit.xml.dist.bak @@ -0,0 +1,42 @@ + + + + + tests + + + + + ./src + + + + + + + + + + + + + + From 9b959da96e31e9df2a56861a90b3288484e04f97 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 10:43:13 +0600 Subject: [PATCH 05/12] Revert "chore: update phpunit.xml" This reverts commit 5e861c89c5f8cc58edae631e3a66058dc35feafb. --- phpunit.xml.dist | 64 +++++++++++++++++++++++++++----------------- phpunit.xml.dist.bak | 42 ----------------------------- 2 files changed, 40 insertions(+), 66 deletions(-) delete mode 100644 phpunit.xml.dist.bak diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e00355b91..84f177600 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,26 +1,42 @@ - - - - tests - - - - - - - - - - - - - - - - - - ./src - - + + + + tests + + + + + ./src + + + + + + + + + + + + + diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak deleted file mode 100644 index 84f177600..000000000 --- a/phpunit.xml.dist.bak +++ /dev/null @@ -1,42 +0,0 @@ - - - - - tests - - - - - ./src - - - - - - - - - - - - - - From 643702f4dd9be6a3a328b862f683a2ec98d3d00b Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 10:45:37 +0600 Subject: [PATCH 06/12] chore: update workflow --- .github/workflows/run-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e89676f3d..d9879d4f4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,12 +14,12 @@ jobs: stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* - testbench: ^8.20 + testbench: 8.20 - laravel: 11.* - testbench: ^9.0 + testbench: 9.0 exclude: - laravel: 11.* - php: ^8.1 + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 51a67e957b88590b1adb1103834b3b457376379f Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 10:47:08 +0600 Subject: [PATCH 07/12] chore: update workflow 2 --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d9879d4f4..f269c747f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,9 +14,9 @@ jobs: stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* - testbench: 8.20 + testbench: ^8.20 - laravel: 11.* - testbench: 9.0 + testbench: ^9.0 exclude: - laravel: 11.* php: 8.1 From 4574ca244c822a1455fd1b5e65fec486ce90137b Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 10:57:22 +0600 Subject: [PATCH 08/12] chore: remove prefer lowest --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f269c747f..b1c900aea 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,7 +11,7 @@ jobs: os: [ubuntu-latest] php: [8.1, 8.2, 8.3] laravel: [10.*, 11.*] - stability: [prefer-lowest, prefer-stable] + stability: [prefer-stable] include: - laravel: 10.* testbench: ^8.20 From 6ef2870cef2341ba561dfe3a16355387a8154941 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Wed, 14 Feb 2024 11:10:07 +0600 Subject: [PATCH 09/12] chore: rollback --- .github/workflows/run-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b1c900aea..8cbeab691 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,15 +11,16 @@ jobs: os: [ubuntu-latest] php: [8.1, 8.2, 8.3] laravel: [10.*, 11.*] - stability: [prefer-stable] + stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: ^8.20 - laravel: 11.* testbench: ^9.0 exclude: - - laravel: 11.* - php: 8.1 + - php: 8.1 + laravel: 11.* + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From a4c3df3721fca37106971c74c3d12db890cfa57f Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 15 Feb 2024 19:21:32 +0600 Subject: [PATCH 10/12] chore: update laravel-typescript-transformer version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2f3f88166..f74c51b68 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "phpstan/extension-installer": "^1.1", "phpunit/phpunit": "^10.0", "spatie/invade": "^1.0", - "spatie/laravel-typescript-transformer": "^2.3", + "spatie/laravel-typescript-transformer": "^2.6.2", "spatie/pest-plugin-snapshots": "^2.1", "spatie/test-time": "^1.2" }, From 6319b7f6beb6e1b1bc292d356c926636c74b4aac Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 15 Feb 2024 19:25:59 +0600 Subject: [PATCH 11/12] chore: wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f74c51b68..792104173 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "phpstan/extension-installer": "^1.1", "phpunit/phpunit": "^10.0", "spatie/invade": "^1.0", - "spatie/laravel-typescript-transformer": "^2.6.2", + "spatie/laravel-typescript-transformer": "^2.6", "spatie/pest-plugin-snapshots": "^2.1", "spatie/test-time": "^1.2" }, From d78c6f94db195a45d872039d2a08c83dbcca98e5 Mon Sep 17 00:00:00 2001 From: Ruben Van Assche Date: Fri, 16 Feb 2024 13:12:26 +0100 Subject: [PATCH 12/12] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 792104173..2f3f88166 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "phpstan/extension-installer": "^1.1", "phpunit/phpunit": "^10.0", "spatie/invade": "^1.0", - "spatie/laravel-typescript-transformer": "^2.6", + "spatie/laravel-typescript-transformer": "^2.3", "spatie/pest-plugin-snapshots": "^2.1", "spatie/test-time": "^1.2" },