Don't whitelist "WP.+Gutenberg" classes.

Let's be more strict to porevent potential issues.
WordPress · Jul 20, 2023 · 27dc135 · 27dc135
1 parent 42ec0e9
commit 27dc135
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/lib/class-wp-duotone-gutenberg.php b/lib/class-wp-duotone-gutenberg.php
@@ -32,6 +32,10 @@
  * @since 6.3.0
  */
 
+if ( class_exists( 'WP_Duotone_Gutenberg' ) ) {
+	return;
+}
+
 /**
  * Manages duotone block supports and global styles.
  *

diff --git a/lib/class-wp-theme-json-data-gutenberg.php b/lib/class-wp-theme-json-data-gutenberg.php
@@ -6,6 +6,10 @@
  * @since 6.1.0
  */
 
+if ( class_exists( 'WP_Theme_JSON_Data_Gutenberg' ) ) {
+	return;
+}
+
 /**
  * Class to provide access to update a theme.json structure.
  */

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
@@ -6,6 +6,10 @@
  * @since 5.8.0
  */
 
+if ( class_exists( 'WP_Theme_JSON_Gutenberg' ) ) {
+	return;
+}
+
 /**
  * Class that encapsulates the processing of structures that adhere to the theme.json spec.
  *

diff --git a/lib/class-wp-theme-json-resolver-gutenberg.php b/lib/class-wp-theme-json-resolver-gutenberg.php
@@ -6,6 +6,10 @@
  * @since 5.8.0
  */
 
+if ( class_exists( 'WP_Theme_JSON_Resolver_Gutenberg' ) ) {
+	return;
+}
+
 /**
  * Class that abstracts the processing of the different data sources
  * for site-level config and offers an API to work with them.

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -122,7 +122,6 @@
 			</property>
 			<property name="classesWhiteList" type="array">
 				<element value="/^Gutenberg.+/"/>
-				<element value="/^WP_.+_Gutenberg$/"/>
 			</property>
 		</properties>
 	</rule>