Fix PHP CI including PHPCS and PHPUnit; bump PHP/WP versions

.github/workflows/build-test-measure.yml

@@ -208,6 +208,8 @@ jobs:
     if: needs.pre-run.outputs.changed-file-count > 0
     env:
       WP_CORE_DIR: /tmp/wordpress
+      WP_TESTS_DIR: /tmp/wordpress-tests-lib
+      WP_ENVIRONMENT_TYPE: local
     services:
       mysql:
         image: mariadb:latest
@@ -226,31 +228,42 @@ jobs:
         coverage: [false]
         php: ['7.3', '7.2', '7.1']
         wp: ['latest']
+        phpunit: ['7']
         include:
-          - php: '8.0'
+          - php: '8.3'
             wp: 'trunk'
-            experimental: true
             coverage: false
+            phpunit: '9.6'
+
+          - php: '8.2'
+            wp: 'trunk'
+            coverage: false
+            phpunit: '9.6'
+
+          - php: '8.1'
+            wp: 'latest'
+            coverage: false
+            phpunit: '9.6'
+
+          - php: '8.0'
+            wp: 'latest'
+            coverage: false
+            phpunit: '9.3'
 
           - php: '7.4'
             wp: 'latest'
             coverage: false
+            phpunit: '9.3'
 
           - php: '7.4'
             wp: 'latest'
             coverage: true
+            phpunit: '9.3'
 
           - php: '7.0'
-            wp: '5.1'
-            coverage: false
-
-          - php: '5.6'
-            wp: '5.0'
-            coverage: false
-
-          - php: '5.6'
-            wp: '4.9'
+            wp: '6.3'
             coverage: false
+            phpunit: '6'
 
     steps:
       - name: Checkout
@@ -261,8 +274,8 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: curl, date, dom, gd, iconv, json, libxml, mysql, spl
-          coverage: ${{ matrix.coverage && 'pcov' || 'none' }}
-          ini-values: pcov.directory=.
+          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          tools: phpunit:${{ matrix.phpunit }}
 
       - name: Shutdown default MySQL service
         run: sudo service mysql stop
@@ -302,6 +315,13 @@ jobs:
       - name: Build plugin
         run: npm run build
 
+      # Avoid conflicts with globally installed PHPUnit.
+      - name: Remove locally installed PHPUnit
+        if: needs.pre-run.outputs.changed-php-count > 0
+        run: |
+            rm -rf vendor/phpunit
+            composer dump-autoload -o
+
       # Scan the logs for failing tests and surface that information by creating annotations and log file decorations.
       - name: Setup problem matcher to provide annotations for PHPUnit
         # The JSON file is provided by the `shivammathur/setup-php` action. See https://github.com/shivammathur/setup-php#problem-matchers.
@@ -310,26 +330,17 @@ jobs:
       - name: Install WP tests
         run: bash bin/ci/install-wp-tests.sh wordpress_test root '' 127.0.0.1:${{ job.services.mysql.ports['3306'] }} ${{ matrix.wp }} true
 
-      - name: Setup PCOV
-        if: ${{ matrix.coverage == true }}
-        # phpdocumentor/reflection has to be removed as it makes use of an outdated dependency, making pcov/clobber
-        # unable to be installed.
-        run: |
-          composer remove --dev phpdocumentor/reflection
-          composer require --dev --ignore-platform-reqs pcov/clobber
-          vendor/bin/pcov clobber
-
       - name: Copy plugin to WP plugins directory
         run: cp -r "$PWD" "$WP_CORE_DIR/src/wp-content/plugins/pwa"
 
       - name: Run tests
         if: ${{ matrix.coverage == false }}
-        run: vendor/bin/phpunit
+        run: phpunit --verbose
         working-directory: ${{ env.WP_CORE_DIR }}/src/wp-content/plugins/pwa
 
       - name: Run tests with coverage
         if: ${{ matrix.coverage == true }}
-        run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+        run: phpunit --verbose --coverage-clover build/logs/clover.xml
         working-directory: ${{ env.WP_CORE_DIR }}/src/wp-content/plugins/pwa
 
       - name: Upload code coverage report

.gitignore

@@ -7,6 +7,7 @@
 /wp-includes/js/workbox*
 /wiki
 .vscode
+.phpunit.result.cache
 
 # Generated via bin/transform-readme.php
 /readme.txt

.phpcs.xml.dist

@@ -29,7 +29,7 @@
 
 	<rule ref="WordPress.NamingConventions.ValidVariableName">
 		<properties>
-			<property name="customPropertiesWhitelist" value="childNodes,tagName,textContent,parentNode,nodeType,nodeName,nextSibling,firstChild,lastChild,nodeValue,DEFAULT_ARGS,documentElement,removeChild,ownerDocument,DEFAULT_WIDTH,DEFAULT_HEIGHT" />
+			<property name="allowed_custom_properties" value="childNodes,tagName,textContent,parentNode,nodeType,nodeName,nextSibling,firstChild,lastChild,nodeValue,DEFAULT_ARGS,documentElement,removeChild,ownerDocument,DEFAULT_WIDTH,DEFAULT_HEIGHT" />
 		</properties>
 	</rule>
 

README.md

