From d6f84d9eabe6c9b30ff507855e747ddd0d0c1bb2 Mon Sep 17 00:00:00 2001
From: Chris Reynolds <chris@jazzsequence.com>
Date: Tue, 30 May 2023 08:43:31 -0600
Subject: [PATCH 01/32] Connect via unix socket instead of filesystem to be
 compatible with php open_basedir restrictions.

copied from #425
---
 object-cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object-cache.php b/object-cache.php
index d2f3ced..e15f02d 100644
--- a/object-cache.php
+++ b/object-cache.php
@@ -1261,7 +1261,7 @@ public function build_client_parameters( $redis_server ) {
 			}
 		}
 
-		if ( file_exists( $redis_server['host'] ) && 'socket' === filetype( $redis_server['host'] ) ) { // unix socket connection.
+		if ( strpos($redis_server['host'], 'unix:///') === 0 ) ) { // Unix socket connection.
 			// port must be null or socket won't connect.
 			$port = null;
 		}

From 8e103caad4a6fe076adf56eefb54c777a8966ce6 Mon Sep 17 00:00:00 2001
From: Chris Reynolds <chris@jazzsequence.com>
Date: Tue, 30 May 2023 08:45:17 -0600
Subject: [PATCH 02/32] Remove extra brace & fix spacing

---
 object-cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/object-cache.php b/object-cache.php
index e15f02d..929d815 100644
--- a/object-cache.php
+++ b/object-cache.php
@@ -1261,7 +1261,7 @@ public function build_client_parameters( $redis_server ) {
 			}
 		}
 
