Merge pull request #530 from wpengine/issue-488-hwp-previews-review

chore(previews): test against WordPress 6.9

Author: josephfusco

.changeset/prepare-public-release.md

@@ -0,0 +1,11 @@
+---
+"@wpengine/hwp-previews-wordpress-plugin": patch
+---
+
+Verify WordPress 6.9 compatibility and update CI test matrix
+
+- Tested compatibility with WordPress 6.9
+- Updated CI test matrix to WordPress 6.9, 6.8, 6.7 (dropped 6.5, 6.6)
+- Updated dev dependencies (mockery/mockery to ^1.6, wp-graphql/wp-graphql-testcase to ^3.4)
+- Updated Docker defaults to WordPress 6.9
+- Reduced readme.txt tags to 5 for WordPress.org compliance

.github/workflows/code-quality.yml

@@ -65,18 +65,11 @@ jobs:
         id: detect-php-version
         run: |
           PLUGIN="${{ steps.plugin.outputs.slug }}"
-          PHP_VERSION="7.4"
-          if [ -f "plugins/$PLUGIN/composer.json" ]; then
-            DETECTED_VERSION=$(jq -r '.require["php"] // empty' plugins/$PLUGIN/composer.json | grep -oE '[0-9]+\.[0-9]+' | head -1)
-            if [ -n "$DETECTED_VERSION" ]; then
-              PHP_VERSION="$DETECTED_VERSION"
-              echo "Detected PHP version $PHP_VERSION from composer.json"
-            else
-              echo "No PHP version found in composer.json, using default $PHP_VERSION"
-            fi
-          else
-            echo "No composer.json found, using default PHP version $PHP_VERSION"
-          fi
+          # Use PHP 8.2 for code quality checks - PHPStan/Psalm can analyze older PHP code
+          # while running on newer PHP. This is required because wordpress-stubs v6.8+
+          # contain PHP 8+ syntax that cannot be parsed by PHP 7.4.
+          PHP_VERSION="8.2"
+          echo "Using PHP $PHP_VERSION for code quality checks"
           echo "php-version=$PHP_VERSION" >> $GITHUB_OUTPUT
   quality-checks:
     needs: detect-plugins

plugins/hwp-previews/.docker/Dockerfile

@@ -7,7 +7,7 @@
 ARG WP_VERSION
 ARG PHP_VERSION
 
-FROM wordpress:${WP_VERSION:-6.8}-php${PHP_VERSION:-8.2}
+FROM wordpress:${WP_VERSION:-6.9}-php${PHP_VERSION:-8.2}
 
 # Needed to specify the build args again after the FROM command.
 ARG WP_VERSION

plugins/hwp-previews/bin/build-docker.sh

@@ -14,9 +14,9 @@ print_usage_instructions() {
 	echo "Example use:"
 	echo "  npm run docker:build"
 	echo ""
-	echo "  WP_VERSION=6.7 PHP_VERSION=8.2 npm run docker:build -- - c"
+	echo "  WP_VERSION=6.9 PHP_VERSION=8.2 npm run docker:build -- - c"
 	echo ""
-	echo "  WP_VERSION=6.7 PHP_VERSION=8.2 bin/build-docker.sh -- c"
+	echo "  WP_VERSION=6.9 PHP_VERSION=8.2 bin/build-docker.sh -- c"
 	exit 1
 }
 
@@ -50,7 +50,7 @@ done
 
 
 TAG=${TAG:-latest}
-WP_VERSION=${WP_VERSION:-6.7}
+WP_VERSION=${WP_VERSION:-6.9}
 PHP_VERSION=${PHP_VERSION:-8.2}
 
 BUILD_NO_CACHE=${BUILD_NO_CACHE:-}

plugins/hwp-previews/composer.json

@@ -41,14 +41,14 @@
 		"humanmade/psalm-plugin-wordpress": "^3.1",
 		"johnpbloch/wordpress-core": "^6.8",
 		"lucatume/wp-browser": "^3.5",
-		"mockery/mockery": "^1.5",
-		"phpcompatibility/php-compatibility": "dev-develop as 9.99.99",
+		"mockery/mockery": "^1.6",
+		"phpcompatibility/php-compatibility": "^9.3",
 		"phpcompatibility/phpcompatibility-wp": "^2.0",
 		"phpstan/phpstan-strict-rules": "^2.0",
 		"slevomat/coding-standard": "^8.0",
 		"szepeviktor/phpstan-wordpress": "^2.0",
 		"wp-cli/wp-cli-bundle": "^2.8.1",
-		"wp-graphql/wp-graphql-testcase": "^3.0.1"
+		"wp-graphql/wp-graphql-testcase": "^3.4"
 	},
 	"config": {
 		"allow-plugins": {