@@ -6,11 +6,11 @@ WordPress feature plugin to bring Progressive Web App (PWA) capabilities to Core
 
 **Contributors:** [google](https://profiles.wordpress.org/google), [xwp](https://profiles.wordpress.org/xwp), [rtcamp](https://profiles.wordpress.org/rtcamp), [westonruter](https://profiles.wordpress.org/westonruter), [albertomedina](https://profiles.wordpress.org/albertomedina)  
 **Tags:** [pwa](https://wordpress.org/plugins/tags/pwa), [progressive web apps](https://wordpress.org/plugins/tags/progressive-web-apps), [service workers](https://wordpress.org/plugins/tags/service-workers), [web app manifest](https://wordpress.org/plugins/tags/web-app-manifest)  
-**Requires at least:** 5.5  
+**Requires at least:** 6.3  
 **Tested up to:** 6.3  
 **Stable tag:** 0.7.1  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
-**Requires PHP:** 5.6
+**Requires PHP:** 7.0
 
 [![Build Status](https://github.com/GoogleChromeLabs/pwa-wp/workflows/Build,%20test%20&%20measure/badge.svg)](https://github.com/GoogleChromeLabs/pwa-wp/actions?query=branch%3Adevelop+workflow%3A%22Build%2C+test+%26+measure%22)
 [![Built with Grunt](https://gruntjs.com/cdn/builtwith.svg)](http://gruntjs.com)

bin/verify-version-consistency.php

@@ -19,14 +19,14 @@
 
 $versions = array();
 
-$readme_md = file_get_contents( dirname( __FILE__ ) . '/../README.md' );
+$readme_md = file_get_contents( __DIR__ . '/../README.md' );
 if ( ! preg_match( '/\*\*Stable tag:\*\*\s+(?P<version>\S+)/i', $readme_md, $matches ) ) {
 	echo "Could not find stable tag in readme\n";
 	exit( 1 );
 }
 $versions['README.md#stable-tag'] = $matches['version'];
 
-$plugin_file = file_get_contents( dirname( __FILE__ ) . '/../pwa.php' );
+$plugin_file = file_get_contents( __DIR__ . '/../pwa.php' );
 if ( ! preg_match( '/\*\s*Version:\s*(?P<version>\d+\.\d+(?:.\d+)?(-\w+)?)/', $plugin_file, $matches ) ) {
 	echo "Could not find version in readme metadata\n";
 	exit( 1 );

bundled-theme-support/twentynineteen/offline.php

@@ -12,7 +12,7 @@
 // Add the body class for the 404 template for the sake of styling.
 add_filter(
 	'body_class',
-	function( $body_classes ) {
+	function ( $body_classes ) {
 		$body_classes[] = 'error404';
 		return $body_classes;
 	}

bundled-theme-support/twentysixteen/offline.php

@@ -13,7 +13,7 @@
 // Add the body class for the 404 template for the sake of styling.
 add_filter(
 	'body_class',
-	function( $body_classes ) {
+	function ( $body_classes ) {
 		$body_classes[] = 'error404';
 		return $body_classes;
 	}

bundled-theme-support/twentytwenty/offline.php

@@ -22,7 +22,7 @@ function () {
 // Add the body class for the 404 template for the sake of styling.
 add_filter(
 	'body_class',
-	function( $body_classes ) {
+	function ( $body_classes ) {
 		$body_classes[] = 'error404';
 		return $body_classes;
 	}

composer.json

@@ -5,28 +5,27 @@
   "type": "wordpress-plugin",
   "homepage": "https://github.com/GoogleChromeLabs/pwa-wp",
   "require": {
-    "php": "^5.6 || ^7.0 || ^8.0",
+    "php": "^7.0 || ^8.0",
     "ext-json": "*"
   },
   "require-dev": {
-    "automattic/vipwpcs": "^2.3",
+    "automattic/vipwpcs": "3.0.0",
     "civicrm/composer-downloads-plugin": "^3.0",
-    "dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
     "php-stubs/wordpress-stubs": "^6.3.2",
     "phpcompatibility/phpcompatibility-wp": "2.1.4",
     "wp-cli/wp-cli": "^2.9",
-    "wp-coding-standards/wpcs": "2.3.0",
-    "yoast/wp-test-utils": "^0.2.2"
+    "wp-coding-standards/wpcs": "3.0.1",
+    "yoast/wp-test-utils": "1.2.0"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
   "config": {
     "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true,
-      "civicrm/composer-downloads-plugin": true
+      "civicrm/composer-downloads-plugin": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true
     },
     "platform": {
-      "php": "5.6"
+      "php": "7.0"
     },
     "sort-packages": true
   },
@@ -41,13 +40,24 @@
         "path": "vendor/bin/phpstan",
         "type": "phar",
         "url": "https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar"
+      },
+      "phpunit": {
+        "path": "vendor/bin/_phpunit",
+        "type": "phar",
+        "url": "https://phar.phpunit.de/phpunit-9.phar"
       }
     }
   },
   "scripts": {
+    "post-install-cmd": [
+      "@php -r \"if (file_exists('vendor/bin/_phpunit')) { rename('vendor/bin/_phpunit', 'vendor/bin/phpunit'); }\""
+    ],
+    "post-update-cmd": [
+      "composer run-script post-install-cmd"
+    ],
     "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan --version; phpstan analyze --ansi --memory-limit=1G; fi",
     "pre-commit": [
       "npm run lint:staged"
     ]
   }
-}
+}