From 11a02fa554904e1499c979ee21a477b2379e3718 Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@gmail.com>
Date: Wed, 31 May 2023 13:37:17 -0600
Subject: [PATCH 1/7] Ensure we have the message array key before trying to use
 it

---
 inc/classes/class-srm-redirect.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/classes/class-srm-redirect.php b/inc/classes/class-srm-redirect.php
index 453b950c..c100670f 100644
--- a/inc/classes/class-srm-redirect.php
+++ b/inc/classes/class-srm-redirect.php
@@ -141,7 +141,7 @@ public function match_redirect( $requested_path ) {
 			$status_code  = $redirect['status_code'];
 			$enable_regex = ( isset( $redirect['enable_regex'] ) ) ? $redirect['enable_regex'] : false;
 			$redirect_id  = $redirect['ID'];
-			$message      = $redirect['message'];
+			$message      = $redirect['message'] ?? '';
 
 			// check if the redirection destination is valid, otherwise just skip it (unless this is a 4xx request)
 			if ( empty( $redirect_to ) && ! in_array( $status_code, array( 403, 404, 410 ), true ) ) {

From a255dc9a9c970271d162e6a63707896ae6ba484b Mon Sep 17 00:00:00 2001
From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:52:37 +1000
Subject: [PATCH 2/7] Fix PHP 8.1 deprecation warnings in
 `srm_validate_from_url()`.

---
 inc/classes/class-srm-post-type.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/inc/classes/class-srm-post-type.php b/inc/classes/class-srm-post-type.php
index 9242a09b..59e7b3fb 100644
--- a/inc/classes/class-srm-post-type.php
+++ b/inc/classes/class-srm-post-type.php
@@ -689,13 +689,18 @@ public function load_resources() {
 	 * @return void
 	 */
 	public function srm_validate_from_url() {
-		$_wpnonce = filter_input( INPUT_GET, '_wpnonce', FILTER_SANITIZE_STRING );
+		if ( ! isset( $_GET['_wpnonce'] ) || ! isset( $_GET['from'] ) ) {
+			echo 0;
+			die();
+		}
+
+		$_wpnonce = sanitize_text_field( wp_unslash( $_GET['_wpnonce'] ) );
 		if ( ! wp_verify_nonce( $_wpnonce, 'srm-save-redirect-meta' ) ) {
 			echo 0;
 			die();
 		}
 
-		$from = filter_input( INPUT_GET, 'from', FILTER_SANITIZE_STRING );
+		$from = srm_sanitize_redirect_from( wp_unslash( $_GET['from'] ) );
 
 		/**
 		 * SRM treats '/sample-page' and 'sample-page' equally.

From 1d26bc1468e94a60a63b1e488e2464a29ea1b552 Mon Sep 17 00:00:00 2001
From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com>
Date: Thu, 1 Jun 2023 12:30:37 +1000
Subject: [PATCH 3/7] =?UTF-8?q?Create=20test=20to=20ensure=20duplicate=20r?=
 =?UTF-8?q?edirects=20can=E2=80=99t=20be=20created.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/safe-redirect-manager.test.js     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/cypress/integration/safe-redirect-manager.test.js b/tests/cypress/integration/safe-redirect-manager.test.js
index 2c7e91d5..1781525c 100644
--- a/tests/cypress/integration/safe-redirect-manager.test.js
+++ b/tests/cypress/integration/safe-redirect-manager.test.js
@@ -121,6 +121,21 @@ describe('Test redirect rules', () => {
 		cy.verifyEndpointDead('wildcard-403-test/1', 'Test message for a 403 wildcard');
 	});
 
+	it('Can not create a duplicate redirect rule', () => {
+		cy.createRedirectRule(
+			'/duplicate-rule-test/',
+			'/hello-world/',
+			'Rule for testing duplicate rule creation.'
+		);
+
+		cy.visit('/wp-admin/post-new.php?post_type=redirect_rule');
+
+		cy.get('#srm_redirect_rule_from').click().clear().type('/duplicate-rule-test/');
+		cy.get('#srm_redirect_rule_to').click();
+
+		cy.get('.notice-error').should('contain', 'There is an existing redirect with the same Redirect From URL.');
+	});
+
 	it('Can die with a 403 header', () => {
 		cy.createRedirectRule(
 			'/403-test',

From e8438f3d5ac44a5039268546386d6793b37b6ed1 Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@gmail.com>
Date: Thu, 1 Jun 2023 09:24:04 -0600
Subject: [PATCH 4/7] Version bump to 2.0.1

---
 package-lock.json         | 4 ++--
 package.json              | 2 +-
 readme.txt                | 2 +-
 safe-redirect-manager.php | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8cefe1cf..36e77cfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "safe-redirect-manager",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "safe-redirect-manager",
-      "version": "2.0.0",
+      "version": "2.0.1",
       "license": "GPL-2.0-or-later",
       "dependencies": {
         "cypress-mochawesome-reporter": "^3.4.0",
diff --git a/package.json b/package.json
index d0d54e5f..50599880 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "safe-redirect-manager",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Easily and safely manage HTTP redirects.",
   "homepage": "https://github.com/10up/safe-redirect-manager",
   "bugs": {
diff --git a/readme.txt b/readme.txt
index dabd9358..6c7e6196 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags:              http redirects, redirect manager, url redirection, safe http
 Requires at least: 5.7
 Tested up to:      6.2
 Requires PHP:      7.4
-Stable tag:        2.0.0
+Stable tag:        2.0.1
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
diff --git a/safe-redirect-manager.php b/safe-redirect-manager.php
index a2a1c2ec..26327058 100644
--- a/safe-redirect-manager.php
+++ b/safe-redirect-manager.php
@@ -3,7 +3,7 @@
  * Plugin Name:       Safe Redirect Manager
  * Plugin URI:        https://wordpress.org/plugins/safe-redirect-manager
  * Description:       Easily and safely manage HTTP redirects.
- * Version:           2.0.0
+ * Version:           2.0.1
  * Requires at least: 5.7
  * Requires PHP:      7.4
  * Author:            10up
@@ -20,7 +20,7 @@
 require_once dirname( __FILE__ ) . '/inc/classes/class-srm-post-type.php';
 require_once dirname( __FILE__ ) . '/inc/classes/class-srm-redirect.php';
 
-define( 'SRM_VERSION', '2.0.0' );
+define( 'SRM_VERSION', '2.0.1' );
 
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
 	require_once dirname( __FILE__ ) . '/inc/classes/class-srm-wp-cli.php';

From 4be047947d18f83ba545298188f1057bad8555d7 Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@gmail.com>
Date: Thu, 1 Jun 2023 09:29:37 -0600
Subject: [PATCH 5/7] Update changelogs with new PRs

---
 CHANGELOG.md | 7 +++++++
 readme.txt   | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd006c5..d2f1439a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [2.0.1] - 2023-06-01
+### Fixed
+- Ensure our E2E tests run (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#318](https://github.com/10up/safe-redirect-manager/pull/318)).
+- Ensure the `message` array key exists before we use it (props [@dkotter](https://github.com/dkotter), [@ocean90](https://github.com/ocean90), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#319](https://github.com/10up/safe-redirect-manager/pull/319)).
+- Deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
+
 ## [2.0.0] - 2023-05-31
 **Note that this version bumps the PHP minimum from 5.6 to 7.4 and the WordPress minimum from 4.6 to 5.7.**
 
@@ -272,6 +278,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Plugin released
 
 [Unreleased]: https://github.com/10up/safe-redirect-manager/compare/trunk...develop
+[2.0.1]: https://github.com/10up/safe-redirect-manager/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/10up/safe-redirect-manager/compare/1.11.1...2.0.0
 [1.11.1]: https://github.com/10up/safe-redirect-manager/compare/1.11.0...1.11.1
 [1.11.0]: https://github.com/10up/safe-redirect-manager/compare/1.10.1...1.11.0
diff --git a/readme.txt b/readme.txt
index 6c7e6196..cd6557ad 100644
--- a/readme.txt
+++ b/readme.txt
@@ -53,6 +53,11 @@ This should be a path (i.e. `/test`) or a URL (i.e. `http://example.com/wp/test`
 
 == Changelog ==
 
+= 2.0.1 - 2023-06-01 =
+* **Fixed:** Ensure our E2E tests run (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#318](https://github.com/10up/safe-redirect-manager/pull/318)).
+* **Fixed:** Ensure the `message` array key exists before we use it (props [@dkotter](https://github.com/dkotter), [@ocean90](https://github.com/ocean90), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#319](https://github.com/10up/safe-redirect-manager/pull/319)).
+* **Fixed:** Deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
+
 = 2.0.0 - 2023-05-31 =
 **Note that this version bumps the PHP minimum from 5.6 to 7.4 and the WordPress minimum from 4.6 to 5.7.**
 

From 59dc62af56500ec5975bdf1257dd99decce07739 Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@gmail.com>
Date: Thu, 1 Jun 2023 09:31:51 -0600
Subject: [PATCH 6/7] Update CREDITS.md

---
 CHANGELOG.md | 2 +-
 CREDITS.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2f1439a..ac323b84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 ## [2.0.1] - 2023-06-01
 ### Fixed
 - Ensure our E2E tests run (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#318](https://github.com/10up/safe-redirect-manager/pull/318)).
-- Ensure the `message` array key exists before we use it (props [@dkotter](https://github.com/dkotter), [@ocean90](https://github.com/ocean90), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#319](https://github.com/10up/safe-redirect-manager/pull/319)).
+- Ensure the `message` array key exists before we use it (props [@dkotter](https://github.com/dkotter), [@ocean90](https://github.com/ocean90), [@vena](https://github.com/vena), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#319](https://github.com/10up/safe-redirect-manager/pull/319)).
 - Deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
 
 ## [2.0.0] - 2023-05-31
diff --git a/CREDITS.md b/CREDITS.md
index 4e99f4d4..11cd3e9e 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zack Tollman (@tollmanz)](https://github.com/tollmanz), [Taylor Dewey (@tddewey)](https://github.com/tddewey), [10up (@10up)](https://github.com/10up), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Daniel Bachhuber (@danielbachhuber)](https://github.com/danielbachhuber), [VentureBeat (@VentureBeat)](https://github.com/VentureBeat), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Simon Wheatley (@simonwheatley)](https://github.com/simonwheatley), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Tauno Hogue (@tauno)](https://github.com/tauno), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Benoît Chantre (@benoitchantre)](https://github.com/benoitchantre), [Viktor Szépe (@szepeviktor)](https://github.com/szepeviktor), [Molnár Éva (@milli05)](https://github.com/milli05), [Henrique Mouta (@vaurdan)](https://github.com/vaurdan), [Raymond Ware (@raymondware)](https://github.com/raymondware), [Kevin Langley Jr (@kevinlangleyjr)](https://github.com/kevinlangleyjr), [Justin Sternberg (@jtsternberg)](https://github.com/jtsternberg), [Francesco Laffi (@francescolaffi)](https://github.com/francescolaffi), [Scott Walkinshaw (@swalkinshaw)](https://github.com/swalkinshaw), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Lucy Tomás (@lucymtc)](https://github.com/lucymtc), [Luca Speranza (@lucspe)](https://github.com/lucspe), [Luke Gedeon (@lgedeon)](https://github.com/lgedeon), [Josh Betz (@joshbetz)](https://github.com/joshbetz), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [James Burke (@jameswburke)](https://github.com/jameswburke), [@inathani](https://github.com/inathani), [Ulrich Pogson (@grappler)](https://github.com/grappler), [Chancey Mathews (@chanceymathews)](https://github.com/chanceymathews), [Ramon van Belzen (@Ramoonus)](https://github.com/Ramoonus), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Linnea Huxford (@mslinnea)](https://github.com/mslinnea), [Jon Sherrard (@jonsherrard)](https://github.com/jonsherrard), Jean-Christophe Brebion, [Michael Pretty (@prettyboymp)](https://github.com/prettyboymp), [Armando Lüscher (@noplanman)](https://github.com/noplanman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Noeste IJver (@noesteijver)](https://github.com/noesteijver), [David Greenwald (@davidegreenwald)](https://github.com/davidegreenwald), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Amy Evans (@amyevans)](https://github.com/amyevans), [Jeffrey Betts (@jeffreybetts)](https://github.com/jeffreybetts), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [Bradley Taylor (@braders)](https://github.com/braders), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Pop VeKind (@PopVeKind)](https://github.com/PopVeKind), [Vincent Klaiber (@vinkla)](https://github.com/vinkla), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Jeffrey Carandang (@phpbits)](https://github.com/phpbits), [Zachary Brown (@TheLastCicada)](https://github.com/TheLastCicada), [MD Sultan Nasir Uddin (@sultann)](https://github.com/sultann), [@jilltilt](https://github.com/jilltilt), [@yeevy](https://github.com/yeevy), [David Mondok (@davidmondok)](https://github.com/davidmondok), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Dhanendran (@dhanendran)](https://github.com/dhanendran), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Michael Ilett (@hrkhal)](https://github.com/hrkhal), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Sanket Parmar (@sanketio)](https://github.com/sanketio), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Nate Conley (@nateconley)](https://github.com/nateconley), [Max Lyuchin (@cadic)](https://github.com/cadic), [Dustin Rue (@dustinrue)](https://github.com/dustinrue), [Michele Cipriani (@ciprianimike)](https://github.com/ciprianimike), [Alex Osmichenko (@aosmichenko)](https://github.com/aosmichenko), [Oka Tai-Lee (@okadots)](https://github.com/okadots), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Curtis Loisel (@csloisel)](https://github.com/csloisel), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Andrew Norcross (@norcross)](https://github.com/norcross), [Giorgos Sarigiannidis (@gsarig)](https://github.com/gsarig), [David Chandra Purnama (@turtlepod)](https://github.com/turtlepod).
+[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zack Tollman (@tollmanz)](https://github.com/tollmanz), [Taylor Dewey (@tddewey)](https://github.com/tddewey), [10up (@10up)](https://github.com/10up), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Daniel Bachhuber (@danielbachhuber)](https://github.com/danielbachhuber), [VentureBeat (@VentureBeat)](https://github.com/VentureBeat), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Simon Wheatley (@simonwheatley)](https://github.com/simonwheatley), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Tauno Hogue (@tauno)](https://github.com/tauno), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Benoît Chantre (@benoitchantre)](https://github.com/benoitchantre), [Viktor Szépe (@szepeviktor)](https://github.com/szepeviktor), [Molnár Éva (@milli05)](https://github.com/milli05), [Henrique Mouta (@vaurdan)](https://github.com/vaurdan), [Raymond Ware (@raymondware)](https://github.com/raymondware), [Kevin Langley Jr (@kevinlangleyjr)](https://github.com/kevinlangleyjr), [Justin Sternberg (@jtsternberg)](https://github.com/jtsternberg), [Francesco Laffi (@francescolaffi)](https://github.com/francescolaffi), [Scott Walkinshaw (@swalkinshaw)](https://github.com/swalkinshaw), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Lucy Tomás (@lucymtc)](https://github.com/lucymtc), [Luca Speranza (@lucspe)](https://github.com/lucspe), [Luke Gedeon (@lgedeon)](https://github.com/lgedeon), [Josh Betz (@joshbetz)](https://github.com/joshbetz), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [James Burke (@jameswburke)](https://github.com/jameswburke), [@inathani](https://github.com/inathani), [Ulrich Pogson (@grappler)](https://github.com/grappler), [Chancey Mathews (@chanceymathews)](https://github.com/chanceymathews), [Ramon van Belzen (@Ramoonus)](https://github.com/Ramoonus), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Linnea Huxford (@mslinnea)](https://github.com/mslinnea), [Jon Sherrard (@jonsherrard)](https://github.com/jonsherrard), Jean-Christophe Brebion, [Michael Pretty (@prettyboymp)](https://github.com/prettyboymp), [Armando Lüscher (@noplanman)](https://github.com/noplanman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Noeste IJver (@noesteijver)](https://github.com/noesteijver), [David Greenwald (@davidegreenwald)](https://github.com/davidegreenwald), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Amy Evans (@amyevans)](https://github.com/amyevans), [Jeffrey Betts (@jeffreybetts)](https://github.com/jeffreybetts), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [Bradley Taylor (@braders)](https://github.com/braders), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Pop VeKind (@PopVeKind)](https://github.com/PopVeKind), [Vincent Klaiber (@vinkla)](https://github.com/vinkla), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Jeffrey Carandang (@phpbits)](https://github.com/phpbits), [Zachary Brown (@TheLastCicada)](https://github.com/TheLastCicada), [MD Sultan Nasir Uddin (@sultann)](https://github.com/sultann), [@jilltilt](https://github.com/jilltilt), [@yeevy](https://github.com/yeevy), [David Mondok (@davidmondok)](https://github.com/davidmondok), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Dhanendran (@dhanendran)](https://github.com/dhanendran), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Michael Ilett (@hrkhal)](https://github.com/hrkhal), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Sanket Parmar (@sanketio)](https://github.com/sanketio), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Nate Conley (@nateconley)](https://github.com/nateconley), [Max Lyuchin (@cadic)](https://github.com/cadic), [Dustin Rue (@dustinrue)](https://github.com/dustinrue), [Michele Cipriani (@ciprianimike)](https://github.com/ciprianimike), [Alex Osmichenko (@aosmichenko)](https://github.com/aosmichenko), [Oka Tai-Lee (@okadots)](https://github.com/okadots), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Curtis Loisel (@csloisel)](https://github.com/csloisel), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Andrew Norcross (@norcross)](https://github.com/norcross), [Giorgos Sarigiannidis (@gsarig)](https://github.com/gsarig), [David Chandra Purnama (@turtlepod)](https://github.com/turtlepod), [Dominik Schilling (@ocean90)](https://github.com/ocean90), [Daniel Vena (@vena)](https://github.com/vena).
 
 ## Libraries
 

From 93415f8ef1368abd555b643eb0550dfb6c8bba4a Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@gmail.com>
Date: Thu, 1 Jun 2023 09:34:29 -0600
Subject: [PATCH 7/7] Update changelog slightly

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac323b84..bceb25d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Fixed
 - Ensure our E2E tests run (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#318](https://github.com/10up/safe-redirect-manager/pull/318)).
 - Ensure the `message` array key exists before we use it (props [@dkotter](https://github.com/dkotter), [@ocean90](https://github.com/ocean90), [@vena](https://github.com/vena), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#319](https://github.com/10up/safe-redirect-manager/pull/319)).
-- Deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
+- Resolve deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
 
 ## [2.0.0] - 2023-05-31
 **Note that this version bumps the PHP minimum from 5.6 to 7.4 and the WordPress minimum from 4.6 to 5.7.**
diff --git a/readme.txt b/readme.txt
index cd6557ad..4a562aa2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -56,7 +56,7 @@ This should be a path (i.e. `/test`) or a URL (i.e. `http://example.com/wp/test`
 = 2.0.1 - 2023-06-01 =
 * **Fixed:** Ensure our E2E tests run (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#318](https://github.com/10up/safe-redirect-manager/pull/318)).
 * **Fixed:** Ensure the `message` array key exists before we use it (props [@dkotter](https://github.com/dkotter), [@ocean90](https://github.com/ocean90), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#319](https://github.com/10up/safe-redirect-manager/pull/319)).
-* **Fixed:** Deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
+* **Fixed:** Resolve deprecation notices in PHP 8.1 and later (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#322](https://github.com/10up/safe-redirect-manager/pull/322)).
 
 = 2.0.0 - 2023-05-31 =
 **Note that this version bumps the PHP minimum from 5.6 to 7.4 and the WordPress minimum from 4.6 to 5.7.**