Merge pull request #610 from dxw/revert/prod-release-2024-06-26

Revert/prod release 2024 06 26

.github/workflows/dxw-sec-api.yml

@@ -9,11 +9,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.1.6
 
-      - uses: shivammathur/setup-php@2.31.0
+      - uses: shivammathur/setup-php@2.30.5
         with:
-          php-version: "8.2"
+          php-version: "7.4"
           coverage: none
           tools: composer
 
@@ -25,4 +25,4 @@ jobs:
       - name: Run tests
         run: |
           cd "wp-content/plugins/$PLUGIN_NAME"
-          vendor/bin/kahlan --spec=specs
+          vendor/bin/peridot specs

.github/workflows/main.yml

@@ -6,7 +6,7 @@ jobs:
   shellcheck:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.1.6
       - run: sudo apt-get update
       - run: sudo apt-get install -y shellcheck
       - run: ./.shellcheck.sh

.github/workflows/theme.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-versions: ['8.2']
+        php-versions: ['7.4']
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.1.6
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.31.0
+        uses: shivammathur/setup-php@2.30.5
         with:
           php-version: ${{ matrix.php-versions }}
       - name: Get Composer Cache Directory
@@ -32,5 +32,5 @@ jobs:
         run: composer install --no-interaction
       - name: PHP CS fix
         run: vendor/bin/php-cs-fixer fix --dry-run -v --diff
-      - name: Run Kahlan tests
-        run: vendor/bin/kahlan spec
+      - name: Run Peridot tests
+        run: vendor/bin/peridot spec

.github/workflows/whippet.yml

@@ -5,6 +5,6 @@ on: [push, pull_request]
 jobs:
 
   whippet-deps-validate:
-    uses: dxw/govpress-workflow-whippet-validate/.github/workflows/whippet-dependencies-validate.yml@v3
+    uses: dxw/govpress-workflow-whippet-validate/.github/workflows/whippet-dependencies-validate.yml@v2
     secrets:
       GH_ACCOUNT_TOKEN: ${{ secrets.GOVPRESS_TOOLS_PLUGIN_READER_TOKEN }}

README.md

@@ -21,10 +21,6 @@ Please use `develop/main` branches.
 
 - Analytics for dxw Advisories is handled via our Plausible account
 
-## PHP version
-
-This site builds on PHP 8.2 and deploys on PHP 8.3.
-
 ## Getting started
 
 Run the setup (first-time run only):
@@ -95,7 +91,7 @@ curl -L https://security.dxw.com/wp-json/v1/inspections/twitter-widget-pro
 
 The API code is packaged as a plugin.
 
-To run the tests, run `vendor/bin/kahlan specs` from the plugin directory.
+To run the tests, run `vendor/bin/peridot specs` from the plugin directory.
 
 The first time you do this you'll need to `composer install` from the plugin
 directory.

composer.json

@@ -1,7 +1,7 @@
 {
     "config": {
         "platform": {
-            "php": "8.3"
+            "php": "7.4.3"
         }
     },
     "require-dev": {

docker-compose.yml

@@ -33,7 +33,7 @@ services:
       MYSQL_ROOT_PASSWORD: foobar
 
   wordpress:
-    image: thedxw/wpc-wordpress:php8.2
+    image: thedxw/wpc-wordpress
     ports:
       - "80:80"
     links:

script/test

@@ -15,4 +15,4 @@ echo "===> Validating Whippet files..."
 vendor/bin/whippet deps validate
 
 echo "===> Running theme unit tests..."
-$THEME_DIRECTORY/vendor/bin/kahlan --spec="$THEME_DIRECTORY/spec"
+$THEME_DIRECTORY/vendor/bin/peridot "$THEME_DIRECTORY/spec"

whippet.lock

@@ -24,7 +24,7 @@
         {
             "name": "advanced-custom-fields-pro",
             "src": "git@github.com:dxw-wordpress-plugins/advanced-custom-fields-pro",
-            "revision": "7d42074d841d35d9e3f0cea550cd8647df14532b"
+            "revision": "f9df07ea23fe38372e6bcf14cf8d06f25bd32714"
         }
     ]
 }

wp-content/plugins/dxw-sec-api/composer.json

@@ -1,9 +1,11 @@
 {
     "require-dev": {
-        "10up/wp_mock": "^1.0.1",
-        "squizlabs/php_codesniffer": "^3",
-        "dxw/phar-install": "^1.0",
-        "kahlan/kahlan": "^5.2"
+        "peridot-php/peridot": "~1.15",
+        "peridot-php/leo": "~1.0",
+        "peridot-php/peridot-dot-reporter": "~1.0",
+        "10up/wp_mock": "^0.1.1",
+        "squizlabs/php_codesniffer": "^2.7",
+        "dxw/phar-install": "^1.0"
     },
     "require": {
         "aura/autoload": "^2.0"