From 0ec2625610f275aaf3c07cef3f2c9faa918b1ca8 Mon Sep 17 00:00:00 2001
From: Mikael Korpela <mikael@ihminen.org>
Date: Mon, 12 Dec 2022 14:24:39 +0200
Subject: [PATCH 1/2] ETK: make PHP linting PHP 8 compatible

---
 apps/phpcs.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/phpcs.xml b/apps/phpcs.xml
index 4248f11133a95..5511dce980ba2 100644
--- a/apps/phpcs.xml
+++ b/apps/phpcs.xml
@@ -2,6 +2,12 @@
 <ruleset name="editing-toolkit">
 	<description>Editing Toolkit Plugin Rules</description>
 
+	<!--
+	Prevent errors caused by WordPress Coding Standards not supporting PHP 8.0+.
+	See https://github.com/WordPress/WordPress-Coding-Standards/issues/2035
+	-->
+	<ini name="error_reporting" value="E_ALL &#38; ~E_DEPRECATED" />
+
 	<rule ref="Jetpack"/>
 	<rule ref="WordPress.Utils.I18nTextDomainFixer">
 		<properties>

From 3980d3a2c76b1a578bcc1e0488fa7447da98052f Mon Sep 17 00:00:00 2001
From: Mikael Korpela <mikael@ihminen.org>
Date: Mon, 12 Dec 2022 15:21:47 +0200
Subject: [PATCH 2/2] Clarify the comment

---
 apps/phpcs.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/phpcs.xml b/apps/phpcs.xml
index 5511dce980ba2..b9fe5dd4ffc4a 100644
--- a/apps/phpcs.xml
+++ b/apps/phpcs.xml
@@ -3,7 +3,9 @@
 	<description>Editing Toolkit Plugin Rules</description>
 
 	<!--
-	Prevent errors caused by WordPress Coding Standards not supporting PHP 8.0+.
+	Suppress all PHP run-time notices across all PHP versions, thus preventing
+	errors caused by WordPress Coding Standards not supporting PHP 8.0+ yet.
+	Once WPCS supports PHP8, this can be removed.
 	See https://github.com/WordPress/WordPress-Coding-Standards/issues/2035
 	-->
 	<ini name="error_reporting" value="E_ALL &#38; ~E_DEPRECATED" />