From 547247f2b699bb47e860e1cce45f5b201182d8f5 Mon Sep 17 00:00:00 2001
From: Greg Marshall <greg@alley.co>
Date: Fri, 26 Jan 2024 15:44:21 -0600
Subject: [PATCH 1/4] bump php back to 8.1

---
 .github/workflows/built-release.yml | 2 +-
 wp-curate.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/built-release.yml b/.github/workflows/built-release.yml
index e3aea702..250160bd 100644
--- a/.github/workflows/built-release.yml
+++ b/.github/workflows/built-release.yml
@@ -10,4 +10,4 @@ jobs:
     uses: alleyinteractive/.github/.github/workflows/built-release.yml@main
     with:
       node: 20
-      php: 8.2
+      php: 8.1
diff --git a/wp-curate.php b/wp-curate.php
index d15634c0..92007725 100644
--- a/wp-curate.php
+++ b/wp-curate.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Curate
  * Plugin URI: https://github.com/alleyinteractive/wp-curate
  * Description: Plugin to curate homepages and other landing pages
- * Version: 1.5.1
+ * Version: 1.6.0
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-curate
  * Requires at least: 6.4

From fe7f557d89299ce58c9291d2b150ef5314220c25 Mon Sep 17 00:00:00 2001
From: Greg Marshall <greg@alley.co>
Date: Fri, 26 Jan 2024 15:45:31 -0600
Subject: [PATCH 2/4] more 8.2 -> 8.1

---
 .github/workflows/build-branch.yml | 2 +-
 .github/workflows/code-quality.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml
index 8a7a0942..695a4c35 100644
--- a/.github/workflows/build-branch.yml
+++ b/.github/workflows/build-branch.yml
@@ -11,4 +11,4 @@ jobs:
     uses: alleyinteractive/.github/.github/workflows/built-branch.yml@main
     with:
       node: 20
-      php: 8.2
+      php: 8.1
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 00feb2c7..a5656262 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -14,7 +14,7 @@ jobs:
     if: github.event.pull_request.draft == false
     uses: alleyinteractive/.github/.github/workflows/php-composer-command.yml@main
     with:
-      php: 8.2
+      php: 8.1
       command: |
         phpcs
         phpstan

From ef2790b2ce49e1e69d35ab1b52262d037dadc1b9 Mon Sep 17 00:00:00 2001
From: Greg Marshall <greg@alley.co>
Date: Fri, 26 Jan 2024 15:48:09 -0600
Subject: [PATCH 3/4] add readme

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0bd6a7a..cd4d98d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 All notable changes to `WP Curate` will be documented in this file.
 
-## 1.5.1 - 2023-01-25
+## 1.6.0 - 2024-01-26
+- Change GitHub actions back to PHP 8.1 so that sites are not required to run 8.2 yet.
+
+## 1.5.1 - 2024-01-25
 
 - Bug Fix: Avoid BlockControl toolbar obstructing PostPicker button when Post inner blocks are selected.
 

From e2cf57cf7c4a6a9325d093538bb1e6e0d613a0d5 Mon Sep 17 00:00:00 2001
From: Greg Marshall <greg@alley.co>
Date: Fri, 26 Jan 2024 15:57:30 -0600
Subject: [PATCH 4/4] php matrix

---
 .github/workflows/code-quality.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index a5656262..244ab958 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -12,9 +12,13 @@ on:
 jobs:
   code-quality:
     if: github.event.pull_request.draft == false
+    strategy:
+      matrix:
+        php: [8.1, 8.2]
+        wordpress: ["latest"]
     uses: alleyinteractive/.github/.github/workflows/php-composer-command.yml@main
     with:
-      php: 8.1
+      php: ${{ matrix.php }}
       command: |
         phpcs
         phpstan