Merge pull request #1044 from WordPress-Coding-Standards/WPCS-0.13.0/…

…feature/phpcs-3.x-prep-refactor-arraydeclaration-sniff Remove the `ArrayDeclaration` sniff
WordPress · Jul 22, 2017 · 1c4399f · 1c4399f
2 parents ae0c2b2 + e7d4398
commit 1c4399f
Show file tree

Hide file tree

Showing 13 changed files with 769 additions and 727 deletions.
diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
@@ -46,21 +46,13 @@
 	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
 
 	<!-- Generic array layout check. -->
-	<rule ref="WordPress.Arrays.ArrayDeclaration">
-		<exclude name="WordPress.Arrays.ArrayDeclaration.SingleLineNotAllowed"/>
-		<exclude name="WordPress.Arrays.ArrayDeclaration.CommaAfterLast"/>
-		<exclude name="WordPress.Arrays.ArrayDeclaration.NoSpaceAfterComma"/>
-		<exclude name="WordPress.Arrays.ArrayDeclaration.SpaceAfterComma"/>
-		<exclude name="WordPress.Arrays.ArrayDeclaration.SpaceBeforeComma"/>
-	</rule>
-
-	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
-	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
-
 	<!-- Covers rule: For associative arrays, values should start on a new line.
 		 Also covers various single-line array whitespace issues. -->
 	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing"/>
 
+	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
+	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
+
 	<!-- Covers rule: For switch structures case should indent one tab from the
 	     switch statement and break one tab from the case statement. -->
 	<rule ref="PSR2.ControlStructures.SwitchDeclaration">