From 3918379262105f92c3878e2d051fbf81476c66dd Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Tue, 24 Jan 2023 15:07:42 -0800
Subject: [PATCH 1/5] Add a `behat.yml` so tests run as expected

---
 behat.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 behat.yml

diff --git a/behat.yml b/behat.yml
new file mode 100644
index 0000000..d6ee862
--- /dev/null
+++ b/behat.yml
@@ -0,0 +1,7 @@
+default:
+  suites:
+    default:
+      contexts:
+        - WP_CLI\Tests\Context\FeatureContext
+      paths:
+        - features

From 68a6f5bb4ca0723c2181d14f45239e052cee9b32 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Tue, 24 Jan 2023 15:18:26 -0800
Subject: [PATCH 2/5] Bump `wp-cli/wp-cli-tests` to v3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b49acb6..531b598 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require-dev": {
         "behat/behat": "~2.5",
-        "wp-cli/wp-cli-tests": "^2.1"
+        "wp-cli/wp-cli-tests": "^3.1"
     },
     "config": {
         "platform": {

From 97ffb0e41b473ec85fe30b0c7bef6b4a8e1fbefc Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Tue, 24 Jan 2023 15:22:01 -0800
Subject: [PATCH 3/5] Bump platform requirements to PHP 5.6

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 531b598..f69de81 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     },
     "config": {
         "platform": {
-            "php": "5.4"
+            "php": "5.6"
         },
         "process-timeout": 7200,
         "sort-packages": true,

From d1964bd17b8308d9500ea72fa2bcf50872b15789 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Tue, 24 Jan 2023 15:23:33 -0800
Subject: [PATCH 4/5] Behat dependency shouldn't be necessary

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index f69de81..f03834c 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,6 @@
         "wp-cli/wp-cli": "^2"
     },
     "require-dev": {
-        "behat/behat": "~2.5",
         "wp-cli/wp-cli-tests": "^3.1"
     },
     "config": {

From cd76694e425922f4aed176af4791abb62860c93c Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Tue, 24 Jan 2023 15:23:53 -0800
Subject: [PATCH 5/5] Update `branch-alias`

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f03834c..69aede4 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "commands": [
             "find"