From 550e7dc46d7947540475aa416ffd049fcb08b9cb Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Wed, 9 Aug 2023 17:00:08 -0700
Subject: [PATCH 01/18] Tested up to WordPress 6.3

---
 README.md  | 2 +-
 readme.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d77b73e..06cfb6b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 **Contributors:** [getpantheon](https://profiles.wordpress.org/getpantheon), [danielbachhuber](https://profiles.wordpress.org/danielbachhuber), [mboynes](https://profiles.wordpress.org/mboynes), [Outlandish Josh](https://profiles.wordpress.org/outlandish-josh) [jspellman](https://profiles.wordpress.org/jspellman/) [jazzs3quence](https://profiles.wordpress.org/jazzs3quence/)  
 **Tags:** cache, plugin, redis  
 **Requires at least:** 3.0.1  
-**Tested up to:** 6.2  
+**Tested up to:** 6.3  
 **Stable tag:** 1.4.4-dev  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
diff --git a/readme.txt b/readme.txt
index c8239c5..eb0d397 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: getpantheon, danielbachhuber, mboynes, Outlandish Josh, jspellman, jazzs3quence
 Tags: cache, plugin, redis
 Requires at least: 3.0.1
-Tested up to: 6.2
+Tested up to: 6.3
 Stable tag: 1.4.4-dev
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

From 6f56691fa2fb2d895f3c7152a2023beb61cdddc7 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:16:33 -0700
Subject: [PATCH 02/18] move lint and validate behat

---
 .circleci/config.yml            | 21 +---------------
 .github/workflows/lint-test.yml | 19 ++++++++++++++
 bin/validate-fixture-version.sh | 44 +++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 bin/validate-fixture-version.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8397ee6..ca10c87 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,6 @@ version: 2.1
 workflows:
   main:
     jobs:
-      - lint
       - test-behat
       - test-phpunit-redis-disabled-74
       - test-phpunit-redis-enabled-74
@@ -58,25 +57,6 @@ commands:
             bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
             composer phpunit
 jobs:
-  lint:
-    working_directory: ~/pantheon-systems/wp-redis
-    docker:
-      - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.0
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - test-lint-dependencies-{{ checksum "composer.json" }}
-      - run: composer install -n --prefer-dist
-      - save_cache:
-          key: test-lint-dependencies-{{ checksum "composer.json" }}
-          paths:
-            - vendor
-      - run:
-          name: "Run PHP Lint"
-          command: |
-            composer phpcs
-
   test-behat:
     working_directory: ~/pantheon-systems/wp-redis
     parallelism: 1
@@ -117,6 +97,7 @@ jobs:
           exit 0
         fi
         terminus auth:login --machine-token=$TERMINUS_TOKEN
+    - run: ./bin/validate-fixture-version.sh
     - run: ./bin/behat-prepare.sh
     - run: ./bin/behat-test.sh --strict
     - run:
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 9b7f282..772baea 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -9,6 +9,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - uses: pantheon-systems/validate-readme-spacing@v1
+  lint:
+    name: PHPCS Linting
+    steps:
+    - name: Checkout
+        uses: actions/checkout@v3
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-lint-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-lint-dependencies-{{ checksum "composer.json" }}
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+    - name: Install dependencies
+      run: composer install -n --prefer-dist
+    - name: Run PHP Lint
+      run: composer phpcs
   wporg-validation:
     name: WP.org Validator
     runs-on: ubuntu-latest
diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh
new file mode 100644
index 0000000..f369b8d
--- /dev/null
+++ b/bin/validate-fixture-version.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+main(){
+    export TERMINUS_HIDE_GIT_MODE_WARNING=1
+    local DIRNAME=$(dirname "$0")
+
+    if [ -z "${TERMINUS_SITE}" ]; then
+        echo "TERMINUS_SITE environment variable must be set"
+        exit 1
+    fi
+
+    if ! terminus whoami > /dev/null; then
+        if [ -z "${TERMINUS_TOKEN}" ]; then
+            echo "TERMINUS_TOKEN environment variable must be set or terminus already logged in."
+            exit 1
+        fi
+        terminus auth:login --machine-token="${TERMINUS_TOKEN}"
+    fi
+
+
+    # Use find to locate the file with a case-insensitive search
+    README_FILE_PATH=$(find ${DIRNAME}/.. -iname "readme.txt" -print -quit)
+    if [[ -z "$README_FILE_PATH" ]]; then
+        echo "readme.txt not found."
+        exit 1
+    fi
+
+    local TESTED_UP_TO
+    TESTED_UP_TO=$(grep -i "Tested up to:" "${README_FILE_PATH}" | tr -d '\r\n' | awk -F ': ' '{ print $2 }')
+    echo "Tested Up To: ${TESTED_UP_TO}"
+    local FIXTURE_VERSION
+    FIXTURE_VERSION=$(terminus wp "${TERMINUS_SITE}.dev" -- core version)
+    echo "Fixture Version: ${FIXTURE_VERSION}"
+
+    if ! php -r "exit(version_compare('${TESTED_UP_TO}', '${FIXTURE_VERSION}'));"; then
+        echo "${FIXTURE_VERSION} is less than ${TESTED_UP_TO}"
+        echo "Please update ${TERMINUS_SITE} to at least WordPress ${TESTED_UP_TO}"
+        exit 1
+    fi
+}
+
+main

From 2a7b8bd1689b629d5308005ea2bbbad1a491d0bd Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:17:46 -0700
Subject: [PATCH 03/18] lint-test fixup

---
 .github/workflows/lint-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 772baea..24f0ead 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -13,7 +13,7 @@ jobs:
     name: PHPCS Linting
     steps:
     - name: Checkout
-        uses: actions/checkout@v3
+      uses: actions/checkout@v3
     - name: Cache dependencies
       uses: actions/cache@v3
       with:

From 1dbf5d6a6681203704e75cb48fa643dd9fccd02e Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:19:12 -0700
Subject: [PATCH 04/18] chmod

---
 bin/validate-fixture-version.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/validate-fixture-version.sh

diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh
old mode 100644
new mode 100755

From bffc64fee9568f75f44e1de13ad701a8b454caa3 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:20:19 -0700
Subject: [PATCH 05/18] lint fixup

---
 .github/workflows/lint-test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 24f0ead..6799e2e 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -11,6 +11,7 @@ jobs:
       - uses: pantheon-systems/validate-readme-spacing@v1
   lint:
     name: PHPCS Linting
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -23,7 +24,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.0'
     - name: Install dependencies
       run: composer install -n --prefer-dist
     - name: Run PHP Lint

From 71b1d149caf9b2a4ebe19e63c1ecce10d4be5e3c Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:32:08 -0700
Subject: [PATCH 06/18] update prep script

---
 bin/behat-prepare.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/bin/behat-prepare.sh b/bin/behat-prepare.sh
index 5ba9ad9..e0e1333 100755
--- a/bin/behat-prepare.sh
+++ b/bin/behat-prepare.sh
@@ -55,12 +55,6 @@ rsync -av --exclude='vendor/' --exclude='node_modules/' --exclude='tests/' ./* $
 rm -rf $PREPARE_DIR/wp-content/plugins/wp-redis/.git
 cp object-cache.php $PREPARE_DIR/wp-content/object-cache.php
 
-# Download the latest Classic Editor release from WordPress.org
-wget -O $PREPARE_DIR/classic-editor.zip https://downloads.wordpress.org/plugin/classic-editor.zip
-unzip $PREPARE_DIR/classic-editor.zip -d $PREPARE_DIR
-mv $PREPARE_DIR/classic-editor $PREPARE_DIR/wp-content/plugins/
-rm $PREPARE_DIR/classic-editor.zip
-
 ###
 # Add the debugging plugin to the environment
 ###
@@ -90,7 +84,7 @@ echo "Installing WordPress..."
 } &> /dev/null
 
 echo "Flush cache and setup environment..."
-terminus wp $SITE_ENV -- plugin activate wp-redis classic-editor
+terminus wp $SITE_ENV -- plugin activate wp-redis
 terminus wp $SITE_ENV -- cache flush
-terminus wp $SITE_ENV -- theme activate twentyseventeen
+terminus wp $SITE_ENV -- theme activate twentytwentythree
 terminus wp $SITE_ENV -- rewrite structure '/%year%/%monthnum%/%day%/%postname%/'

From ee5952998afa7f34e2269869c050772923bfd152 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:45:04 -0700
Subject: [PATCH 07/18] Modernize Load WP feature

---
 tests/behat/load-wp.feature | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/behat/load-wp.feature b/tests/behat/load-wp.feature
index 51b7994..e97873e 100644
--- a/tests/behat/load-wp.feature
+++ b/tests/behat/load-wp.feature
@@ -4,18 +4,10 @@ Feature: Load WordPress
     Given I am on the homepage
     Then I should see "Hello World"
 
-  Scenario: Verify that a user can publish a blog post
-    Given I log in as an admin
-
-    When I go to "/wp-admin/post-new.php"
-    And I fill in "post_title" with "Awesome Post"
-    And I press "publish"
-    Then I should see "Post published."
-
   Scenario: Verify that a user can update the site's title
     When I go to the homepage
     Then print current URL
-    And the "#masthead" element should not contain "Pantheon WordPress Site"
+    And the ".wp-block-site-title" element should not contain "Pantheon WordPress Site"
 
     Given I log in as an admin
 
@@ -27,4 +19,4 @@ Feature: Load WordPress
     And I should see "Settings saved."
 
     When I go to the homepage
-    Then the "#masthead" element should contain "Pantheon WordPress Site"
+    Then the ".wp-block-site-title" element should contain "Pantheon WordPress Site"

From 87345e86519859eb256222440e43a3fc3221d3b4 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:48:40 -0700
Subject: [PATCH 08/18] cimg images

---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca10c87..5645d3f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,8 +106,8 @@ jobs:
   test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: circleci/php:7.4-node-browsers
-      - image: circleci/mariadb:10.3
+      - image: cimg/php:7.4-node-browsers
+      - image: cimg/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -128,9 +128,9 @@ jobs:
   test-phpunit-redis-enabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: circleci/php:7.4-node-browsers
-      - image: circleci/mariadb:10.3
-      - image: circleci/redis:latest
+      - image: cimg/php:7.4-node-browsers
+      - image: cimg/mariadb:10.3
+      - image: cimg/redis:latest
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -153,7 +153,7 @@ jobs:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: cimg/php:8.2.0
-      - image: circleci/mariadb:10.3
+      - image: cimg/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -174,8 +174,8 @@ jobs:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: cimg/php:8.2.0
-      - image: circleci/mariadb:10.3
-      - image: circleci/redis:latest
+      - image: cimg/mariadb:10.3
+      - image: cimg/redis:latest
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"

From ded1a206220ebb253bd0227d48ae546eecec1efe Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:52:08 -0700
Subject: [PATCH 09/18] small images

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5645d3f..5d44240 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,6 +62,7 @@ jobs:
     parallelism: 1
     docker:
     - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
+    resource_class: small
     steps:
     - checkout
     - restore_cache:
@@ -108,6 +109,7 @@ jobs:
     docker:
       - image: cimg/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
+    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -131,6 +133,7 @@ jobs:
       - image: cimg/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
       - image: cimg/redis:latest
+    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -154,6 +157,7 @@ jobs:
     docker:
       - image: cimg/php:8.2.0
       - image: cimg/mariadb:10.3
+    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -176,6 +180,7 @@ jobs:
       - image: cimg/php:8.2.0
       - image: cimg/mariadb:10.3
       - image: cimg/redis:latest
+    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"

From 65e909580444ee2ff582b844c7e1dcc88c100edc Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:55:51 -0700
Subject: [PATCH 10/18] back to old image

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d44240..8e1d296 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,7 +107,7 @@ jobs:
   test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: cimg/php:7.4-node-browsers
+      - image: circleci/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
     resource_class: small
     environment:
@@ -130,7 +130,7 @@ jobs:
   test-phpunit-redis-enabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: cimg/php:7.4-node-browsers
+      - image: circleci/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
       - image: cimg/redis:latest
     resource_class: small

From 93d8f869cbdc56c78df5aa8ac56c9ad07a7af8bb Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:57:34 -0700
Subject: [PATCH 11/18] Revert "back to old image"

This reverts commit 65e909580444ee2ff582b844c7e1dcc88c100edc.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e1d296..5d44240 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,7 +107,7 @@ jobs:
   test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: circleci/php:7.4-node-browsers
+      - image: cimg/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
     resource_class: small
     environment:
@@ -130,7 +130,7 @@ jobs:
   test-phpunit-redis-enabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: circleci/php:7.4-node-browsers
+      - image: cimg/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
       - image: cimg/redis:latest
     resource_class: small

From 0b4219db1126cbe680578eceb1a6735d1c4691f0 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:58:11 -0700
Subject: [PATCH 12/18] Revert "small images"

This reverts commit ded1a206220ebb253bd0227d48ae546eecec1efe.
---
 .circleci/config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d44240..5645d3f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,7 +62,6 @@ jobs:
     parallelism: 1
     docker:
     - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
-    resource_class: small
     steps:
     - checkout
     - restore_cache:
@@ -109,7 +108,6 @@ jobs:
     docker:
       - image: cimg/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
-    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -133,7 +131,6 @@ jobs:
       - image: cimg/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
       - image: cimg/redis:latest
-    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -157,7 +154,6 @@ jobs:
     docker:
       - image: cimg/php:8.2.0
       - image: cimg/mariadb:10.3
-    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -180,7 +176,6 @@ jobs:
       - image: cimg/php:8.2.0
       - image: cimg/mariadb:10.3
       - image: cimg/redis:latest
-    resource_class: small
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"

From f6f25abd42287c5ad9a0a52be4e814d7c0c89cd5 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 12:58:16 -0700
Subject: [PATCH 13/18] Revert "cimg images"

This reverts commit 87345e86519859eb256222440e43a3fc3221d3b4.
---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5645d3f..ca10c87 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,8 +106,8 @@ jobs:
   test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: cimg/php:7.4-node-browsers
-      - image: cimg/mariadb:10.3
+      - image: circleci/php:7.4-node-browsers
+      - image: circleci/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -128,9 +128,9 @@ jobs:
   test-phpunit-redis-enabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: cimg/php:7.4-node-browsers
-      - image: cimg/mariadb:10.3
-      - image: cimg/redis:latest
+      - image: circleci/php:7.4-node-browsers
+      - image: circleci/mariadb:10.3
+      - image: circleci/redis:latest
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -153,7 +153,7 @@ jobs:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: cimg/php:8.2.0
-      - image: cimg/mariadb:10.3
+      - image: circleci/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -174,8 +174,8 @@ jobs:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: cimg/php:8.2.0
-      - image: cimg/mariadb:10.3
-      - image: cimg/redis:latest
+      - image: circleci/mariadb:10.3
+      - image: circleci/redis:latest
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"

From f9e9232e977f82ce2bf5af3966d137a638067ca3 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 13:00:56 -0700
Subject: [PATCH 14/18] try cimg images again

---
 .circleci/config.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca10c87..c7f5c1b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,6 +58,7 @@ commands:
             composer phpunit
 jobs:
   test-behat:
+    resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     parallelism: 1
     docker:
@@ -104,10 +105,11 @@ jobs:
         command: ./bin/behat-cleanup.sh
         when: always
   test-phpunit-redis-disabled-74:
+    resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: circleci/php:7.4-node-browsers
-      - image: circleci/mariadb:10.3
+      - image: cimg/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -126,11 +128,12 @@ jobs:
       - install-mariadb-10-5
       - run-phpunit-tests
   test-phpunit-redis-enabled-74:
+    resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: circleci/php:7.4-node-browsers
-      - image: circleci/mariadb:10.3
-      - image: circleci/redis:latest
+      - image: cimg/mariadb:10.3
+      - image: circleci/redis:6.2
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -150,10 +153,11 @@ jobs:
       - install-redis-extras
       - run-phpunit-tests
   test-phpunit-redis-disabled-82:
+    resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: cimg/php:8.2.0
-      - image: circleci/mariadb:10.3
+      - image: cimg/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -171,11 +175,12 @@ jobs:
       - install-mariadb-10-6
       - run-phpunit-tests
   test-phpunit-redis-enabled-82:
+    resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: cimg/php:8.2.0
-      - image: circleci/mariadb:10.3
-      - image: circleci/redis:latest
+      - image: cimg/mariadb:10.3
+      - image: circleci/redis:6.2
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"

From 76473a6a0f46bc72e8374a248383883f453fcd0c Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 13:02:24 -0700
Subject: [PATCH 15/18] didn't actually change cimg:

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c7f5c1b..e0e1edd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -133,7 +133,7 @@ jobs:
     docker:
       - image: circleci/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
-      - image: circleci/redis:6.2
+      - image: cimg/redis:6.2
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -180,7 +180,7 @@ jobs:
     docker:
       - image: cimg/php:8.2.0
       - image: cimg/mariadb:10.3
-      - image: circleci/redis:6.2
+      - image: cimg/redis:6.2
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"

From f3bdca46625e708e947a0f86cb5f8e63bc73e790 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 13:03:27 -0700
Subject: [PATCH 16/18] likely don't actually need node browser images

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0e1edd..07ec19d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,7 @@ jobs:
     resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: circleci/php:7.4-node-browsers
+      - image: cimg/php:7.4
       - image: cimg/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
@@ -131,7 +131,7 @@ jobs:
     resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: circleci/php:7.4-node-browsers
+      - image: cimg/php:7.4
       - image: cimg/mariadb:10.3
       - image: cimg/redis:6.2
     environment:

From 28d563710a5a40b67b19f69f1af8eca453e46d71 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 13:07:50 -0700
Subject: [PATCH 17/18] Revert "likely don't actually need node browser images"

This reverts commit f3bdca46625e708e947a0f86cb5f8e63bc73e790.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 07ec19d..e0e1edd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,7 @@ jobs:
     resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: cimg/php:7.4
+      - image: circleci/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
@@ -131,7 +131,7 @@ jobs:
     resource_class: small
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: cimg/php:7.4
+      - image: circleci/php:7.4-node-browsers
       - image: cimg/mariadb:10.3
       - image: cimg/redis:6.2
     environment:

From 94bd678a2385a6e20b93e4ea9d28a4ac0bc2cead Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Fri, 11 Aug 2023 13:20:09 -0700
Subject: [PATCH 18/18] Update bin/validate-fixture-version.sh

---
 bin/validate-fixture-version.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh
index f369b8d..5a27b99 100755
--- a/bin/validate-fixture-version.sh
+++ b/bin/validate-fixture-version.sh
@@ -18,8 +18,6 @@ main(){
         fi
         terminus auth:login --machine-token="${TERMINUS_TOKEN}"
     fi
-
-
     # Use find to locate the file with a case-insensitive search
     README_FILE_PATH=$(find ${DIRNAME}/.. -iname "readme.txt" -print -quit)
     if [[ -z "$README_FILE_PATH" ]]; then