diff --git a/Magento/Sniffs/Legacy/MageEntitySniff.php b/Magento/Sniffs/Legacy/MageEntitySniff.php
index 6750eec5..e0db60a8 100644
--- a/Magento/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento/Sniffs/Legacy/MageEntitySniff.php
@@ -13,11 +13,11 @@
  */
 class MageEntitySniff implements Sniff
 {
-   /**
-    * String representation of error.
-    *
-    * @var string
-    */
+    /**
+     * String representation of error.
+     *
+     * @var string
+     */
     protected $errorMessage = 'Possible Magento 2 design violation. Detected typical Magento 1.x construction "%s".';
 
     /**
diff --git a/Magento/Sniffs/Security/IncludeFileSniff.php b/Magento/Sniffs/Security/IncludeFileSniff.php
index 28b768ea..0673f598 100644
--- a/Magento/Sniffs/Security/IncludeFileSniff.php
+++ b/Magento/Sniffs/Security/IncludeFileSniff.php
@@ -14,11 +14,11 @@
  */
 class IncludeFileSniff implements Sniff
 {
-   /**
-    * Warning violation code.
-    *
-    * @var string
-    */
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
     protected $warningCode = 'FoundIncludeFile';
 
     /**
@@ -93,7 +93,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($hasVariable) {
             $message .= ' Variables inside are insecure.';
         }
-        $phpcsFile->addWarning(
+        $phpcsFile->addError(
             $message,
             $stackPtr,
             $this->warningCode,
diff --git a/Magento/Tests/Security/IncludeFileUnitTest.php b/Magento/Tests/Security/IncludeFileUnitTest.php
index 254dc842..40153cf5 100644
--- a/Magento/Tests/Security/IncludeFileUnitTest.php
+++ b/Magento/Tests/Security/IncludeFileUnitTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
@@ -16,14 +17,6 @@ class IncludeFileUnitTest extends AbstractSniffUnitTest
      * @inheritdoc
      */
     public function getErrorList()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList()
     {
         return [
             3 => 1,
@@ -42,4 +35,12 @@ public function getWarningList()
             34 => 1,
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
 }
diff --git a/Magento/ruleset.xml b/Magento/ruleset.xml
index e85c2930..91f4c72f 100644
--- a/Magento/ruleset.xml
+++ b/Magento/ruleset.xml
@@ -5,197 +5,398 @@
     <!-- File extensions to be checked. -->
     <arg name="extensions" value="php,phtml"/>
 
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax">
-        <severity>8</severity>
-        <type>warning</type>
+    <!-- Severity 10 errors: Critical code issues. -->
+    <rule ref="Generic.Functions.CallTimePassByReference">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.Classes.DuplicateClassName">
-        <severity>8</severity>
+    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*.phtml</exclude-pattern>
     </rule>
-    <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop">
-        <severity>6</severity>
+    <rule ref="Generic.PHP.DeprecatedFunctions">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall">
-        <severity>6</severity>
+    <rule ref="Generic.PHP.NoSilencedErrors">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.CodeAnalysis.JumbledIncrementer">
-        <severity>8</severity>
+    <rule ref="Generic.PHP.Syntax">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement">
-        <severity>6</severity>
+    <rule ref="Magento.Legacy.MageEntity">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter">
-        <severity>6</severity>
+    <rule ref="Magento.NamingConvention.ReservedWords">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod">
-        <severity>6</severity>
+    <rule ref="Magento.PHP.FinalImplementation">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.Functions.CallTimePassByReference">
+    <rule ref="Magento.PHP.Goto">
         <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.Metrics.CyclomaticComplexity">
-        <severity>8</severity>
-        <type>warning</type>
+    <rule ref="Magento.PHP.ReturnValueCheck">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.Metrics.NestingLevel">
-        <severity>8</severity>
+    <rule ref="Magento.Security.IncludeFile">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
+    <rule ref="Magento.Security.LanguageConstruct">
         <severity>10</severity>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.PHP.DeprecatedFunctions">
+    <rule ref="Magento.Security.Superglobal.SuperglobalUsageError">
         <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.PHP.NoSilencedErrors.Discouraged">
-        <severity>8</severity>
+    <rule ref="Magento.Strings.ExecutableRegEx">
+        <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Generic.PHP.Syntax">
+    <rule ref="PSR1.Classes.ClassDeclaration">
         <severity>10</severity>
+        <type>error</type>
     </rule>
-    <rule ref="Magento.Annotation">
-        <severity>6</severity>
+    <rule ref="PSR2.Files.ClosingTag">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.PHP.Eval">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+
+    <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
+    <rule ref="Generic.Files.ByteOrderMark">
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento.PHP.DateTime">
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento.PHP.DiscouragedFunction">
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento.Security.Superglobal.SuperglobalUsageWarning">
+        <severity>9</severity>
+        <type>warning</type>
     </rule>
+    <rule ref="Magento.Security.XssTemplate">
+        <include-pattern>*.phtml</include-pattern>
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.PHP.NonExecutableCode">
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
+
+    <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
     <rule ref="Magento.Classes.ObjectInstantiation">
         <severity>8</severity>
+        <type>warning</type>
     </rule>
     <rule ref="Magento.Classes.ObjectManager">
         <severity>8</severity>
-    </rule>
-    <rule ref="Magento.CodeAnalysis.EmptyBlock">
-        <severity>8</severity>
         <type>warning</type>
     </rule>
     <rule ref="Magento.Exceptions.DirectThrow">
         <severity>8</severity>
-    </rule>
-    <rule ref="Magento.Exceptions.Namespace">
-        <severity>8</severity>
+        <type>warning</type>
     </rule>
     <rule ref="Magento.Functions.StaticFunction">
-        <severity>6</severity>
+        <severity>8</severity>
+        <type>warning</type>
     </rule>
     <rule ref="Magento.Files.LineLength">
         <properties>
             <property name="lineLimit" value="120"/>
             <property name="absoluteLineLimit" value="120"/>
         </properties>
+        <severity>8</severity>
         <type>warning</type>
-        <severity>6</severity>
-    </rule>
-    <rule ref="Magento.Legacy.MageEntity">
-        <severity>10</severity>
     </rule>
     <rule ref="Magento.NamingConvention.InterfaceName">
-        <severity>6</severity>
+        <severity>8</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.NamingConvention.ReservedWords">
-        <severity>10</severity>
+    <rule ref="Magento.PHP.ShortEchoSyntax">
+        <severity>8</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.DateTime">
-        <severity>6</severity>
+    <rule ref="Magento.Templates.ThisInTemplate">
+        <include-pattern>*.phtml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.DiscouragedFunction">
+    <rule ref="Magento.Translation.ConstantUsage">
         <severity>8</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.FinalImplementation">
-        <severity>10</severity>
+
+    <!-- Severity 7 warnings: General code issues. -->
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.Goto">
-        <severity>10</severity>
+    <rule ref="Generic.Classes.DuplicateClassName">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.LiteralNamespaces">
-        <severity>8</severity>
+    <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.ReturnValueCheck">
-        <severity>10</severity>
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.PHP.ShortEchoSyntax">
-        <severity>8</severity>
+    <rule ref="Generic.CodeAnalysis.JumbledIncrementer">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.Metrics.CyclomaticComplexity">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.Metrics.NestingLevel">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.PHP.DisallowShortOpenTag">
+        <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>
+    </rule>
+    <rule ref="Magento.Exceptions.Namespace">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento.PHP.LiteralNamespaces">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
     <rule ref="Magento.PHP.Var">
-        <severity>8</severity>
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
     <rule ref="Magento.Performance.EmptyCheck">
-        <severity>8</severity>
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Security.IncludeFile">
-        <severity>8</severity>
+    <rule ref="Magento.Strings.StringConcat">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Security.LanguageConstruct">
-        <severity>10</severity>
+    <rule ref="PEAR.Functions.ValidDefaultValue">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Security.Superglobal.SuperglobalUsageError">
-        <severity>10</severity>
+    <rule ref="Squiz.Functions.GlobalFunction">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Security.Superglobal.SuperglobalUsageWarning">
-        <severity>8</severity>
+    <rule ref="Squiz.Operators.IncrementDecrementUsage">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Security.XssTemplate">
-        <include-pattern>*.phtml</include-pattern>
-        <severity>8</severity>
+    <rule ref="Squiz.PHP.GlobalKeyword">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Strings.ExecutableRegEx">
-        <severity>10</severity>
+    <rule ref="Squiz.Scope.MemberVarScope">
+        <severity>7</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Strings.StringConcat">
-        <severity>8</severity>
+
+    <!-- Severity 6 warnings: Code style issues. -->
+    <rule ref="Generic.ControlStructures.InlineControlStructure">
+        <severity>6</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Templates.ThisInTemplate">
-        <include-pattern>*.phtml</include-pattern>
+    <rule ref="Generic.Files.LineEndings">
         <severity>6</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Translation.ConstantUsage">
+    <rule ref="Generic.Formatting.DisallowMultipleStatements">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.Functions.FunctionCallArgumentSpacing">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.NamingConventions.UpperCaseConstantName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.PHP.LowerCaseConstant">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.PHP.LowerCaseKeyword">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.WhiteSpace.DisallowTabIndent">
+        <severity>6</severity>
+        <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>
+    <rule ref="Magento.Whitespace.EmptyLineMissed">
         <severity>6</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Magento.Whitespace">
+    <rule ref="Magento.Whitespace.MultipleEmptyLines">
         <severity>6</severity>
+        <type>warning</type>
     </rule>
     <rule ref="PEAR.ControlStructures.ControlSignature">
         <severity>6</severity>
         <type>warning</type>
     </rule>
-    <rule ref="PSR2">
-        <severity>8</severity>
+    <rule ref="PSR1.Files.SideEffects">
+        <severity>6</severity>
         <type>warning</type>
-        <exclude name="Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose"/>
-        <exclude name="Generic.Files.LineLength"/>
     </rule>
-    <rule ref="PSR1.Classes.ClassDeclaration">
-        <severity>10</severity>
-        <type>error</type>
+    <rule ref="PSR1.Methods.CamelCapsMethodName">
+        <severity>6</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="PSR2.Files.ClosingTag">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+    <rule ref="PSR2.Classes.ClassDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Squiz.Commenting.DocCommentAlignment">
+    <rule ref="PSR2.Classes.PropertyDeclaration">
         <severity>6</severity>
         <type>warning</type>
+        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
     </rule>
-    <rule ref="Squiz.Operators.IncrementDecrementUsage">
+    <rule ref="PSR2.ControlStructures.ControlStructureSpacing">
         <severity>6</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Squiz.PHP.CommentedOutCode">
+    <rule ref="PSR2.ControlStructures.ElseIfDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PSR2.ControlStructures.SwitchDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PSR2.Files.EndFileNewline">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PSR2.Methods.FunctionCallSignature">
+        <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>
+    </rule>
+    <rule ref="PSR2.Methods.MethodDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+    </rule>
+    <rule ref="PSR2.Namespaces.NamespaceDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PSR2.Namespaces.UseDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Classes.ValidClassName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.ControlStructures.ControlSignature">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration">
+        <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>
+    </rule>
+    <rule ref="Squiz.ControlStructures.LowercaseDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Functions.FunctionDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
         <severity>6</severity>
+        <type>warning</type>
         <properties>
-            <property name="maxPercentage" value="70"/>
+            <property name="equalsSpacing" value="1"/>
         </properties>
     </rule>
-    <rule ref="Squiz.PHP.Eval.Discouraged">
-        <severity>10</severity>
-        <type>error</type>
+    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
+        <severity>0</severity>
     </rule>
-    <rule ref="Squiz.PHP.GlobalKeyword">
-        <severity>8</severity>
+    <rule ref="Squiz.Functions.LowercaseFunctionKeywords">
+        <severity>6</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Squiz.PHP.NonExecutableCode">
+    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration">
         <severity>6</severity>
+        <type>warning</type>
     </rule>
-    <rule ref="Squiz.Scope.MemberVarScope">
+    <rule ref="Squiz.Scope.MethodScope">
         <severity>6</severity>
         <type>warning</type>
     </rule>
@@ -207,7 +408,45 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Squiz.Functions.GlobalFunction">
-        <severity>8</severity>
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing">
+        <severity>6</severity>
+        <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">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Commenting.DocCommentAlignment">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.PHP.CommentedOutCode">
+        <properties>
+            <property name="maxPercentage" value="70"/>
+        </properties>
+        <severity>5</severity>
+        <type>warning</type>
     </rule>
 </ruleset>