Update sniffer rules

Author: tvdijen

phpcs-simplesamlphp.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <ruleset name="SimpleSAMLphp">
-
   <!-- Only allow shorthand array syntax -->
   <rule ref="Generic.Arrays.DisallowLongArraySyntax" />
 
@@ -10,8 +9,17 @@
   <!-- Do not allow unnecessary spaces inside arbitrary parentheses -->
   <rule ref="Generic.WhiteSpace.ArbitraryParenthesesSpacing" />
 
+  <!-- Complain about unresolved merge conflicts -->
+  <rule ref="Generic.VersionControl.GitMergeConflict" />
+
   <config name="installed_paths" value="vendor/slevomat/coding-standard"/>
 
+  <!-- Use fully qualified class names in annotations and PHPdoc -->
+  <rule ref="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation" />
+
+  <!-- Do not allow any grouped use-statements to exist -->
+  <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
+
   <!-- Do not allow any unused use-statements to exist -->
   <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses" />
 
@@ -24,4 +32,48 @@
   <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse" />
   <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration" />
 
+  <!-- Enforce the use of typed constants -->
+  <rule ref="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint" />
+
+  <!-- Require one blank line between different types of use-statements -->
+  <rule ref="SlevomatCodingStandard.Namespaces.UseSpacing">
+    <properties>
+      <property name="linesCountBetweenUseTypes" value="1" />
+    </properties>
+  </rule>
+
+  <!-- Require two blank lines between class members -->
+  <rule ref="SlevomatCodingStandard.Classes.ClassMemberSpacing">
+    <properties>
+      <property name="linesCountBetweenMembers" value="2" />
+    </properties>
+  </rule>
+
+  <!-- Require one blank line between constant declarations -->
+  <rule ref="SlevomatCodingStandard.Classes.ConstantSpacing">
+    <properties>
+      <property name="minLinesCountBeforeWithComment" value="1" />
+      <property name="maxLinesCountBeforeWithComment" value="1" />
+      <property name="minLinesCountBeforeWithoutComment" value="1" />
+      <property name="maxLinesCountBeforeWithoutComment" value="1" />
+    </properties>
+  </rule>
+
+  <!-- Require one blank line between property definitions -->
+  <rule ref="SlevomatCodingStandard.Classes.PropertySpacing">
+    <properties>
+      <property name="minLinesCountBeforeWithComment" value="1" />
+      <property name="maxLinesCountBeforeWithComment" value="1" />
+      <property name="minLinesCountBeforeWithoutComment" value="1" />
+      <property name="maxLinesCountBeforeWithoutComment" value="1" />
+    </properties>
+  </rule>
+
+  <!-- Require two blank lines between method declarations -->
+  <rule ref="SlevomatCodingStandard.Classes.MethodSpacing">
+    <properties>
+      <property name="minLinesCount" value="2" />
+      <property name="maxLinesCount" value="2" />
+    </properties>
+  </rule>
 </ruleset>