Merge pull request #1802 from WordPress/feature/move-one-object-per-c…

…lass-to-core OneObjectStructurePerFile: move from `Extra` to `Core`
WordPress · Apr 12, 2021 · 41f5a9c · 41f5a9c
2 parents 2483567 + 88c5608
commit 41f5a9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
@@ -517,6 +517,12 @@
 		<severity>0</severity>
 	</rule>
 
+	<!-- Encourage having only one class/interface/trait per file.
+		 Moved from Extra to Core after discussion on Slack. -->
+	<rule ref="Generic.Files.OneObjectStructurePerFile">
+		<message>Best practices: Declare only one class/interface/trait in a file.</message>
+	</rule>
+
 	<!--
 	#############################################################################
 	Not in the coding standard handbook: WP specific sniffs.

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
@@ -56,12 +56,6 @@
 	<!-- https://github.com/WordPress/WordPress-Coding-Standards/pull/382#discussion_r29981655 -->
 	<!--<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>-->
 
-	<!-- Encourage having only one class/interface/trait per file. -->
-	<rule ref="Generic.Files.OneObjectStructurePerFile">
-		<type>warning</type>
-		<message>Best practice suggestion: Declare only one class/interface/trait in a file.</message>
-	</rule>
-
 	<!-- Verify modifier keywords for declared methods and properties in classes.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
 	<rule ref="Squiz.Scope.MethodScope"/>