From acb8235563967a06439ab0bdcf645ccccb651c94 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 12 Nov 2024 11:07:55 +0000 Subject: [PATCH 01/37] Add PHP 8.4 to the testing matrix --- .github/workflows/tests.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22f5f16056..601581fe56 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,10 +16,10 @@ jobs: strategy: matrix: - php: [8.1, 8.2, 8.3] - laravel: [10.*, 11.*] - stability: [prefer-lowest, prefer-stable] - os: [ubuntu-latest] + php: [ 8.1, 8.2, 8.3, 8.4 ] + laravel: [ 10.*, 11.* ] + stability: [ prefer-lowest, prefer-stable ] + os: [ ubuntu-latest ] include: - os: windows-latest php: 8.3 @@ -32,6 +32,8 @@ jobs: exclude: - php: 8.1 laravel: 11.* + - php: 8.4 + laravel: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -146,7 +148,7 @@ jobs: slack: name: Slack Notification runs-on: ubuntu-20.04 - needs: [php-tests, js-tests] + needs: [ php-tests, js-tests ] if: always() steps: - uses: technote-space/workflow-conclusion-action@v3 From 1fa1fd19ed05d8b916c3adfe9306c1ecc248855f Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 12 Nov 2024 11:09:07 +0000 Subject: [PATCH 02/37] Make PHPUnit display any deprecations --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 601581fe56..cbe63191bc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit + run: vendor/bin/phpunit --display-deprecations js-tests: runs-on: ubuntu-20.04 From e20a56209363516708e2a5903cf1d1ed886cb80d Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 12 Nov 2024 11:10:49 +0000 Subject: [PATCH 03/37] Update `laravel/framework` version constraint --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cbe63191bc..cae43a12bb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: php: [ 8.1, 8.2, 8.3, 8.4 ] - laravel: [ 10.*, 11.* ] + laravel: [ 10.*, dev-php84-support ] stability: [ prefer-lowest, prefer-stable ] os: [ ubuntu-latest ] include: From 70fb20ccedf59130c8020718b0b693cba1b5596c Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 12 Nov 2024 11:19:13 +0000 Subject: [PATCH 04/37] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cae43a12bb..cbe63191bc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: php: [ 8.1, 8.2, 8.3, 8.4 ] - laravel: [ 10.*, dev-php84-support ] + laravel: [ 10.*, 11.* ] stability: [ prefer-lowest, prefer-stable ] os: [ ubuntu-latest ] include: From 4dc0f6d9514bcd2254dc3b41e3456baa71bbf617 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 11:05:54 +0000 Subject: [PATCH 05/37] Revert unnecessary formatting. --- .github/workflows/tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cbe63191bc..fef0039477 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,10 +16,10 @@ jobs: strategy: matrix: - php: [ 8.1, 8.2, 8.3, 8.4 ] - laravel: [ 10.*, 11.* ] - stability: [ prefer-lowest, prefer-stable ] - os: [ ubuntu-latest ] + php: [8.1, 8.2, 8.3, 8.4] + laravel: [10.*, 11.*] + stability: [prefer-lowest, prefer-stable] + os: [ubuntu-latest] include: - os: windows-latest php: 8.3 @@ -148,7 +148,7 @@ jobs: slack: name: Slack Notification runs-on: ubuntu-20.04 - needs: [ php-tests, js-tests ] + needs: [php-tests, js-tests] if: always() steps: - uses: technote-space/workflow-conclusion-action@v3 From 475c2b2045e53e56b6b60a85091384ba615f41ae Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 11:41:32 +0000 Subject: [PATCH 06/37] Specify minimum version of PHPUnit Otherwise, we'll see deprecation warnings when running the `prefer-lowest` tests with PHP 8.4. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 53c2e4921d..d7ac315066 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "laravel/pint": "1.16.0", "mockery/mockery": "^1.3.3", "orchestra/testbench": "^8.14 || ^9.0", - "phpunit/phpunit": "^10.0", + "phpunit/phpunit": "^10.5.35", "spatie/laravel-ray": "^1.37" }, "config": { From c5680d271899f9bc0766c629d37b017fa5b99d65 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 11:47:30 +0000 Subject: [PATCH 07/37] Specify minimum version of Laravel 11 Otherwise, we'll see deprecation warnings when running the `prefer-lowest` tests with PHP 8.4. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d7ac315066..6b4994eaea 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer/semver": "^3.4", "guzzlehttp/guzzle": "^6.3 || ^7.0", "james-heinrich/getid3": "^1.9.21", - "laravel/framework": "^10.40 || ^11.0", + "laravel/framework": "^10.40 || ^11.3", "laravel/prompts": "^0.1.16", "league/commonmark": "^2.2", "league/csv": "^9.0", From 1085f615f2f449d3e1dcab2b40cfa17d38bd33d6 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 11:55:27 +0000 Subject: [PATCH 08/37] Specify minimum version of Laravel 11 (again) Due to another PR preventing deprecation warnings: https://github.com/laravel/framework/pull/50922 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6b4994eaea..c3849a5449 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer/semver": "^3.4", "guzzlehttp/guzzle": "^6.3 || ^7.0", "james-heinrich/getid3": "^1.9.21", - "laravel/framework": "^10.40 || ^11.3", + "laravel/framework": "^10.40 || ^11.32", "laravel/prompts": "^0.1.16", "league/commonmark": "^2.2", "league/csv": "^9.0", From 128eeeb62184eb807fb598092c1ef939acb3a57b Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 14:15:59 +0000 Subject: [PATCH 09/37] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fef0039477..60c1527efd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit --display-deprecations + run: vendor/bin/phpunit --display-deprecation js-tests: runs-on: ubuntu-20.04 From 365dad691bf5ccc221c27fe3ca77ed331e65f31f Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 14:16:48 +0000 Subject: [PATCH 10/37] Update Mockery --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c3849a5449..8349c204ae 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "fakerphp/faker": "~1.10", "google/cloud-translate": "^1.6", "laravel/pint": "1.16.0", - "mockery/mockery": "^1.3.3", + "mockery/mockery": "^1.6.2", "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", "spatie/laravel-ray": "^1.37" From 8f2b6a4eda1d8f0d956223c0bfef4f26b2aedb1f Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 14:39:43 +0000 Subject: [PATCH 11/37] Let's just focus on getting PHP 8.4 passing for now. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 60c1527efd..8ec1e4aebf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - php: [8.1, 8.2, 8.3, 8.4] + php: [8.4] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] os: [ubuntu-latest] From b172d127127cc0b9ca911237ab1cdc62c6aeb259 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 14:45:04 +0000 Subject: [PATCH 12/37] Revert "Let's just focus on getting PHP 8.4 passing for now." This reverts commit 8f2b6a4eda1d8f0d956223c0bfef4f26b2aedb1f. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8ec1e4aebf..60c1527efd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - php: [8.4] + php: [8.1, 8.2, 8.3, 8.4] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] os: [ubuntu-latest] From 6e5b1e56b749b1c3b6f3e3e68cc4e53cf7a1bf80 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 14:49:55 +0000 Subject: [PATCH 13/37] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 60c1527efd..9642afef33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit --display-deprecation + run: vendor/bin/phpunit js-tests: runs-on: ubuntu-20.04 From 25b20862691389bc54fc712b33bc3c1100abcfdd Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 14:58:58 +0000 Subject: [PATCH 14/37] wip --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9642afef33..fef0039477 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit + run: vendor/bin/phpunit --display-deprecations js-tests: runs-on: ubuntu-20.04 diff --git a/composer.json b/composer.json index 8349c204ae..a8d5bc912a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer/semver": "^3.4", "guzzlehttp/guzzle": "^6.3 || ^7.0", "james-heinrich/getid3": "^1.9.21", - "laravel/framework": "^10.40 || ^11.32", + "laravel/framework": "^10.40 || ^11.3", "laravel/prompts": "^0.1.16", "league/commonmark": "^2.2", "league/csv": "^9.0", From 9657591172c826be586cf71798ba63f57c66aa65 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 15:21:23 +0000 Subject: [PATCH 15/37] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a8d5bc912a..722119ee78 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "fakerphp/faker": "~1.10", "google/cloud-translate": "^1.6", "laravel/pint": "1.16.0", - "mockery/mockery": "^1.6.2", + "mockery/mockery": "^1.6.10", "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", "spatie/laravel-ray": "^1.37" From a13af74de247604ef71f5298d0afc679bd5033d3 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Tue, 19 Nov 2024 16:10:34 +0000 Subject: [PATCH 16/37] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fef0039477..9642afef33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit --display-deprecations + run: vendor/bin/phpunit js-tests: runs-on: ubuntu-20.04 From a1c1d327d61a5aa2227d61ba9aa25d9c4adb7932 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Wed, 20 Nov 2024 12:01:23 +0000 Subject: [PATCH 17/37] Specify minimum version of `spatie/ray` Only 1.41.2 and above is compatible with PHP 8.4, otherwise we get deprecation warnings which throws off one of our tests. Related: https://github.com/spatie/ray/releases/tag/1.41.2 Since `spatie/laravel-ray` doesn't specify a minimum version, we're having to specify it here. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 722119ee78..737b8292a2 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,8 @@ "mockery/mockery": "^1.6.10", "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", - "spatie/laravel-ray": "^1.37" + "spatie/laravel-ray": "^1.37", + "spatie/ray": "^1.41.2" }, "config": { "optimize-autoloader": true, From b86bf99ae216e19acb883a4fe3e1d904399e5fc2 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Wed, 20 Nov 2024 13:20:11 +0000 Subject: [PATCH 18/37] For giggles, let's see if this breaks anything. --- phpunit.xml.dist | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2a6a07aeb8..c095cfb3f3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,7 +7,8 @@ colors="true" processIsolation="false" cacheDirectory=".phpunit.cache" - stopOnFailure="false"> + stopOnFailure="false" + displayDetailsOnTestsThatTriggerDeprecations="true"> ./tests From 6349da2aec7a0d23d32f15c2ebadc90bab25ef10 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Wed, 20 Nov 2024 13:26:43 +0000 Subject: [PATCH 19/37] Nah, it didn't. Good. --- phpunit.xml.dist | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c095cfb3f3..2a6a07aeb8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,8 +7,7 @@ colors="true" processIsolation="false" cacheDirectory=".phpunit.cache" - stopOnFailure="false" - displayDetailsOnTestsThatTriggerDeprecations="true"> + stopOnFailure="false"> ./tests From 36c8547af715fa96205d85c11eb06c0d5f0224fb Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 10:23:08 +0000 Subject: [PATCH 20/37] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9642afef33..ff4098c4fe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit + run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }} js-tests: runs-on: ubuntu-20.04 From c37d23b70349c59fc60a511d7e4a2991580ebc25 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 15:25:24 +0000 Subject: [PATCH 21/37] Don't run `prefer-lowest` tests with PHP 8.4 The "lowest" versions of dependencies throw deprecation errors with PHP 8.4 - we only want to test with the latest versions for now. This means we also don't need to adjust the minimum versions of dependencies. This is what Laravel does in their test suite. --- .github/workflows/tests.yml | 2 ++ composer.json | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ff4098c4fe..6810ccea6c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,6 +34,8 @@ jobs: laravel: 11.* - php: 8.4 laravel: 10.* + - php: 8.4 + stability: prefer-lowest name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 737b8292a2..98d0c12bba 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer/semver": "^3.4", "guzzlehttp/guzzle": "^6.3 || ^7.0", "james-heinrich/getid3": "^1.9.21", - "laravel/framework": "^10.40 || ^11.3", + "laravel/framework": "^10.40 || ^11.0", "laravel/prompts": "^0.1.16", "league/commonmark": "^2.2", "league/csv": "^9.0", @@ -44,8 +44,7 @@ "mockery/mockery": "^1.6.10", "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", - "spatie/laravel-ray": "^1.37", - "spatie/ray": "^1.41.2" + "spatie/laravel-ray": "^1.37" }, "config": { "optimize-autoloader": true, From eaa2692db7a2b6ed34fe393379534bc969ba2d64 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 15:33:42 +0000 Subject: [PATCH 22/37] Revert "Don't run `prefer-lowest` tests with PHP 8.4" This reverts commit c37d23b70349c59fc60a511d7e4a2991580ebc25. --- .github/workflows/tests.yml | 2 -- composer.json | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6810ccea6c..ff4098c4fe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,8 +34,6 @@ jobs: laravel: 11.* - php: 8.4 laravel: 10.* - - php: 8.4 - stability: prefer-lowest name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 98d0c12bba..737b8292a2 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer/semver": "^3.4", "guzzlehttp/guzzle": "^6.3 || ^7.0", "james-heinrich/getid3": "^1.9.21", - "laravel/framework": "^10.40 || ^11.0", + "laravel/framework": "^10.40 || ^11.3", "laravel/prompts": "^0.1.16", "league/commonmark": "^2.2", "league/csv": "^9.0", @@ -44,7 +44,8 @@ "mockery/mockery": "^1.6.10", "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", - "spatie/laravel-ray": "^1.37" + "spatie/laravel-ray": "^1.37", + "spatie/ray": "^1.41.2" }, "config": { "optimize-autoloader": true, From e6b8d78c5f8c331152f4081a3df9e576b9e21e39 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 15:59:54 +0000 Subject: [PATCH 23/37] Specify some minimum versions --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 737b8292a2..4e5eb38b4f 100644 --- a/composer.json +++ b/composer.json @@ -29,11 +29,12 @@ "spatie/ignition": "^1.15", "statamic/stringy": "^3.1.2", "stillat/blade-parser": "^1.10.1", + "symfony/console": "^7.0.3", "symfony/lock": "^6.4", "symfony/var-exporter": "^6.0", "symfony/yaml": "^6.0 || ^7.0", "ueberdosis/tiptap-php": "^1.4", - "voku/portable-ascii": "^2.0", + "voku/portable-ascii": "^2.0.2", "wilderborn/partyline": "^1.0" }, "require-dev": { From a883c3fcc93be8d173889d7617c6c0a392901601 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 16:02:59 +0000 Subject: [PATCH 24/37] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4e5eb38b4f..831a8886bb 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "spatie/ignition": "^1.15", "statamic/stringy": "^3.1.2", "stillat/blade-parser": "^1.10.1", - "symfony/console": "^7.0.3", + "symfony/console": "^6.4.3", "symfony/lock": "^6.4", "symfony/var-exporter": "^6.0", "symfony/yaml": "^6.0 || ^7.0", From d733c39e3fd83a15edb6f220eb564721886b04bc Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 16:09:39 +0000 Subject: [PATCH 25/37] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 831a8886bb..ec5b5b6ced 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "spatie/ignition": "^1.15", "statamic/stringy": "^3.1.2", "stillat/blade-parser": "^1.10.1", - "symfony/console": "^6.4.3", + "symfony/console": "^6.4.3 || ^7.0.3", "symfony/lock": "^6.4", "symfony/var-exporter": "^6.0", "symfony/yaml": "^6.0 || ^7.0", From d9fc77c9462797a2e93400c7754cb09fe2fd9af7 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 16:18:46 +0000 Subject: [PATCH 26/37] wip we shouldn't need this after Laravel's PHP 8.4 PR has been merged --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ec5b5b6ced..c0547dc437 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,8 @@ "symfony/yaml": "^6.0 || ^7.0", "ueberdosis/tiptap-php": "^1.4", "voku/portable-ascii": "^2.0.2", - "wilderborn/partyline": "^1.0" + "wilderborn/partyline": "^1.0", + "vlucas/phpdotenv": "^5.6.1" }, "require-dev": { "doctrine/dbal": "^3.6", From cef7a7212fe77ff6cc50d71abb1b58e17f774091 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 16:51:08 +0000 Subject: [PATCH 27/37] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c0547dc437..8077bd4276 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "google/cloud-translate": "^1.6", "laravel/pint": "1.16.0", "mockery/mockery": "^1.6.10", - "orchestra/testbench": "^8.14 || ^9.0", + "orchestra/testbench": "^8.14 || ^9.8", "phpunit/phpunit": "^10.5.35", "spatie/laravel-ray": "^1.37", "spatie/ray": "^1.41.2" From c1862c55265f4d2a57c47f8d08e020138523b86a Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 21 Nov 2024 16:52:58 +0000 Subject: [PATCH 28/37] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8077bd4276..c0547dc437 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "google/cloud-translate": "^1.6", "laravel/pint": "1.16.0", "mockery/mockery": "^1.6.10", - "orchestra/testbench": "^8.14 || ^9.8", + "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", "spatie/laravel-ray": "^1.37", "spatie/ray": "^1.41.2" From cde9043a0268a4084acdb194ef31bebdbff59a60 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 22 Nov 2024 09:53:33 +0000 Subject: [PATCH 29/37] Prevent deprecation warnings from Carbon --- .github/workflows/tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ff4098c4fe..6804930537 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -84,6 +84,15 @@ jobs: ini-values: short_open_tag=on coverage: none + - name: Set Minimum PHP 8.4 Versions + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer require nesbot/carbon:^3.4 --no-interaction --no-update + shell: bash + if: matrix.php >= 8.4 + - name: Install dependencies uses: nick-invision/retry@v3 if: steps.should-run-tests.outputs.result == 'true' From 965f81ac9e82f338e63398eda2ca737e1d032e40 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 22 Nov 2024 14:34:10 +0000 Subject: [PATCH 30/37] Revert "Prevent deprecation warnings from Carbon" This reverts commit cde9043a0268a4084acdb194ef31bebdbff59a60. --- .github/workflows/tests.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6804930537..ff4098c4fe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -84,15 +84,6 @@ jobs: ini-values: short_open_tag=on coverage: none - - name: Set Minimum PHP 8.4 Versions - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require nesbot/carbon:^3.4 --no-interaction --no-update - shell: bash - if: matrix.php >= 8.4 - - name: Install dependencies uses: nick-invision/retry@v3 if: steps.should-run-tests.outputs.result == 'true' From d88d3ce34725a08355ea45275cb0988055196aed Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Mon, 25 Nov 2024 12:02:46 +0000 Subject: [PATCH 31/37] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c0547dc437..6f64be3f64 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "michelf/php-smartypants": "^1.8.1", "nesbot/carbon": "^2.62.1", "pixelfear/composer-dist-plugin": "^0.1.4", - "rebing/graphql-laravel": "^9.5", + "rebing/graphql-laravel": "^9.7", "rhukster/dom-sanitizer": "^1.0.6", "spatie/blink": "^1.3", "spatie/ignition": "^1.15", From a95ca6913027ff77eb16119b8393329ef9409354 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 25 Nov 2024 16:07:11 -0500 Subject: [PATCH 32/37] =?UTF-8?q?=F0=9F=A4=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 6f64be3f64..6501132b83 100644 --- a/composer.json +++ b/composer.json @@ -29,14 +29,12 @@ "spatie/ignition": "^1.15", "statamic/stringy": "^3.1.2", "stillat/blade-parser": "^1.10.1", - "symfony/console": "^6.4.3 || ^7.0.3", "symfony/lock": "^6.4", "symfony/var-exporter": "^6.0", "symfony/yaml": "^6.0 || ^7.0", "ueberdosis/tiptap-php": "^1.4", "voku/portable-ascii": "^2.0.2", - "wilderborn/partyline": "^1.0", - "vlucas/phpdotenv": "^5.6.1" + "wilderborn/partyline": "^1.0" }, "require-dev": { "doctrine/dbal": "^3.6", @@ -46,8 +44,7 @@ "mockery/mockery": "^1.6.10", "orchestra/testbench": "^8.14 || ^9.0", "phpunit/phpunit": "^10.5.35", - "spatie/laravel-ray": "^1.37", - "spatie/ray": "^1.41.2" + "spatie/laravel-ray": "^1.37" }, "config": { "optimize-autoloader": true, From adbe8e1a9cb507314f2caab73a6a423594764d81 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 25 Nov 2024 16:19:50 -0500 Subject: [PATCH 33/37] phpdotenv --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6501132b83..b96fe9e716 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "symfony/yaml": "^6.0 || ^7.0", "ueberdosis/tiptap-php": "^1.4", "voku/portable-ascii": "^2.0.2", - "wilderborn/partyline": "^1.0" + "wilderborn/partyline": "^1.0", + "vlucas/phpdotenv": "^5.6.1" }, "require-dev": { "doctrine/dbal": "^3.6", From f196bd1c261cb0a299ef440a821359012188be8d Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 25 Nov 2024 16:29:37 -0500 Subject: [PATCH 34/37] latest dotenv is required in what will probably be framework 11.34 --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index b96fe9e716..f811d9b5d6 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "composer/semver": "^3.4", "guzzlehttp/guzzle": "^6.3 || ^7.0", "james-heinrich/getid3": "^1.9.21", - "laravel/framework": "^10.40 || ^11.3", + "laravel/framework": "^10.40 || ^11.34", "laravel/prompts": "^0.1.16", "league/commonmark": "^2.2", "league/csv": "^9.0", @@ -34,8 +34,7 @@ "symfony/yaml": "^6.0 || ^7.0", "ueberdosis/tiptap-php": "^1.4", "voku/portable-ascii": "^2.0.2", - "wilderborn/partyline": "^1.0", - "vlucas/phpdotenv": "^5.6.1" + "wilderborn/partyline": "^1.0" }, "require-dev": { "doctrine/dbal": "^3.6", From c593909542ee47013b1678d501931038f67bd49d Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 26 Nov 2024 15:12:00 -0500 Subject: [PATCH 35/37] bump From a9235d3209d5e11b326314a5a59e34af7d62a8cf Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 26 Nov 2024 16:11:40 -0500 Subject: [PATCH 36/37] bump testbench ... prefer-lowest failed because of changes introduced in laravel 11.11. it used to pass because our prefer-lowest allowed laravel 11.0. now that we force 11.34, the lowest causes those errors. testbench 9.2 fixes it. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f811d9b5d6..2121da9d38 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "google/cloud-translate": "^1.6", "laravel/pint": "1.16.0", "mockery/mockery": "^1.6.10", - "orchestra/testbench": "^8.14 || ^9.0", + "orchestra/testbench": "^8.14 || ^9.2", "phpunit/phpunit": "^10.5.35", "spatie/laravel-ray": "^1.37" }, From 86b28dfb45adc8d9f26fa65bc5ba070b8b59333f Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 27 Nov 2024 12:10:36 -0500 Subject: [PATCH 37/37] not really helpful imo --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ff4098c4fe..9642afef33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: - name: Execute tests if: steps.should-run-tests.outputs.result == 'true' - run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }} + run: vendor/bin/phpunit js-tests: runs-on: ubuntu-20.04