Tests: Add PHP 8.4 and move PCOV to PHP 8.2

.github/workflows/integration-tests.yml

@@ -23,34 +23,25 @@ jobs:
       WP_VERSION: ${{ matrix.wp }}
 
     strategy:
-      # PHP 7.2 uses PHPUnit 8.5.21
-      # PHP 7.3 uses PHPUnit 9.5.10
-      # PHP 7.4 uses PHPUnit 9.5.10
-      # PHP 8.0 uses PHPUnit 9.5.10
-      # PHP 8.1 uses PHPUnit 9.5.10
-      # PHP 8.2 uses PHPUnit 9.5.10
+      # Note: Different PHP versions use different PHPUnit versions.
       # Keys:
       # - coverage: Whether to run the tests with code coverage.
       # - experimental: Whether the build is "allowed to fail".
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0']
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.3']
         wp: ['latest']
         coverage: [none]
         experimental: [false]
         include:
-          - php: '8.1'
-            coverage: pcov
+          - php: '8.2'
+            coverage: pcov # Warning: PCOV might not work for PHP 8.4 or newer according to https://thephp.cc/articles/pcov-or-xdebug.
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
             experimental: false
-          - php: '8.2'
-            wp: 'trunk'
-            coverage: none
-            experimental: false
-          - php: '8.3'
+          - php: '8.4'
             wp: 'trunk'
             coverage: none
-            experimental: false
+            experimental: true
       fail-fast: false
     continue-on-error: ${{ matrix.experimental }}
     steps:
@@ -92,17 +83,17 @@ jobs:
         run: composer prepare-ci --no-interaction
 
       - name: Run integration tests (single site)
-        if: ${{ matrix.php != 8.0 && ! matrix.experimental }}
+        if: ${{ matrix.php != 8.2 && ! matrix.experimental }}
         run: composer testwp --no-interaction
 
-      - name: Run integration tests experimental
+      - name: Run integration tests (single site) experimental
         if: ${{ matrix.experimental }}
         run: composer testwp-experimental --no-interaction
 
-      - name: Run integration tests (multi site)
-        if: ${{ matrix.php != 8.0 && ! matrix.experimental }}
+      - name: Run integration tests (multisite)
+        if: ${{ matrix.php != 8.2 && ! matrix.experimental }}
         run: composer testwp-ms --no-interaction
 
       - name: Run integration tests (multisite site with code coverage)
-        if: ${{ matrix.php == 8.1 }}
+        if: ${{ matrix.php == 8.2 }} # To prevent unneeded test runs, use this version in the above if clauses.
         run: composer coveragewp-ci --no-interaction

.github/workflows/unit-tests.yml

@@ -25,25 +25,24 @@ jobs:
       WP_VERSION: latest
 
     strategy:
-      # PHP 7.2 uses PHPUnit 8.5.21
-      # PHP 7.3 uses PHPUnit 9.5.10
-      # PHP 7.4 uses PHPUnit 9.5.10
-      # PHP 8.0 uses PHPUnit 9.5.10
-      # PHP 8.1 uses PHPUnit 9.5.10
+      # Note: Different PHP versions use different PHPUnit versions.
       # Keys:
       # - coverage: Whether to run the tests with code coverage.
       # - experimental: Whether the build is "allowed to fail".
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.2', '8.3']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.3']
         coverage: [none]
         experimental: [false]
         include:
           # Run code coverage for only one PHP version
-          - php: '8.1'
-            coverage: pcov
+          - php: '8.2'
+            coverage: pcov # Warning: PCOV might not work for PHP 8.4 or newer according to https://thephp.cc/articles/pcov-or-xdebug.
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
             experimental: false
+          - php: '8.4'
+            coverage: none
+            experimental: true
       fail-fast: false
     continue-on-error: ${{ matrix.experimental }}
     steps:

.phpcs.xml.dist

@@ -79,9 +79,9 @@
 		</properties>
 	</rule>
 
-	<!-- Allow short @var assignments in tests. -->
+	<!-- Allow short @var assignments -->
  	<rule ref="Generic.Commenting.DocComment.MissingShort">
-    	<exclude-pattern>/tests/</exclude-pattern>
+    	<exclude-pattern>/</exclude-pattern>
  	</rule>
 
 </ruleset>

build/blocks/recommendations/edit.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '985cd7ad36a37322fb62');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'f73735ea0f420620d3aa');

build/blocks/recommendations/view.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '816c6be0377185053443');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'db27a5e749f0f3888bee');

build/content-helper/dashboard-widget.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '86a5430e052e357f1b96');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '3a7734d69011884c8267');

build/content-helper/editor-sidebar.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '2dba3c67213de163a67c');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '6e668f9bfad0f3f02bf6');

build/content-helper/excerpt-generator.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url', 'wp-wordcount'), 'version' => '2a31635723a6474c1f34');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url', 'wp-wordcount'), 'version' => 'f4a464bba52051300fa7');

phpstan.neon

@@ -14,7 +14,7 @@ parameters:
     - vendor/php-stubs/wordpress-stubs/wordpress-stubs.php
     - vendor/php-stubs/wordpress-tests-stubs/wordpress-tests-stubs.php
   type_coverage:
-      return_type: 91
+      return_type: 90
       param_type: 79.2
       property_type: 0 # We can't use property types until PHP 7.4 becomes the plugin's minimum version.
       print_suggestions: false