Merge pull request #502 from Automattic/fix/minor-phpcs-ruleset-tweak

CS ruleset: minor tweaks
Automattic · Jul 21, 2020 · f3944e7 · f3944e7
2 parents 8331730 + 74a0ce3
commit f3944e7
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
@@ -16,6 +16,7 @@
 	<rule ref="WordPress-Extra">
 		<exclude name="WordPress.Files.FileName"/>
 		<exclude name="WordPress.NamingConventions.ValidVariableName"/>
+		<exclude name="Generic.Arrays.DisallowShortArraySyntax"/>
 	</rule>
 
 	<rule ref="WordPress-Docs"/>
@@ -34,13 +35,8 @@
 	<!-- Disallow long array syntax -->
 	<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 
-	<!-- Allow short array syntax -->
-	<rule ref="Generic.Arrays.DisallowShortArraySyntax.Found">
-		<exclude name="Generic.Arrays.DisallowShortArraySyntax.Found"/>
-	</rule>
-
 	<!-- Check code for cross-version PHP compatibility. -->
-	<config name="testVersion" value="5.6-"/>
+	<config name="testVersion" value="5.4-"/>
 	<rule ref="PHPCompatibility">
 		<!-- Exclude PHP constants back-filled by PHPCS. -->
 		<exclude name="PHPCompatibility.PHP.NewConstants.t_finallyFound"/>