Support PHP 7.4 to 8.5 and WP 6.*

gmazzap · gmazzap · commit b56185bb53f3 · 2025-11-28T15:41:02.000+01:00
Deprecate PHP 7.2 and 7.6, as well as WP 5.*
diff --git a/.github/workflows/php-qa.yml b/.github/workflows/php-qa.yml
@@ -41,7 +41,7 @@ jobs:
         steps:
 
             -   name: Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
@@ -71,22 +71,9 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-ver: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
-                wp-ver: [ '5.*', '6.*' ]
+                php-ver: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
+                wp-ver: [ '6.0.*', '6.5.*', '6.*' ]
                 dependency-versions: [ 'highest', 'lowest' ]
-                exclude:
-                    -   php-ver: '8.1'
-                        wp-ver: '5.*'
-                        dependency-versions: 'lowest'
-                    -   php-ver: '8.2'
-                        wp-ver: '5.*'
-                        dependency-versions: 'lowest'
-                    -   php-ver: '8.3'
-                        wp-ver: '5.*'
-                    -   php-ver: '8.4'
-                        wp-ver: '5.*'
-                    -   php-ver: '8.4'
-                        dependency-versions: 'lowest'
 
         steps:
 
@@ -95,7 +82,7 @@ jobs:
                 run: echo "USE_COVERAGE=yes" >> $GITHUB_ENV
 
             -   name: Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
@@ -104,22 +91,22 @@ jobs:
                     ini-values: zend.assertions=1, error_reporting=E_ALL, display_errors=On
                     coverage: ${{ ((env.USE_COVERAGE == 'yes') && 'xdebug') || 'none' }}
 
-            -   name: Adjust WP version
+            -   name: Adjust dependencies
                 run: |
                     composer remove --dev --no-update "roots/wordpress-no-content"
+                    composer remove --dev --no-update "inpsyde/php-coding-standards"
+                    composer remove --dev --no-update "vimeo/psalm"
                     composer remove --dev --no-update "phpunit/phpunit"
                     composer require --no-update "roots/wordpress-no-content:${{ matrix.wp-ver }}"
-                    composer require --no-update "phpunit/phpunit:^7.5.20 || ^9.6.4"
+                    composer require --no-update "phpunit/phpunit:^9.6.29"
 
             -   name: Install dependencies
                 uses: ramsey/composer-install@v3
                 with:
                     dependency-versions: ${{ matrix.dependency-versions }}
 
             -   name: Run unit tests
-                run: |
-                    ./vendor/bin/phpunit --atleast-version 9 && ./vendor/bin/phpunit --migrate-configuration || echo 'Config does not need updates.'
-                    ./vendor/bin/phpunit ${{ ((env.USE_COVERAGE == 'yes') && '--coverage-html=coverage-report') || '--no-coverage' }}
+                run: ./vendor/bin/phpunit ${{ ((env.USE_COVERAGE == 'yes') && '--coverage-html=coverage-report') || '--no-coverage' }}
 
             -   name: Upload coverage report
                 uses: actions/upload-artifact@v4
@@ -134,11 +121,11 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php-ver: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+                php-ver: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         steps:
 
             -   name: Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
