From d08045c8ebdba3af4cf995fe6a42f66e112f8791 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 20:15:16 +0530 Subject: [PATCH 01/15] Add support for laravel 8.0 version --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 732ce44..6335dc1 100644 --- a/composer.json +++ b/composer.json @@ -33,10 +33,10 @@ ], "require": { "php": "^8.1 || ^8.2", - "illuminate/bus": "^9.0 || ^10.0", - "illuminate/queue": "^9.0 || ^10.0", - "illuminate/http": "^9.0 || ^10.0", - "illuminate/validation": "^9.0 || ^10.0", + "illuminate/bus": "^8.0 || ^9.0 || ^10.0", + "illuminate/queue": "^8.0 || ^9.0 || ^10.0", + "illuminate/http": "^8.0 || ^9.0 || ^10.0", + "illuminate/validation": "^8.0 || ^9.0 || ^10.0", "guzzlehttp/guzzle": "^7.5" }, "require-dev": { From babd2fab9f5cb9d51deada5099f8d24a5a01c80a Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 22:38:35 +0530 Subject: [PATCH 02/15] Update run-tests.yml --- .github/workflows/run-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f165e8d..0e143b7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,13 +9,15 @@ jobs: fail-fast: true matrix: php: [8.2, 8.1] - laravel: [10.*, 9.*] + laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* - laravel: 9.* testbench: 7.* + - laravel: 8.* + testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} @@ -42,4 +44,4 @@ jobs: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit \ No newline at end of file + run: vendor/bin/phpunit From edd14693ddb35d618d14b25f85b6c0795b972940 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 22:47:01 +0530 Subject: [PATCH 03/15] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 7e52a50..835cfdd 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,11 @@ You can also enable [debugging mode](https://developers.google.com/analytics/dev ``` bash composer test ``` +or + +``` bash +./vendor/bin/phpunit +``` ## Security From 8301f7e33c58be58f08b602f7c73313f702a9394 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 22:51:33 +0530 Subject: [PATCH 04/15] Fix github actions for laravel 8.x --- .github/workflows/run-tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0e143b7..1a00c35 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: - laravel: 9.* testbench: 7.* - laravel: 8.* - testbench: 7.* + testbench: 6.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index 6335dc1..fdd01bf 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "require-dev": { "mockery/mockery": "^1.4.4", "nesbot/carbon": "^2.66", - "orchestra/testbench": "^7.0 || ^8.0", + "orchestra/testbench": "^6.0 || ^7.0 || ^8.0", "phpunit/phpunit": "^9.5" }, "autoload": { From cc4722a78a61fa9dec69bc83d3e0d2c0f1058640 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 22:56:50 +0530 Subject: [PATCH 05/15] Update inbuilt github actions to use latest version of nodejs and prevent github actions warning --- .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 1a00c35..ee68667 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -23,10 +23,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} From 05091ecdfe0d6609a00324e13ef0e27e59c89696 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 22:59:13 +0530 Subject: [PATCH 06/15] Update inbuilt github actions to use latest version of nodejs and prevent github actions warning --- .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 ee68667..eed83ac 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} From cdc804d84db486d46675fbaa995cea22aa24b2d6 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 23:35:53 +0530 Subject: [PATCH 07/15] Remove illuminate/http ^8.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fdd01bf..6fb78c4 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "php": "^8.1 || ^8.2", "illuminate/bus": "^8.0 || ^9.0 || ^10.0", "illuminate/queue": "^8.0 || ^9.0 || ^10.0", - "illuminate/http": "^8.0 || ^9.0 || ^10.0", + "illuminate/http": "^9.0 || ^10.0", "illuminate/validation": "^8.0 || ^9.0 || ^10.0", "guzzlehttp/guzzle": "^7.5" }, From 0f977f30578c9fd919610039fdfee53a29dfe0fa Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 23:40:42 +0530 Subject: [PATCH 08/15] Remove illuminate/http --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 6fb78c4..a32b9df 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,6 @@ "php": "^8.1 || ^8.2", "illuminate/bus": "^8.0 || ^9.0 || ^10.0", "illuminate/queue": "^8.0 || ^9.0 || ^10.0", - "illuminate/http": "^9.0 || ^10.0", "illuminate/validation": "^8.0 || ^9.0 || ^10.0", "guzzlehttp/guzzle": "^7.5" }, From 756e386255b740621c4803e22a689bc2195e7918 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 23:45:25 +0530 Subject: [PATCH 09/15] Revert to 05091ecdfe0d6609a00324e13ef0e27e59c89696 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index a32b9df..fdd01bf 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@ "php": "^8.1 || ^8.2", "illuminate/bus": "^8.0 || ^9.0 || ^10.0", "illuminate/queue": "^8.0 || ^9.0 || ^10.0", + "illuminate/http": "^8.0 || ^9.0 || ^10.0", "illuminate/validation": "^8.0 || ^9.0 || ^10.0", "guzzlehttp/guzzle": "^7.5" }, From e871d89ff8a322733430f1ef2ae39ca3e922e9e9 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Tue, 5 Mar 2024 23:58:36 +0530 Subject: [PATCH 10/15] Use minimal illuminate/http version to add support for php8.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fdd01bf..7033963 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "php": "^8.1 || ^8.2", "illuminate/bus": "^8.0 || ^9.0 || ^10.0", "illuminate/queue": "^8.0 || ^9.0 || ^10.0", - "illuminate/http": "^8.0 || ^9.0 || ^10.0", + "illuminate/http": "^8.74 || ^9.0 || ^10.0", "illuminate/validation": "^8.0 || ^9.0 || ^10.0", "guzzlehttp/guzzle": "^7.5" }, From 4f33e5d8bb9753772f903e4af7d008a7e1fdabc1 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Wed, 6 Mar 2024 00:07:07 +0530 Subject: [PATCH 11/15] Update orchestra/testbench version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7033963..f5c3a1f 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "require-dev": { "mockery/mockery": "^1.4.4", "nesbot/carbon": "^2.66", - "orchestra/testbench": "^6.0 || ^7.0 || ^8.0", + "orchestra/testbench": "^6.5 || ^7.0 || ^8.0", "phpunit/phpunit": "^9.5" }, "autoload": { From 0547cca874f06c326a1316a01df06ebeacaea968 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Wed, 6 Mar 2024 00:28:26 +0530 Subject: [PATCH 12/15] Update orchestra/testbench version to fix undefined method getAnnotations --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5c3a1f..af10577 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "require-dev": { "mockery/mockery": "^1.4.4", "nesbot/carbon": "^2.66", - "orchestra/testbench": "^6.5 || ^7.0 || ^8.0", + "orchestra/testbench": "^6.20 || ^7.0 || ^8.0", "phpunit/phpunit": "^9.5" }, "autoload": { From 96dd8c58d48aac466eaf1dd6187d8c2ea78180b6 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Wed, 6 Mar 2024 00:30:13 +0530 Subject: [PATCH 13/15] Update orchestra/testbench version to fix undefined method getAnnotations --- .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 eed83ac..203fdbe 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: - laravel: 9.* testbench: 7.* - laravel: 8.* - testbench: 6.* + testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} From 5e7a6af9a850e4070b26994e6977173d3aee7215 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Wed, 6 Mar 2024 00:31:25 +0530 Subject: [PATCH 14/15] Update orchestra/testbench version to fix undefined method getAnnotations --- .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 203fdbe..c1c3cbf 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: - laravel: 9.* testbench: 7.* - laravel: 8.* - testbench: 7.* + testbench: 6.5* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} From 191a4a76193adfcc3f8f3ed37f6d8622f3641821 Mon Sep 17 00:00:00 2001 From: Joy Prakash Sharma Date: Wed, 6 Mar 2024 00:32:06 +0530 Subject: [PATCH 15/15] Update orchestra/testbench version to fix undefined method getAnnotations --- .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 c1c3cbf..460438a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: - laravel: 9.* testbench: 7.* - laravel: 8.* - testbench: 6.5* + testbench: 6.5.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}