From 596740ebe114858d7d9467e1302a1284c91a7a79 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Mon, 25 Nov 2024 12:08:09 +0000 Subject: [PATCH 01/18] wip --- .github/workflows/tests.yml | 10 ++++++++-- composer.json | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e70c8fd..2683e2d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - php: [8.1, 8.2, 8.3] + php: [8.1, 8.2, 8.3, 8.4] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] os: [ubuntu-latest] @@ -25,9 +25,15 @@ jobs: php: 8.3 laravel: 11.* stability: prefer-stable + - os: windows-latest + php: 8.4 + laravel: 11.* + stability: prefer-stable exclude: - php: 8.1 laravel: 11.* + - php: 8.4 + laravel: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -48,7 +54,7 @@ jobs: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit + run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }} - name: Send Slack notification uses: 8398a7/action-slack@v2 diff --git a/composer.json b/composer.json index 18a9366..95ba958 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,10 @@ "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, "require-dev": { - "statamic/cms": "^5.0", + "statamic/cms": "dev-php84", "mockery/mockery": "^1.4.4", - "orchestra/testbench": "^8.0 || ^9.0", - "phpunit/phpunit": "^10.0" + "orchestra/testbench": "^8.28 || ^9.6.1", + "phpunit/phpunit": "^10.5.35" }, "autoload": { "psr-4": { From edcdd57680fe602f3302fecfffcc76b020cc0935 Mon Sep 17 00:00:00 2001 From: Jesse Leite Date: Mon, 25 Nov 2024 17:09:20 -0500 Subject: [PATCH 02/18] Kick test suite. From 0df212c2966d6e50314c1e5e61a535a2fb56dde5 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 27 Nov 2024 12:40:26 -0500 Subject: [PATCH 03/18] back to original constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 95ba958..97e2dff 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, "require-dev": { - "statamic/cms": "dev-php84", + "statamic/cms": "^5.0, "mockery/mockery": "^1.4.4", "orchestra/testbench": "^8.28 || ^9.6.1", "phpunit/phpunit": "^10.5.35" From 9c7c6ae1fd3696d7221e376669e92c227833b11c Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 27 Nov 2024 12:44:42 -0500 Subject: [PATCH 04/18] bump From c6cd4cef2bcf1dc81a5b6bf8bd4b16fcf3fc85aa Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 27 Nov 2024 12:45:19 -0500 Subject: [PATCH 05/18] fix missing quote --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 97e2dff..621863c 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, "require-dev": { - "statamic/cms": "^5.0, + "statamic/cms": "^5.0", "mockery/mockery": "^1.4.4", "orchestra/testbench": "^8.28 || ^9.6.1", "phpunit/phpunit": "^10.5.35" From 59003b3967bac7f4d88aa8c141dd0a7636961e71 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 28 Nov 2024 20:48:36 +0000 Subject: [PATCH 06/18] We can do without this. --- .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 2683e2d..23d0baa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,7 +54,7 @@ jobs: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }} + run: vendor/bin/phpunit - name: Send Slack notification uses: 8398a7/action-slack@v2 From 5ec178833b9a90e06abcdf85f9128dc34379656e Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 28 Nov 2024 20:48:55 +0000 Subject: [PATCH 07/18] Require Statamic 5.41 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 621863c..7b2c4f5 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, "require-dev": { - "statamic/cms": "^5.0", + "statamic/cms": "^5.41", "mockery/mockery": "^1.4.4", "orchestra/testbench": "^8.28 || ^9.6.1", "phpunit/phpunit": "^10.5.35" From edd6dc0477958d1a09bbd7759267b33ae949caf2 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 15:07:26 +0000 Subject: [PATCH 08/18] take away php 8.4 for a second --- .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 23d0baa..5976c87 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - php: [8.1, 8.2, 8.3, 8.4] + php: [8.1, 8.2, 8.3] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] os: [ubuntu-latest] From 93de87661b98ead9a9cb28874dea00f3ae8c24a6 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 15:12:06 +0000 Subject: [PATCH 09/18] wip --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5976c87..302688f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,15 +25,15 @@ jobs: php: 8.3 laravel: 11.* stability: prefer-stable - - os: windows-latest - php: 8.4 - laravel: 11.* - stability: prefer-stable +# - os: windows-latest +# php: 8.4 +# laravel: 11.* +# stability: prefer-stable exclude: - php: 8.1 laravel: 11.* - - php: 8.4 - laravel: 10.* +# - php: 8.4 +# laravel: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 7496bd969b073f50bb5ec44d6e2022cdfa1b6f28 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 15:19:21 +0000 Subject: [PATCH 10/18] wip --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 302688f..221bd68 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,10 +25,10 @@ jobs: php: 8.3 laravel: 11.* stability: prefer-stable -# - os: windows-latest -# php: 8.4 -# laravel: 11.* -# stability: prefer-stable + - os: windows-latest + php: 8.4 + laravel: 11.* + stability: prefer-stable exclude: - php: 8.1 laravel: 11.* From 3d6b16303d67bb6307755be1e71a650f46dbe7d5 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 15:36:50 +0000 Subject: [PATCH 11/18] could some of the php 8.4 fixes in newer versions of php cs fixer help? --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b2c4f5..f4a7fbf 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "statamic/migrator", "type": "statamic-addon", "require": { - "friendsofphp/php-cs-fixer": "^3.54.0", + "friendsofphp/php-cs-fixer": "^3.60.0", "league/flysystem-aws-s3-v3": "~1.0 || ~3.0", "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, From 0e892bd4168955683ad6131535b0344f8e119571 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 15:43:55 +0000 Subject: [PATCH 12/18] maybe try the absolute latest version then --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f4a7fbf..69ef3e6 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "statamic/migrator", "type": "statamic-addon", "require": { - "friendsofphp/php-cs-fixer": "^3.60.0", + "friendsofphp/php-cs-fixer": "^3.65.0", "league/flysystem-aws-s3-v3": "~1.0 || ~3.0", "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, From f9d41f33846e3725e456d750a2788c2926b02b9e Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 15:51:23 +0000 Subject: [PATCH 13/18] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 69ef3e6..af978f6 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "require-dev": { "statamic/cms": "^5.41", "mockery/mockery": "^1.4.4", - "orchestra/testbench": "^8.28 || ^9.6.1", + "orchestra/testbench": "^8.0 || ^9.0", "phpunit/phpunit": "^10.5.35" }, "autoload": { From 57fddf7fea1ff0df31b379d9fcb224f44c43ffb9 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 16:31:16 +0000 Subject: [PATCH 14/18] wip --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index af978f6..7b2c4f5 100644 --- a/composer.json +++ b/composer.json @@ -2,14 +2,14 @@ "name": "statamic/migrator", "type": "statamic-addon", "require": { - "friendsofphp/php-cs-fixer": "^3.65.0", + "friendsofphp/php-cs-fixer": "^3.54.0", "league/flysystem-aws-s3-v3": "~1.0 || ~3.0", "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" }, "require-dev": { "statamic/cms": "^5.41", "mockery/mockery": "^1.4.4", - "orchestra/testbench": "^8.0 || ^9.0", + "orchestra/testbench": "^8.28 || ^9.6.1", "phpunit/phpunit": "^10.5.35" }, "autoload": { From 686535f11ca1fea465fa120712d69fe49c46a6c4 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 29 Nov 2024 16:35:52 +0000 Subject: [PATCH 15/18] put everything back to how it was --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 221bd68..23d0baa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - php: [8.1, 8.2, 8.3] + php: [8.1, 8.2, 8.3, 8.4] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] os: [ubuntu-latest] @@ -32,8 +32,8 @@ jobs: exclude: - php: 8.1 laravel: 11.* -# - php: 8.4 -# laravel: 10.* + - php: 8.4 + laravel: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 6982acc5e70f776a85c782bf6acf2c44b4405a46 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Wed, 26 Feb 2025 12:07:09 +0000 Subject: [PATCH 16/18] use current testbench versions to see if that fixes the tests --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b2c4f5..8c39d24 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "require-dev": { "statamic/cms": "^5.41", "mockery/mockery": "^1.4.4", - "orchestra/testbench": "^8.28 || ^9.6.1", + "orchestra/testbench": "^8.0 || ^9.0", "phpunit/phpunit": "^10.5.35" }, "autoload": { From 43c3d82c20d791726ced0e2026bfcf56e37d965f Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Wed, 26 Feb 2025 12:09:31 +0000 Subject: [PATCH 17/18] ah, we need these versions of testbench --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8c39d24..7b2c4f5 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "require-dev": { "statamic/cms": "^5.41", "mockery/mockery": "^1.4.4", - "orchestra/testbench": "^8.0 || ^9.0", + "orchestra/testbench": "^8.28 || ^9.6.1", "phpunit/phpunit": "^10.5.35" }, "autoload": { From 8ad776e081df31f9f4c841bcf16fc46fbf25be34 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Mon, 22 Sep 2025 11:11:18 +0100 Subject: [PATCH 18/18] require minimum version of PHP CS Fixer for PHP 8.4 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b2c4f5..65bcdd7 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "statamic/migrator", "type": "statamic-addon", "require": { - "friendsofphp/php-cs-fixer": "^3.54.0", + "friendsofphp/php-cs-fixer": "^3.80.0", "league/flysystem-aws-s3-v3": "~1.0 || ~3.0", "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d" },