Update PHP and testing requirements; enhance CI configuration and PHP CodeSniffer rules

- Updated PHP version requirement to >= 8.1 in composer.json and CI configuration.
- Added PHPUnit setup instructions in CLAUDE.md.
- Enhanced PHP CodeSniffer rules for better code quality checks.
- Refactored test scripts for improved compatibility with PHP 8.1.
- Updated PHPUnit configuration to align with the latest standards.

Author: kodinkat

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ["7.4", "8.4"]
+        php: ["8.1", "8.4"]
 
     name: PHP ${{ matrix.php }}
     steps:
@@ -55,7 +55,7 @@ jobs:
       with:
         # caching node_modules
         path: vendor
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-build-${{ env.cache-name }}-
           ${{ runner.os }}-build-
@@ -131,10 +131,8 @@ jobs:
       run: ./tests/install-wp-tests.sh wordpress_test root rootpassword 127.0.0.0 latest
       shell: bash
 
-    - name: PHPunit
+    - name: PHPUnit
       run: |
-        composer require "phpunit/phpunit=8.*"
-        composer require "yoast/phpunit-polyfills"
-        vendor/phpunit/phpunit/phpunit --version
-        WP_MULTISITE=1 vendor/phpunit/phpunit/phpunit
+        vendor/bin/phpunit --version
+        WP_MULTISITE=1 vendor/bin/phpunit
 

CLAUDE.md

@@ -19,13 +19,20 @@ npm run build        # Build CSS/JS for production (Vite)
 ```bash
 npm run lint                    # Run ESLint
 npm run prettier                # Format JS files with Prettier
-composer install                # Install PHP dependencies (required for PHPCS)
+composer install                # Install PHP dependencies (PHPCS, PHPUnit, etc.; requires PHP >= 8.1)
 ./tests/test_phpcs.sh           # Run PHP CodeSniffer
 ./tests/test_phpcs.sh file.php  # Run PHPCS on specific files
 ./vendor/bin/phpcbf             # Auto-fix PHPCS errors
 ./tests/test_eslint.sh          # Run ESLint + Prettier check
 ```
 
+### PHPUnit (after WordPress test lib install)
+```bash
+./tests/install-wp-tests.sh <db-name> <db-user> <db-pass> [db-host]
+composer install
+composer run test             # or: WP_MULTISITE=1 vendor/bin/phpunit
+```
+
 ## Architecture
 
 ### Core Module Structure
@@ -92,7 +99,7 @@ Husky runs lint-staged on commit:
 ## CI Requirements
 
 Pull requests must pass:
-1. PHP syntax check
+1. PHP syntax check (PHP 8.1+ in CI)
 2. PHPCS on changed PHP files
 3. ESLint + Prettier
 4. Vite build (compiled assets must match expected output)

composer.json

@@ -1,19 +1,23 @@
 {
+    "require": {
+        "php": ">=8.1",
+        "kucrut/vite-for-wp": "^0.12.0"
+    },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "1.*",
-        "wp-coding-standards/wpcs": "3.1.*",
-        "squizlabs/php_codesniffer": "*"
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.2",
+        "phpunit/phpunit": "^9.6",
+        "squizlabs/php_codesniffer": "^3.13.5",
+        "wp-coding-standards/wpcs": "^3.3",
+        "yoast/phpunit-polyfills": "^4.0"
     },
     "scripts": {
         "lint": "vendor/bin/phpcs",
-        "lintfix": "vendor/bin/phpcbf"
+        "lintfix": "vendor/bin/phpcbf",
+        "test": "vendor/bin/phpunit"
     },
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
-    },
-    "require": {
-        "kucrut/vite-for-wp": "^0.12.0"
     }
 }

phpcs.xml

@@ -181,7 +181,6 @@
 
   <!-- Keeping these ones: -->
   <rule ref="Generic.ControlStructures.InlineControlStructure"/>
-  <rule ref="Generic.Debug.ClosureLinter"/>
   <rule ref="Generic.Files.ByteOrderMark"/>
   <rule ref="Generic.Files.LineEndings"/>
   <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
@@ -196,7 +195,10 @@
   <rule ref="Generic.WhiteSpace.ScopeIndent">
     <properties>
       <property name="indent" value="4"/>
-      <property name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT_OPEN_TAG"/>
+      <property name="ignoreIndentationTokens" type="array">
+        <element value="T_COMMENT"/>
+        <element value="T_DOC_COMMENT_OPEN_TAG"/>
+      </property>
     </properties>
   </rule>
   <rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>

phpunit.xml.dist

@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
 	bootstrap="tests/bootstrap.php"
 	backupGlobals="false"
 	colors="true"

tests/bootstrap.php

@@ -5,6 +5,11 @@
  * @package Disciple.Tools
  */
 
+$autoload = dirname( __DIR__ ) . '/vendor/autoload.php';
+if ( file_exists( $autoload ) ) {
+    require_once $autoload;
+}
+
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
 
 if ( !$_tests_dir ) {

tests/install-wp-tests.sh

@@ -138,7 +138,7 @@ install_db() {
 
 	if ! [ -z $DB_HOSTNAME ] ; then
 		if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
-			EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
+			EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT"
 		elif ! [ -z $DB_SOCK_OR_PORT ] ; then
 			EXTRA=" --socket=$DB_SOCK_OR_PORT"
 		elif ! [ -z $DB_HOSTNAME ] ; then

tests/test_phpcs.sh

@@ -4,9 +4,9 @@ set -e
 
 cd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-if [ "$(php -r 'echo version_compare( phpversion(), "7.0", ">=" ) ? 1 : 0;')" != 1 ] ; then
+if [ "$(php -r 'echo version_compare( phpversion(), "8.1", ">=" ) ? 1 : 0;')" != 1 ] ; then
     vendor/bin/phpcs functions.php
     exit
 fi
 
-eval vendor/bin/phpcs $args
+vendor/bin/phpcs "$@"