diff --git a/composer.json b/composer.json
@@ -31,14 +31,14 @@
         "source": "https://github.com/wecodemore/wordpress-early-hook"
     },
     "require": {
-        "php": ">=7.1 < 8.5"
+        "php": ">=7.4 <= 8.5"
     },
     "require-dev": {
-        "roots/wordpress-no-content": ">=6.1.1",
+        "roots/wordpress-no-content": ">=6.8.3",
         "roave/security-advisories": "dev-latest",
-        "inpsyde/php-coding-standards": "^1.0.0",
-        "vimeo/psalm": "^4.30.0",
-        "phpunit/phpunit": "^7.5.20 || ^9.6.4"
+        "inpsyde/php-coding-standards": "^2.0.2",
+        "vimeo/psalm": "^5.26.1 || ^6.13.1",
+        "phpunit/phpunit": "^9.6.29"
     },
     "autoload": {
         "files": [
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -7,7 +7,7 @@
 
     <arg value="sp"/>
     <arg name="colors"/>
-    <config name="testVersion" value="7.1-"/>
+    <config name="testVersion" value="7.4-"/>
 
     <rule ref="Inpsyde">
         <exclude name="WordPress.Security.EscapeOutput"/>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/schema/9.5.xsd"
     bootstrap="./tests/bootstrap.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertDeprecationsToExceptions="false">
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    colors="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <file>./wordpress-early-hook.php</file>
-        </whitelist>
-    </filter>
-
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="integration">
             <directory>./tests/integration</directory>
diff --git a/tests/integration/IntegrationTest.php b/tests/integration/IntegrationTest.php
@@ -93,7 +93,9 @@ private function createCallbacks(): array
 
         $hookObj = new class ($filter, $action)
         {
+            /** @var callable */
             private $filter;
+            /** @var callable */
             private $action;
 
             /**
@@ -136,7 +138,7 @@ public function action(...$args): void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
      */
-    private function doAssertions(callable $filter, callable $action, $hookObj): void
+    private function doAssertions(callable $filter, callable $action, object $hookObj): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
         static::assertSame(
@@ -149,7 +151,7 @@ private function doAssertions(callable $filter, callable $action, $hookObj): voi
 
         ob_start();
         do_action('wecodemore.test-action', 'TEST_');
-        static::assertSame('TEST_TEST_', trim(ob_get_clean() ?: ''));
+        static::assertSame('TEST_TEST_', trim((string) ob_get_clean()));
 
         static::assertSame(10, has_filter('wecodemore.test-filter', $filter));
         static::assertSame(10, has_filter('wecodemore.test-action', $action));
@@ -169,7 +171,7 @@ private function doAssertions(callable $filter, callable $action, $hookObj): voi
 
         ob_start();
         do_action('wecodemore.test-action', 'TEST_');
-        static::assertSame('TEST_', trim(ob_get_clean() ?: ''));
+        static::assertSame('TEST_', trim((string) ob_get_clean()));
 
         static::assertTrue(has_filter('wecodemore.test-filter'));
         static::assertTrue(has_filter('wecodemore.test-action'));
@@ -182,7 +184,7 @@ private function doAssertions(callable $filter, callable $action, $hookObj): voi
         static::assertSame(1, apply_filters('wecodemore.test-filter', 1));
         ob_start();
         do_action('wecodemore.test-action', 'TEST');
-        static::assertSame('', trim(ob_get_clean() ?: ''));
+        static::assertSame('', trim((string) ob_get_clean()));
 
         static::assertFalse(has_filter('wecodemore.test-filter'));
         static::assertFalse(has_filter('wecodemore.test-action'));
diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -19,7 +19,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     protected function defineAbspath(): void
     {
         if (!defined('ABSPATH')) {
-            define('ABSPATH', (getenv('WP_DIR') ?: '') . '/');
+            define('ABSPATH', ((string) getenv('WP_DIR')) . '/');
         }
     }
 
diff --git a/wordpress-early-hook.php b/wordpress-early-hook.php
@@ -76,7 +76,6 @@ function earlyAddHook(
 }
 
 namespace WeCodeMore {
-
     /**
      * @param string $hook
      * @param callable $callback

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase`
`19`	`19`	`protected function defineAbspath(): void`
`20`	`20`	`{`
`21`	`21`	`if (!defined('ABSPATH')) {`
`22`		`- define('ABSPATH', (getenv('WP_DIR') ?: '') . '/');`
	`22`	`+ define('ABSPATH', ((string) getenv('WP_DIR')) . '/');`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ function earlyAddHook(`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`namespace WeCodeMore {`
`79`		`-`
`80`	`79`	`/**`
`81`	`80`	`* @param string $hook`
`82`	`81`	`* @param callable $callback`