Update PHP and PHPUnit versions, fix test workflow and improve build process

Author: ajaydsouza

.github/workflows/cs.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           tools: cs2pr
           coverage: none
 
@@ -50,4 +50,4 @@ jobs:
         run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml
 
       - name: Show PHPCS results in PR
-        run: cs2pr --graceful-warnings ./phpcs-report.xml
+        run: cs2pr --graceful-warnings ./phpcs-report.xml

.github/workflows/unit-tests.yml

@@ -37,9 +37,12 @@ jobs:
           - php: '8.2'
             wp: 'latest'
             experimental: true
-          - php: '8.0'
+          - php: '8.2'
             wp: '6.3'
             experimental: true
+          - php: '8.0'
+            wp: '5.9'
+            experimental: true
 
     name: "PHP ${{ matrix.php }} - WP ${{ matrix.wp }}"
 
@@ -68,23 +71,18 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: phpunit-polyfills
+          extensions: mysqli, mysql
           coverage: none
-          # The PHP 5.6 and 7.0 images don't include mysql[i] by default.
-          extensions: mysqli
-
-      - name: Set up WordPress
-        run: phpunit/install.sh wordpress_test root '' 127.0.0.1:3306 ${{ matrix.wp }}
 
       # On WP 5.2, PHPUnit 5.x, 6.x and 7.x are supported.
       # On PHP >= 8.0, PHPUnit 7.5+ is needed, no matter what.
       - name: Determine supported PHPUnit version
         id: set_phpunit
         run: |
-          if [[ "${{ matrix.php }}" > "7.4" ]]; then
-            echo "PHPUNIT=8.5.*" >> $GITHUB_ENV
+          if [[ "${{ matrix.php }}" > "8.0" ]]; then
+            echo "PHPUNIT=9.*" >> $GITHUB_ENV
           else
-            echo "PHPUNIT=5.7.*||6.*||7.5.*" >> $GITHUB_ENV
+            echo "PHPUNIT=5.7.*||6.*||7.5.*||8.5.*" >> $GITHUB_ENV
           fi
 
       - name: 'Composer: set up PHPUnit'
@@ -96,30 +94,32 @@ jobs:
       # @link https://github.com/marketplace/actions/install-composer-dependencies
       - name: Install Composer dependencies for PHP < 8.0
         if: ${{ matrix.php < 8.0 }}
-        uses: "ramsey/composer-install@v3"
+        uses: "ramsey/composer-install@v2"
 
       # For the PHP 8.0 and above, we need to install with ignore platform reqs as not all dependencies allow it yet.
       - name: Install Composer dependencies for PHP >= 8.0
         if: ${{ matrix.php >= 8.0 }}
-        uses: "ramsey/composer-install@v3"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: --ignore-platform-reqs
 
-      - name: 'Run Composer Update'
-        run: |
-          composer update --ignore-platform-reqs
+      - name: Install Subversion
+        run: sudo apt-get install subversion
+
+      - name: Set up WordPress
+        run: phpunit/install.sh wordpress_test root '' 127.0.0.1:3306 ${{ matrix.wp }}
 
       - name: Tool versions
         run: |
           php --version
           composer --version
-          phpunit --version
-          which phpunit
+          ./vendor/bin/phpunit --version
+          which ./vendor/bin/phpunit
 
       - name: Run the unit tests - single site
-        run: vendor/bin/phpunit
+        run: ./vendor/bin/phpunit
 
       - name: Run the unit tests - multisite
-        run: vendor/bin/phpunit
         env:
           WP_MULTISITE: 1
+        run: ./vendor/bin/phpunit

.github/workflows/zipitup.yml

@@ -29,15 +29,15 @@ jobs:
       - name: Create artifact
         uses: montudor/action-zip@v1
         with:
-          args: zip -X -r build/knowledgebase.zip . -x *.git* node_modules/\* .* "*/\.*" CODE_OF_CONDUCT.md CONTRIBUTING.md ISSUE_TEMPLATE.md PULL_REQUEST_TEMPLATE.md *.dist *.yml composer.* dev-helpers** build** wporg-assets** phpunit**
+          args: zip -X -r build/${{ github.event.repository.name }}.zip . -x *.git* node_modules/\* .* "*/\.*" CODE_OF_CONDUCT.md CONTRIBUTING.md ISSUE_TEMPLATE.md PULL_REQUEST_TEMPLATE.md *.dist *.yml *.neon composer.* package.json dev-helpers** build** wporg-assets** phpunit**
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-            name: knowledgebase
-            path: build/knowledgebase.zip
+          name: ${{ github.event.repository.name }}
+          path: build/${{ github.event.repository.name }}.zip
       - name: Upload to release
         uses: JasonEtco/upload-to-release@master
         with:
-          args: build/knowledgebase.zip application/zip
+          args: build/${{ github.event.repository.name }}.zip application/zip
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

phpunit/bootstrap.php

@@ -1,14 +1,8 @@
 <?php
 /**
- * PHPUnit bootstrap file for WebberZone Knowledge Base.
- *
- * This file sets up the testing environment for PHPUnit.
- *
- * @package WebberZone\Knowledge_Base
+ * PHPUnit bootstrap file.
  */
 
-require_once dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/.composer/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
-
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
 
 // Check if we're installed in a src checkout.
@@ -34,5 +28,8 @@ function _manually_load_plugin() {
 }
 tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
 
+// Include the PHPUnit Polyfills autoloader.
+require dirname( __DIR__ ) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
+
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';

phpunit/install.sh

@@ -81,4 +81,4 @@ install_db() {
 }
 
 install_wp_and_test_suite
-install_db
+install_db