REPO-70: [EQP][Sniffs Consolidation] Assign severity to each sniff

- review fixes;
- made it follow PSR2;

Author: lenaorobei

Magento/Sniffs/PHP/DiscouragedFunctionSniff.php

@@ -235,7 +235,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
      *
      * @return void
      */
-    protected function addError($phpcsFile, $stackPtr, $function, $pattern=null)
+    protected function addError($phpcsFile, $stackPtr, $function, $pattern = null)
     {
         $data = [$function];
         $warningMessage = 'The use of function %s() is discouraged';

Magento/Sniffs/Security/XssTemplateSniff.php

@@ -307,7 +307,7 @@ private function findNextInScope($types, $start, $end)
      * @param int|bool $last
      * @return int|bool
      */
-    private function findLastInScope($types, $start, $end, $last=false)
+    private function findLastInScope($types, $start, $end, $last = false)
     {
         $types = (array)$types;
         $nextInScope = $this->findNextInScope($types, $start, $end);

Magento/ruleset.xml

@@ -172,6 +172,9 @@
         <severity>7</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
+        <severity>0</severity>
+    </rule>
     <rule ref="Magento.CodeAnalysis.EmptyBlock">
         <severity>7</severity>
         <type>warning</type>
@@ -263,6 +266,12 @@
         <type>warning</type>
     </rule>
     <rule ref="Generic.WhiteSpace.ScopeIndent">
+        <properties>
+            <property name="ignoreIndentationTokens" type="array">
+                <element value="T_COMMENT"/>
+                <element value="T_DOC_COMMENT_OPEN_TAG"/>
+            </property>
+        </properties>
         <severity>6</severity>
         <type>warning</type>
     </rule>
@@ -314,6 +323,12 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="PSR2.Methods.FunctionCallSignature.SpaceAfterCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PSR2.Methods.FunctionCallSignature.OpeningIndent">
+        <severity>0</severity>
+    </rule>
     <rule ref="PSR2.Methods.FunctionClosingBrace">
         <severity>6</severity>
         <type>warning</type>
@@ -342,6 +357,9 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.AsNotLower">
+        <severity>0</severity>
+    </rule>
     <rule ref="Squiz.ControlStructures.ForLoopDeclaration">
         <severity>6</severity>
         <type>warning</type>
@@ -357,6 +375,12 @@
     <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
         <severity>6</severity>
         <type>warning</type>
+        <properties>
+            <property name="equalsSpacing" value="1"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
+        <severity>0</severity>
     </rule>
     <rule ref="Squiz.Functions.LowercaseFunctionKeywords">
         <severity>6</severity>
@@ -383,9 +407,21 @@
         <type>warning</type>
     </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="true"/>
+        </properties>
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
+        <severity>0</severity>
+    </rule>
 
     <!-- Severity 5 warnings: PHPDoc formatting and commenting issues. -->
     <rule ref="Magento.Annotation">