From c539ed44c3b93284d9bc24e5e58c0271cbaa1d40 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Tue, 17 Sep 2019 09:37:32 +0200
Subject: [PATCH] MC-19366: Fixes order of rules and silences GraphQL field
 name validation

---
 Magento2/ruleset.xml | 49 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 60186f30..9d65e166 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -364,6 +364,30 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.GraphQL.ValidArgumentName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.GraphQL.ValidEnumValue">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.GraphQL.ValidFieldName">
+        <!--
+         * Field name validation deactivated as per request
+         * https://github.com/magento/magento-coding-standard/pull/141#discussion_r323349939
+        -->
+        <severity>0</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.GraphQL.ValidTopLevelFieldName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.GraphQL.ValidTypeName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Magento2.Whitespace.MultipleEmptyLines">
         <severity>6</severity>
         <type>warning</type>
@@ -522,31 +546,6 @@
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
         <severity>0</severity>
     </rule>
-    <rule ref="Magento2.GraphQL.ValidTypeName">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.GraphQL.ValidFieldName">
-        <!--
-         * Field name validation deactivated as per request
-         * https://github.com/magento/magento-coding-standard/pull/141#discussion_r323349939
-        -->
-        <exclude name="Magento2.GraphQL.ValidFieldName" />
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.GraphQL.ValidArgumentName">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.GraphQL.ValidTopLevelFieldName">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.GraphQL.ValidEnumValue">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
 
     <!-- Severity 5 warnings: PHPDoc formatting and commenting issues. -->
     <rule ref="Magento2.Commenting.ClassAndInterfacePHPDocFormatting">