Merge pull request #541 from ProgressPlanner/ari/update-composer-20250703

Update composer packages to support PHP 8.4, removing PHP 7.4

Author: aristath

.github/workflows/cs.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.3'
           coverage: none
           tools: cs2pr
 

.github/workflows/lint.yml

@@ -24,9 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        # Lint against the highest/lowest supported versions of each PHP major.
-        # And also do a run against "nightly" (the current dev version of PHP).
-        php_version: ['7.4', '8.0', '8.1', '8.2']
+        php_version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     name: "Lint: PHP ${{ matrix.php_version }}"
 
@@ -37,7 +35,7 @@ jobs:
       - name: Install PHP for the composer install
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: ${{ matrix.php_version }}
           coverage: none
 
       # The lint stage doesn't use code style, so no need for WPCS or phpcompatibility.

.github/workflows/phpunit.yml

@@ -20,19 +20,31 @@ jobs:
     strategy:
       matrix:
         include:
-          - php_version: '8.1'
+          - php_version: '8.2'
             wp_version: '6.2'
             multisite: false
 
-          - php_version: '8.1'
+          - php_version: '8.2'
             wp_version: 'latest'
             multisite: false
 
-          - php_version: '8.1'
+          - php_version: '8.2'
             wp_version: 'latest'
             multisite: true
 
-          - php_version: '8.2'
+          - php_version: '8.3'
+            wp_version: 'latest'
+            multisite: false
+
+          - php_version: '8.3'
+            wp_version: 'latest'
+            multisite: true
+
+          - php_version: '8.4'
+            wp_version: 'latest'
+            multisite: false
+
+          - php_version: '8.4'
             wp_version: 'latest'
             multisite: true
 

.php-cs-fixer.dist.php

@@ -10,7 +10,9 @@
 		]
 	);
 
-return ( new PhpCsFixer\Config() )->setRules(
+$config = new PhpCsFixer\Config();
+
+return $config->setRules(
 	[
 		'native_function_invocation' => [
 			'include' => [ '@all' ],

composer.json

@@ -25,7 +25,9 @@
 			"@php ./vendor/bin/phpcs -s"
 		],
 		"fix-cs": [
-			"@php ./vendor/bin/phpcbf && ./vendor/bin/php-cs-fixer fix . --allow-risky=yes"
+			"PHP_CS_FIXER_IGNORE_ENV=1",
+			"@php ./vendor/bin/phpcbf",
+			"@php ./vendor/bin/php-cs-fixer fix . --allow-risky=yes"
 		],
 		"lint": [
 			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude node_modules --exclude .git"
@@ -41,6 +43,9 @@
 		]
 	},
 	"config": {
+		"platform": {
+			"php": "8.3"
+		},
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true,
 			"phpstan/extension-installer": true