chore: update ruleset and annotations for wpcs 3.0

wpengine · Nov 27, 2023 · 2aedf54 · 2aedf54
1 parent ff4901a
commit 2aedf54
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
@@ -49,6 +49,11 @@
 		<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
 		<!-- This should be excluded upstream in the ruleset-->
 		<exclude name="WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase" />
+		<!-- These maybe should be added back later -->
+		<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
+		<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification" />
+		<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
+		<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint" />
 	</rule>
 
 	<!-- Individual rule configuration -->
@@ -65,19 +70,6 @@
 		</properties>
 	</rule>
 
-	<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
-		<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
-	</rule>
-
-	<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
-		<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification" />
-	</rule>
-
-	<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
-		<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
-		<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint" />
-	</rule>
-
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<!-- Value: replace the text domain used. -->
@@ -152,4 +144,4 @@
 		<exclude-pattern>/tests/</exclude-pattern>
 	</rule>
 
-</ruleset>
+</ruleset>
diff --git a/includes/Data/ContentBlocksResolver.php b/includes/Data/ContentBlocksResolver.php
@@ -99,7 +99,7 @@ static function ( $parsed_block ) {
 		);
 
 		// Flatten block list here if requested or if 'flat' value is not selected (default)
-		if ( ! isset( $args['flat'] ) || 'true' == $args['flat'] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		if ( ! isset( $args['flat'] ) || 'true' == $args['flat'] ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 			$parsed_blocks = self::flatten_block_list( $parsed_blocks );
 		}
 

diff --git a/includes/WPGraphQLContentBlocks.php b/includes/WPGraphQLContentBlocks.php
@@ -179,8 +179,7 @@ public function init_block_editor_registry( \WPGraphQL\Registry\TypeRegistry $ty
 	 */
 	private function define( string $name, $value ): void {
 		if ( ! defined( $name ) ) {
-			// phpcs:ignore
-			define($name, $value);
+			define( $name, $value ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.VariableConstantNameFound
 		}
 	}
 }