-		if ( strpos($redis_server['host'], 'unix:///') === 0 ) ) { // Unix socket connection.
+		if ( strpos( $redis_server['host'], 'unix:///' ) === 0 ) { // Unix socket connection.
 			// port must be null or socket won't connect.
 			$port = null;
 		}

From 4711c1f1c933218a95dee7b63c1e3b321d5aa798 Mon Sep 17 00:00:00 2001
From: Phil Tyler <phil.tyler@pantheon.io>
Date: Mon, 5 Jun 2023 12:59:29 -0700
Subject: [PATCH 03/32] Updated changelog

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

diff --git a/README.md b/README.md
index 820297a..737c6d4 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,7 @@ There's a known issue with WordPress `alloptions` cache design. Specifically, a
 ## Changelog ##
 
 ### 1.4.3-dev ###
+* Bug fix: Connect via unix socket instead of filesystem to be compatible with php open_basedir restrictions [[426](https://github.com/pantheon-systems/wp-redis/pull/426)] (props @hj-collab)
 * Bug fix: Fixes assumption that CACHE_PORT & CACHE_PASSWORD are Set. [[428](https://github.com/pantheon-systems/wp-redis/pull/428)] (props @timnolte)
 
 ### 1.4.2 (May 15, 2023) ###
diff --git a/readme.txt b/readme.txt
index 2779580..f2515fe 100644
--- a/readme.txt
+++ b/readme.txt
@@ -103,6 +103,7 @@ There's a known issue with WordPress `alloptions` cache design. Specifically, a
 == Changelog ==
 
 = 1.4.3-dev =
+* Bug fix: Connect via unix socket instead of filesystem to be compatible with php open_basedir restrictions [[426](https://github.com/pantheon-systems/wp-redis/pull/426)] (props @hj-collab)
 * Bug fix: Fixes assumption that CACHE_PORT & CACHE_PASSWORD are Set. [[428](https://github.com/pantheon-systems/wp-redis/pull/428)] (props @tnolte)
 
 = 1.4.2 (May 15, 2023) =

From c3ef25efcee95123fbf2551ce27a17b5967d52f0 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 13:09:45 -0400
Subject: [PATCH 04/32] Updates behat test.

---
 behat.yml                                |  1 +
 tests/behat/bootstrap/FeatureContext.php | 19 +++++++++++++++++++
 tests/behat/load-wp.feature              |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 tests/behat/bootstrap/FeatureContext.php

diff --git a/behat.yml b/behat.yml
index ff5ce58..2776a21 100644
--- a/behat.yml
+++ b/behat.yml
@@ -7,6 +7,7 @@ default:
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
+        - FeatureContext
   extensions:
     Behat\MinkExtension:
       # base_url set by ENV
diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/bootstrap/FeatureContext.php
new file mode 100644
index 0000000..4732ddb
--- /dev/null
+++ b/tests/behat/bootstrap/FeatureContext.php
@@ -0,0 +1,19 @@
+<?php
+
+use Behat\Behat\Context\Context;
+
+class FeatureContext implements Context
+{
+	/**
+	 * Waits a certain number of seconds.
+	 *
+	 * @param int $seconds
+	 *   How long to wait.
+	 *
+	 * @When I wait :seconds second(s)
+	 */
+	public function wait($seconds) {
+		sleep($seconds);
+	}
+
+}
diff --git a/tests/behat/load-wp.feature b/tests/behat/load-wp.feature
index ca6eec8..cd06415 100644
--- a/tests/behat/load-wp.feature
+++ b/tests/behat/load-wp.feature
@@ -22,6 +22,7 @@ Feature: Load WordPress
     When I go to "/wp-admin/options-general.php"
     And I fill in "blogname" with "Pantheon WordPress Site"
     And I press "submit"
+	When I wait 1 second
     Then print current URL
     And I should see "Settings saved."
 

From 41434a1e467a9731643f856eed1a52adcd31f28c Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 13:38:14 -0400
Subject: [PATCH 05/32] Adds constructor.

---
 tests/behat/bootstrap/FeatureContext.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/bootstrap/FeatureContext.php
index 4732ddb..5ddc8b6 100644
--- a/tests/behat/bootstrap/FeatureContext.php
+++ b/tests/behat/bootstrap/FeatureContext.php
@@ -4,6 +4,17 @@
 
 class FeatureContext implements Context
 {
+
+	/**
+	 * Initializes context.
+	 *
+	 * Every scenario gets its own context instance.
+	 * You can also pass arbitrary arguments to the
+	 * context constructor through behat.yml.
+	 */
+	public function __construct() {
+	}
+
 	/**
 	 * Waits a certain number of seconds.
 	 *

From 404b664c582d02705fd80dec682f3a76061d1ff6 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 14:07:55 -0400
Subject: [PATCH 06/32] Adds constructor.

---
 behat.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/behat.yml b/behat.yml
index 2776a21..b0470f9 100644
--- a/behat.yml
+++ b/behat.yml
@@ -4,6 +4,7 @@ default:
     default:
       paths:
         - tests/behat
+        - tests/behat/bootstrap
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn

From e1fb0be2d82c494a0475aa600ed68cc57702fc5d Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 15:49:08 -0400
Subject: [PATCH 07/32] Reorganizes files to match standards.

---
 behat.yml                                               | 3 +--
 tests/behat/{ => features}/bootstrap/FeatureContext.php | 8 ++++++--
 tests/behat/{ => features}/load-wp.feature              | 0
 tests/behat/{ => features}/wp-redis.feature             | 0
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename tests/behat/{ => features}/bootstrap/FeatureContext.php (80%)
 rename tests/behat/{ => features}/load-wp.feature (100%)
 rename tests/behat/{ => features}/wp-redis.feature (100%)

diff --git a/behat.yml b/behat.yml
index b0470f9..f54b57c 100644
--- a/behat.yml
+++ b/behat.yml
@@ -3,8 +3,7 @@ default:
   suites:
     default:
       paths:
-        - tests/behat
-        - tests/behat/bootstrap
+        - tests/behat/features
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php
similarity index 80%
rename from tests/behat/bootstrap/FeatureContext.php
rename to tests/behat/features/bootstrap/FeatureContext.php
index 5ddc8b6..c9ff76e 100644
--- a/tests/behat/bootstrap/FeatureContext.php
+++ b/tests/behat/features/bootstrap/FeatureContext.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace behat\features\bootstrap;
+
 use Behat\Behat\Context\Context;
 
 class FeatureContext implements Context
@@ -12,7 +14,8 @@ class FeatureContext implements Context
 	 * You can also pass arbitrary arguments to the
 	 * context constructor through behat.yml.
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 	}
 
 	/**
@@ -23,7 +26,8 @@ public function __construct() {
 	 *
 	 * @When I wait :seconds second(s)
 	 */
-	public function wait($seconds) {
+	public function wait($seconds)
+	{
 		sleep($seconds);
 	}
 
diff --git a/tests/behat/load-wp.feature b/tests/behat/features/load-wp.feature
similarity index 100%
rename from tests/behat/load-wp.feature
rename to tests/behat/features/load-wp.feature
diff --git a/tests/behat/wp-redis.feature b/tests/behat/features/wp-redis.feature
similarity index 100%
rename from tests/behat/wp-redis.feature
rename to tests/behat/features/wp-redis.feature

From 10dc04387d22ffa7f83521bbc6e9497242b86ebc Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 16:27:58 -0400
Subject: [PATCH 08/32] Tests different context name

---
 behat.yml                                                      | 2 +-
 .../{FeatureContext.php => WPRedisFeatureContext.php}          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename tests/behat/features/bootstrap/{FeatureContext.php => WPRedisFeatureContext.php} (84%)

diff --git a/behat.yml b/behat.yml
index f54b57c..b4aba83 100644
--- a/behat.yml
+++ b/behat.yml
@@ -7,7 +7,7 @@ default:
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
-        - FeatureContext
+        - WPRedisFeatureContext
   extensions:
     Behat\MinkExtension:
       # base_url set by ENV
diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/WPRedisFeatureContext.php
similarity index 84%
rename from tests/behat/features/bootstrap/FeatureContext.php
rename to tests/behat/features/bootstrap/WPRedisFeatureContext.php
index c9ff76e..f8cc848 100644
--- a/tests/behat/features/bootstrap/FeatureContext.php
+++ b/tests/behat/features/bootstrap/WPRedisFeatureContext.php
@@ -1,10 +1,11 @@
 <?php
+// features/bootstrap/WPRedisFeatureContext.php
 
 namespace behat\features\bootstrap;
 
 use Behat\Behat\Context\Context;
 
-class FeatureContext implements Context
+class WPRedisFeatureContext implements Context
 {
 
 	/**

From 55da4a63d70338b4c3fc83f0db4553df0e4ac72c Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 17:16:24 -0400
Subject: [PATCH 09/32] Moves context

---
 behat.yml                                                      | 3 +--
 .../{WPRedisFeatureContext.php => FeatureContext.php}          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename tests/behat/features/bootstrap/{WPRedisFeatureContext.php => FeatureContext.php} (92%)

diff --git a/behat.yml b/behat.yml
index b4aba83..d70c972 100644
--- a/behat.yml
+++ b/behat.yml
@@ -3,11 +3,10 @@ default:
   suites:
     default:
       paths:
-        - tests/behat/features
+        - tests/behat/
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
-        - WPRedisFeatureContext
   extensions:
     Behat\MinkExtension:
       # base_url set by ENV
diff --git a/tests/behat/features/bootstrap/WPRedisFeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php
similarity index 92%
rename from tests/behat/features/bootstrap/WPRedisFeatureContext.php
rename to tests/behat/features/bootstrap/FeatureContext.php
index f8cc848..285a54e 100644
--- a/tests/behat/features/bootstrap/WPRedisFeatureContext.php
+++ b/tests/behat/features/bootstrap/FeatureContext.php
@@ -5,7 +5,7 @@
 
 use Behat\Behat\Context\Context;
 
-class WPRedisFeatureContext implements Context
+class FeatureContext implements Context
 {
 
 	/**

From 45e884477560c0bede90b72b6d59cbf639ae44a3 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Tue, 6 Jun 2023 17:39:16 -0400
Subject: [PATCH 10/32] Moves context

---
 tests/behat/features/wp-redis.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index dec2f5f..3ba5d0b 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -15,4 +15,3 @@ Feature: WP Redis
     Then I should see "Redis Calls:"
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
-    And I should see "- get:"

From 3a8287d3beeaf1865691074eeb6e1197133ea804 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Wed, 7 Jun 2023 14:20:19 -0400
Subject: [PATCH 11/32] Updates redis checks.

---
 tests/behat/features/wp-redis.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index 3ba5d0b..f089d79 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -15,3 +15,5 @@ Feature: WP Redis
     Then I should see "Redis Calls:"
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
+    And I should see "- redis_get:"
+    And I should see "- redis-get:"

From d68c0ca2f2117d847fa34a67789683da263da5a1 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Wed, 7 Jun 2023 15:07:50 -0400
Subject: [PATCH 12/32] Updates redis checks.

---
 tests/behat/features/wp-redis.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index f089d79..e524325 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -15,5 +15,4 @@ Feature: WP Redis
     Then I should see "Redis Calls:"
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
-    And I should see "- redis_get:"
     And I should see "- redis-get:"

From d965c0395e0d12665b53f79a98248be0cb61d768 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Wed, 7 Jun 2023 16:50:34 -0400
Subject: [PATCH 13/32] Updates redis checks.

---
 tests/behat/features/wp-redis.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index e524325..8703d59 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -15,4 +15,4 @@ Feature: WP Redis
     Then I should see "Redis Calls:"
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
-    And I should see "- redis-get:"
+    And I should see "get:"

From 35ee9823fe333d940fbcbe93eb449f82c7cfb133 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Wed, 7 Jun 2023 17:14:18 -0400
Subject: [PATCH 14/32] Updates redis checks.

---
 tests/behat/features/wp-redis.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index 8703d59..2a87e35 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -15,4 +15,4 @@ Feature: WP Redis
     Then I should see "Redis Calls:"
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
-    And I should see "get:"
+    And I should see "Redis Calls:"

From 0f430c6f22004ef8cd1caaa260f2fed63103ff7b Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 12:26:14 -0400
Subject: [PATCH 15/32] Tests page refresh

---
 tests/behat/features/wp-redis.feature | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index 2a87e35..b9cf9b9 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -16,3 +16,7 @@ Feature: WP Redis
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
     And I should see "Redis Calls:"
+
+	When I am on "/?redis_debug"
+	Then I should see "get"
+

From b70187bd208e6574c09236dabaab2d5269f2fd51 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 12:55:57 -0400
Subject: [PATCH 16/32] Tweaks page refresh

---
 tests/behat/features/wp-redis.feature | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index b9cf9b9..d1d9374 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -17,6 +17,8 @@ Feature: WP Redis
     And I should see "Cache Misses:"
     And I should see "Redis Calls:"
 
+	# We call the same page twice to give Redis an opportunity to cache
+	# something so that `get` actually fires.
 	When I am on "/?redis_debug"
-	Then I should see "get"
+	Then I should see "get:"
 

From b92ad23f60e2901451de24b8a34efd906060c803 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 14:17:40 -0400
Subject: [PATCH 17/32] Wraps 1 in quotes

---
 tests/behat/features/load-wp.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/features/load-wp.feature b/tests/behat/features/load-wp.feature
index cd06415..f8cad1d 100644
--- a/tests/behat/features/load-wp.feature
+++ b/tests/behat/features/load-wp.feature
@@ -22,7 +22,7 @@ Feature: Load WordPress
     When I go to "/wp-admin/options-general.php"
     And I fill in "blogname" with "Pantheon WordPress Site"
     And I press "submit"
-	When I wait 1 second
+	When I wait "1" second
     Then print current URL
     And I should see "Settings saved."
 

From 86243cc57b2191562dc14fcc05651ccc9e068742 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 14:38:22 -0400
Subject: [PATCH 18/32] Tweaks wording

---
 tests/behat/features/load-wp.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/features/load-wp.feature b/tests/behat/features/load-wp.feature
index f8cad1d..ad5e453 100644
--- a/tests/behat/features/load-wp.feature
+++ b/tests/behat/features/load-wp.feature
@@ -22,7 +22,7 @@ Feature: Load WordPress
     When I go to "/wp-admin/options-general.php"
     And I fill in "blogname" with "Pantheon WordPress Site"
     And I press "submit"
-	When I wait "1" second
+	When I wait "1" second(s)
     Then print current URL
     And I should see "Settings saved."
 

From d71af15bad704d7d5f33c942ac9af7ac78fbbb4e Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 16:07:51 -0400
Subject: [PATCH 19/32] Tweaks wording

---
 tests/behat/features/load-wp.feature  | 2 +-
 tests/behat/features/wp-redis.feature | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/behat/features/load-wp.feature b/tests/behat/features/load-wp.feature
index ad5e453..f8cad1d 100644
--- a/tests/behat/features/load-wp.feature
+++ b/tests/behat/features/load-wp.feature
@@ -22,7 +22,7 @@ Feature: Load WordPress
     When I go to "/wp-admin/options-general.php"
     And I fill in "blogname" with "Pantheon WordPress Site"
     And I press "submit"
-	When I wait "1" second(s)
+	When I wait "1" second
     Then print current URL
     And I should see "Settings saved."
 
diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index d1d9374..2b29c0a 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -20,5 +20,5 @@ Feature: WP Redis
 	# We call the same page twice to give Redis an opportunity to cache
 	# something so that `get` actually fires.
 	When I am on "/?redis_debug"
-	Then I should see "get:"
+	Then I should see "- get"
 

From 48b43950f797d6e580f25199f24e2c9cb95d834a Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 16:36:32 -0400
Subject: [PATCH 20/32] Tweaks wording

---
 tests/behat/features/wp-redis.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index 2b29c0a..65b6453 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -20,5 +20,5 @@ Feature: WP Redis
 	# We call the same page twice to give Redis an opportunity to cache
 	# something so that `get` actually fires.
 	When I am on "/?redis_debug"
-	Then I should see "- get"
+	Then I should see "Group:"
 

From 78510768bb0ce6d315a921a747070b7701a93559 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 17:03:37 -0400
Subject: [PATCH 21/32] Adjusts namespace

---
 tests/{ => wpredis}/behat/features/bootstrap/FeatureContext.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/{ => wpredis}/behat/features/bootstrap/FeatureContext.php (92%)

diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/wpredis/behat/features/bootstrap/FeatureContext.php
similarity index 92%
rename from tests/behat/features/bootstrap/FeatureContext.php
rename to tests/wpredis/behat/features/bootstrap/FeatureContext.php
index 285a54e..ad938e4 100644
--- a/tests/behat/features/bootstrap/FeatureContext.php
+++ b/tests/wpredis/behat/features/bootstrap/FeatureContext.php
@@ -1,7 +1,7 @@
 <?php
 // features/bootstrap/WPRedisFeatureContext.php
 
-namespace behat\features\bootstrap;
+namespace wpredis\behat\features\bootstrap;
 
 use Behat\Behat\Context\Context;
 

From 9491db488a18313878743ecf0594824cd62a59e9 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Thu, 8 Jun 2023 17:20:07 -0400
Subject: [PATCH 22/32] Removes cleanup so manual inspection can be done

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8397ee6..83a86a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ commands:
       - run: sudo apt-get install mariadb-client-10.6
   install-redis-extras:
     steps:
-      - run: 
+      - run:
           name: "Install Redis Extras"
           command: |
             yes '' | sudo pecl install redis || true
@@ -119,9 +119,9 @@ jobs:
         terminus auth:login --machine-token=$TERMINUS_TOKEN
     - run: ./bin/behat-prepare.sh
     - run: ./bin/behat-test.sh --strict
-    - run:
-        command: ./bin/behat-cleanup.sh
-        when: always
+#    - run:
+#        command: ./bin/behat-cleanup.sh
+#        when: always
   test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:

From 7b9425de96acf95ca65d21109ad5b6fa81adf97d Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Fri, 9 Jun 2023 14:33:42 -0400
Subject: [PATCH 23/32] Adds "else" fallback

---
 object-cache.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/object-cache.php b/object-cache.php
index 929d815..144a525 100644
--- a/object-cache.php
+++ b/object-cache.php
@@ -1264,6 +1264,9 @@ public function build_client_parameters( $redis_server ) {
 		if ( strpos( $redis_server['host'], 'unix:///' ) === 0 ) { // Unix socket connection.
 			// port must be null or socket won't connect.
 			$port = null;
+
+		} else { // tcp connection.
+			$port = ! empty( $redis_server['port'] ) ? $redis_server['port'] : 6379;
 		}
 
 		$defaults = [

From c21e535e6275882e7ace8ac7918e4ed611a108ea Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Fri, 9 Jun 2023 15:44:09 -0400
Subject: [PATCH 24/32] Tweaks context name

---
 behat.yml                                                       | 1 +
 .../bootstrap/{FeatureContext.php => WpRedisFeatureContext.php} | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename tests/wpredis/behat/features/bootstrap/{FeatureContext.php => WpRedisFeatureContext.php} (92%)

diff --git a/behat.yml b/behat.yml
index d70c972..d4c1ace 100644
--- a/behat.yml
+++ b/behat.yml
@@ -7,6 +7,7 @@ default:
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
+        - wpredis\behat\features\bootstrap\WpRedisFeatureContext
   extensions:
     Behat\MinkExtension:
       # base_url set by ENV
diff --git a/tests/wpredis/behat/features/bootstrap/FeatureContext.php b/tests/wpredis/behat/features/bootstrap/WpRedisFeatureContext.php
similarity index 92%
rename from tests/wpredis/behat/features/bootstrap/FeatureContext.php
rename to tests/wpredis/behat/features/bootstrap/WpRedisFeatureContext.php
index ad938e4..05266ec 100644
--- a/tests/wpredis/behat/features/bootstrap/FeatureContext.php
+++ b/tests/wpredis/behat/features/bootstrap/WpRedisFeatureContext.php
@@ -5,7 +5,7 @@
 
 use Behat\Behat\Context\Context;
 
-class FeatureContext implements Context
+class WpRedisFeatureContext implements Context
 {
 
 	/**

From cc4e3f84053ad104e7daa03398a5adc11696b5db Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Fri, 9 Jun 2023 16:11:34 -0400
Subject: [PATCH 25/32] Updates autoload and adds cleanup back

---
 .circleci/config.yml |   6 +-
 composer.json        |   4 +
 composer.lock        | 180 ++++++++++++++++++++-----------------------
 3 files changed, 92 insertions(+), 98 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83a86a4..16b4591 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,9 +119,9 @@ jobs:
         terminus auth:login --machine-token=$TERMINUS_TOKEN
     - run: ./bin/behat-prepare.sh
     - run: ./bin/behat-test.sh --strict
-#    - run:
-#        command: ./bin/behat-cleanup.sh
-#        when: always
+    - run:
+        command: ./bin/behat-cleanup.sh
+        when: always
   test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
diff --git a/composer.json b/composer.json
index 9bc37b1..20467de 100644
--- a/composer.json
+++ b/composer.json
@@ -28,5 +28,9 @@
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
+  },
+  "autoload": {
+    "psr-4": { "wpredis\\behat\\features\\bootstrap\\": "tests/behat/features/bootstrap/" }
   }
+
 }
diff --git a/composer.lock b/composer.lock
index 2bd200e..0593453 100644
--- a/composer.lock
+++ b/composer.lock
@@ -583,30 +583,30 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.5.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
             "autoload": {
@@ -633,7 +633,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -649,7 +649,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-30T00:15:36+00:00"
+            "time": "2022-12-30T00:23:10+00:00"
         },
         {
             "name": "fabpot/goutte",
@@ -884,16 +884,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.2",
+            "version": "1.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
+                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
                 "shasum": ""
             },
             "require": {
@@ -903,11 +903,6 @@
                 "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "src/functions_include.php"
@@ -948,7 +943,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.2"
+                "source": "https://github.com/guzzle/promises/tree/1.5.3"
             },
             "funding": [
                 {
@@ -964,7 +959,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:55:35+00:00"
+            "time": "2023-05-21T12:31:43+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -1132,16 +1127,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.4",
+            "version": "v4.15.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
+                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
-                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
                 "shasum": ""
             },
             "require": {
@@ -1182,9 +1177,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
             },
-            "time": "2023-03-05T19:49:14+00:00"
+            "time": "2023-05-19T20:20:00+00:00"
         },
         {
             "name": "pantheon-systems/pantheon-wordpress-upstream-tests",
@@ -1917,16 +1912,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.7",
+            "version": "9.6.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2"
+                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
-                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
                 "shasum": ""
             },
             "require": {
@@ -2000,7 +1995,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
             },
             "funding": [
                 {
@@ -2016,7 +2011,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-14T08:58:40+00:00"
+            "time": "2023-05-11T05:14:45+00:00"
         },
         {
             "name": "psr/container",
@@ -2513,16 +2508,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
                 "shasum": ""
             },
             "require": {
@@ -2567,7 +2562,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
             },
             "funding": [
                 {
@@ -2575,7 +2570,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-05-07T05:35:17+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -3237,16 +3232,16 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.11.1",
+            "version": "8.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "af87461316b257e46e15bb041dca6fca3796d822"
+                "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/af87461316b257e46e15bb041dca6fca3796d822",
-                "reference": "af87461316b257e46e15bb041dca6fca3796d822",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7",
+                "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7",
                 "shasum": ""
             },
             "require": {
@@ -3258,11 +3253,11 @@
             "require-dev": {
                 "phing/phing": "2.17.4",
                 "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.10.14",
+                "phpstan/phpstan": "1.10.15",
                 "phpstan/phpstan-deprecation-rules": "1.1.3",
                 "phpstan/phpstan-phpunit": "1.3.11",
                 "phpstan/phpstan-strict-rules": "1.5.1",
-                "phpunit/phpunit": "7.5.20|8.5.21|9.6.6|10.1.1"
+                "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.1.3"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -3286,7 +3281,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.11.1"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.12.1"
             },
             "funding": [
                 {
@@ -3298,7 +3293,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-24T08:19:01+00:00"
+            "time": "2023-05-15T21:42:25+00:00"
         },
         {
             "name": "spryker/code-sniffer",
@@ -3567,16 +3562,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.23",
+            "version": "v5.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c"
+                "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/90f21e27d0d88ce38720556dd164d4a1e4c3934c",
-                "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8",
+                "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8",
                 "shasum": ""
             },
             "require": {
@@ -3646,7 +3641,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.23"
+                "source": "https://github.com/symfony/console/tree/v5.4.24"
             },
             "funding": [
                 {
@@ -3662,7 +3657,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-24T18:47:29+00:00"
+            "time": "2023-05-26T05:13:16+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -3818,25 +3813,25 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.0.2",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
-                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3865,7 +3860,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -3881,7 +3876,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -4044,29 +4039,26 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.0.2",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
-                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4103,7 +4095,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -4119,7 +4111,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -5004,32 +4996,33 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.0.19",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a"
+                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a",
-                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
+                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
                 "symfony/error-handler": "^5.4|^6.0",
                 "symfony/http-client": "^5.4|^6.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/intl": "^6.2",
+                "symfony/translation-contracts": "^2.5|^3.0",
                 "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
@@ -5069,7 +5062,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.19"
+                "source": "https://github.com/symfony/string/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -5085,7 +5078,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2023-03-21T21:06:29+00:00"
         },
         {
             "name": "symfony/translation",
@@ -5256,20 +5249,20 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.0.19",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "deec3a812a0305a50db8ae689b183f43d915c884"
+                "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/deec3a812a0305a50db8ae689b183f43d915c884",
-                "reference": "deec3a812a0305a50db8ae689b183f43d915c884",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927",
+                "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -5278,9 +5271,6 @@
             "require-dev": {
                 "symfony/console": "^5.4|^6.0"
             },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
             "bin": [
                 "Resources/bin/yaml-lint"
             ],
@@ -5310,7 +5300,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.0.19"
+                "source": "https://github.com/symfony/yaml/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -5326,7 +5316,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-11T11:50:03+00:00"
+            "time": "2023-04-28T13:28:14+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -5499,5 +5489,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 0b676157bbacd24b68c30c74bb3acac5f838250d Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Fri, 9 Jun 2023 16:52:20 -0400
Subject: [PATCH 26/32] Updates autoload and adds cleanup back

---
 behat.yml     |   2 +
 composer.json |   4 --
 composer.lock | 180 ++++++++++++++++++++++++++------------------------
 3 files changed, 97 insertions(+), 89 deletions(-)

diff --git a/behat.yml b/behat.yml
index d4c1ace..097143d 100644
--- a/behat.yml
+++ b/behat.yml
@@ -1,5 +1,7 @@
 # behat.yml
 default:
+  autoload:
+    '': %paths.base%/tests/behat/features/bootstrap
   suites:
     default:
       paths:
diff --git a/composer.json b/composer.json
index 20467de..9bc37b1 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,5 @@
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
-  },
-  "autoload": {
-    "psr-4": { "wpredis\\behat\\features\\bootstrap\\": "tests/behat/features/bootstrap/" }
   }
-
 }
diff --git a/composer.lock b/composer.lock
index 0593453..2bd200e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -583,30 +583,30 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "2.0.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11",
+                "doctrine/coding-standard": "^9 || ^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^5.4"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.30 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -633,7 +633,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -649,7 +649,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-30T00:23:10+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
         },
         {
             "name": "fabpot/goutte",
@@ -884,16 +884,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.3",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -903,6 +903,11 @@
                 "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
             "autoload": {
                 "files": [
                     "src/functions_include.php"
@@ -943,7 +948,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": [
                 {
@@ -959,7 +964,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-21T12:31:43+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -1127,16 +1132,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.5",
+            "version": "v4.15.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
                 "shasum": ""
             },
             "require": {
@@ -1177,9 +1182,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
             },
-            "time": "2023-05-19T20:20:00+00:00"
+            "time": "2023-03-05T19:49:14+00:00"
         },
         {
             "name": "pantheon-systems/pantheon-wordpress-upstream-tests",
@@ -1912,16 +1917,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.8",
+            "version": "9.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
+                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
+                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
                 "shasum": ""
             },
             "require": {
@@ -1995,7 +2000,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7"
             },
             "funding": [
                 {
@@ -2011,7 +2016,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-11T05:14:45+00:00"
+            "time": "2023-04-14T08:58:40+00:00"
         },
         {
             "name": "psr/container",
@@ -2508,16 +2513,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
@@ -2562,7 +2567,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2570,7 +2575,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -3232,16 +3237,16 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.12.1",
+            "version": "8.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7"
+                "reference": "af87461316b257e46e15bb041dca6fca3796d822"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7",
-                "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/af87461316b257e46e15bb041dca6fca3796d822",
+                "reference": "af87461316b257e46e15bb041dca6fca3796d822",
                 "shasum": ""
             },
             "require": {
@@ -3253,11 +3258,11 @@
             "require-dev": {
                 "phing/phing": "2.17.4",
                 "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.10.15",
+                "phpstan/phpstan": "1.10.14",
                 "phpstan/phpstan-deprecation-rules": "1.1.3",
                 "phpstan/phpstan-phpunit": "1.3.11",
                 "phpstan/phpstan-strict-rules": "1.5.1",
-                "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.1.3"
+                "phpunit/phpunit": "7.5.20|8.5.21|9.6.6|10.1.1"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -3281,7 +3286,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.12.1"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.11.1"
             },
             "funding": [
                 {
@@ -3293,7 +3298,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-15T21:42:25+00:00"
+            "time": "2023-04-24T08:19:01+00:00"
         },
         {
             "name": "spryker/code-sniffer",
@@ -3562,16 +3567,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.24",
+            "version": "v5.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8"
+                "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8",
-                "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8",
+                "url": "https://api.github.com/repos/symfony/console/zipball/90f21e27d0d88ce38720556dd164d4a1e4c3934c",
+                "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c",
                 "shasum": ""
             },
             "require": {
@@ -3641,7 +3646,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.24"
+                "source": "https://github.com/symfony/console/tree/v5.4.23"
             },
             "funding": [
                 {
@@ -3657,7 +3662,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-26T05:13:16+00:00"
+            "time": "2023-04-24T18:47:29+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -3813,25 +3818,25 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3860,7 +3865,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -3876,7 +3881,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -4039,26 +4044,29 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.3.0",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.0.2",
                 "psr/event-dispatcher": "^1"
             },
+            "suggest": {
+                "symfony/event-dispatcher-implementation": ""
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4095,7 +4103,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -4111,7 +4119,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -4996,33 +5004,32 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.0",
+            "version": "v6.0.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
+                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a",
+                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.5"
+                "symfony/translation-contracts": "<2.0"
             },
             "require-dev": {
                 "symfony/error-handler": "^5.4|^6.0",
                 "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.2",
-                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
                 "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
@@ -5062,7 +5069,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.0"
+                "source": "https://github.com/symfony/string/tree/v6.0.19"
             },
             "funding": [
                 {
@@ -5078,7 +5085,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-21T21:06:29+00:00"
+            "time": "2023-01-01T08:36:10+00:00"
         },
         {
             "name": "symfony/translation",
@@ -5249,20 +5256,20 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.3.0",
+            "version": "v6.0.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927"
+                "reference": "deec3a812a0305a50db8ae689b183f43d915c884"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927",
-                "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/deec3a812a0305a50db8ae689b183f43d915c884",
+                "reference": "deec3a812a0305a50db8ae689b183f43d915c884",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -5271,6 +5278,9 @@
             "require-dev": {
                 "symfony/console": "^5.4|^6.0"
             },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
             "bin": [
                 "Resources/bin/yaml-lint"
             ],
@@ -5300,7 +5310,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.3.0"
+                "source": "https://github.com/symfony/yaml/tree/v6.0.19"
             },
             "funding": [
                 {
@@ -5316,7 +5326,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-28T13:28:14+00:00"
+            "time": "2023-01-11T11:50:03+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -5489,5 +5499,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 651f37131b441d9300413de46f2bab1ca2dce1ac Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Fri, 9 Jun 2023 17:14:02 -0400
Subject: [PATCH 27/32] Updates autoload and adds cleanup back

---
 behat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/behat.yml b/behat.yml
index 097143d..af00f6c 100644
--- a/behat.yml
+++ b/behat.yml
@@ -1,7 +1,7 @@
 # behat.yml
 default:
   autoload:
-    '': %paths.base%/tests/behat/features/bootstrap
+    '': '%paths.base%/tests/behat/features/bootstrap'
   suites:
     default:
       paths:

From 40ae2f191031bd876bd8e5b80c0159a534641b0c Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Mon, 12 Jun 2023 11:00:46 -0400
Subject: [PATCH 28/32] Updates autoload

---
 behat.yml     | 2 --
 composer.json | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/behat.yml b/behat.yml
index af00f6c..d4c1ace 100644
--- a/behat.yml
+++ b/behat.yml
@@ -1,7 +1,5 @@
 # behat.yml
 default:
-  autoload:
-    '': '%paths.base%/tests/behat/features/bootstrap'
   suites:
     default:
       paths:
diff --git a/composer.json b/composer.json
index 9bc37b1..20467de 100644
--- a/composer.json
+++ b/composer.json
@@ -28,5 +28,9 @@
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
+  },
+  "autoload": {
+    "psr-4": { "wpredis\\behat\\features\\bootstrap\\": "tests/behat/features/bootstrap/" }
   }
+
 }

From 5ed5fa00374c0aa680aa343c1b05d919f6ce478d Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Mon, 12 Jun 2023 11:24:28 -0400
Subject: [PATCH 29/32] Updates autoload

---
 composer.json                                                   | 2 +-
 .../behat/features/bootstrap/WpRedisFeatureContext.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/{wpredis => }/behat/features/bootstrap/WpRedisFeatureContext.php (92%)

diff --git a/composer.json b/composer.json
index 20467de..a5f0929 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
     }
   },
   "autoload": {
-    "psr-4": { "wpredis\\behat\\features\\bootstrap\\": "tests/behat/features/bootstrap/" }
+    "psr-4": { "behat\\features\\bootstrap\\": "tests/behat/features/bootstrap/" }
   }
 
 }
diff --git a/tests/wpredis/behat/features/bootstrap/WpRedisFeatureContext.php b/tests/behat/features/bootstrap/WpRedisFeatureContext.php
similarity index 92%
rename from tests/wpredis/behat/features/bootstrap/WpRedisFeatureContext.php
rename to tests/behat/features/bootstrap/WpRedisFeatureContext.php
index 05266ec..e5f0981 100644
--- a/tests/wpredis/behat/features/bootstrap/WpRedisFeatureContext.php
+++ b/tests/behat/features/bootstrap/WpRedisFeatureContext.php
@@ -1,7 +1,7 @@
 <?php
 // features/bootstrap/WPRedisFeatureContext.php
 
-namespace wpredis\behat\features\bootstrap;
+namespace behat\features\bootstrap;
 
 use Behat\Behat\Context\Context;
 

From 630bd91b793971d627b39055c44e46c0c2ebdd6a Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Mon, 12 Jun 2023 11:42:46 -0400
Subject: [PATCH 30/32] Updates autoload

---
 behat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/behat.yml b/behat.yml
index d4c1ace..12dad86 100644
--- a/behat.yml
+++ b/behat.yml
@@ -7,7 +7,7 @@ default:
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
-        - wpredis\behat\features\bootstrap\WpRedisFeatureContext
+        - behat\features\bootstrap\WpRedisFeatureContext
   extensions:
     Behat\MinkExtension:
       # base_url set by ENV

From b218b79f5f9d2b037e30f32b67b90ca995941573 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Mon, 12 Jun 2023 16:08:19 -0400
Subject: [PATCH 31/32] Fixes spacing

---
 tests/behat/features/wp-redis.feature | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/behat/features/wp-redis.feature b/tests/behat/features/wp-redis.feature
index 65b6453..3bd1074 100644
--- a/tests/behat/features/wp-redis.feature
+++ b/tests/behat/features/wp-redis.feature
@@ -17,8 +17,9 @@ Feature: WP Redis
     And I should see "Cache Misses:"
     And I should see "Redis Calls:"
 
-	# We call the same page twice to give Redis an opportunity to cache
-	# something so that `get` actually fires.
-	When I am on "/?redis_debug"
-	Then I should see "Group:"
+    # We call the same page twice to give Redis an opportunity to cache
+    # something so that `get` actually fires.
+    When I am on "/?redis_debug"
+    Then I should see "Group:"
+    Then I should see "- get"
 

From 5cdf6fcfe052c2eeba963052e95a65363fdbb2d2 Mon Sep 17 00:00:00 2001
From: Ryan Wagner <ryan.wagner@pantheon.io>
Date: Mon, 12 Jun 2023 16:13:29 -0400
Subject: [PATCH 32/32] Fixes spacing

---
 tests/behat/features/load-wp.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/features/load-wp.feature b/tests/behat/features/load-wp.feature
index f8cad1d..51b7994 100644
--- a/tests/behat/features/load-wp.feature
+++ b/tests/behat/features/load-wp.feature
@@ -22,7 +22,7 @@ Feature: Load WordPress
     When I go to "/wp-admin/options-general.php"
     And I fill in "blogname" with "Pantheon WordPress Site"
     And I press "submit"
-	When I wait "1" second
+    When I wait "1" second
     Then print current URL
     And I should see "Settings saved."