Workflow Updates

Author: PDowney

.github/workflows/php-code-quality.yml

@@ -28,24 +28,33 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '7.4'
           extensions: mbstring, intl, curl
           tools: composer:v2, phpcs, wp-coding-standards
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress
+        run: |
+          # First try and handle dependency conflicts
+          composer config platform.php 7.4
+          composer install --prefer-dist --no-progress --no-suggest || {
+            echo "Standard install failed, trying with --ignore-platform-reqs"
+            composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
+          }
 
       - name: Run PHP_CodeSniffer
         run: |
           if [ -f phpcs.xml ] || [ -f phpcs.xml.dist ]; then
-            ./vendor/bin/phpcs --standard=phpcs.xml || ./vendor/bin/phpcs --standard=phpcs.xml.dist
+            vendor/bin/phpcs --standard=phpcs.xml || vendor/bin/phpcs --standard=phpcs.xml.dist
           else
-            ./vendor/bin/phpcs --standard=WordPress-Core --extensions=php --ignore=vendor/,node_modules/ .
+            vendor/bin/phpcs --standard=WordPress-Core --extensions=php --ignore=vendor/,node_modules/ .
           fi
 
       - name: Run PHP Compatibility Check
         run: |
-          ./vendor/bin/phpcs --standard=PHPCompatibilityWP --extensions=php --ignore=vendor/,node_modules/ --runtime-set testVersion 7.0- .
+          # Install PHP compatibility standards if they're not already installed
+          composer require --dev phpcompatibility/php-compatibility wp-coding-standards/wpcs dealerdirect/phpcodesniffer-composer-installer --no-interaction || true
+          vendor/bin/phpcs --config-set installed_paths $(pwd)/vendor/phpcompatibility/php-compatibility || true
+          vendor/bin/phpcs --standard=PHPCompatibilityWP --extensions=php --ignore=vendor/,node_modules/ --runtime-set testVersion 7.0- .
 
       - name: Check PHP syntax
         run: |

.github/workflows/wordpress-tests.yml

@@ -86,6 +86,17 @@ jobs:
           composer-options: "--prefer-dist --no-progress"
         continue-on-error: true
 
+      - name: Verify Composer installation
+        run: |
+          if [ ! -d "vendor" ]; then
+            echo "::warning::Composer vendor directory not found. Installing dependencies manually."
+            composer install --no-progress
+          fi
+          if [ ! -f "vendor/bin/phpunit" ]; then
+            echo "::warning::PHPUnit not found in vendor/bin. Installing phpunit explicitly."
+            composer require phpunit/phpunit:^7.5 --dev --no-progress
+          fi
+      
       - name: Check Test Environment
         id: check-test-env
         run: |
@@ -111,4 +122,10 @@ jobs:
       - name: Run tests
         if: steps.check-test-env.outputs.test_env_ready == 'true'
         run: |
-          composer test
+          if [ -f "vendor/bin/phpunit" ]; then
+            vendor/bin/phpunit
+          else
+            echo "::error::PHPUnit executable not found in vendor/bin directory."
+            ls -la vendor/bin || echo "vendor/bin directory not found"
+            exit 1
+          fi