Remove IfElseDeclaration sniff in favour of similar from PHPCSExtra

Yoast · Nov 3, 2023 · 06485bf · 06485bf
1 parent dbf537a
commit 06485bf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 280 deletions.
diff --git a/Yoast/Docs/ControlStructures/IfElseDeclarationStandard.xml b/Yoast/Docs/ControlStructures/IfElseDeclarationStandard.xml
diff --git a/Yoast/Sniffs/ControlStructures/IfElseDeclarationSniff.php b/Yoast/Sniffs/ControlStructures/IfElseDeclarationSniff.php
diff --git a/Yoast/Tests/ControlStructures/IfElseDeclarationUnitTest.inc b/Yoast/Tests/ControlStructures/IfElseDeclarationUnitTest.inc
diff --git a/Yoast/Tests/ControlStructures/IfElseDeclarationUnitTest.php b/Yoast/Tests/ControlStructures/IfElseDeclarationUnitTest.php
diff --git a/Yoast/ruleset.xml b/Yoast/ruleset.xml
@@ -138,6 +138,10 @@
 	These may make it into WPCS at some point. If so, they can be removed here.
 	#############################################################################
 	-->
+
+	<!-- Demand that "else(if)" is on a new line after the scope closer of the preceding if. -->
+	<rule ref="Universal.ControlStructures.IfElseDeclaration"/>
+
 	<!-- Error prevention: Make sure the condition in a inline if declaration is bracketed. -->
 	<rule ref="Squiz.ControlStructures.InlineIfDeclaration"/>