From f7c47a0ce9a8923e0f950a66ecc2eb7f45c128d5 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sun, 18 Aug 2019 12:03:42 +0200
Subject: [PATCH 001/630] No longer require a space before a colon for control
 structures using the alternative syntax

---
 Magento2/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index df66ac69..30fde861 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -431,6 +431,9 @@
     <rule ref="Squiz.ControlStructures.ControlSignature">
         <severity>6</severity>
         <type>warning</type>
+        <properties>
+            <property name="requiredSpacesBeforeColon" value="0"/>
+        </properties>
     </rule>
     <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
         <exclude-pattern>*.phtml</exclude-pattern>

From 13ceb9af4bdccb9caeef5136cdd406e99623f75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stjepan=20Udovi=C4=8Di=C4=87?= <udovicic.stjepan@gmail.com>
Date: Thu, 22 Aug 2019 20:04:14 +0200
Subject: [PATCH 002/630] implement rule from #131

---
 ...ClassAndInterfacePHPDocFormattingSniff.php |  9 +++
 .../ConstantsPHPDocFormattingSniff.php        |  9 +++
 .../Commenting/PHPDocFormattingValidator.php  | 50 ++++++++++++++++
 ...AndInterfacePHPDocFormattingUnitTest.1.inc | 57 +++++++++++++++++-
 ...AndInterfacePHPDocFormattingUnitTest.2.inc | 58 ++++++++++++++++++-
 ...ssAndInterfacePHPDocFormattingUnitTest.php |  6 +-
 .../ConstantsPHPDocFormattingUnitTest.1.inc   | 12 ++++
 .../ConstantsPHPDocFormattingUnitTest.2.inc   | 45 ++++++++++++++
 .../ConstantsPHPDocFormattingUnitTest.php     | 16 +++--
 9 files changed, 254 insertions(+), 8 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index e3ed49b8..6eecabed 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -87,6 +87,15 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
+        if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) {
+            $phpcsFile->addWarning(
+                'Motivation behind the added @deprecated tag MUST be explained. '
+                    . '@see tag MUST be used with reference to new implementation.',
+                $stackPtr,
+                'InvalidDeprecatedTagUsage'
+            );
+        }
+
         $this->validateTags($phpcsFile, $commentStartPtr, $tokens);
     }
 
diff --git a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
index 205dcdf9..d922d050 100644
--- a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
@@ -71,5 +71,14 @@ public function process(File $phpcsFile, $stackPtr)
                 'MissingConstantPHPDoc'
             );
         }
+
+        if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) {
+            $phpcsFile->addWarning(
+                'Motivation behind the added @deprecated tag MUST be explained. '
+                    . '@see tag MUST be used with reference to new implementation.',
+                $stackPtr,
+                'InvalidDeprecatedTagUsage'
+            );
+        }
     }
 }
diff --git a/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php b/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
index 4112f675..241a2dc9 100644
--- a/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
@@ -71,4 +71,54 @@ public function providesMeaning($namePtr, $commentStartPtr, $tokens)
 
         return false;
     }
+
+    /**
+     * In case comment has deprecated tag, it must be explained and followed by see tag with details
+     *
+     * @param int $commentStartPtr
+     * @param array $tokens
+     * @return bool
+     */
+    public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
+    {
+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
+
+        $hasDeprecated = false;
+        $hasSee = false;
+
+        for ($i = $commentStartPtr; $i <= $commentCloserPtr; $i++) {
+            $token = $tokens[$i];
+
+            // Not interesting
+            if ($token['code'] !== T_DOC_COMMENT_TAG) {
+                continue;
+            }
+
+            $tag = $token['content'];
+
+            // Not an interesting tag
+            if ($tag !== '@deprecated' && $tag !== '@see') {
+                continue;
+            }
+
+            if ($tag === '@deprecated') {
+                $hasDeprecated = true;
+            }
+
+            if ($tag === '@see') {
+                $hasSee = true;
+            }
+
+            // Tag not followed by description
+            if ($tokens[$i + 2]['code'] !== T_DOC_COMMENT_STRING) {
+                return false;
+            }
+        }
+
+        if ($hasDeprecated === true && $hasSee !== true) {
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index 81cfa9bc..bf47ae48 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -59,6 +59,7 @@ class EmptyHandler
  *
  * @api is ok here
  * @deprecated can be used in this context
+ * @see is ok here
  * @author is actually ok
  * @category is irrelevant
  * @package is not ment to be used
@@ -90,4 +91,58 @@ class AsyncApiHandler
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GroupRepositoryHandler
-{}
+{
+
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ */
+class AncientHandler
+{
+
+}
+
+/**
+ * @deprecated
+ * @see
+ */
+class AgedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see
+ */
+class ArhaicHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see Magento\Framework\NewHandler
+ */
+class OldHandler
+{
+
+}
+
+/**
+ * @see Magento\Framework\NewHandler
+ */
+interface SomethingHandler
+{
+
+}
+
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
index 7a9c9b6a..75e7bbc3 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
@@ -59,6 +59,7 @@ interface EmptyHandler
  *
  * @api is ok here
  * @deprecated can be used in this context
+ * @see is ok here
  * @author is actually ok
  * @category is irrelevant
  * @package is not ment to be used
@@ -89,5 +90,58 @@ interface AsyncApiHandler
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class GroupRepositoryHandler
-{}
+interface GroupRepositoryHandler
+{
+
+}
+
+/**
+ * @deprecated
+ */
+interface DeprecatedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ */
+interface AncientHandler
+{
+
+}
+
+/**
+ * @deprecated
+ * @see
+ */
+interface AgedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see
+ */
+interface ArhaicHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see Magento\Framework\NewHandler
+ */
+interface OldHandler
+{
+
+}
+
+/**
+ * @see Magento\Framework\NewHandler
+ */
+interface SomethingHandler
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
index 477c1adf..9e7bfde2 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
@@ -29,9 +29,13 @@ public function getWarningList($testFile = '')
             35 => 1,
             44 => 1,
             52 => 1,
-            63 => 1,
             64 => 1,
             65 => 1,
+            66 => 1,
+            101 => 1,
+            109 => 1,
+            118 => 1,
+            127 => 1,
         ];
     }
 }
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
index e3d2000a..f0e8b474 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
@@ -7,6 +7,12 @@ define('DS', DIRECTORY_SEPARATOR);
 
 define('BP', dirname(__FILE__));
 
+/**
+ * @deprecated New implementation available
+ * @see \Ascii\Asterisk
+ */
+define('ANSWER', '42');
+
 class Profiler
 {
     const NESTING_SEPARATOR = '->';
@@ -15,4 +21,10 @@ class Profiler
      * Unlike first const, this one is not self explanatory.
      */
     const NUMBER_TWO = 2;
+
+    /**
+     * @deprecated Unable to identify the question, replaced
+     * @see \ComputationalMatrix\Earth
+     */
+    const COMPUTER = 'Deep Thought';
 }
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
index c4189ff1..924fe1e6 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Nesting separator.
  */
@@ -7,6 +8,28 @@ define("NESTING_SEPARATOR", '->0');
 /**  */
 define('NUMBER_ONE', 1);
 
+/**
+ * @deprecated
+ */
+define('A', 65);
+
+/**
+ * @deprecated Slightly better, but no see tag
+ */
+define('B', 66);
+
+/**
+ * @deprecated
+ * @see
+ */
+define('C', 67);
+
+/**
+ * @deprecated No reference specified
+ * @see
+ */
+define('D', 68);
+
 class Profiler
 {
     /**
@@ -18,4 +41,26 @@ class Profiler
      *
      */
     const NUMBER_TWO = 2;
+
+    /**
+     * @deprecated
+     */
+    const a = 97;
+
+    /**
+     * @deprecated Slightly better, but no see tag
+     */
+    const b = 98;
+
+    /**
+     * @deprecated
+     * @see
+     */
+    const c = 99;
+
+    /**
+     * @deprecated No reference specified
+     * @see
+     */
+    const d = 100;
 }
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
index aa475c3d..ef6cc85d 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
@@ -27,10 +27,18 @@ public function getWarningList($testFile = '')
         }
 
         return [
-            5 => 1,
-            8 => 1,
-            15 => 1,
-            20 => 1
+            6 => 1,
+            9 => 1,
+            14 => 1,
+            19 => 1,
+            25 => 1,
+            31 => 1,
+            38 => 1,
+            43 => 1,
+            48 => 1,
+            53 => 1,
+            59 => 1,
+            65 => 1
         ];
     }
 }

From 5465546122ced493b449bf57160d5c8be03329fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stjepan=20Udovi=C4=8Di=C4=87?= <udovicic.stjepan@gmail.com>
Date: Sat, 24 Aug 2019 10:47:54 +0200
Subject: [PATCH 003/630] Refactor PHPDoc search

---
 ...ClassAndInterfacePHPDocFormattingSniff.php | 19 ++--------
 .../ConstantsPHPDocFormattingSniff.php        |  4 +--
 .../Commenting/PHPDocFormattingValidator.php  | 36 +++++++++++++++++++
 .../ConstantsPHPDocFormattingUnitTest.3.inc   |  9 +++++
 .../ConstantsPHPDocFormattingUnitTest.php     |  2 +-
 5 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.3.inc

diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index e3ed49b8..d890147d 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -56,23 +56,8 @@ public function process(File $phpcsFile, $stackPtr)
 
         $namePtr = $phpcsFile->findNext(T_STRING, $stackPtr + 1, null, false, null, true);
 
-        $commentStartPtr = $phpcsFile->findPrevious(
-            [
-                T_WHITESPACE,
-                T_DOC_COMMENT_STAR,
-                T_DOC_COMMENT_WHITESPACE,
-                T_DOC_COMMENT_TAG,
-                T_DOC_COMMENT_STRING,
-                T_DOC_COMMENT_CLOSE_TAG
-            ],
-            $stackPtr - 1,
-            null,
-            true,
-            null,
-            true
-        );
-
-        if ($tokens[$commentStartPtr]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
+        $commentStartPtr = $this->PHPDocFormattingValidator->findPHPDoc($stackPtr, $phpcsFile);
+        if ($commentStartPtr === -1) {
             return;
         }
 
diff --git a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
index 205dcdf9..a4b9e71b 100644
--- a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
@@ -59,8 +59,8 @@ public function process(File $phpcsFile, $stackPtr)
             true
         );
 
-        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, null, false, null, true);
-        if ($commentStartPtr === false) {
+        $commentStartPtr = $this->PHPDocFormattingValidator->findPHPDoc($stackPtr, $phpcsFile);
+        if ($commentStartPtr === -1) {
             return;
         }
 
diff --git a/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php b/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
index 4112f675..5be093ae 100644
--- a/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
@@ -6,11 +6,47 @@
  */
 namespace Magento2\Sniffs\Commenting;
 
+use PHP_CodeSniffer\Files\File;
+
 /**
  * Helper class for common DocBlock validations
  */
 class PHPDocFormattingValidator
 {
+    /**
+     * Finds matching PHPDoc for current pointer
+     *
+     * @param int $startPtr
+     * @param File $phpcsFile
+     * @return int
+     */
+    public function findPHPDoc($startPtr, $phpcsFile)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $commentStartPtr = $phpcsFile->findPrevious(
+            [
+                T_WHITESPACE,
+                T_DOC_COMMENT_STAR,
+                T_DOC_COMMENT_WHITESPACE,
+                T_DOC_COMMENT_TAG,
+                T_DOC_COMMENT_STRING,
+                T_DOC_COMMENT_CLOSE_TAG
+            ],
+            $startPtr - 1,
+            null,
+            true,
+            null,
+            true
+        );
+
+        if ($tokens[$commentStartPtr]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
+            return -1;
+        }
+
+        return $commentStartPtr;
+    }
+
     /**
      * Determines if the comment identified by $commentStartPtr provides additional meaning to origin at $namePtr
      *
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.3.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.3.inc
new file mode 100644
index 00000000..ba6686ef
--- /dev/null
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.3.inc
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * Profiler
+ */
+class Profiler
+{
+    const PROFILER = true;
+}
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
index aa475c3d..612a3948 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
@@ -22,7 +22,7 @@ public function getErrorList()
      */
     public function getWarningList($testFile = '')
     {
-        if ($testFile === 'ConstantsPHPDocFormattingUnitTest.1.inc') {
+        if ($testFile !== 'ConstantsPHPDocFormattingUnitTest.2.inc') {
             return [];
         }
 

From d9c49242af6fd80268c4129e57d5c22509d2c15a Mon Sep 17 00:00:00 2001
From: konarshankar07 <konar.shankar2013@gmail.com>
Date: Sat, 31 Aug 2019 14:47:25 +0530
Subject: [PATCH 004/630] test folder is excluded from the coding standard
 rules

---
 Magento2/ruleset.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 30fde861..246b6fe1 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -35,6 +35,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Legacy.MageEntity">
         <severity>10</severity>
@@ -64,6 +65,7 @@
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.InsecureFunction">
         <severity>10</severity>
@@ -84,6 +86,7 @@
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Strings.ExecutableRegEx">
         <severity>10</severity>
@@ -116,6 +119,7 @@
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.XssTemplate">
         <include-pattern>*.phtml</include-pattern>
@@ -130,6 +134,7 @@
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Squiz.PHP.NonExecutableCode">
         <severity>9</severity>
@@ -148,6 +153,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Exceptions.ThrowCatch">
         <severity>8</severity>
@@ -160,6 +166,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Functions.DiscouragedFunction">
         <severity>8</severity>
@@ -169,6 +176,7 @@
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Functions.StaticFunction">
         <severity>8</severity>
@@ -179,6 +187,7 @@
         <exclude-pattern>*/Setup/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.NamingConvention.InterfaceName">
         <severity>8</severity>
@@ -245,6 +254,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.LiteralNamespaces">
         <severity>7</severity>
@@ -253,6 +263,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.Var">
         <severity>7</severity>
@@ -277,6 +288,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Squiz.Operators.IncrementDecrementUsage">
         <severity>7</severity>
@@ -294,6 +306,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Squiz.Scope.MemberVarScope">
         <severity>7</severity>
@@ -367,6 +380,7 @@
         <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="PSR1.Methods.CamelCapsMethodName">
         <severity>6</severity>

From ba0bbce3e893c1c1854edb3736a571218ed73cd9 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 6 Sep 2019 16:52:27 +0200
Subject: [PATCH 005/630] MC-19366: Adds a tokenizer for GraphQL schema files

---
 Magento2/ruleset.xml                   |  6 ++-
 PHP_CodeSniffer/Tokenizers/GraphQL.php | 52 ++++++++++++++++++++++++++
 composer.json                          |  5 +++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 PHP_CodeSniffer/Tokenizers/GraphQL.php

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 246b6fe1..adda516c 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -3,7 +3,7 @@
     <description>Magento Coding Standard</description>
 
     <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml"/>
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.Functions.CallTimePassByReference">
@@ -522,6 +522,10 @@
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
         <severity>0</severity>
     </rule>
+    <rule ref="Magento2.GraphQL.ValidTypeName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 5 warnings: PHPDoc formatting and commenting issues. -->
     <rule ref="Magento2.Commenting.ClassAndInterfacePHPDocFormatting">
diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GraphQL.php
new file mode 100644
index 00000000..2b66e3a0
--- /dev/null
+++ b/PHP_CodeSniffer/Tokenizers/GraphQL.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace PHP_CodeSniffer\Tokenizers;
+
+use PHP_CodeSniffer\Config;
+
+/**
+ * Implements a tokenizer for GraphQL files.
+ */
+class GraphQL extends JS
+{
+
+    protected $additionalTokenValues = [
+        'type'      => 'T_CLASS',
+        'interface' => 'T_CLASS',
+        'enum'      => 'T_CLASS',
+        '#'         => 'T_COMMENT',
+    ];
+
+    /**
+     * Constructor.
+     *
+     * @param string $content
+     * @param Config $config
+     * @param string $eolChar
+     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException
+     */
+    public function __construct($content, Config $config, $eolChar = '\n')
+    {
+        //add our token values
+        $this->tokenValues = array_merge(
+            $this->tokenValues,
+            $this->additionalTokenValues
+        );
+
+        //let parent do its job (which will start tokenizing)
+        parent::__construct($content, $config, $eolChar);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function processAdditional()
+    {
+        //NOP Does nothing intentionally
+    }
+
+}
diff --git a/composer.json b/composer.json
index d67474e9..a3684c36 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,11 @@
     "require-dev": {
         "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
+    "autoload": {
+        "classmap": [
+            "PHP_CodeSniffer/Tokenizers/"
+        ]
+    },
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..",
         "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../.."

From 6003dcd0a79f0a49cb3bb152ab4939f80aa2f3bc Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 6 Sep 2019 16:59:17 +0200
Subject: [PATCH 006/630] MC-19366: Adds sniff for type names

---
 .../Sniffs/GraphQL/ValidTypeNameSniff.php     | 32 ++++++++
 .../GraphQL/ValidTypeNameUnitTest.graphqls    | 44 +++++++++++
 .../Tests/GraphQL/ValidTypeNameUnitTest.php   | 77 +++++++++++++++++++
 3 files changed, 153 insertions(+)
 create mode 100644 Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
 create mode 100644 Magento2/Tests/GraphQL/ValidTypeNameUnitTest.graphqls
 create mode 100644 Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php

diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
new file mode 100644
index 00000000..76af7b7d
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\GraphQL;
+
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff;
+
+/**
+ * Detects types (<kbd>type</kbd>, <kbd>interface</kbd> and <kbd>enum</kbd>) that are not specified in
+ * <kbd>UpperCamelCase</kbd>.
+ */
+class ValidTypeNameSniff extends ValidClassNameSniff
+{
+
+    /**
+     * Defines the tokenizers that this sniff is using.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = ['GraphQL'];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_CLASS];
+    }
+
+}
diff --git a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.graphqls
new file mode 100644
index 00000000..1fba0386
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.graphqls
@@ -0,0 +1,44 @@
+# Valid type names.
+type ValidCamelCaseType {}
+interface ValidCamelCaseInterface {}
+enum ValidCamelCaseEnum {}
+
+# Incorrect usage of camel case.
+type invalidCamelCaseType {}
+type Invalid_Camel_Case_Type_With_Underscores {}
+interface invalidCamelCaseInterface {}
+interface Invalid_Camel_Case_Interface_With_Underscores {}
+enum invalidCamelCaseEnum {}
+enum Invalid_Camel_Case_Enum_With_Underscores {}
+
+# All lowercase
+type invalidlowercasetype {}
+interface invalidlowercaseinterface {}
+enum invalidlowercaseenum {}
+
+# All uppercase
+type VALIDUPPERCASETYPE {}
+type INVALID_UPPERCASE_TYPE_WITH_UNDERSCORES {}
+interface VALIDUPPERCASEINTERFACE {}
+interface INVALID_UPPERCASE_INTERFACE_WITH_UNDERSCORES {}
+enum VALIDUPPERCASECENUM {}
+enum INVALID_UPPERCASE_ENUM_WITH_UNDERSCORES {}
+
+# Mix camel case with uppercase
+type ValidCamelCaseTypeWITHUPPERCASE {}
+interface ValidCamelCaseInterfaceWITHUPPERCASE {}
+enum ValidCamelCaseEnumWITHUPPERCASE {}
+
+# Usage of numeric characters
+type ValidCamelCaseTypeWith1Number {}
+type ValidCamelCaseTypeWith12345Numbers {}
+type 5InvalidCamelCaseTypeStartingWithNumber {}
+type ValidCamelCaseTypeEndingWithNumber4 {}
+interface ValidCamelCaseInterfaceWith1Number {}
+interface ValidCamelCaseInterfaceWith12345Numbers {}
+interface 5InvalidCamelCaseInterfaceStartingWithNumber {}
+interface ValidCamelCaseInterfaceEndingWithNumber4 {}
+enum ValidCamelCaseEnumWith1Number {}
+enum ValidCamelCaseEnumWith12345Numbers {}
+enum 5InvalidCamelCaseEnumStartingWithNumber {}
+enum ValidCamelCaseEnumEndingWithNumber4 {}
\ No newline at end of file
diff --git a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
new file mode 100644
index 00000000..0e07c91d
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\GraphQL;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Covers {@link \agento2\Sniffs\GraphQL\ValidTypeNameSniff}.
+ */
+class ValidTypeNameUnitTest extends AbstractSniffUnitTest
+{
+
+    protected function setUp()
+    {
+        //let parent do its job
+        parent::setUp();
+
+        //generate a config that allows ro use our GraphQL tokenizer
+        $config = new Config();
+        $config->extensions = array_merge(
+            $config->extensions,
+            [
+                'graphqls' => 'GraphQL'
+            ]
+        );
+
+        //and write back to a global that is used in base class
+        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
+    }
+
+    /**
+     * Returns the lines where errors should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of errors that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    protected function getErrorList()
+    {
+        return [
+            7 => 1,
+            8 => 1,
+            9 => 1,
+            10 => 1,
+            11 => 1,
+            12 => 1,
+            15 => 1,
+            16 => 1,
+            17 => 1,
+            21 => 1,
+            23 => 1,
+            25 => 1,
+            35 => 1,
+            39 => 1,
+            43 => 1,
+        ];
+    }
+
+    /**
+     * Returns the lines where warnings should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of warnings that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    protected function getWarningList()
+    {
+        return [];
+    }
+}
+

From 8cb90c89e32224b641beed3c42493be61174f836 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Mon, 9 Sep 2019 17:06:02 +0200
Subject: [PATCH 007/630] MC-19366: Improves GraphQL tokenizer by making use of
 webonyx/graphql-php library

---
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php |  28 +++
 .../Sniffs/GraphQL/ValidTypeNameSniff.php     |  36 +++-
 PHP_CodeSniffer/Tokenizers/GraphQL.php        | 171 ++++++++++++++++--
 composer.json                                 |   3 +-
 composer.lock                                 |  54 +++++-
 5 files changed, 273 insertions(+), 19 deletions(-)
 create mode 100644 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
new file mode 100644
index 00000000..e7acd46a
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * Copyright (c) 2019 TechDivision GmbH <info@techdivision.com> - TechDivision GmbH
+ * All rights reserved
+ *
+ * This product includes proprietary software developed at TechDivision GmbH, Germany
+ * For more information see https://www.techdivision.com/
+ *
+ * To obtain a valid license for using this software please contact us at license@techdivision.com
+ */
+
+namespace Magento2\Sniffs\GraphQL;
+
+/**
+ * Kurze Beschreibung der Klasse
+ *
+ * Lange Beschreibung der Klasse (wenn vorhanden)...
+ *
+ * @copyright  Copyright (c) 2019 TechDivision GmbH <info@techdivision.com> - TechDivision GmbH
+ * @link       https://www.techdivision.com/
+ * @author     Jean-Bernard Valentaten <j.valentaten@techdivision.com>
+ */
+class ValidArgumentNymeSniff
+{
+
+}
diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
index 76af7b7d..c6aba7f8 100644
--- a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -5,13 +5,15 @@
  */
 namespace Magento2\Sniffs\GraphQL;
 
-use PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Common;
 
 /**
  * Detects types (<kbd>type</kbd>, <kbd>interface</kbd> and <kbd>enum</kbd>) that are not specified in
  * <kbd>UpperCamelCase</kbd>.
  */
-class ValidTypeNameSniff extends ValidClassNameSniff
+class ValidTypeNameSniff implements Sniff
 {
 
     /**
@@ -26,7 +28,35 @@ class ValidTypeNameSniff extends ValidClassNameSniff
      */
     public function register()
     {
-        return [T_CLASS];
+        return [T_CLASS, T_INTERFACE];
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        //compose entity name by making use of the next strings the we find until we hit a non-string token
+        $name = '';
+        for ($i=$stackPtr+1; $tokens[$i]['code'] === T_STRING; ++$i) {
+            $name .= $tokens[$i]['content'];
+        }
+
+        $valid = Common::isCamelCaps($name, true, true, false);
+
+        if ($valid === false) {
+            $type  = ucfirst($tokens[$stackPtr]['content']);
+            $error = '%s name "%s" is not in PascalCase format';
+            $data  = [
+                $type,
+                $name,
+            ];
+            $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
+            $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'no');
+        } else {
+            $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'yes');
+        }
+    }
 }
diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GraphQL.php
index 2b66e3a0..2fbe2634 100644
--- a/PHP_CodeSniffer/Tokenizers/GraphQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GraphQL.php
@@ -6,19 +6,63 @@
 
 namespace PHP_CodeSniffer\Tokenizers;
 
+use GraphQL\Language\Lexer;
+use GraphQL\Language\Source;
+use GraphQL\Language\Token;
 use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Exceptions\TokenizerException;
 
 /**
  * Implements a tokenizer for GraphQL files.
+ *
+ * @todo Reimplement using the official GraphQL implementation
  */
-class GraphQL extends JS
+class GraphQL extends Tokenizer
 {
 
-    protected $additionalTokenValues = [
-        'type'      => 'T_CLASS',
-        'interface' => 'T_CLASS',
-        'enum'      => 'T_CLASS',
-        '#'         => 'T_COMMENT',
+    /**
+     * Defines how GraphQL token types are mapped to PHP token types.
+     *
+     * @var array
+     */
+    private $tokenTypeMap = [
+        Token::AMP          => null, //TODO
+        Token::AT           => 'T_DOC_COMMENT_TAG',
+        Token::BANG         => null, //TODO
+        Token::BLOCK_STRING => 'T_COMMENT',
+        Token::BRACE_L      => 'T_OPEN_CURLY_BRACKET',
+        Token::BRACE_R      => 'T_CLOSE_CURLY_BRACKET',
+        Token::BRACKET_L    => 'T_OPEN_SQUARE_BRACKET',
+        Token::BRACKET_R    => 'T_CLOSE_CURLY_BRACKET',
+        Token::COLON        => 'T_COLON',
+        Token::COMMENT      => 'T_COMMENT',
+        Token::DOLLAR       => 'T_DOLLAR',
+        Token::EOF          => 'T_CLOSE_TAG',
+        Token::EQUALS       => 'T_EQUAL',
+        Token::FLOAT        => null, //TODO
+        Token::INT          => null, //TODO
+        Token::NAME         => 'T_STRING',
+        Token::PAREN_L      => 'T_OPEN_PARENTHESIS',
+        Token::PAREN_R      => 'T_CLOSE_PARENTHESIS',
+        Token::PIPE         => null, //TODO
+        Token::SPREAD       => 'T_ELLIPSIS',
+        Token::SOF          => 'T_OPEN_TAG',
+        Token::STRING       => 'T_STRING',
+    ];
+
+    /**
+     * Defines how special keywords are mapped to PHP token types
+     *
+     * @var array
+     */
+    private $keywordTokenTypeMap = [
+        'enum'       => 'T_CLASS',
+        'extend'     => 'T_EXTENDS', //TODO This might not be the appropriate equivalent
+        'interface'  => 'T_INTERFACE',
+        'implements' => 'T_IMPLEMENTS',
+        'type'       => 'T_CLASS',
+        'union'      => 'T_CLASS',
+        //TODO Add further types
     ];
 
     /**
@@ -27,17 +71,13 @@ class GraphQL extends JS
      * @param string $content
      * @param Config $config
      * @param string $eolChar
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException
+     * @throws TokenizerException
      */
     public function __construct($content, Config $config, $eolChar = '\n')
     {
-        //add our token values
-        $this->tokenValues = array_merge(
-            $this->tokenValues,
-            $this->additionalTokenValues
-        );
+        //TODO We might want to delete this unless we need the constructor to work totally different
 
-        //let parent do its job (which will start tokenizing)
+        //let parent do its job
         parent::__construct($content, $config, $eolChar);
     }
 
@@ -46,7 +86,110 @@ public function __construct($content, Config $config, $eolChar = '\n')
      */
     public function processAdditional()
     {
-        //NOP Does nothing intentionally
+        //NOP: Does nothing intentionally
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws TokenizerException
+     */
+    protected function tokenize($string)
+    {
+        $this->logVerbose('*** START GRAPHQL TOKENIZING ***');
+
+        $string = str_replace($this->eolChar, "\n", $string);
+        $tokens = [];
+        $lexer  = new Lexer(
+            new Source($string)
+        );
+
+        do {
+            $kind  = $lexer->token->kind;
+            $value = $lexer->token->value ?: '';
+
+            //if we have encountered a keyword, we convert it
+            //otherwise we translate the token or default it to T_STRING
+            if ($kind === Token::NAME && isset($this->keywordTokenTypeMap[$value])) {
+                $tokenType = $this->keywordTokenTypeMap[$value];
+            } elseif (isset($this->tokenTypeMap[$kind])) {
+                $tokenType = $this->tokenTypeMap[$kind];
+            } else {
+                $tokenType = 'T_STRING';
+            }
+
+            //some GraphQL tokens need special handling
+            switch ($kind) {
+                case Token::AT:
+                case Token::BRACE_L:
+                case Token::BRACE_R:
+                case Token::PAREN_L:
+                case Token::PAREN_R:
+                    $value = $kind;
+                    break;
+                default:
+                    //NOP
+            }
+
+            //finally we create the PHP token
+            $token = [
+                'code'    => constant($tokenType),
+                'type'    => $tokenType,
+                'content' => $value,
+            ];
+            $line  = $lexer->token->line;
+
+            $lexer->advance();
+
+            //if line has changed (and we're not on start of file) we have to append at least one line break to current
+            //tokens content otherwise PHP_CodeSniffer will screw up line numbers
+            if ($lexer->token->line !== $line && $kind !== Token::SOF) {
+                $token['content'] .= $this->eolChar;
+            }
+            $tokens[] = $token;
+            $tokens = array_merge(
+                $tokens,
+                $this->getNewLineTokens($line, $lexer->token->line)
+            );
+        } while ($lexer->token->kind !== Token::EOF);
+
+        $this->logVerbose('*** END GRAPHQL TOKENIZING ***');
+        return $tokens;
+    }
+
+    /**
+     * Returns tokens of empty new lines for the range <var>$lineStart</var> to <var>$lineEnd</var>
+     *
+     * @param int $lineStart
+     * @param int $lineEnd
+     * @return array
+     */
+    private function getNewLineTokens($lineStart, $lineEnd)
+    {
+        $amount = ($lineEnd - $lineStart) - 1;
+        $tokens = [];
+
+        for ($i = 0; $i < $amount; ++$i) {
+            $tokens[] = [
+                'code'    => T_WHITESPACE,
+                'type'    => 'T_WHITESPACE',
+                'content' => $this->eolChar,
+            ];
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Logs <var>$message</var> if {@link PHP_CODESNIFFER_VERBOSITY} is greater than <var>$level</var>.
+     *
+     * @param string $message
+     * @param int $level
+     */
+    private function logVerbose($message, $level = 1)
+    {
+        if (PHP_CODESNIFFER_VERBOSITY > $level) {
+            printf("\t%s" . PHP_EOL, $message);
+        }
+    }
 }
diff --git a/composer.json b/composer.json
index a3684c36..889a9f4e 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
     "version": "4",
     "require": {
         "php": ">=5.6.0",
-        "squizlabs/php_codesniffer": "^3.4"
+        "squizlabs/php_codesniffer": "^3.4",
+        "webonyx/graphql-php": "^0.13.8"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
diff --git a/composer.lock b/composer.lock
index 416f08c7..377b98d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dd5642c8fa31b4c4fdcf19135002185f",
+    "content-hash": "c407f30fd32fc53345205fe5c6d3aa4d",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -56,6 +56,58 @@
                 "standards"
             ],
             "time": "2019-04-10T23:49:02+00:00"
+        },
+        {
+            "name": "webonyx/graphql-php",
+            "version": "v0.13.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webonyx/graphql-php.git",
+                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": "^7.1||^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^6.0",
+                "phpbench/phpbench": "^0.14.0",
+                "phpstan/phpstan": "^0.11.4",
+                "phpstan/phpstan-phpunit": "^0.11.0",
+                "phpstan/phpstan-strict-rules": "^0.11.0",
+                "phpunit/phpcov": "^5.0",
+                "phpunit/phpunit": "^7.2",
+                "psr/http-message": "^1.0",
+                "react/promise": "2.*"
+            },
+            "suggest": {
+                "psr/http-message": "To use standard GraphQL server",
+                "react/promise": "To leverage async resolving on React PHP platform"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "GraphQL\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A PHP port of GraphQL reference implementation",
+            "homepage": "https://github.com/webonyx/graphql-php",
+            "keywords": [
+                "api",
+                "graphql"
+            ],
+            "time": "2019-08-25T10:32:47+00:00"
         }
     ],
     "packages-dev": [

From 5fd88b518cd9d40121ac14e75dd55ae063376ed5 Mon Sep 17 00:00:00 2001
From: konarshankar07 <konar.shankar2013@gmail.com>
Date: Mon, 9 Sep 2019 22:21:44 +0530
Subject: [PATCH 008/630] New rule added for class property PHP Doc block

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 72 +++++++++++++++++++
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 35 +++++++++
 .../ClassPropertyPHPDocFormattingUnitTest.php | 32 +++++++++
 Magento2/ruleset.xml                          |  4 ++
 4 files changed, 143 insertions(+)
 create mode 100644 Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
 create mode 100644 Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
 create mode 100644 Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
new file mode 100644
index 00000000..3a08852d
--- /dev/null
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -0,0 +1,72 @@
+<?php
+namespace Magento2\Sniffs\Commenting;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class ClassPropertyPHPDocFormattingSniff implements Sniff
+{
+
+    private $ignoreTokens = [
+        T_PUBLIC,
+        T_PRIVATE,
+        T_PROTECTED,
+        T_VAR,
+        T_STATIC,
+        T_WHITESPACE,
+    ];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [
+            T_VARIABLE
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($stackPtr - 1), null, true);
+        if ($commentEnd === false
+            || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
+                && $tokens[$commentEnd]['code'] !== T_COMMENT)
+        ) {
+            $phpcsFile->addWarning('Missing class property doc comment', $stackPtr, 'Missing');
+            return;
+        }
+
+        $commentStart = $tokens[$commentEnd]['comment_opener'];
+
+        $foundVar = null;
+        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
+            if ($tokens[$tag]['content'] === '@var') {
+                if ($foundVar !== null) {
+                    $error = 'Only one @var tag is allowed in a class property comment';
+                    $phpcsFile->addWarning($error, $tag, 'DuplicateVar');
+                } else {
+                    $foundVar = $tag;
+                }
+            }
+        }
+
+        if ($foundVar === null) {
+            $error = 'Missing @var tag in class property comment';
+            $phpcsFile->addWarning($error, $commentEnd, 'MissingVar');
+            return;
+        }
+
+        $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar, $commentEnd);
+        if ($string === false || $tokens[$string]['line'] !== $tokens[$foundVar]['line']) {
+            $error = 'Content missing for @var tag in class property comment';
+            $phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
+            return;
+        }
+    }
+}
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
new file mode 100644
index 00000000..2abc3e8f
--- /dev/null
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -0,0 +1,35 @@
+<?php
+
+class Foo
+{
+    /**
+     * @var Foo
+     */
+    private $_classAttribute = '';
+
+    /**
+     * Foo
+     */
+    private $_withoutClassAttribute = '';
+
+    /**
+     * @var Test
+     *
+     * Short Description
+     */
+    private $_classAttributeWithShortDescription = '';
+
+    /**
+     * @var
+     */
+    private $_emptyClassAttributeContent = '';
+
+
+    /**
+     * @var Foo
+     * @var Bar
+     */
+    private $_multipleClassAttribute = '';
+
+    private $_missingDocBlockClassAttribute = '';
+}
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
new file mode 100644
index 00000000..6672d3f0
--- /dev/null
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Commenting;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ClassPropertyPHPDocFormattingUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [
+            12 => 1,
+            23 => 1,
+            30 => 1,
+            34 => 1
+        ];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 246b6fe1..e8e34d12 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -528,6 +528,10 @@
         <severity>5</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Commenting.ClassPropertyPHPDocFormatting">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Magento2.Commenting.ConstantsPHPDocFormatting">
         <severity>5</severity>
         <type>warning</type>

From 586244ad0718b730d03eaf532a2b2a12218e3f67 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Tue, 10 Sep 2019 14:38:08 +0200
Subject: [PATCH 009/630] MC-19366: Adds sniff for field names

---
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php |  28 -----
 .../Sniffs/GraphQL/ValidFieldNameSniff.php    |  65 +++++++++++
 .../Sniffs/GraphQL/ValidTypeNameSniff.php     |   2 +-
 .../AbstractGraphQLSniffUnitTestCase.php      |  35 ++++++
 .../GraphQL/ValidFieldNameUnitTest.graphqls   |  31 ++++++
 .../Tests/GraphQL/ValidFieldNameUnitTest.php  |  45 ++++++++
 .../Tests/GraphQL/ValidTypeNameUnitTest.php   |  24 +---
 PHP_CodeSniffer/Tokenizers/GraphQL.php        | 103 ++++++++++++------
 8 files changed, 249 insertions(+), 84 deletions(-)
 delete mode 100644 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
 create mode 100644 Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
 create mode 100644 Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
 create mode 100644 Magento2/Tests/GraphQL/ValidFieldNameUnitTest.graphqls
 create mode 100644 Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
deleted file mode 100644
index e7acd46a..00000000
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * NOTICE OF LICENSE
- *
- * Copyright (c) 2019 TechDivision GmbH <info@techdivision.com> - TechDivision GmbH
- * All rights reserved
- *
- * This product includes proprietary software developed at TechDivision GmbH, Germany
- * For more information see https://www.techdivision.com/
- *
- * To obtain a valid license for using this software please contact us at license@techdivision.com
- */
-
-namespace Magento2\Sniffs\GraphQL;
-
-/**
- * Kurze Beschreibung der Klasse
- *
- * Lange Beschreibung der Klasse (wenn vorhanden)...
- *
- * @copyright  Copyright (c) 2019 TechDivision GmbH <info@techdivision.com> - TechDivision GmbH
- * @link       https://www.techdivision.com/
- * @author     Jean-Bernard Valentaten <j.valentaten@techdivision.com>
- */
-class ValidArgumentNymeSniff
-{
-
-}
diff --git a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
new file mode 100644
index 00000000..c8aef8c0
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\GraphQL;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Common;
+
+/**
+ * Detects field names the are not specified in <kbd>snake_case</kbd>.
+ */
+class ValidFieldNameSniff implements Sniff
+{
+
+    /**
+     * Defines the tokenizers that this sniff is using.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = ['GraphQL'];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_VARIABLE];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $name   = $tokens[$stackPtr]['content'];
+
+        if (!$this->isSnakeCase($name)) {
+            $type  = 'Field';
+            $error = '%s name "%s" is not in snake_case format';
+            $data  = [
+                $type,
+                $name,
+            ];
+            $phpcsFile->addError($error, $stackPtr, 'NotSnakeCase', $data);
+            $phpcsFile->recordMetric($stackPtr, 'SnakeCase field name', 'no');
+        } else {
+            $phpcsFile->recordMetric($stackPtr, 'SnakeCase field name', 'yes');
+        }
+    }
+
+    /**
+     * Returns whether <var>$name</var> is strictly lower case, potentially separated by underscores.
+     *
+     * @param string $name
+     * @return bool
+     */
+    private function isSnakeCase($name)
+    {
+        return preg_match('/^[a-z][a-z0-9_]*$/', $name);
+    }
+}
diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
index c6aba7f8..6b639294 100644
--- a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -38,7 +38,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        //compose entity name by making use of the next strings the we find until we hit a non-string token
+        //compose entity name by making use of the next strings that we find until we hit a non-string token
         $name = '';
         for ($i=$stackPtr+1; $tokens[$i]['code'] === T_STRING; ++$i) {
             $name .= $tokens[$i]['content'];
diff --git a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
new file mode 100644
index 00000000..83f858b0
--- /dev/null
+++ b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\GraphQL;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Implements an abstract base for unit tests that cover GraphQL sniffs.
+ */
+abstract class AbstractGraphQLSniffUnitTestCase extends AbstractSniffUnitTest
+{
+
+    protected function setUp()
+    {
+        //let parent do its job
+        parent::setUp();
+
+        //generate a config that allows ro use our GraphQL tokenizer
+        $config = new Config();
+        $config->extensions = array_merge(
+            $config->extensions,
+            [
+                'graphqls' => 'GraphQL'
+            ]
+        );
+
+        //and write back to a global that is used in base class
+        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
+    }
+
+}
diff --git a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.graphqls
new file mode 100644
index 00000000..54b496ac
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.graphqls
@@ -0,0 +1,31 @@
+type FooType {
+    # Valid snake case field names
+    valid_snake_case_field: String
+    validlowercasefield: String
+    valid_snake_case_field_ending_with_number_5: String
+    valid_snake_case_field_with_ending_numbers_12345: String
+    valid_snake_case_field_5_with_number5_inline: String
+
+    # Incorrect use of snake case
+    INVALIDUPPERCASEFIELD: String
+    INVALID_SCREAMING_SNAKE_CASE_FIELD: String
+    Invalid_Upper_Snake_Case_Field: String
+    invalid_mixed_case_FIELD: String
+    InvalidCameCaseFieldName: String
+}
+
+interface FooInterface {
+    # Valid snake case field names
+    valid_snake_case_field: String
+    validlowercasefield: String
+    valid_snake_case_field_ending_with_number_5: String
+    valid_snake_case_field_with_ending_numbers_12345: String
+    valid_snake_case_field_5_with_number5_inline: String
+
+    # Incorrect use of snake case
+    INVALIDUPPERCASEFIELD: String
+    INVALID_SCREAMING_SNAKE_CASE_FIELD: String
+    Invalid_Upper_Snake_Case_Field: String
+    invalid_mixed_case_FIELD: String
+    InvalidCameCaseFieldName: String
+}
diff --git a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
new file mode 100644
index 00000000..eebd53e3
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\GraphQL;
+
+/**
+ * Covers {@link \Magento2\Sniffs\GraphQL\ValidFieldNameUnitTest}.
+ */
+class ValidFieldNameUnitTest extends AbstractGraphQLSniffUnitTestCase
+{
+
+    /**
+     * Returns the lines where errors should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of errors that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    protected function getErrorList()
+    {
+        return [
+            10 => 1,
+            11 => 1,
+            12 => 1,
+            13 => 1,
+            14 => 1,
+            26 => 1,
+            27 => 1,
+            28 => 1,
+            29 => 1,
+            30 => 1,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
index 0e07c91d..a04fb314 100644
--- a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
@@ -6,32 +6,12 @@
 namespace Magento2\Tests\GraphQL;
 
 use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
 /**
- * Covers {@link \agento2\Sniffs\GraphQL\ValidTypeNameSniff}.
+ * Covers {@link \Magento2\Sniffs\GraphQL\ValidTypeNameSniff}.
  */
-class ValidTypeNameUnitTest extends AbstractSniffUnitTest
+class ValidTypeNameUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
-
-    protected function setUp()
-    {
-        //let parent do its job
-        parent::setUp();
-
-        //generate a config that allows ro use our GraphQL tokenizer
-        $config = new Config();
-        $config->extensions = array_merge(
-            $config->extensions,
-            [
-                'graphqls' => 'GraphQL'
-            ]
-        );
-
-        //and write back to a global that is used in base class
-        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
-    }
-
     /**
      * Returns the lines where errors should occur.
      *
diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GraphQL.php
index 2fbe2634..d3d03ecc 100644
--- a/PHP_CodeSniffer/Tokenizers/GraphQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GraphQL.php
@@ -3,19 +3,14 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace PHP_CodeSniffer\Tokenizers;
 
 use GraphQL\Language\Lexer;
 use GraphQL\Language\Source;
 use GraphQL\Language\Token;
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Exceptions\TokenizerException;
 
 /**
  * Implements a tokenizer for GraphQL files.
- *
- * @todo Reimplement using the official GraphQL implementation
  */
 class GraphQL extends Tokenizer
 {
@@ -26,9 +21,9 @@ class GraphQL extends Tokenizer
      * @var array
      */
     private $tokenTypeMap = [
-        Token::AMP          => null, //TODO
+        Token::AMP          => null, //TODO Should we map this to a specific type
         Token::AT           => 'T_DOC_COMMENT_TAG',
-        Token::BANG         => null, //TODO
+        Token::BANG         => null, //TODO Should we map this to a specific type
         Token::BLOCK_STRING => 'T_COMMENT',
         Token::BRACE_L      => 'T_OPEN_CURLY_BRACKET',
         Token::BRACE_R      => 'T_CLOSE_CURLY_BRACKET',
@@ -39,12 +34,12 @@ class GraphQL extends Tokenizer
         Token::DOLLAR       => 'T_DOLLAR',
         Token::EOF          => 'T_CLOSE_TAG',
         Token::EQUALS       => 'T_EQUAL',
-        Token::FLOAT        => null, //TODO
-        Token::INT          => null, //TODO
+        Token::FLOAT        => null, //TODO Should we map this to a specific type
+        Token::INT          => null, //TODO Should we map this to a specific type
         Token::NAME         => 'T_STRING',
         Token::PAREN_L      => 'T_OPEN_PARENTHESIS',
         Token::PAREN_R      => 'T_CLOSE_PARENTHESIS',
-        Token::PIPE         => null, //TODO
+        Token::PIPE         => null, //TODO Should we map this to a specific type
         Token::SPREAD       => 'T_ELLIPSIS',
         Token::SOF          => 'T_OPEN_TAG',
         Token::STRING       => 'T_STRING',
@@ -62,37 +57,45 @@ class GraphQL extends Tokenizer
         'implements' => 'T_IMPLEMENTS',
         'type'       => 'T_CLASS',
         'union'      => 'T_CLASS',
-        //TODO Add further types
+        //TODO We may have to add further types
     ];
 
-    /**
-     * Constructor.
-     *
-     * @param string $content
-     * @param Config $config
-     * @param string $eolChar
-     * @throws TokenizerException
-     */
-    public function __construct($content, Config $config, $eolChar = '\n')
-    {
-        //TODO We might want to delete this unless we need the constructor to work totally different
-
-        //let parent do its job
-        parent::__construct($content, $config, $eolChar);
-    }
-
     /**
      * @inheritDoc
      */
     public function processAdditional()
     {
-        //NOP: Does nothing intentionally
+        $this->logVerbose('*** START ADDITIONAL GRAPHQL PROCESSING ***');
+
+        $processingEntity = false;
+        $numTokens        = count($this->tokens);
+        $entityTypes      = [T_CLASS, T_INTERFACE];
+
+        for ($i = 0; $i < $numTokens; ++$i) {
+            $tokenCode = $this->tokens[$i]['code'];
+
+            //have we found a new entity or its end?
+            if (in_array($tokenCode, $entityTypes) && $this->tokens[$i]['content'] !== 'enum') {
+                $processingEntity = true;
+                continue;
+            } elseif ($tokenCode === T_CLOSE_CURLY_BRACKET) {
+                $processingEntity = false;
+                continue;
+            }
+
+            //if we are processing an entity, are we currently seeing a field?
+            if ($processingEntity && $this->isFieldToken($i)) {
+                $this->tokens[$i]['code'] = T_VARIABLE;
+                $this->tokens[$i]['type'] = 'T_VARIABLE';
+                continue;
+            }
+        }
+
+        $this->logVerbose('*** END ADDITIONAL GRAPHQL PROCESSING ***');
     }
 
     /**
-     * {@inheritDoc}
-     *
-     * @throws TokenizerException
+     * @inheritDoc
      */
     protected function tokenize($string)
     {
@@ -125,6 +128,7 @@ protected function tokenize($string)
                 case Token::BRACE_R:
                 case Token::PAREN_L:
                 case Token::PAREN_R:
+                case Token::COLON:
                     $value = $kind;
                     break;
                 default:
@@ -142,12 +146,12 @@ protected function tokenize($string)
             $lexer->advance();
 
             //if line has changed (and we're not on start of file) we have to append at least one line break to current
-            //tokens content otherwise PHP_CodeSniffer will screw up line numbers
+            //token's content otherwise PHP_CodeSniffer will screw up line numbers
             if ($lexer->token->line !== $line && $kind !== Token::SOF) {
                 $token['content'] .= $this->eolChar;
             }
             $tokens[] = $token;
-            $tokens = array_merge(
+            $tokens   = array_merge(
                 $tokens,
                 $this->getNewLineTokens($line, $lexer->token->line)
             );
@@ -180,6 +184,39 @@ private function getNewLineTokens($lineStart, $lineEnd)
         return $tokens;
     }
 
+    /**
+     * Returns whether the token under <var>$stackPointer</var> is a field.
+     *
+     * We consider a token to be a field if:
+     * <ul>
+     *   <li>its direct successor is of type {@link T_COLON}</li>
+     *   <li>it has a list of arguments followed by a {@link T_COLON}</li>
+     * </ul>
+     *
+     * @param int $stackPointer
+     * @return bool
+     */
+    private function isFieldToken($stackPointer)
+    {
+        $nextToken = $this->tokens[$stackPointer + 1];
+
+        //if next token is an opening parenthesis, we seek for the closing parenthesis
+        if ($nextToken['code'] === T_OPEN_PARENTHESIS) {
+            $nextPointer = $stackPointer + 1;
+            $numTokens = count($this->tokens);
+
+            for ($i=$nextPointer; $i<$numTokens; ++$i) {
+                if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
+                    $nextToken = $this->tokens[$i + 1];
+                    break;
+                }
+            }
+        }
+
+        //return whether next token is a colon
+        return $nextToken['code'] === T_COLON;
+    }
+
     /**
      * Logs <var>$message</var> if {@link PHP_CODESNIFFER_VERBOSITY} is greater than <var>$level</var>.
      *

From 27e99de30626d032604f30203e46a29f84630e25 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Wed, 11 Sep 2019 10:41:28 +0200
Subject: [PATCH 010/630] MC-19366: Adds sniff for argument names

---
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php | 145 ++++++++++++++++++
 .../Sniffs/GraphQL/ValidFieldNameSniff.php    |   1 -
 .../ValidArgumentNameUnitTest.graphqls        |  32 ++++
 .../GraphQL/ValidArgumentNameUnitTest.php     |  39 +++++
 .../Tests/GraphQL/ValidFieldNameUnitTest.php  |   9 +-
 PHP_CodeSniffer/Tokenizers/GraphQL.php        |  79 ++++++----
 6 files changed, 270 insertions(+), 35 deletions(-)
 create mode 100644 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
 create mode 100644 Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
 create mode 100644 Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
new file mode 100644
index 00000000..6faeefb6
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\GraphQL;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Detects argument names that are not specified in <kbd>cameCase</kbd>.
+ */
+class ValidArgumentNameSniff implements Sniff
+{
+
+    /**
+     * Defines the tokenizers that this sniff is using.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = ['GraphQL'];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_OPEN_PARENTHESIS];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens                  = $phpcsFile->getTokens();
+        $closeParenthesisPointer = $this->getCloseParenthesisPointer($stackPtr, $tokens);
+
+        //if we could not find the closing parenthesis pointer, we add a warning and terminate
+        if ($closeParenthesisPointer === false) {
+            $error = 'Possible parse error: Missing closing parenthesis for argument list in line %d';
+            $data  = [
+                $tokens[$stackPtr]['line'],
+            ];
+            $phpcsFile->addWarning($error, $stackPtr, 'UnclosedArgumentList', $data);
+            return;
+        }
+
+        $arguments = $this->getArguments($stackPtr, $closeParenthesisPointer, $tokens);
+
+        foreach ($arguments as $argument) {
+            $pointer = $argument[0];
+            $name    = $argument[1];
+
+            if (!$this->isCamelCase($name)) {
+                $type  = 'Argument';
+                $error = '%s name "%s" is not in CamelCase format';
+                $data  = [
+                    $type,
+                    $name,
+                ];
+
+                $phpcsFile->addError($error, $pointer, 'NotCamelCase', $data);
+                $phpcsFile->recordMetric($pointer, 'CamelCase argument name', 'no');
+            } else {
+                $phpcsFile->recordMetric($pointer, 'CamelCase argument name', 'yes');
+            }
+        }
+
+        //return stack pointer of closing parenthesis
+        return $closeParenthesisPointer;
+    }
+
+    /**
+     * Finds all argument names contained in <var>$tokens</var> range <var>$startPointer</var> and
+     * <var>$endPointer</var>.
+     *
+     * @param int $startPointer
+     * @param int $endPointer
+     * @param array $tokens
+     * @return array[]
+     */
+    private function getArguments($startPointer, $endPointer, array $tokens)
+    {
+        $argumentTokenPointer = null;
+        $argument             = '';
+        $names                = [];
+        $skipTypes            = [T_COMMENT, T_WHITESPACE];
+
+        for ($i = $startPointer + 1; $i < $endPointer; ++$i) {
+            //skip comment tokens
+            if (in_array($tokens[$i]['code'], $skipTypes)) {
+                continue;
+            }
+            $argument .= $tokens[$i]['content'];
+
+            if ($argumentTokenPointer === null) {
+                $argumentTokenPointer = $i;
+            }
+
+            if (preg_match('/^.+:.+$/', $argument)) {
+                list($name, $type) = explode(':', $argument);
+                $names[]              = [$argumentTokenPointer, $name];
+                $argument             = '';
+                $argumentTokenPointer = null;
+            }
+        }
+
+        return $names;
+    }
+
+    /**
+     * Seeks the next available token of type {@link T_CLOSE_PARENTHESIS} in <var>$tokens</var> and returns its pointer.
+     *
+     * @param int $stackPointer
+     * @param array $tokens
+     * @return bool|int
+     */
+    private function getCloseParenthesisPointer($stackPointer, array $tokens)
+    {
+        $numTokens = count($tokens);
+
+        for ($i = $stackPointer + 1; $i < $numTokens; ++$i) {
+            if ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
+                return $i;
+            }
+        }
+
+        //if we came here we could not find the closing parenthesis
+        return false;
+    }
+
+    /**
+     * Returns whether <var>$name</var> starts with a lower case character and is written in camel case.
+     *
+     * @param string $argumentName
+     * @return bool
+     */
+    private function isCamelCase($argumentName)
+    {
+        return (preg_match('/^[a-z][a-zA-Z0-9]+$/', $argumentName) !== 0);
+    }
+}
diff --git a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
index c8aef8c0..23d7cb1c 100644
--- a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
@@ -7,7 +7,6 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Common;
 
 /**
  * Detects field names the are not specified in <kbd>snake_case</kbd>.
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
new file mode 100644
index 00000000..83b4f23c
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
@@ -0,0 +1,32 @@
+type Foo {
+    bar(
+        # Valid argument names
+        validArgumentName: Int
+        validArgumentNameWith1Number: Int
+        validArgumentNameWith12345Numbers: Int
+        validArgumentNameEndingWithNumber5: Int
+        validArgumentNameWithUPPERCASE: Int
+        validargumentwithlowercase: Int
+        # Invalid argument names
+        InvalidArgumentNameUpperCamelCase: Int
+        INVALIDARGUMENTNAMEUPPERCASE: Int
+        invalid_argument_name_snake_case: Int
+        5invalidArgumentNameStatingWithNumber: Int
+    ): String
+}
+interface Foo {
+    bar(
+        # Valid argument names
+        validArgumentName: Int
+        validArgumentNameWith1Number: Int
+        validArgumentNameWith12345Numbers: Int
+        validArgumentNameEndingWithNumber5: Int
+        validArgumentNameWithUPPERCASE: Int
+        validargumentwithlowercase: Int
+        # Invalid argument names
+        InvalidArgumentNameUpperCamelCase: Int
+        INVALIDARGUMENTNAMEUPPERCASE: Int
+        invalid_argument_name_snake_case: Int
+        5invalidArgumentNameStatingWithNumber: Int
+    ): String
+}
\ No newline at end of file
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
new file mode 100644
index 00000000..746c867e
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\GraphQL;
+
+/**
+ * Covers {@link \Magento2\Sniffs\GraphQL\ValidArgumentNameSniff}.
+ */
+class ValidArgumentNameUnitTest extends AbstractGraphQLSniffUnitTestCase
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected function getErrorList()
+    {
+        return [
+            11 => 1,
+            12 => 1,
+            13 => 1,
+            14 => 1,
+            27 => 1,
+            28 => 1,
+            29 => 1,
+            30 => 1,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getWarningList()
+    {
+        return [];
+    }
+}
+
diff --git a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
index eebd53e3..3ded35bb 100644
--- a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
@@ -6,18 +6,13 @@
 namespace Magento2\Tests\GraphQL;
 
 /**
- * Covers {@link \Magento2\Sniffs\GraphQL\ValidFieldNameUnitTest}.
+ * Covers {@link \Magento2\Sniffs\GraphQL\ValidFieldNameSniff}.
  */
 class ValidFieldNameUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
 
     /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @return array<int, int>
+     * @inheritDoc
      */
     protected function getErrorList()
     {
diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GraphQL.php
index d3d03ecc..0e49cd01 100644
--- a/PHP_CodeSniffer/Tokenizers/GraphQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GraphQL.php
@@ -3,6 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace PHP_CodeSniffer\Tokenizers;
 
 use GraphQL\Language\Lexer;
@@ -67,29 +68,7 @@ public function processAdditional()
     {
         $this->logVerbose('*** START ADDITIONAL GRAPHQL PROCESSING ***');
 
-        $processingEntity = false;
-        $numTokens        = count($this->tokens);
-        $entityTypes      = [T_CLASS, T_INTERFACE];
-
-        for ($i = 0; $i < $numTokens; ++$i) {
-            $tokenCode = $this->tokens[$i]['code'];
-
-            //have we found a new entity or its end?
-            if (in_array($tokenCode, $entityTypes) && $this->tokens[$i]['content'] !== 'enum') {
-                $processingEntity = true;
-                continue;
-            } elseif ($tokenCode === T_CLOSE_CURLY_BRACKET) {
-                $processingEntity = false;
-                continue;
-            }
-
-            //if we are processing an entity, are we currently seeing a field?
-            if ($processingEntity && $this->isFieldToken($i)) {
-                $this->tokens[$i]['code'] = T_VARIABLE;
-                $this->tokens[$i]['type'] = 'T_VARIABLE';
-                continue;
-            }
-        }
+        $this->processFields();
 
         $this->logVerbose('*** END ADDITIONAL GRAPHQL PROCESSING ***');
     }
@@ -203,9 +182,9 @@ private function isFieldToken($stackPointer)
         //if next token is an opening parenthesis, we seek for the closing parenthesis
         if ($nextToken['code'] === T_OPEN_PARENTHESIS) {
             $nextPointer = $stackPointer + 1;
-            $numTokens = count($this->tokens);
+            $numTokens   = count($this->tokens);
 
-            for ($i=$nextPointer; $i<$numTokens; ++$i) {
+            for ($i = $nextPointer; $i < $numTokens; ++$i) {
                 if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
                     $nextToken = $this->tokens[$i + 1];
                     break;
@@ -213,8 +192,8 @@ private function isFieldToken($stackPointer)
             }
         }
 
-        //return whether next token is a colon
-        return $nextToken['code'] === T_COLON;
+        //return whether current token is a string and next token is a colon
+        return $this->tokens[$stackPointer]['code'] === T_STRING && $nextToken['code'] === T_COLON;
     }
 
     /**
@@ -229,4 +208,50 @@ private function logVerbose($message, $level = 1)
             printf("\t%s" . PHP_EOL, $message);
         }
     }
+
+    /**
+     * Processes field tokens, setting their type to {@link T_VARIABLE}.
+     */
+    private function processFields()
+    {
+        $processingArgumentList = false;
+        $processingEntity       = false;
+        $numTokens              = count($this->tokens);
+        $entityTypes            = [T_CLASS, T_INTERFACE];
+        $skipTypes              = [T_COMMENT, T_WHITESPACE];
+
+        for ($i = 0; $i < $numTokens; ++$i) {
+            $tokenCode = $this->tokens[$i]['code'];
+
+            //process current token
+            switch (true) {
+                case in_array($tokenCode, $skipTypes):
+                    //we have hit a token that needs to be skipped -> NOP
+                    break;
+                case in_array($tokenCode, $entityTypes) && $this->tokens[$i]['content'] !== 'enum':
+                    //we have hit an entity declaration
+                    $processingEntity = true;
+                    break;
+                case $tokenCode === T_CLOSE_CURLY_BRACKET:
+                    //we have hit the end of an entity declaration
+                    $processingEntity = false;
+                    break;
+                case $tokenCode === T_OPEN_PARENTHESIS:
+                    //we have hit an argument list
+                    $processingArgumentList = true;
+                    break;
+                case $tokenCode === T_CLOSE_PARENTHESIS:
+                    //we have hit an argument list end
+                    $processingArgumentList = false;
+                    break;
+                case $processingEntity && !$processingArgumentList && $this->isFieldToken($i):
+                    //we have hit a field
+                    $this->tokens[$i]['code'] = T_VARIABLE;
+                    $this->tokens[$i]['type'] = 'T_VARIABLE';
+                    break;
+                default:
+                    //NOP All operations have already been executed
+            }
+        }
+    }
 }

From 47fb2030cfcf97d50142c53454505f073d1a3255 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Wed, 11 Sep 2019 13:10:47 +0200
Subject: [PATCH 011/630] MC-19366: Adds sniff for top level fields

---
 .../Sniffs/GraphQL/AbstractGraphQLSniff.php   | 52 +++++++++++++++++++
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php | 21 +-------
 .../Sniffs/GraphQL/ValidFieldNameSniff.php    | 20 +------
 .../GraphQL/ValidTopLevelFieldNameSniff.php   | 51 ++++++++++++++++++
 .../Sniffs/GraphQL/ValidTypeNameSniff.php     | 10 +---
 .../ValidTopLevelFieldNameUnitTest.graphqls   | 35 +++++++++++++
 .../ValidTopLevelFieldNameUnitTest.php        | 39 ++++++++++++++
 Magento2/ruleset.xml                          | 12 +++++
 PHP_CodeSniffer/Tokenizers/GraphQL.php        |  2 +
 9 files changed, 194 insertions(+), 48 deletions(-)
 create mode 100644 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
 create mode 100644 Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
 create mode 100644 Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.graphqls
 create mode 100644 Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
new file mode 100644
index 00000000..6d52dcfd
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * Copyright (c) 2019 TechDivision GmbH <info@techdivision.com> - TechDivision GmbH
+ * All rights reserved
+ *
+ * This product includes proprietary software developed at TechDivision GmbH, Germany
+ * For more information see https://www.techdivision.com/
+ *
+ * To obtain a valid license for using this software please contact us at license@techdivision.com
+ */
+namespace Magento2\Sniffs\GraphQL;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Defines an abstract base class for GraphQL sniffs.
+ */
+abstract class AbstractGraphQLSniff implements Sniff
+{
+
+    /**
+     * Defines the tokenizers that this sniff is using.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = ['GraphQL'];
+
+    /**
+     * Returns whether <var>$name</var> starts with a lower case character and is written in camel case.
+     *
+     * @param string $name
+     * @return bool
+     */
+    protected function isCamelCase($name)
+    {
+        return (preg_match('/^[a-z][a-zA-Z0-9]+$/', $name) !== 0);
+    }
+
+    /**
+     * Returns whether <var>$name</var> is strictly lower case, potentially separated by underscores.
+     *
+     * @param string $name
+     * @return bool
+     */
+    protected function isSnakeCase($name)
+    {
+        return preg_match('/^[a-z][a-z0-9_]*$/', $name);
+    }
+
+}
diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 6faeefb6..5a96ec77 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -3,25 +3,16 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Detects argument names that are not specified in <kbd>cameCase</kbd>.
  */
-class ValidArgumentNameSniff implements Sniff
+class ValidArgumentNameSniff extends AbstractGraphQLSniff
 {
 
-    /**
-     * Defines the tokenizers that this sniff is using.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['GraphQL'];
-
     /**
      * @inheritDoc
      */
@@ -132,14 +123,4 @@ private function getCloseParenthesisPointer($stackPointer, array $tokens)
         return false;
     }
 
-    /**
-     * Returns whether <var>$name</var> starts with a lower case character and is written in camel case.
-     *
-     * @param string $argumentName
-     * @return bool
-     */
-    private function isCamelCase($argumentName)
-    {
-        return (preg_match('/^[a-z][a-zA-Z0-9]+$/', $argumentName) !== 0);
-    }
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
index 23d7cb1c..91743afa 100644
--- a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
@@ -6,21 +6,13 @@
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Detects field names the are not specified in <kbd>snake_case</kbd>.
  */
-class ValidFieldNameSniff implements Sniff
+class ValidFieldNameSniff extends AbstractGraphQLSniff
 {
 
-    /**
-     * Defines the tokenizers that this sniff is using.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['GraphQL'];
-
     /**
      * @inheritDoc
      */
@@ -51,14 +43,4 @@ public function process(File $phpcsFile, $stackPtr)
         }
     }
 
-    /**
-     * Returns whether <var>$name</var> is strictly lower case, potentially separated by underscores.
-     *
-     * @param string $name
-     * @return bool
-     */
-    private function isSnakeCase($name)
-    {
-        return preg_match('/^[a-z][a-z0-9_]*$/', $name);
-    }
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
new file mode 100644
index 00000000..cbdf642b
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\GraphQL;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detects top level field names that are not specified in <kbd>cameCase</kbd>.
+ */
+class ValidTopLevelFieldNameSniff extends AbstractGraphQLSniff
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_FUNCTION];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        //compose function name by making use of the next strings that we find until we hit a non-string token
+        $name = '';
+        for ($i=$stackPtr+1; $tokens[$i]['code'] === T_STRING; ++$i) {
+            $name .= $tokens[$i]['content'];
+        }
+
+        if (strlen($name) > 0 && !$this->isCamelCase($name)) {
+            $type  = ucfirst($tokens[$stackPtr]['content']);
+            $error = '%s name "%s" is not in PascalCase format';
+            $data  = [
+                $type,
+                $name,
+            ];
+            $phpcsFile->addError($error, $stackPtr, 'NotCamelCase', $data);
+            $phpcsFile->recordMetric($stackPtr, 'CamelCase top level field name', 'no');
+        } else {
+            $phpcsFile->recordMetric($stackPtr, 'CamelCase top level field name', 'yes');
+        }
+    }
+
+}
diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
index 6b639294..ca153340 100644
--- a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -6,23 +6,15 @@
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Common;
 
 /**
  * Detects types (<kbd>type</kbd>, <kbd>interface</kbd> and <kbd>enum</kbd>) that are not specified in
  * <kbd>UpperCamelCase</kbd>.
  */
-class ValidTypeNameSniff implements Sniff
+class ValidTypeNameSniff extends AbstractGraphQLSniff
 {
 
-    /**
-     * Defines the tokenizers that this sniff is using.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['GraphQL'];
-
     /**
      * @inheritDoc
      */
diff --git a/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.graphqls
new file mode 100644
index 00000000..39d16c92
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.graphqls
@@ -0,0 +1,35 @@
+# Valid names
+query validCamelCaseQuery {}
+mutation validCamelCaseMutation {}
+
+# Incorrect use of camel cyse
+query InvalidCamelCaseQuery {}
+query invalid_Camel_Case_Query_With_Underscores {}
+mutation InvalidCamelCaseMutation {}
+mutation invalid_Camel_Case_Mutation_With_Underscores {}
+
+# All lower case
+query validlowercasequery {}
+mutation validlowercasemutation {}
+
+# All upper case
+query INVALIDUPPERCASEQUERY {}
+mutation INVALIDUPPERCASEMUTATION {}
+
+# Mix camel case with uppercase
+query validCamelCaseQueryWithUPPERCASE {}
+mutation validCamelCaseMutationWithUPPERCASE {}
+
+# Usage of numeric characters
+query validCamelCaseQueryWith1Number {}
+query validCamelCaseQueryWith12345Numbers {}
+query validCamelCaseQueryEndingWithNumber4 {}
+query 5invalidCamelCaseQueryStartingWithNumber {}
+mutation validCamelCaseMutationWith1Number {}
+mutation validCamelCaseMutationWith12345Numbers {}
+mutation validCamelCaseMutationEndingWithNumber4 {}
+mutation 5invalidCamelCaseMutationStartingWithNumber {}
+
+# Empty names (valid by definition of GraphQL)
+query {}
+mutation {}
\ No newline at end of file
diff --git a/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
new file mode 100644
index 00000000..759e9e18
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\GraphQL;
+
+/**
+ * Covers {@link \Magento2\Sniffs\GraphQL\ValidTopLevelFieldNameSniff}.
+ */
+class ValidTopLevelFieldNameUnitTest extends AbstractGraphQLSniffUnitTestCase
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected function getErrorList()
+    {
+        return [
+            6 => 1,
+            7 => 1,
+            8 => 1,
+            9 => 1,
+            16 => 1,
+            17 => 1,
+            27 => 1,
+            31 => 1,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getWarningList()
+    {
+        return [];
+    }
+
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index adda516c..d31750fe 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -526,6 +526,18 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="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>
 
     <!-- Severity 5 warnings: PHPDoc formatting and commenting issues. -->
     <rule ref="Magento2.Commenting.ClassAndInterfacePHPDocFormatting">
diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GraphQL.php
index 0e49cd01..508660fd 100644
--- a/PHP_CodeSniffer/Tokenizers/GraphQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GraphQL.php
@@ -58,6 +58,8 @@ class GraphQL extends Tokenizer
         'implements' => 'T_IMPLEMENTS',
         'type'       => 'T_CLASS',
         'union'      => 'T_CLASS',
+        'query'      => 'T_FUNCTION',
+        'mutation'   => 'T_FUNCTION',
         //TODO We may have to add further types
     ];
 

From 6f5d136ce1a4d98598ccbefd043158de35bd3ef2 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Wed, 11 Sep 2019 13:31:36 +0200
Subject: [PATCH 012/630] MC-19366: Downgrade of package webonyx/graphql-php to
 match lowest php version supported by coding standard

---
 PHP_CodeSniffer/Tokenizers/GraphQL.php |  1 -
 composer.json                          |  2 +-
 composer.lock                          | 23 ++++++++---------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GraphQL.php
index 508660fd..3d2c30b1 100644
--- a/PHP_CodeSniffer/Tokenizers/GraphQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GraphQL.php
@@ -22,7 +22,6 @@ class GraphQL extends Tokenizer
      * @var array
      */
     private $tokenTypeMap = [
-        Token::AMP          => null, //TODO Should we map this to a specific type
         Token::AT           => 'T_DOC_COMMENT_TAG',
         Token::BANG         => null, //TODO Should we map this to a specific type
         Token::BLOCK_STRING => 'T_COMMENT',
diff --git a/composer.json b/composer.json
index 889a9f4e..492357e1 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": ">=5.6.0",
         "squizlabs/php_codesniffer": "^3.4",
-        "webonyx/graphql-php": "^0.13.8"
+        "webonyx/graphql-php": ">=0.12.6 <1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
diff --git a/composer.lock b/composer.lock
index 377b98d9..de4d5a34 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c407f30fd32fc53345205fe5c6d3aa4d",
+    "content-hash": "560d5eca9cf59f965d8f3b98d2ee2a0a",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -59,31 +59,24 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.13.8",
+            "version": "v0.12.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
                 "ext-mbstring": "*",
-                "php": "^7.1||^8.0"
+                "php": ">=5.6"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpbench/phpbench": "^0.14.0",
-                "phpstan/phpstan": "^0.11.4",
-                "phpstan/phpstan-phpunit": "^0.11.0",
-                "phpstan/phpstan-strict-rules": "^0.11.0",
-                "phpunit/phpcov": "^5.0",
-                "phpunit/phpunit": "^7.2",
+                "phpunit/phpunit": "^4.8",
                 "psr/http-message": "^1.0",
                 "react/promise": "2.*"
             },
@@ -107,7 +100,7 @@
                 "api",
                 "graphql"
             ],
-            "time": "2019-08-25T10:32:47+00:00"
+            "time": "2018-09-02T14:59:54+00:00"
         }
     ],
     "packages-dev": [

From 7a5b2661b42a88aff31f23924060147ab274fb32 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Wed, 11 Sep 2019 14:18:20 +0200
Subject: [PATCH 013/630] MC-19366: Fixes code style issues

---
 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php            | 2 --
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php          | 2 --
 Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php             | 2 --
 Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php     | 2 --
 Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php              | 1 -
 Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php | 2 --
 Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php        | 1 -
 Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php           | 1 -
 Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php   | 2 --
 Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php            | 1 -
 10 files changed, 16 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index 6d52dcfd..b03cffe8 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -19,7 +19,6 @@
  */
 abstract class AbstractGraphQLSniff implements Sniff
 {
-
     /**
      * Defines the tokenizers that this sniff is using.
      *
@@ -48,5 +47,4 @@ protected function isSnakeCase($name)
     {
         return preg_match('/^[a-z][a-z0-9_]*$/', $name);
     }
-
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 5a96ec77..ffb1f8d4 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -12,7 +12,6 @@
  */
 class ValidArgumentNameSniff extends AbstractGraphQLSniff
 {
-
     /**
      * @inheritDoc
      */
@@ -122,5 +121,4 @@ private function getCloseParenthesisPointer($stackPointer, array $tokens)
         //if we came here we could not find the closing parenthesis
         return false;
     }
-
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
index 91743afa..f638c228 100644
--- a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
@@ -12,7 +12,6 @@
  */
 class ValidFieldNameSniff extends AbstractGraphQLSniff
 {
-
     /**
      * @inheritDoc
      */
@@ -42,5 +41,4 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'SnakeCase field name', 'yes');
         }
     }
-
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
index cbdf642b..eacbc10d 100644
--- a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
@@ -12,7 +12,6 @@
  */
 class ValidTopLevelFieldNameSniff extends AbstractGraphQLSniff
 {
-
     /**
      * @inheritDoc
      */
@@ -47,5 +46,4 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'CamelCase top level field name', 'yes');
         }
     }
-
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
index ca153340..b80ada40 100644
--- a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -14,7 +14,6 @@
  */
 class ValidTypeNameSniff extends AbstractGraphQLSniff
 {
-
     /**
      * @inheritDoc
      */
diff --git a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
index 83f858b0..f767a25f 100644
--- a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
+++ b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
@@ -13,7 +13,6 @@
  */
 abstract class AbstractGraphQLSniffUnitTestCase extends AbstractSniffUnitTest
 {
-
     protected function setUp()
     {
         //let parent do its job
@@ -31,5 +30,4 @@ protected function setUp()
         //and write back to a global that is used in base class
         $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
     }
-
 }
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
index 746c867e..9c9cfa1d 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
@@ -10,7 +10,6 @@
  */
 class ValidArgumentNameUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
-
     /**
      * @inheritDoc
      */
diff --git a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
index 3ded35bb..6e55e399 100644
--- a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
@@ -10,7 +10,6 @@
  */
 class ValidFieldNameUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
-
     /**
      * @inheritDoc
      */
diff --git a/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
index 759e9e18..be37ddd2 100644
--- a/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
@@ -10,7 +10,6 @@
  */
 class ValidTopLevelFieldNameUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
-
     /**
      * @inheritDoc
      */
@@ -35,5 +34,4 @@ protected function getWarningList()
     {
         return [];
     }
-
 }
diff --git a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
index a04fb314..035934e0 100644
--- a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
@@ -54,4 +54,3 @@ protected function getWarningList()
         return [];
     }
 }
-

From e310c5c80eed552966ba677a41d945ecbd7e021c Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Wed, 11 Sep 2019 14:25:05 +0200
Subject: [PATCH 014/630] MC-19366: Fixes code style issue

---
 Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
index 9c9cfa1d..091a017d 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
@@ -35,4 +35,3 @@ protected function getWarningList()
         return [];
     }
 }
-

From 740410bb46a45405b065e8f63ff5d8feed9f4756 Mon Sep 17 00:00:00 2001
From: konarshankar07 <konar.shankar2013@gmail.com>
Date: Wed, 11 Sep 2019 23:03:19 +0530
Subject: [PATCH 015/630] Fixed false positive finding

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 46 +++++++++++++------
 .../Sniffs/Exceptions/DirectThrowSniff.php    |  1 +
 Magento2/Sniffs/Security/SuperglobalSniff.php |  4 +-
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 3a08852d..a9765278 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -2,11 +2,17 @@
 namespace Magento2\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
 
-class ClassPropertyPHPDocFormattingSniff implements Sniff
+/**
+ * Class ClassPropertyPHPDocFormattingSniff
+ */
+class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
 {
 
+    /**
+     * @var array
+     */
     private $ignoreTokens = [
         T_PUBLIC,
         T_PRIVATE,
@@ -17,19 +23,11 @@ class ClassPropertyPHPDocFormattingSniff implements Sniff
     ];
 
     /**
-     * @inheritDoc
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
      */
-    public function register()
-    {
-        return [
-            T_VARIABLE
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
+    public function processMemberVar(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -69,4 +67,24 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
     }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     */
+    protected function processVariable(File $phpcsFile, $stackPtr)
+    {
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     */
+    protected function processVariableInString(File $phpcsFile, $stackPtr)
+    {
+    }
 }
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 9612d84c..b50ce5d1 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -16,6 +16,7 @@ class DirectThrowSniff implements Sniff
     /**
      * String representation of warning.
      * phpcs:disable Generic.Files.LineLength.TooLong
+     * @var string
      */
     protected $warningMessage = 'Direct throw of generic Exception is discouraged. Use context specific instead.';
     //phpcs:enable
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index 466c1cba..c9f58300 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -42,7 +42,7 @@ class SuperglobalSniff implements Sniff
     protected $errorCode = 'SuperglobalUsageError';
 
     /**
-     * @inheritdoc
+     * @var array
      */
     protected $superGlobalErrors = [
         '$GLOBALS',
@@ -55,7 +55,7 @@ class SuperglobalSniff implements Sniff
     ];
 
     /**
-     * @inheritdoc
+     * @var array
      */
     protected $superGlobalWarning = [
         '$_COOKIE', //sometimes need to get list of all cookies array and there are no methods to do that in M2

From 2a8d52183bb612c3e4b520fb9b6d8a664932d9a9 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Thu, 12 Sep 2019 08:59:40 +0200
Subject: [PATCH 016/630] MC-19366: Deactivates field name validation

---
 Magento2/ruleset.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index d31750fe..9c524658 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -526,10 +526,11 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.GraphQL.ValidFieldName">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
+    <!-- Field name validation deactivated as per request https://github.com/magento/magento-coding-standard/pull/141#discussion_r323349939 -->
+<!--    <rule ref="Magento2.GraphQL.ValidFieldName">-->
+<!--        <severity>6</severity>-->
+<!--        <type>warning</type>-->
+<!--    </rule>-->
     <rule ref="Magento2.GraphQL.ValidArgumentName">
         <severity>6</severity>
         <type>warning</type>

From 505c9b25c8e974a8f430992aba3f9a8adcc6958d Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Thu, 12 Sep 2019 11:33:18 +0200
Subject: [PATCH 017/630] MC-19366: Adds sniff for valid enum values

---
 .../Sniffs/GraphQL/AbstractGraphQLSniff.php   |  32 ++++-
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php |  16 +--
 .../Sniffs/GraphQL/ValidEnumValueSniff.php    | 134 ++++++++++++++++++
 .../GraphQL/ValidEnumValueUnitTest.graphqls   |  19 +++
 .../Tests/GraphQL/ValidEnumValueUnitTest.php  |  34 +++++
 5 files changed, 220 insertions(+), 15 deletions(-)
 create mode 100644 Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
 create mode 100644 Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls
 create mode 100644 Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index b03cffe8..b9e95fae 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -10,6 +10,7 @@
  *
  * To obtain a valid license for using this software please contact us at license@techdivision.com
  */
+
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -38,13 +39,38 @@ protected function isCamelCase($name)
     }
 
     /**
-     * Returns whether <var>$name</var> is strictly lower case, potentially separated by underscores.
+     * Returns whether <var>$name</var> is specified in snake case (either all lower case or all upper case).
      *
      * @param string $name
+     * @param bool $upperCase If set to <kbd>true</kbd> checks for all upper case, otherwise all lower case
      * @return bool
      */
-    protected function isSnakeCase($name)
+    protected function isSnakeCase($name, $upperCase = false)
     {
-        return preg_match('/^[a-z][a-z0-9_]*$/', $name);
+        $pattern = $upperCase ? '/^[A-Z][A-Z0-9_]*$/' : '/^[a-z][a-z0-9_]*$/';
+        return preg_match($pattern, $name);
+    }
+
+    /**
+     * Searches for the first token that has <var>$tokenCode</var> in <var>$tokens</var> from position
+     * <var>$startPointer</var> (excluded).
+     *
+     * @param mixed $tokenCode
+     * @param array $tokens
+     * @param int $startPointer
+     * @return bool|int If token was found, returns its pointer, <kbd>false</kbd> otherwise
+     */
+    protected function seekToken($tokenCode, array $tokens, $startPointer = 0)
+    {
+        $numTokens = count($tokens);
+
+        for ($i = $startPointer + 1; $i < $numTokens; ++$i) {
+            if ($tokens[$i]['code'] === $tokenCode) {
+                return $i;
+            }
+        }
+
+        //if we came here we could not find the requested token
+        return false;
     }
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index ffb1f8d4..03de433f 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -3,6 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Files\File;
@@ -64,7 +65,7 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * Finds all argument names contained in <var>$tokens</var> range <var>$startPointer</var> and
+     * Finds all argument names contained in <var>$tokens</var> in range <var>$startPointer</var> to
      * <var>$endPointer</var>.
      *
      * @param int $startPointer
@@ -80,7 +81,7 @@ private function getArguments($startPointer, $endPointer, array $tokens)
         $skipTypes            = [T_COMMENT, T_WHITESPACE];
 
         for ($i = $startPointer + 1; $i < $endPointer; ++$i) {
-            //skip comment tokens
+            //skip some tokens
             if (in_array($tokens[$i]['code'], $skipTypes)) {
                 continue;
             }
@@ -110,15 +111,6 @@ private function getArguments($startPointer, $endPointer, array $tokens)
      */
     private function getCloseParenthesisPointer($stackPointer, array $tokens)
     {
-        $numTokens = count($tokens);
-
-        for ($i = $stackPointer + 1; $i < $numTokens; ++$i) {
-            if ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
-                return $i;
-            }
-        }
-
-        //if we came here we could not find the closing parenthesis
-        return false;
+        return $this->seekToken(T_CLOSE_PARENTHESIS, $tokens, $stackPointer);
     }
 }
diff --git a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
new file mode 100644
index 00000000..b7c702c7
--- /dev/null
+++ b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\GraphQL;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detects enum values that are not specified in <kbd>SCREAMING_SNAKE_CASE</kbd>.
+ */
+class ValidEnumValueSniff extends AbstractGraphQLSniff
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_CLASS];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        //bail out if we're not inspecting an enum
+        if ($tokens[$stackPtr]['content'] !== 'enum') {
+            return;
+        }
+
+        $openingCurlyPointer = $this->getOpeningCurlyBracketPointer($stackPtr, $tokens);
+        $closingCurlyPointer = $this->getClosingCurlyBracketPointer($stackPtr, $tokens);
+
+        //if we could not find the closing curly bracket pointer, we add a warning and terminate
+        if ($openingCurlyPointer === false || $closingCurlyPointer === false) {
+            $error = 'Possible parse error: %s missing opening or closing brace';
+            $data  = [$tokens[$stackPtr]['content']];
+            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
+            return;
+        }
+
+        $values = $this->getValues($openingCurlyPointer, $closingCurlyPointer, $tokens, $phpcsFile->eolChar);
+
+        foreach ($values as $value) {
+            $pointer = $value[0];
+            $name    = $value[1];
+
+            if (!$this->isSnakeCase($name, true)) {
+                $type  = 'Enum value';
+                $error = '%s "%s" is not in SCREAMING_SNAKE_CASE format';
+                $data  = [
+                    $type,
+                    $name,
+                ];
+
+                $phpcsFile->addError($error, $pointer, 'NotScreamingSnakeCase', $data);
+                $phpcsFile->recordMetric($pointer, 'SCREAMING_SNAKE_CASE enum value', 'no');
+            } else {
+                $phpcsFile->recordMetric($pointer, 'SCREAMING_SNAKE_CASE enum value', 'yes');
+            }
+        }
+
+        return $closingCurlyPointer;
+    }
+
+    /**
+     * Seeks the next available token of type {@link T_CLOSE_CURLY_BRACKET} in <var>$tokens</var> and returns its
+     * pointer.
+     *
+     * @param int $startPointer
+     * @param array $tokens
+     * @return bool|int
+     */
+    private function getClosingCurlyBracketPointer($startPointer, array $tokens)
+    {
+        return $this->seekToken(T_CLOSE_CURLY_BRACKET, $tokens, $startPointer);
+    }
+
+    /**
+     * Seeks the next available token of type {@link T_OPEN_CURLY_BRACKET} in <var>$tokens</var> and returns its
+     * pointer.
+     *
+     * @param $startPointer
+     * @param array $tokens
+     * @return bool|int
+     */
+    private function getOpeningCurlyBracketPointer($startPointer, array $tokens)
+    {
+        return $this->seekToken(T_OPEN_CURLY_BRACKET, $tokens, $startPointer);
+    }
+
+    /**
+     * Finds all enum values contained in <var>$tokens</var> in range <var>$startPointer</var> to
+     * <var>$endPointer</var>.
+     *
+     * @param int $startPointer
+     * @param int $endPointer
+     * @param array $tokens
+     * @param string $eolChar
+     * @return array[]
+     */
+    private function getValues($startPointer, $endPointer, array $tokens, $eolChar)
+    {
+        $valueTokenPointer = null;
+        $enumValue         = '';
+        $values            = [];
+        $skipTypes         = [T_COMMENT, T_WHITESPACE];
+
+        for ($i = $startPointer + 1; $i < $endPointer; ++$i) {
+            //skip some tokens
+            if (in_array($tokens[$i]['code'], $skipTypes)) {
+                continue;
+            }
+            $enumValue .= $tokens[$i]['content'];
+
+            if ($valueTokenPointer === null) {
+                $valueTokenPointer = $i;
+            }
+
+            if (strpos($enumValue, $eolChar) !== false) {
+                $values[]          = [$valueTokenPointer, rtrim($enumValue, $eolChar)];
+                $enumValue         = '';
+                $valueTokenPointer = null;
+            }
+        }
+
+        return $values;
+    }
+}
diff --git a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls
new file mode 100644
index 00000000..994e75f2
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls
@@ -0,0 +1,19 @@
+enum Foo {
+    # Valid values
+    VALID_SCREAMING_SNAKE_CASE_VALUE
+    VALID_SCREAMING_SNAKE_CASE_VALUE_WITH_1_NUMBER
+    VALID_SCREAMING_SNAKE_CASE_VALUE_WITH_12345_NUMBERS
+    VALID_SCREAMING_SNAKE_CASE_VALUE_ENDING_WITH_NUMBER_5
+    VALIDUPPERCASEVALUE
+
+    # Invalid values
+    1_INVALID_SCREAMING_SNAKE_CASE_VALUE_STARTING_WITH_NUMBER
+    invalidCamelCaseValue
+    InvalidCamelCaseCapsValue
+    invalidlowercasevalue
+}
+
+# Ignored although it triggers a T_CLASS token
+type Bar {
+    some_field: String
+}
\ No newline at end of file
diff --git a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
new file mode 100644
index 00000000..9d577f68
--- /dev/null
+++ b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\GraphQL;
+
+/**
+ * Covers {@link \Magento2\Sniffs\GraphQL\ValidEnumValueSniff}
+ */
+class ValidEnumValueUnitTest extends AbstractGraphQLSniffUnitTestCase
+{
+    /**
+     * @inheritDoc
+     */
+    protected function getErrorList()
+    {
+        return [
+            10 => 1,
+            11 => 1,
+            12 => 1,
+            13 => 1,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getWarningList()
+    {
+        return [];
+    }
+}

From 19cdbecfce7889dc09d4941f85649bcd42b352b8 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Thu, 12 Sep 2019 11:41:02 +0200
Subject: [PATCH 018/630] MC-19366: Activates sniff for enum values

---
 Magento2/ruleset.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 9c524658..8d404b05 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -539,6 +539,10 @@
         <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">

From 01eee92d2c72a2433e298a17682d5aa739e7ba50 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Thu, 12 Sep 2019 15:14:22 +0200
Subject: [PATCH 019/630] MC-19366: Fixes file doc

---
 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php  | 12 ++----------
 Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php |  1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index b9e95fae..1012f372 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -1,16 +1,8 @@
 <?php
 /**
- * NOTICE OF LICENSE
- *
- * Copyright (c) 2019 TechDivision GmbH <info@techdivision.com> - TechDivision GmbH
- * All rights reserved
- *
- * This product includes proprietary software developed at TechDivision GmbH, Germany
- * For more information see https://www.techdivision.com/
- *
- * To obtain a valid license for using this software please contact us at license@techdivision.com
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
-
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
index 9d577f68..aaa3e55c 100644
--- a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
@@ -3,7 +3,6 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento2\Tests\GraphQL;
 
 /**

From d99c92283aa303d1c4fbb7a6af6853cb4bffc34e Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 13 Sep 2019 09:22:25 +0200
Subject: [PATCH 020/630] MC-19366: Fixes that tokenizer for GraphQL files
 could not be loaded due to PHP_CodeSniffer uppercasing tokenizer names

---
 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php            | 2 +-
 Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php | 2 +-
 PHP_CodeSniffer/Tokenizers/{GraphQL.php => GRAPHQL.php}     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename PHP_CodeSniffer/Tokenizers/{GraphQL.php => GRAPHQL.php} (99%)

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index 1012f372..6309df08 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -17,7 +17,7 @@ abstract class AbstractGraphQLSniff implements Sniff
      *
      * @var array
      */
-    public $supportedTokenizers = ['GraphQL'];
+    public $supportedTokenizers = ['GRAPHQL'];
 
     /**
      * Returns whether <var>$name</var> starts with a lower case character and is written in camel case.
diff --git a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
index f767a25f..19bcd586 100644
--- a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
+++ b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
@@ -23,7 +23,7 @@ protected function setUp()
         $config->extensions = array_merge(
             $config->extensions,
             [
-                'graphqls' => 'GraphQL'
+                'graphqls' => 'GRAPHQL'
             ]
         );
 
diff --git a/PHP_CodeSniffer/Tokenizers/GraphQL.php b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
similarity index 99%
rename from PHP_CodeSniffer/Tokenizers/GraphQL.php
rename to PHP_CodeSniffer/Tokenizers/GRAPHQL.php
index 3d2c30b1..17c30581 100644
--- a/PHP_CodeSniffer/Tokenizers/GraphQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
@@ -13,7 +13,7 @@
 /**
  * Implements a tokenizer for GraphQL files.
  */
-class GraphQL extends Tokenizer
+class GRAPHQL extends Tokenizer
 {
 
     /**

From 49f0b0b09924067373cfc86b2e8a210f546393c6 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 13 Sep 2019 13:38:10 +0200
Subject: [PATCH 021/630] MC-19366: Fixes that agruments with directives would
 result in erroneous output and that arguments could be treated as fields

---
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php | 163 +++++++++++++-----
 .../ValidArgumentNameUnitTest.graphqls        |  19 +-
 .../GraphQL/ValidArgumentNameUnitTest.php     |   2 +
 PHP_CodeSniffer/Tokenizers/GRAPHQL.php        |  39 ++---
 4 files changed, 156 insertions(+), 67 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 03de433f..39cf76df 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -6,6 +6,8 @@
 
 namespace Magento2\Sniffs\GraphQL;
 
+use GraphQL\Error\SyntaxError;
+use GraphQL\Language\AST\DocumentNode;
 use PHP_CodeSniffer\Files\File;
 
 /**
@@ -13,12 +15,13 @@
  */
 class ValidArgumentNameSniff extends AbstractGraphQLSniff
 {
+
     /**
      * @inheritDoc
      */
     public function register()
     {
-        return [T_OPEN_PARENTHESIS];
+        return [T_VARIABLE];
     }
 
     /**
@@ -26,11 +29,17 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens                  = $phpcsFile->getTokens();
-        $closeParenthesisPointer = $this->getCloseParenthesisPointer($stackPtr, $tokens);
+        $tokens = $phpcsFile->getTokens();
+
+        //get the pointer to the argument list opener or bail out if none was found since then the field does not have arguments
+        $openArgumentListPointer = $this->getArgumentListOpenPointer($stackPtr, $tokens);
+        if ($openArgumentListPointer === false) {
+            return;
+        }
 
-        //if we could not find the closing parenthesis pointer, we add a warning and terminate
-        if ($closeParenthesisPointer === false) {
+        //get the pointer to the argument list closer or add a warning and terminate as we have an unbalanced file
+        $closeArgumentListPointer = $this->getArgumentListClosePointer($openArgumentListPointer, $tokens);
+        if ($closeArgumentListPointer === false) {
             $error = 'Possible parse error: Missing closing parenthesis for argument list in line %d';
             $data  = [
                 $tokens[$stackPtr]['line'],
@@ -39,18 +48,15 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $arguments = $this->getArguments($stackPtr, $closeParenthesisPointer, $tokens);
+        $arguments = $this->getArguments($openArgumentListPointer, $closeArgumentListPointer, $tokens);
 
-        foreach ($arguments as $argument) {
-            $pointer = $argument[0];
-            $name    = $argument[1];
-
-            if (!$this->isCamelCase($name)) {
+        foreach ($arguments as $pointer => $argument) {
+            if (!$this->isCamelCase($argument)) {
                 $type  = 'Argument';
                 $error = '%s name "%s" is not in CamelCase format';
                 $data  = [
                     $type,
-                    $name,
+                    $argument,
                 ];
 
                 $phpcsFile->addError($error, $pointer, 'NotCamelCase', $data);
@@ -61,56 +67,131 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         //return stack pointer of closing parenthesis
-        return $closeParenthesisPointer;
+        return $closeArgumentListPointer;
     }
 
     /**
-     * Finds all argument names contained in <var>$tokens</var> in range <var>$startPointer</var> to
-     * <var>$endPointer</var>.
+     * Seeks the last token of an argument definition and returns its pointer.
      *
-     * @param int $startPointer
-     * @param int $endPointer
+     * Arguments are defined as follows:
+     * <noformat>
+     *   {ArgumentName}: {ArgumentType}[ = {DefaultValue}][{Directive}]*
+     * </noformat>
+     *
+     * @param int $argumentDefinitionStartPointer
      * @param array $tokens
-     * @return array[]
+     * @return int
      */
-    private function getArguments($startPointer, $endPointer, array $tokens)
+    private function getArgumentDefinitionEndPointer($argumentDefinitionStartPointer, array $tokens)
     {
-        $argumentTokenPointer = null;
-        $argument             = '';
-        $names                = [];
-        $skipTypes            = [T_COMMENT, T_WHITESPACE];
+        $colonPointer = $this->seekToken(T_COLON, $tokens, $argumentDefinitionStartPointer);
 
-        for ($i = $startPointer + 1; $i < $endPointer; ++$i) {
-            //skip some tokens
-            if (in_array($tokens[$i]['code'], $skipTypes)) {
-                continue;
-            }
-            $argument .= $tokens[$i]['content'];
+        //the colon is always followed by a type so we can consume the token after the colon
+        $endPointer = $colonPointer + 1;
 
-            if ($argumentTokenPointer === null) {
-                $argumentTokenPointer = $i;
-            }
+        //if argument has a default value, we advance to the default definition end
+        if ($tokens[$endPointer + 1]['code'] === T_EQUAL) {
+            $endPointer += 2;
+        }
+
+        //while next token starts a directive, we advance to the end of the directive
+        while ($tokens[$endPointer + 1]['code'] === T_DOC_COMMENT_TAG) {
+            //consume next two tokens
+            $endPointer += 2;
 
-            if (preg_match('/^.+:.+$/', $argument)) {
-                list($name, $type) = explode(':', $argument);
-                $names[]              = [$argumentTokenPointer, $name];
-                $argument             = '';
-                $argumentTokenPointer = null;
+            //if next token is an opening parenthesis, we consume everything up to the closing parenthesis
+            if ($tokens[$endPointer + 1]['code'] === T_OPEN_PARENTHESIS) {
+                $endPointer = $tokens[$endPointer + 1]['parenthesis_closer'];
             }
         }
 
-        return $names;
+        return $endPointer;
+    }
+
+    /**
+     * Returns the closing parenthesis for the token found at <var>$openParenthesisPointer</var> in <var>$tokens</var>.
+     *
+     * @param int $openParenthesisPointer
+     * @param array $tokens
+     * @return bool|int
+     */
+    private function getArgumentListClosePointer($openParenthesisPointer, array $tokens)
+    {
+        $openParenthesisToken = $tokens[$openParenthesisPointer];
+        return $openParenthesisToken['parenthesis_closer'];
     }
 
     /**
-     * Seeks the next available token of type {@link T_CLOSE_PARENTHESIS} in <var>$tokens</var> and returns its pointer.
+     * Seeks the next available {@link T_OPEN_PARENTHESIS} token that comes directly after <var>$stackPointer</var>.
+     * token.
      *
      * @param int $stackPointer
      * @param array $tokens
      * @return bool|int
      */
-    private function getCloseParenthesisPointer($stackPointer, array $tokens)
+    private function getArgumentListOpenPointer($stackPointer, array $tokens)
+    {
+        //get next open parenthesis pointer or bail out if none was found
+        $openParenthesisPointer = $this->seekToken(T_OPEN_PARENTHESIS, $tokens, $stackPointer);
+        if ($openParenthesisPointer === false) {
+            return false;
+        }
+
+        //bail out if open parenthesis does not directly come after current stack pointer
+        if ($openParenthesisPointer !== $stackPointer + 1) {
+            return false;
+        }
+
+        //we have found the appropriate opening parenthesis
+        return $openParenthesisPointer;
+    }
+
+    /**
+     * Finds all argument names contained in <var>$tokens</var> in range <var>$startPointer</var> to
+     * <var>$endPointer</var>.
+     *
+     * The returned array uses token pointers as keys and argument names as values.
+     *
+     * @param int $startPointer
+     * @param int $endPointer
+     * @param array $tokens
+     * @return array<int, string>
+     */
+    private function getArguments($startPointer, $endPointer, array $tokens)
     {
-        return $this->seekToken(T_CLOSE_PARENTHESIS, $tokens, $stackPointer);
+        $argumentTokenPointer = null;
+        $argument             = '';
+        $names                = [];
+        $skipTypes            = [T_COMMENT, T_WHITESPACE];
+
+        for ($i = $startPointer + 1; $i < $endPointer; ++$i) {
+            $tokenCode = $tokens[$i]['code'];
+
+            switch (true) {
+                case in_array($tokenCode, $skipTypes):
+                    //NOP This is a toke that we have to skip
+                    break;
+                case $tokenCode === T_COLON:
+                    //we have reached the end of the argument name, thus we store its pointer and value
+                    $names[$argumentTokenPointer] = $argument;
+
+                    //advance to end of argument definition
+                    $i = $this->getArgumentDefinitionEndPointer($argumentTokenPointer, $tokens);
+
+                    //and reset temporary variables
+                    $argument             = '';
+                    $argumentTokenPointer = null;
+                    break;
+                default:
+                    //this seems to be part of the argument name
+                    $argument .= $tokens[$i]['content'];
+
+                    if ($argumentTokenPointer === null) {
+                        $argumentTokenPointer = $i;
+                    }
+            }
+        }
+
+        return $names;
     }
 }
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
index 83b4f23c..5fa3c277 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
@@ -29,4 +29,21 @@ interface Foo {
         invalid_argument_name_snake_case: Int
         5invalidArgumentNameStatingWithNumber: Int
     ): String
-}
\ No newline at end of file
+}
+
+#
+# Make sure that directives on arguments do not lead to false positives
+#
+type Foo @doc(descripton: "Foo Bar Baz") {
+    myfield (
+        # Valid arguments
+        validArgument: String = "My fair lady" @doc(
+            # A comment
+            description: "This is a valid argument, spanned over multiple lines."
+        ) @foo
+        varlidArgumentWithDefaultValue: Int = 20 @doc(description: "This is another valid argument with a default value.")
+        # Invalid argument
+        invalid_argument: String @doc(description: "This is an invalid argument."),
+        invalid_argument_with_default_value: Int = 20 @doc(description: "This is another invalid argument with a default value")
+    ): String @doc(description: "Foo Bar")
+}
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
index 091a017d..8ed55cfa 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
@@ -24,6 +24,8 @@ protected function getErrorList()
             28 => 1,
             29 => 1,
             30 => 1,
+            46 => 1,
+            47 => 1,
         ];
     }
 
diff --git a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
index 17c30581..01345fc3 100644
--- a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
@@ -7,6 +7,7 @@
 namespace PHP_CodeSniffer\Tokenizers;
 
 use GraphQL\Language\Lexer;
+use GraphQL\Language\Parser;
 use GraphQL\Language\Source;
 use GraphQL\Language\Token;
 
@@ -81,11 +82,10 @@ protected function tokenize($string)
     {
         $this->logVerbose('*** START GRAPHQL TOKENIZING ***');
 
-        $string = str_replace($this->eolChar, "\n", $string);
-        $tokens = [];
-        $lexer  = new Lexer(
-            new Source($string)
-        );
+        $string   = str_replace($this->eolChar, "\n", $string);
+        $tokens   = [];
+        $source   = new Source($string);
+        $lexer    = new Lexer($source);
 
         do {
             $kind  = $lexer->token->kind;
@@ -178,19 +178,17 @@ private function getNewLineTokens($lineStart, $lineEnd)
      */
     private function isFieldToken($stackPointer)
     {
+        //bail out if current token is nested in a parenthesis, since fields cannot be contained in parenthesises
+        if (isset($this->tokens[$stackPointer]['nested_parenthesis'])) {
+            return false;
+        }
+
         $nextToken = $this->tokens[$stackPointer + 1];
 
-        //if next token is an opening parenthesis, we seek for the closing parenthesis
+        //if next token is an opening parenthesis, we advance to the token after the closing parenthesis
         if ($nextToken['code'] === T_OPEN_PARENTHESIS) {
-            $nextPointer = $stackPointer + 1;
-            $numTokens   = count($this->tokens);
-
-            for ($i = $nextPointer; $i < $numTokens; ++$i) {
-                if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
-                    $nextToken = $this->tokens[$i + 1];
-                    break;
-                }
-            }
+            $nextPointer = $nextToken['parenthesis_closer'] + 1;
+            $nextToken   = $this->tokens[$nextPointer];
         }
 
         //return whether current token is a string and next token is a colon
@@ -215,7 +213,6 @@ private function logVerbose($message, $level = 1)
      */
     private function processFields()
     {
-        $processingArgumentList = false;
         $processingEntity       = false;
         $numTokens              = count($this->tokens);
         $entityTypes            = [T_CLASS, T_INTERFACE];
@@ -237,15 +234,7 @@ private function processFields()
                     //we have hit the end of an entity declaration
                     $processingEntity = false;
                     break;
-                case $tokenCode === T_OPEN_PARENTHESIS:
-                    //we have hit an argument list
-                    $processingArgumentList = true;
-                    break;
-                case $tokenCode === T_CLOSE_PARENTHESIS:
-                    //we have hit an argument list end
-                    $processingArgumentList = false;
-                    break;
-                case $processingEntity && !$processingArgumentList && $this->isFieldToken($i):
+                case $processingEntity && $this->isFieldToken($i):
                     //we have hit a field
                     $this->tokens[$i]['code'] = T_VARIABLE;
                     $this->tokens[$i]['type'] = 'T_VARIABLE';

From 0b8eeaad4c41b40a5997ab7e0bf8b77b5248d8d4 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 13 Sep 2019 13:50:41 +0200
Subject: [PATCH 022/630] MC-19366: Fixes that field name validation was
 executed although it should not

---
 Magento2/ruleset.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 8d404b05..60186f30 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -526,11 +526,15 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
-    <!-- Field name validation deactivated as per request https://github.com/magento/magento-coding-standard/pull/141#discussion_r323349939 -->
-<!--    <rule ref="Magento2.GraphQL.ValidFieldName">-->
-<!--        <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>

From 571b642071ff71fe5f49f0660939b2b86c20a20d Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 13 Sep 2019 14:06:47 +0200
Subject: [PATCH 023/630] MC-19366: Fixes that field and argument names were
 marked as entities in case their name was a keyword

---
 PHP_CodeSniffer/Tokenizers/GRAPHQL.php | 53 +++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
index 01345fc3..b9056414 100644
--- a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
@@ -7,7 +7,6 @@
 namespace PHP_CodeSniffer\Tokenizers;
 
 use GraphQL\Language\Lexer;
-use GraphQL\Language\Parser;
 use GraphQL\Language\Source;
 use GraphQL\Language\Token;
 
@@ -70,6 +69,7 @@ public function processAdditional()
     {
         $this->logVerbose('*** START ADDITIONAL GRAPHQL PROCESSING ***');
 
+        $this->fixErroneousKeywordTokens();
         $this->processFields();
 
         $this->logVerbose('*** END ADDITIONAL GRAPHQL PROCESSING ***');
@@ -82,10 +82,10 @@ protected function tokenize($string)
     {
         $this->logVerbose('*** START GRAPHQL TOKENIZING ***');
 
-        $string   = str_replace($this->eolChar, "\n", $string);
-        $tokens   = [];
-        $source   = new Source($string);
-        $lexer    = new Lexer($source);
+        $string = str_replace($this->eolChar, "\n", $string);
+        $tokens = [];
+        $source = new Source($string);
+        $lexer  = new Lexer($source);
 
         do {
             $kind  = $lexer->token->kind;
@@ -141,6 +141,41 @@ protected function tokenize($string)
         return $tokens;
     }
 
+    /**
+     * Fixes that keywords may be used as field, argument etc. names and could thus have been marked as special tokens
+     * while tokenizing.
+     */
+    private function fixErroneousKeywordTokens()
+    {
+        $processingCodeBlock = false;
+        $numTokens           = count($this->tokens);
+
+        for ($i = 0; $i < $numTokens; ++$i) {
+            $tokenCode    = $this->tokens[$i]['code'];
+            $tokenContent = $this->tokens[$i]['content'];
+
+            switch (true) {
+                case $tokenCode === T_OPEN_CURLY_BRACKET:
+                    //we have hit the beginning of a code block
+                    $processingCodeBlock = true;
+                    break;
+                case $tokenCode === T_CLOSE_CURLY_BRACKET:
+                    //we have hit the end of a code block
+                    $processingCodeBlock = false;
+                    break;
+                case $processingCodeBlock
+                     && $tokenCode !== T_STRING
+                     && isset($this->keywordTokenTypeMap[$tokenContent]):
+                    //we have hit a keyword within a code block that is of wrong token type
+                    $this->tokens[$i]['code'] = T_STRING;
+                    $this->tokens[$i]['type'] = 'T_STRING';
+                    break;
+                default:
+                    //NOP All operations have already been executed
+            }
+        }
+    }
+
     /**
      * Returns tokens of empty new lines for the range <var>$lineStart</var> to <var>$lineEnd</var>
      *
@@ -213,10 +248,10 @@ private function logVerbose($message, $level = 1)
      */
     private function processFields()
     {
-        $processingEntity       = false;
-        $numTokens              = count($this->tokens);
-        $entityTypes            = [T_CLASS, T_INTERFACE];
-        $skipTypes              = [T_COMMENT, T_WHITESPACE];
+        $processingEntity = false;
+        $numTokens        = count($this->tokens);
+        $entityTypes      = [T_CLASS, T_INTERFACE];
+        $skipTypes        = [T_COMMENT, T_WHITESPACE];
 
         for ($i = 0; $i < $numTokens; ++$i) {
             $tokenCode = $this->tokens[$i]['code'];

From c57400364834333181731376a51bfe9951ee73cc Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Fri, 13 Sep 2019 14:19:44 +0200
Subject: [PATCH 024/630] MC-19366: Fixes code style issue

---
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 39cf76df..337bf9ff 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -31,7 +31,8 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        //get the pointer to the argument list opener or bail out if none was found since then the field does not have arguments
+        //get the pointer to the argument list opener or bail out if none was found
+        //since then the field does not have arguments
         $openArgumentListPointer = $this->getArgumentListOpenPointer($stackPtr, $tokens);
         if ($openArgumentListPointer === false) {
             return;

From 97cc6618592380361685a7da507cdfcad6dc4c7c Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 15 Sep 2019 13:17:17 +0530
Subject: [PATCH 025/630] added correct formatted examples

---
 .../ClassPropertyPHPDocFormattingSniff.php    |  2 +-
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 28 +++++++++++++++++--
 .../ClassPropertyPHPDocFormattingUnitTest.php |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index a9765278..a057e5b0 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -56,7 +56,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
 
         if ($foundVar === null) {
             $error = 'Missing @var tag in class property comment';
-            $phpcsFile->addWarning($error, $commentEnd, 'MissingVar');
+            $phpcsFile->addWarning($error, $stackPtr, 'MissingVar');
             return;
         }
 
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 2abc3e8f..dc40d74c 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -10,14 +10,14 @@ class Foo
     /**
      * Foo
      */
-    private $_withoutClassAttribute = '';
+    public $_withoutClassAttribute = '';
 
     /**
      * @var Test
      *
      * Short Description
      */
-    private $_classAttributeWithShortDescription = '';
+    protected $_classAttributeWithShortDescription = '';
 
     /**
      * @var
@@ -33,3 +33,27 @@ class Foo
 
     private $_missingDocBlockClassAttribute = '';
 }
+
+class Bar {
+
+    /**
+     * @var correctlyFormattedPublicClassMember
+     *
+     * Short Description
+     */
+    public $correctlyFormattedPublicClassMember;
+
+    /**
+     * @var correctlyFormattedPrivateClassMember
+     *
+     * Short Description
+     */
+    private $correctlyFormattedPrivateClassMember;
+
+    /**
+     * @var correctlyFormattedProtectedClassMember
+     *
+     * Short Description
+     */
+    protected $correctlyFormattedProtectedClassMember;
+}
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 6672d3f0..675eef4f 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -23,7 +23,7 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            12 => 1,
+            13 => 1,
             23 => 1,
             30 => 1,
             34 => 1

From 43ef0a4b8d14197f8ec34cc97161a45a6d71b45a Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Mon, 16 Sep 2019 09:07:19 +0200
Subject: [PATCH 026/630] MC-19366: Removes obsolete TODOs

---
 PHP_CodeSniffer/Tokenizers/GRAPHQL.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
index b9056414..9de922df 100644
--- a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
@@ -19,11 +19,15 @@ class GRAPHQL extends Tokenizer
     /**
      * Defines how GraphQL token types are mapped to PHP token types.
      *
+     * This is a complete list of all token types supported by <kbd>webonyx/graphql-php</var>. <knd>null</kbd> values
+     * are automatically mapped to <kbd>T_STRING</kbd> but are noted as <kbd>null</kbd> in this list to improve
+     * maintenance at a glance.
+     *
      * @var array
      */
     private $tokenTypeMap = [
         Token::AT           => 'T_DOC_COMMENT_TAG',
-        Token::BANG         => null, //TODO Should we map this to a specific type
+        Token::BANG         => null,
         Token::BLOCK_STRING => 'T_COMMENT',
         Token::BRACE_L      => 'T_OPEN_CURLY_BRACKET',
         Token::BRACE_R      => 'T_CLOSE_CURLY_BRACKET',
@@ -34,12 +38,12 @@ class GRAPHQL extends Tokenizer
         Token::DOLLAR       => 'T_DOLLAR',
         Token::EOF          => 'T_CLOSE_TAG',
         Token::EQUALS       => 'T_EQUAL',
-        Token::FLOAT        => null, //TODO Should we map this to a specific type
-        Token::INT          => null, //TODO Should we map this to a specific type
+        Token::FLOAT        => null,
+        Token::INT          => null,
         Token::NAME         => 'T_STRING',
         Token::PAREN_L      => 'T_OPEN_PARENTHESIS',
         Token::PAREN_R      => 'T_CLOSE_PARENTHESIS',
-        Token::PIPE         => null, //TODO Should we map this to a specific type
+        Token::PIPE         => null,
         Token::SPREAD       => 'T_ELLIPSIS',
         Token::SOF          => 'T_OPEN_TAG',
         Token::STRING       => 'T_STRING',
@@ -52,14 +56,13 @@ class GRAPHQL extends Tokenizer
      */
     private $keywordTokenTypeMap = [
         'enum'       => 'T_CLASS',
-        'extend'     => 'T_EXTENDS', //TODO This might not be the appropriate equivalent
+        'extend'     => 'T_EXTENDS',
         'interface'  => 'T_INTERFACE',
         'implements' => 'T_IMPLEMENTS',
         'type'       => 'T_CLASS',
         'union'      => 'T_CLASS',
         'query'      => 'T_FUNCTION',
         'mutation'   => 'T_FUNCTION',
-        //TODO We may have to add further types
     ];
 
     /**

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 027/630] 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">

From af9c04119912bb96ccd5e067c97772d7169f53b1 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Tue, 17 Sep 2019 10:28:30 +0200
Subject: [PATCH 028/630] MC-19366: Fixes that list type and non null arguments
 would not be parsed as expected and would thus lead to false positives

---
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php   | 17 ++++++++++++++---
 .../GraphQL/ValidArgumentNameUnitTest.graphqls  | 12 +++++++++++-
 .../Tests/GraphQL/ValidArgumentNameUnitTest.php |  9 +++++++--
 PHP_CodeSniffer/Tokenizers/GRAPHQL.php          |  7 +++++--
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 337bf9ff..7741b675 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -85,10 +85,21 @@ public function process(File $phpcsFile, $stackPtr)
      */
     private function getArgumentDefinitionEndPointer($argumentDefinitionStartPointer, array $tokens)
     {
-        $colonPointer = $this->seekToken(T_COLON, $tokens, $argumentDefinitionStartPointer);
+        $endPointer = $this->seekToken(T_COLON, $tokens, $argumentDefinitionStartPointer);
+
+        //the colon is always followed by the type, which we can consume. it could be a list type though, thus we check
+        if ($tokens[$endPointer + 1]['code'] === T_OPEN_SQUARE_BRACKET) {
+            //consume everything up to closing bracket
+            $endPointer = $tokens[$endPointer + 1]['bracket_closer'];
+        } else {
+            //consume everything up to type
+            ++$endPointer;
+        }
 
-        //the colon is always followed by a type so we can consume the token after the colon
-        $endPointer = $colonPointer + 1;
+        //the type may be non null, meaning that it is followed by an exclamation mark, which we consume
+        if ($tokens[$endPointer + 1]['code'] === T_BOOLEAN_NOT) {
+            ++$endPointer;
+        }
 
         //if argument has a default value, we advance to the default definition end
         if ($tokens[$endPointer + 1]['code'] === T_EQUAL) {
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
index 5fa3c277..8c1e12c0 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
@@ -41,9 +41,19 @@ type Foo @doc(descripton: "Foo Bar Baz") {
             # A comment
             description: "This is a valid argument, spanned over multiple lines."
         ) @foo
-        varlidArgumentWithDefaultValue: Int = 20 @doc(description: "This is another valid argument with a default value.")
+        validArgumentWithDefaultValue: Int = 20 @doc(description: "This is another valid argument with a default value.")
+        validArgumentListType: [String] @doc(description: "This is a valid argument that uses a list type.")
+        validArgumentNonNullType: String! @doc(description: "This is a valid argument that uses a non null type.")
+        validArgumentNonNullListType: [String]! @doc(description: "This is a valid argument that uses a non null type.")
+        validArgumentNonNullTypeInListType: [String!] @doc(description: "This is a valid argument that uses a non null type within a list.")
+        validArgumentNonNullTypeInNonNullListType: [String!]! @doc(description: "This is a valid argument that uses a non null type within a non null list type.")
         # Invalid argument
         invalid_argument: String @doc(description: "This is an invalid argument."),
         invalid_argument_with_default_value: Int = 20 @doc(description: "This is another invalid argument with a default value")
+        invalid_argument_list_type: [String] @doc(description: "This is an invalid argument that uses a list type.")
+        invalid_argument_non_null_type: String! @doc(description: "This is an invalid argument that uses a non null type.")
+        invalid_argument_non_null_list_type: [String]! @doc(description: "This is an invalid argument that uses a non null type.")
+        invalid_argument_non_null_type_in_list_type: [String!] @doc(description: "This is an invalid argument that uses a non null type within a list.")
+        invalid_argument_non_null_type_in_non_null_list_type: [String!]! @doc(description: "This is a valid argument that uses a non null type within a non null list type.")
     ): String @doc(description: "Foo Bar")
 }
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
index 8ed55cfa..c0f41e5b 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
@@ -24,8 +24,13 @@ protected function getErrorList()
             28 => 1,
             29 => 1,
             30 => 1,
-            46 => 1,
-            47 => 1,
+            51 => 1,
+            52 => 1,
+            53 => 1,
+            54 => 1,
+            55 => 1,
+            56 => 1,
+            57 => 1,
         ];
     }
 
diff --git a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
index 9de922df..8dd5fcae 100644
--- a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
@@ -27,12 +27,12 @@ class GRAPHQL extends Tokenizer
      */
     private $tokenTypeMap = [
         Token::AT           => 'T_DOC_COMMENT_TAG',
-        Token::BANG         => null,
+        Token::BANG         => 'T_BOOLEAN_NOT',
         Token::BLOCK_STRING => 'T_COMMENT',
         Token::BRACE_L      => 'T_OPEN_CURLY_BRACKET',
         Token::BRACE_R      => 'T_CLOSE_CURLY_BRACKET',
         Token::BRACKET_L    => 'T_OPEN_SQUARE_BRACKET',
-        Token::BRACKET_R    => 'T_CLOSE_CURLY_BRACKET',
+        Token::BRACKET_R    => 'T_CLOSE_SQUARE_BRACKET',
         Token::COLON        => 'T_COLON',
         Token::COMMENT      => 'T_COMMENT',
         Token::DOLLAR       => 'T_DOLLAR',
@@ -112,6 +112,9 @@ protected function tokenize($string)
                 case Token::PAREN_L:
                 case Token::PAREN_R:
                 case Token::COLON:
+                case Token::BRACKET_L:
+                case Token::BRACKET_R:
+                case Token::BANG:
                     $value = $kind;
                     break;
                 default:

From c4069e0e44e3b16fc75c01df7c131d599ff8f67f Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Tue, 17 Sep 2019 11:54:43 +0200
Subject: [PATCH 029/630] MC-19366: Fixes that enum values with directives
 would be parsed as expected and would thus lead to false positives

---
 .../Sniffs/GraphQL/AbstractGraphQLSniff.php   | 24 +++++++++++
 .../Sniffs/GraphQL/ValidArgumentNameSniff.php | 10 +----
 .../Sniffs/GraphQL/ValidEnumValueSniff.php    | 40 ++++++++++++-------
 .../ValidArgumentNameUnitTest.graphqls        |  2 +-
 .../GraphQL/ValidEnumValueUnitTest.graphqls   |  8 ++++
 .../Tests/GraphQL/ValidEnumValueUnitTest.php  | 10 +++--
 6 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index 6309df08..d15ff43a 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -43,6 +43,30 @@ protected function isSnakeCase($name, $upperCase = false)
         return preg_match($pattern, $name);
     }
 
+    /**
+     * Returns the pointer to the last token of a directive if the token at <var>$startPointer</var> starts a directive.
+     *
+     * @param array $tokens
+     * @param int $startPointer
+     * @return int The end of the directive if one is found, the start pointer otherwise
+     */
+    protected function seekEndOfDirective(array $tokens, $startPointer)
+    {
+        $endPointer = $startPointer;
+
+        if ($tokens[$startPointer]['code'] === T_DOC_COMMENT_TAG) {
+            //advance to next token
+            $endPointer += 1;
+
+            //if next token is an opening parenthesis, we consume everything up to the closing parenthesis
+            if ($tokens[$endPointer + 1]['code'] === T_OPEN_PARENTHESIS) {
+                $endPointer = $tokens[$endPointer + 1]['parenthesis_closer'];
+            }
+        }
+
+        return $endPointer;
+    }
+
     /**
      * Searches for the first token that has <var>$tokenCode</var> in <var>$tokens</var> from position
      * <var>$startPointer</var> (excluded).
diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 7741b675..549130e4 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -108,13 +108,7 @@ private function getArgumentDefinitionEndPointer($argumentDefinitionStartPointer
 
         //while next token starts a directive, we advance to the end of the directive
         while ($tokens[$endPointer + 1]['code'] === T_DOC_COMMENT_TAG) {
-            //consume next two tokens
-            $endPointer += 2;
-
-            //if next token is an opening parenthesis, we consume everything up to the closing parenthesis
-            if ($tokens[$endPointer + 1]['code'] === T_OPEN_PARENTHESIS) {
-                $endPointer = $tokens[$endPointer + 1]['parenthesis_closer'];
-            }
+            $endPointer = $this->seekEndOfDirective($tokens, $endPointer + 1);
         }
 
         return $endPointer;
@@ -181,7 +175,7 @@ private function getArguments($startPointer, $endPointer, array $tokens)
 
             switch (true) {
                 case in_array($tokenCode, $skipTypes):
-                    //NOP This is a toke that we have to skip
+                    //NOP This is a token that we have to skip
                     break;
                 case $tokenCode === T_COLON:
                     //we have reached the end of the argument name, thus we store its pointer and value
diff --git a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
index b7c702c7..a9c5f245 100644
--- a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
@@ -3,6 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Files\File;
@@ -46,16 +47,14 @@ public function process(File $phpcsFile, $stackPtr)
 
         $values = $this->getValues($openingCurlyPointer, $closingCurlyPointer, $tokens, $phpcsFile->eolChar);
 
-        foreach ($values as $value) {
-            $pointer = $value[0];
-            $name    = $value[1];
+        foreach ($values as $pointer => $value) {
 
-            if (!$this->isSnakeCase($name, true)) {
+            if (!$this->isSnakeCase($value, true)) {
                 $type  = 'Enum value';
                 $error = '%s "%s" is not in SCREAMING_SNAKE_CASE format';
                 $data  = [
                     $type,
-                    $name,
+                    $value,
                 ];
 
                 $phpcsFile->addError($error, $pointer, 'NotScreamingSnakeCase', $data);
@@ -98,11 +97,13 @@ private function getOpeningCurlyBracketPointer($startPointer, array $tokens)
      * Finds all enum values contained in <var>$tokens</var> in range <var>$startPointer</var> to
      * <var>$endPointer</var>.
      *
+     * The returned array uses token pointers as keys and value names as values.
+     *
      * @param int $startPointer
      * @param int $endPointer
      * @param array $tokens
      * @param string $eolChar
-     * @return array[]
+     * @return array<int,string>
      */
     private function getValues($startPointer, $endPointer, array $tokens, $eolChar)
     {
@@ -112,20 +113,31 @@ private function getValues($startPointer, $endPointer, array $tokens, $eolChar)
         $skipTypes         = [T_COMMENT, T_WHITESPACE];
 
         for ($i = $startPointer + 1; $i < $endPointer; ++$i) {
-            //skip some tokens
             if (in_array($tokens[$i]['code'], $skipTypes)) {
+                //NOP This is a token that we have to skip
                 continue;
             }
-            $enumValue .= $tokens[$i]['content'];
 
-            if ($valueTokenPointer === null) {
-                $valueTokenPointer = $i;
+            //add current tokens content to enum value if we have a string
+            if ($tokens[$i]['code'] === T_STRING) {
+                $enumValue .= $tokens[$i]['content'];
+
+                //and store the pointer if we have not done it already
+                if ($valueTokenPointer === null) {
+                    $valueTokenPointer = $i;
+                }
+            }
+
+            //consume directive if we have found one
+            if ($tokens[$i]['code'] === T_DOC_COMMENT_TAG) {
+                $i = $this->seekEndOfDirective($tokens, $i);
             }
 
-            if (strpos($enumValue, $eolChar) !== false) {
-                $values[]          = [$valueTokenPointer, rtrim($enumValue, $eolChar)];
-                $enumValue         = '';
-                $valueTokenPointer = null;
+            //if current token has a line break, we have found the end of the value definition
+            if (strpos($tokens[$i]['content'], $eolChar) !== false) {
+                $values[$valueTokenPointer] = trim($enumValue);
+                $enumValue                  = '';
+                $valueTokenPointer          = null;
             }
         }
 
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
index 8c1e12c0..e2128c9b 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.graphqls
@@ -40,7 +40,7 @@ type Foo @doc(descripton: "Foo Bar Baz") {
         validArgument: String = "My fair lady" @doc(
             # A comment
             description: "This is a valid argument, spanned over multiple lines."
-        ) @foo
+        ) @unparametrizedDirective
         validArgumentWithDefaultValue: Int = 20 @doc(description: "This is another valid argument with a default value.")
         validArgumentListType: [String] @doc(description: "This is a valid argument that uses a list type.")
         validArgumentNonNullType: String! @doc(description: "This is a valid argument that uses a non null type.")
diff --git a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls
index 994e75f2..5f70754a 100644
--- a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls
+++ b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.graphqls
@@ -5,12 +5,20 @@ enum Foo {
     VALID_SCREAMING_SNAKE_CASE_VALUE_WITH_12345_NUMBERS
     VALID_SCREAMING_SNAKE_CASE_VALUE_ENDING_WITH_NUMBER_5
     VALIDUPPERCASEVALUE
+    VALID_SCREMING_CASE_VALUE_WITH_DIRECTIVE @doc(description: "This is a valid enum value with a directive")
+    VALID_SCREMING_CASE_VALUE_WITH_TWO_DIRECTIVES @doc(
+        description: "This is a valid enum value with a directive"
+    ) @unparametrizedDirective
 
     # Invalid values
     1_INVALID_SCREAMING_SNAKE_CASE_VALUE_STARTING_WITH_NUMBER
     invalidCamelCaseValue
     InvalidCamelCaseCapsValue
     invalidlowercasevalue
+    invalidCamelCaseValueWithDirective @doc(description: "This is an invalid enum value with a directive")
+    invalidCamelCaseValueWithTwoDirectives @doc(
+        description: "This is an invalid enum value with a directive"
+    ) @unparametrizedDirective
 }
 
 # Ignored although it triggers a T_CLASS token
diff --git a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
index aaa3e55c..57e6ffed 100644
--- a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
@@ -16,10 +16,12 @@ class ValidEnumValueUnitTest extends AbstractGraphQLSniffUnitTestCase
     protected function getErrorList()
     {
         return [
-            10 => 1,
-            11 => 1,
-            12 => 1,
-            13 => 1,
+            14 => 1,
+            15 => 1,
+            16 => 1,
+            17 => 1,
+            18 => 1,
+            19 => 1,
         ];
     }
 

From 874c9d78dc304bb02ce1ef47f41bf2ad29add04d Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Tue, 17 Sep 2019 12:54:17 +0200
Subject: [PATCH 030/630] MC-19366: Fixes code style issue

---
 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index d15ff43a..2c0448f0 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -56,7 +56,7 @@ protected function seekEndOfDirective(array $tokens, $startPointer)
 
         if ($tokens[$startPointer]['code'] === T_DOC_COMMENT_TAG) {
             //advance to next token
-            $endPointer += 1;
+            ++$endPointer;
 
             //if next token is an opening parenthesis, we consume everything up to the closing parenthesis
             if ($tokens[$endPointer + 1]['code'] === T_OPEN_PARENTHESIS) {

From 4d99ee4797c2e881bd1e75bee78e5faeef2f2dd2 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Wed, 18 Sep 2019 14:25:06 +0200
Subject: [PATCH 031/630] MC-19366: Fixes warning when composer install was run

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index de4d5a34..3bc96315 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "560d5eca9cf59f965d8f3b98d2ee2a0a",
+    "content-hash": "397eb37a3ebf83c48685aeb1c77f12b7",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From e252b1946a0ac34c7454bb76359d091dddaac570 Mon Sep 17 00:00:00 2001
From: Jean-Bernard Valentaten <j.valentaten@techdivision.com>
Date: Thu, 19 Sep 2019 09:45:15 +0200
Subject: [PATCH 032/630] MC-19366: Fixes invalid tag in PHPDoc

---
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 549130e4..d7a19621 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -75,9 +75,9 @@ public function process(File $phpcsFile, $stackPtr)
      * Seeks the last token of an argument definition and returns its pointer.
      *
      * Arguments are defined as follows:
-     * <noformat>
+     * <pre>
      *   {ArgumentName}: {ArgumentType}[ = {DefaultValue}][{Directive}]*
-     * </noformat>
+     * </pre>
      *
      * @param int $argumentDefinitionStartPointer
      * @param array $tokens

From 0f59dcab0415e1d30af1cab916b4b76ec77e17df Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Fri, 27 Sep 2019 14:38:21 +0300
Subject: [PATCH 033/630] magento/magento-coding-standard#144: Using coding
 standard as s reference is causing error

---
 .../Commenting/PHPDocFormattingValidator.php                 | 2 +-
 .../Commenting/ClassAndInterfacePHPDocFormattingSniff.php    | 1 +
 .../Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php     | 1 +
 composer.json                                                | 5 ++++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename Magento2/{Sniffs => Helpers}/Commenting/PHPDocFormattingValidator.php (99%)

diff --git a/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
similarity index 99%
rename from Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
rename to Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index cafdbf70..9b462e36 100644
--- a/Magento2/Sniffs/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -4,7 +4,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento2\Sniffs\Commenting;
+namespace Magento2\Helpers\Commenting;
 
 use PHP_CodeSniffer\Files\File;
 
diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index 57204cdb..8976d67f 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -6,6 +6,7 @@
  */
 namespace Magento2\Sniffs\Commenting;
 
+use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
diff --git a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
index c18857ac..c56e3c65 100644
--- a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
@@ -5,6 +5,7 @@
  */
 namespace Magento2\Sniffs\Commenting;
 
+use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
diff --git a/composer.json b/composer.json
index 492357e1..22357234 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,10 @@
     "autoload": {
         "classmap": [
             "PHP_CodeSniffer/Tokenizers/"
-        ]
+        ],
+        "psr-4": {
+            "Magento2\\": "Magento2/"
+        }
     },
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..",

From 519fc72f414838d5ad64f5ace2f2cc77c81836f2 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 29 Sep 2019 19:42:53 +0530
Subject: [PATCH 034/630] Warning raised if class member already have
 meaningful description

---
 .../ClassPropertyPHPDocFormattingSniff.php    |  8 ++++++
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 28 +++++++++++++++----
 .../ClassPropertyPHPDocFormattingUnitTest.php |  8 ++++--
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index a057e5b0..846c3cfd 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -66,6 +66,14 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             $phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
             return;
         }
+
+        // Check if class has already have meaningful description
+        $isShortDescription = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $commentEnd, $foundVar, false);
+        if ($tokens[$string]['line'] !==  $tokens[$isShortDescription]['line']) {
+            $error = 'Variable member already have meaningful name';
+            $phpcsFile->addWarning($error, $isShortDescription, 'AlreadyMeaningFulNameVar');
+            return;
+        }
     }
 
     /**
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index dc40d74c..24e84eab 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -37,23 +37,41 @@ class Foo
 class Bar {
 
     /**
-     * @var correctlyFormattedPublicClassMember
+     * @var variablehasAlreadyhaveProtectedClassMember
      *
      * Short Description
      */
-    public $correctlyFormattedPublicClassMember;
+    public $variablehasAlreadyhavePublicClassMember;
 
     /**
-     * @var correctlyFormattedPrivateClassMember
+     * @var variablehasAlreadyhavePrivateClassMember
      *
      * Short Description
      */
-    private $correctlyFormattedPrivateClassMember;
+    private $variablehasAlreadyhavePrivateClassMember;
 
     /**
-     * @var correctlyFormattedProtectedClassMember
+     * @var variablehasAlreadyhaveProtectedClassMember
      *
      * Short Description
      */
+    protected $variablehasAlreadyhaveProtectedClassMember;
+}
+
+class correctlyFormattedClassMemberDocBlock
+{
+    /**
+     * @var correctlyFormattedPublicClassMember
+     */
+    public $correctlyFormattedPublicClassMember;
+
+    /**
+     * @var correctlyFormattedPrivateClassMember
+     */
+    private $correctlyFormattedPrivateClassMember;
+
+    /**
+     * @var correctlyFormattedProtectedClassMember
+     */
     protected $correctlyFormattedProtectedClassMember;
 }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 675eef4f..a1c4e068 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -24,9 +24,13 @@ public function getWarningList()
     {
         return [
             13 => 1,
+            18 => 1,
             23 => 1,
-            30 => 1,
-            34 => 1
+            30 => 2,
+            34 => 1,
+            42 => 1,
+            49 => 1,
+            56 => 1
         ];
     }
 }

From 93ceb188ed53713b6ef7b44f58a67f4f6e39faa4 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 13 Oct 2019 12:29:51 +0530
Subject: [PATCH 035/630] use of PHPDocFormattingValidator

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 29 ++++++++++++++++---
 .../ClassPropertyPHPDocFormattingUnitTest.php |  4 +--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 846c3cfd..72e6967f 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -3,6 +3,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Class ClassPropertyPHPDocFormattingSniff
@@ -22,6 +23,28 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_WHITESPACE,
     ];
 
+    /**
+     * @var PHPDocFormattingValidator
+     */
+    private $PHPDocFormattingValidator;
+
+    /**
+     * Constructs an AbstractVariableTest.
+     */
+    public function __construct()
+    {
+        $scopes = Tokens::$ooScopeTokens;
+        $this->PHPDocFormattingValidator = new PHPDocFormattingValidator();
+        $listen = [
+            T_VARIABLE,
+            T_DOUBLE_QUOTED_STRING,
+            T_HEREDOC,
+        ];
+
+        parent::__construct($scopes, $listen, true);
+
+    }
+
     /**
      * @param File $phpcsFile
      * @param int $stackPtr
@@ -39,9 +62,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             $phpcsFile->addWarning('Missing class property doc comment', $stackPtr, 'Missing');
             return;
         }
-
         $commentStart = $tokens[$commentEnd]['comment_opener'];
-
         $foundVar = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
             if ($tokens[$tag]['content'] === '@var') {
@@ -69,9 +90,9 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
 
         // Check if class has already have meaningful description
         $isShortDescription = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $commentEnd, $foundVar, false);
-        if ($tokens[$string]['line'] !==  $tokens[$isShortDescription]['line']) {
+        if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescription, $commentStart, $tokens) !== true) {
             $error = 'Variable member already have meaningful name';
-            $phpcsFile->addWarning($error, $isShortDescription, 'AlreadyMeaningFulNameVar');
+            $phpcsFile->addWarning($error, $isShortDescription, 'AlreadyHaveMeaningFulNameVar');
             return;
         }
     }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index a1c4e068..ba70a2d1 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -26,11 +26,11 @@ public function getWarningList()
             13 => 1,
             18 => 1,
             23 => 1,
-            30 => 2,
+            30 => 1,
             34 => 1,
             42 => 1,
             49 => 1,
-            56 => 1
+            56 => 1,
         ];
     }
 }

From 7f3a89fce97582671e06da9d755affb889812e0c Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 13 Oct 2019 15:24:39 +0530
Subject: [PATCH 036/630] Fixed static build tests

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 72e6967f..ebd3105c 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -29,7 +29,7 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
     private $PHPDocFormattingValidator;
 
     /**
-     * Constructs an AbstractVariableTest.
+     * Constructs an ClassPropertyPHPDocFormattingSniff.
      */
     public function __construct()
     {
@@ -42,7 +42,6 @@ public function __construct()
         ];
 
         parent::__construct($scopes, $listen, true);
-
     }
 
     /**

From 9185a9f89eeb53bf9919757fa0e1d80c312e9cbc Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 13 Oct 2019 18:36:53 +0530
Subject: [PATCH 037/630] import static test ruleset

---
 .../Sniffs/Namespaces/UseDeclarationSniff.php | 51 +++++++++++++++++++
 .../Namespaces/UseDeclarationUnitTest.inc     |  4 ++
 .../Namespaces/UseDeclarationUnitTest.php     | 30 +++++++++++
 Magento2/ruleset.xml                          |  4 ++
 4 files changed, 89 insertions(+)
 create mode 100644 Magento2/Sniffs/Namespaces/UseDeclarationSniff.php
 create mode 100644 Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc
 create mode 100644 Magento2/Tests/Namespaces/UseDeclarationUnitTest.php

diff --git a/Magento2/Sniffs/Namespaces/UseDeclarationSniff.php b/Magento2/Sniffs/Namespaces/UseDeclarationSniff.php
new file mode 100644
index 00000000..b7b52b8b
--- /dev/null
+++ b/Magento2/Sniffs/Namespaces/UseDeclarationSniff.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Namespaces;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detects static test namespace.
+ */
+class UseDeclarationSniff implements Sniff
+{
+
+    /**
+     * @var string
+     */
+    private $_prohibitNamespace = 'Magento\Tests';
+
+    /**
+     * @var string
+     */
+    protected $warningMessage = 'Incorrect namespace has been imported.';
+
+    /**
+     * @var string
+     */
+    protected $warningCode = 'WrongImportNamespaces';
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_USE];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $next = $phpcsFile->findNext([T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP, T_CLOSE_TAG], ($stackPtr + 1));
+        $getTokenAsContent = $phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr));
+        if (strpos($getTokenAsContent, $this->_prohibitNamespace) !== false) {
+            $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
+        }
+    }
+}
diff --git a/Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc b/Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc
new file mode 100644
index 00000000..553f55ec
--- /dev/null
+++ b/Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc
@@ -0,0 +1,4 @@
+<?php
+use Magento\Tests;
+use Magento\Foo\Tests as FakeTest;
+use Magento\Real\Classes;
diff --git a/Magento2/Tests/Namespaces/UseDeclarationUnitTest.php b/Magento2/Tests/Namespaces/UseDeclarationUnitTest.php
new file mode 100644
index 00000000..57dd4230
--- /dev/null
+++ b/Magento2/Tests/Namespaces/UseDeclarationUnitTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Namespaces;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Class InterfaceNameUnitTest
+ */
+class UseDeclarationUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [2 => 1];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 9d65e166..8f6f495f 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -189,6 +189,10 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Namespaces.UseDeclaration">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Magento2.NamingConvention.InterfaceName">
         <severity>8</severity>
         <type>warning</type>

From 2706fafc7f151b78bb55ef4e6f812902612a8267 Mon Sep 17 00:00:00 2001
From: "Leandro F. L" <leandro.luvisotto-ext@ab-inbev.com>
Date: Tue, 15 Oct 2019 13:08:26 -0300
Subject: [PATCH 038/630] How to use phpcbf

How to use phpcbf

Co-Authored-By: Lena Orobei <oorobei@magento.com>
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index f31135c2..dfc6e391 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,14 @@ Once installed, you can run `phpcs` from the command-line to analyse your code `
 ```
 $ vendor/bin/phpcs --standard=Magento2 app/code/MyAwesomeExtension
 ```
+
+### Fixing issues automatically
+Also you can run `phpcbf` from the command-line to fix your code `MyAwesomeExtension` for warnings like
+ "PHPCBF CAN FIX THE [0-9]+ MARKED SNIFF VIOLATIONS AUTOMATICALLY"
+```
+$ vendor/bin/phpcbf --standard=Magento2 app/code/MyAwesomeExtension
+``` 
+ 
 ## Where to contribute
 - Documentation of existing rules. See [ExtDN PHP CodeSniffer rules for Magento 2](https://github.com/extdn/extdn-phpcs) as a good example.
 - Bug fixes and improvements of existing rules.

From f38abf53e586420ffd84772e679ddf0b23dbf259 Mon Sep 17 00:00:00 2001
From: "Leandro F. L" <leandro.luvisotto-ext@ab-inbev.com>
Date: Tue, 15 Oct 2019 15:19:58 -0300
Subject: [PATCH 039/630] Git ignore for IDE files

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index eece033d..ba13e90d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
 /vendor/*
 /bin/*
+
+# IDE files
+.idea/
+.project/
+.settings/
+.vscode/

From 705cac5d2a472ef1083d2b050de6be6cc0b69a1b Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Wed, 16 Oct 2019 23:44:06 +0530
Subject: [PATCH 040/630] Feedback changes

---
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 19 +++++++++++++------
 .../ClassPropertyPHPDocFormattingUnitTest.php |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 24e84eab..e166a0e0 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -37,25 +37,32 @@ class Foo
 class Bar {
 
     /**
-     * @var variablehasAlreadyhaveProtectedClassMember
+     * @var variableHasAlreadyHaveProtectedClassMember
      *
      * Short Description
      */
-    public $variablehasAlreadyhavePublicClassMember;
+    public $variableHasAlreadyHavePublicClassMember;
 
     /**
-     * @var variablehasAlreadyhavePrivateClassMember
+     * @var variableHasAlreadyHavePrivateClassMember
      *
      * Short Description
      */
-    private $variablehasAlreadyhavePrivateClassMember;
+    private $variableHasAlreadyHavePrivateClassMember;
 
     /**
-     * @var variablehasAlreadyhaveProtectedClassMember
+     * @var variableHasAlreadyHaveProtectedClassMember
      *
      * Short Description
      */
-    protected $variablehasAlreadyhaveProtectedClassMember;
+    protected $variableHasAlreadyHaveProtectedClassMember;
+
+    /**
+     * @var className
+     *
+     * Variable name
+     */
+    private $variableName;
 }
 
 class correctlyFormattedClassMemberDocBlock
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index ba70a2d1..6974eabe 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -31,6 +31,7 @@ public function getWarningList()
             42 => 1,
             49 => 1,
             56 => 1,
+            63 => 1
         ];
     }
 }

From 80bfe89d15f2540c69f337ca78f5e6b7c3704531 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 17 Oct 2019 00:23:26 +0530
Subject: [PATCH 041/630] Readme file and feedback changes

---
 .../Namespaces/ImportsFromTestNamespaceSniff.md     | 13 +++++++++++++
 ...nSniff.php => ImportsFromTestNamespaceSniff.php} | 10 +++++-----
 ...est.inc => ImportsFromTestNamespaceUnitTest.inc} |  2 +-
 ...est.php => ImportsFromTestNamespaceUnitTest.php} |  2 +-
 Magento2/ruleset.xml                                |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.md
 rename Magento2/Sniffs/Namespaces/{UseDeclarationSniff.php => ImportsFromTestNamespaceSniff.php} (72%)
 rename Magento2/Tests/Namespaces/{UseDeclarationUnitTest.inc => ImportsFromTestNamespaceUnitTest.inc} (69%)
 rename Magento2/Tests/Namespaces/{UseDeclarationUnitTest.php => ImportsFromTestNamespaceUnitTest.php} (86%)

diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.md b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.md
new file mode 100644
index 00000000..113e4ec6
--- /dev/null
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.md
@@ -0,0 +1,13 @@
+# Rule: Do not import from `Test` namespaces
+## Background
+Sometimes IDE imports the namespace with `Test` automatically for return data type like string, float etc or any other means.
+
+## Reasoning
+Time to time we're getting issue with running tests on PRs in magento/magento2 repository because someone imported `\Magento\Tests\NamingConvention\true\string` by mistake. As result - we have "No build reports available" for "Database Compare build", "Functional Tests build", "Sample Data Tests build" while Static tests are shown as "failing" but in results - we don't really have reason
+
+## How it works
+Any occurrence starts with `Magento\Tests` in import from the namespace will raise the warning. 
+
+## How to fix
+
+Remove `Magento\Tests` from the imported namespaces
diff --git a/Magento2/Sniffs/Namespaces/UseDeclarationSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
similarity index 72%
rename from Magento2/Sniffs/Namespaces/UseDeclarationSniff.php
rename to Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
index b7b52b8b..b1078611 100644
--- a/Magento2/Sniffs/Namespaces/UseDeclarationSniff.php
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -11,23 +11,23 @@
 /**
  * Detects static test namespace.
  */
-class UseDeclarationSniff implements Sniff
+class ImportsFromTestNamespaceSniff implements Sniff
 {
 
     /**
      * @var string
      */
-    private $_prohibitNamespace = 'Magento\Tests';
+    private $prohibitNamespace = 'Magento\Tests';
 
     /**
      * @var string
      */
-    protected $warningMessage = 'Incorrect namespace has been imported.';
+    protected $warningMessage = 'Application modules should not use classed from test modules.';
 
     /**
      * @var string
      */
-    protected $warningCode = 'WrongImportNamespaces';
+    protected $warningCode = 'WrongImport';
 
     /**
      * @inheritdoc
@@ -44,7 +44,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $next = $phpcsFile->findNext([T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP, T_CLOSE_TAG], ($stackPtr + 1));
         $getTokenAsContent = $phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr));
-        if (strpos($getTokenAsContent, $this->_prohibitNamespace) !== false) {
+        if (strpos($getTokenAsContent, $this->prohibitNamespace) !== false) {
             $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
         }
     }
diff --git a/Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
similarity index 69%
rename from Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc
rename to Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
index 553f55ec..13c889c8 100644
--- a/Magento2/Tests/Namespaces/UseDeclarationUnitTest.inc
+++ b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
@@ -1,4 +1,4 @@
 <?php
 use Magento\Tests;
 use Magento\Foo\Tests as FakeTest;
-use Magento\Real\Classes;
+use Magento\Real\Classes;
\ No newline at end of file
diff --git a/Magento2/Tests/Namespaces/UseDeclarationUnitTest.php b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
similarity index 86%
rename from Magento2/Tests/Namespaces/UseDeclarationUnitTest.php
rename to Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
index 57dd4230..4cbcbc3b 100644
--- a/Magento2/Tests/Namespaces/UseDeclarationUnitTest.php
+++ b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
@@ -10,7 +10,7 @@
 /**
  * Class InterfaceNameUnitTest
  */
-class UseDeclarationUnitTest extends AbstractSniffUnitTest
+class ImportsFromTestNamespaceUnitTest extends AbstractSniffUnitTest
 {
     /**
      * @inheritdoc
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 8f6f495f..9810723b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -189,7 +189,7 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Namespaces.UseDeclaration">
+    <rule ref="Magento2.Namespaces.ImportsFromTestNamespaceSniff">
         <severity>8</severity>
         <type>warning</type>
     </rule>

From 785f0c32a6aa424303430ebbb8d141208bca9d6b Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 28 Oct 2019 13:50:12 +0530
Subject: [PATCH 042/630] Fixed PHPDocFormattingValidator class not found issue

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index ebd3105c..b77a3761 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -4,6 +4,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
 
 /**
  * Class ClassPropertyPHPDocFormattingSniff

From 08cc5e7d6719d934beb29ff83713b0595969e990 Mon Sep 17 00:00:00 2001
From: korostii <24894168+korostii@users.noreply.github.com>
Date: Tue, 29 Oct 2019 20:38:10 +0000
Subject: [PATCH 043/630] Fix typo in DiscouragedFunctionSniff

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index c3b9c037..a5a583ac 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -113,7 +113,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^readlink$' => null,
         '^register_shutdown_function$' => null,
         '^register_tick_function$' => null,
-        '^rename$' => 'Magento\Framework\Filesystem\DriverInterface::raname()',
+        '^rename$' => 'Magento\Framework\Filesystem\DriverInterface::rename()',
         '^rmdir$' => 'Magento\Framework\Filesystem\DriverInterface::deleteDirectory()',
         '^scandir$' => null,
         '^session_.*$' => null,

From c32d97db864584caa69450d90dcd512970cbe321 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Mon, 4 Nov 2019 12:07:50 -0600
Subject: [PATCH 044/630] V5 release

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 22357234..2c9a1844 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "4",
+    "version": "5",
     "require": {
         "php": ">=5.6.0",
         "squizlabs/php_codesniffer": "^3.4",
diff --git a/composer.lock b/composer.lock
index 3bc96315..34b78adc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "397eb37a3ebf83c48685aeb1c77f12b7",
+    "content-hash": "de90fd51a20a688a7385615a0fd7d86e",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From 17e993be460db53c4e83baedeb19f6580a41effc Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 9 Nov 2019 00:36:38 +0530
Subject: [PATCH 045/630] Feedback suggestions

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index b77a3761..b488438e 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -59,7 +59,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
                 && $tokens[$commentEnd]['code'] !== T_COMMENT)
         ) {
-            $phpcsFile->addWarning('Missing class property doc comment', $stackPtr, 'Missing');
+            $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
             return;
         }
         $commentStart = $tokens[$commentEnd]['comment_opener'];
@@ -67,7 +67,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
             if ($tokens[$tag]['content'] === '@var') {
                 if ($foundVar !== null) {
-                    $error = 'Only one @var tag is allowed in a class property comment';
+                    $error = 'Only one @var tag is allowed for class property declaration.';
                     $phpcsFile->addWarning($error, $tag, 'DuplicateVar');
                 } else {
                     $foundVar = $tag;
@@ -76,14 +76,14 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         }
 
         if ($foundVar === null) {
-            $error = 'Missing @var tag in class property comment';
+            $error = 'Class properties must have type declaration using @var tag.';
             $phpcsFile->addWarning($error, $stackPtr, 'MissingVar');
             return;
         }
 
         $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar, $commentEnd);
         if ($string === false || $tokens[$string]['line'] !== $tokens[$foundVar]['line']) {
-            $error = 'Content missing for @var tag in class property comment';
+            $error = 'Content missing for @var tag in class property declaration.';
             $phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
             return;
         }
@@ -91,7 +91,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         // Check if class has already have meaningful description
         $isShortDescription = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $commentEnd, $foundVar, false);
         if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescription, $commentStart, $tokens) !== true) {
-            $error = 'Variable member already have meaningful name';
+            $error = 'Short description duplicates class property name.';
             $phpcsFile->addWarning($error, $isShortDescription, 'AlreadyHaveMeaningFulNameVar');
             return;
         }

From 88a5e7568540111ba2d127731c38008d207fc93d Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 16 Nov 2019 19:42:20 +0530
Subject: [PATCH 046/630] Feedback changes

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 27 ++++++++++++++++---
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 18 +++++++++++++
 .../ClassPropertyPHPDocFormattingUnitTest.php |  3 ++-
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index b488438e..cf006d56 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -88,11 +88,30 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         }
 
-        // Check if class has already have meaningful description
-        $isShortDescription = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $commentEnd, $foundVar, false);
-        if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescription, $commentStart, $tokens) !== true) {
+        // Check if class has already have meaningful description after @var tag
+        $isShortDescriptionAfterVar = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar + 4, $commentEnd, false,
+            null,
+            false);
+        if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescriptionAfterVar, $commentStart, $tokens) !== true) {
+            preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i', $tokens[($foundVar + 2)]['content'], $varParts);
+            if ($varParts[1]) {
+                return;
+            }
+            $error = 'Short description duplicates class property name.';
+            $phpcsFile->addWarning($error, $isShortDescriptionAfterVar, 'AlreadyHaveMeaningFulNameVar');
+            return;
+        }
+        // Check if class has already have meaningful description before @var tag
+        $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $foundVar, $commentStart, false,
+            null,
+            false);
+        if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescriptionPreviousVar, $commentStart, $tokens) !== true) {
+            preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i', $tokens[($foundVar + 2)]['content'], $varParts);
+            if ($varParts[1]) {
+                return;
+            }
             $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescription, 'AlreadyHaveMeaningFulNameVar');
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningFulNameVar');
             return;
         }
     }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index e166a0e0..6dcccf65 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -63,6 +63,13 @@ class Bar {
      * Variable name
      */
     private $variableName;
+
+    /**
+     * Some more invalid description
+     *
+     * @var test
+     */
+    protected $test;
 }
 
 class correctlyFormattedClassMemberDocBlock
@@ -81,4 +88,15 @@ class correctlyFormattedClassMemberDocBlock
      * @var correctlyFormattedProtectedClassMember
      */
     protected $correctlyFormattedProtectedClassMember;
+
+    /**
+     * @var Array|\Foo_BAR
+     */
+    protected $array;
+
+    /**
+     * @var \FOO\BAR\TEST\Class\\FooBarInterface|
+     *      \FooObject_TEST_C
+     */
+    private $testObject;
 }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 6974eabe..8817ab3b 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -31,7 +31,8 @@ public function getWarningList()
             42 => 1,
             49 => 1,
             56 => 1,
-            63 => 1
+            63 => 1,
+            68 => 1
         ];
     }
 }

From 975977da7f566c0445c85623f72990d96d05130f Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 17 Nov 2019 18:52:08 +0530
Subject: [PATCH 047/630] Sniff added for grouped namespace

---
 .../ImportsFromTestNamespaceSniff.php         | 19 +++++++++++++++++++
 .../ImportsFromTestNamespaceUnitTest.inc      |  4 +++-
 .../ImportsFromTestNamespaceUnitTest.php      |  5 ++++-
 Magento2/ruleset.xml                          |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
index b1078611..8d976b4b 100644
--- a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -7,6 +7,7 @@
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Detects static test namespace.
@@ -43,9 +44,27 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $next = $phpcsFile->findNext([T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP, T_CLOSE_TAG], ($stackPtr + 1));
+        $tokens = $phpcsFile->getTokens();
         $getTokenAsContent = $phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr));
         if (strpos($getTokenAsContent, $this->prohibitNamespace) !== false) {
             $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
         }
+        if ($next !== false
+            && $tokens[$next]['code'] !== T_SEMICOLON
+            && $tokens[$next]['code'] !== T_CLOSE_TAG
+        ) {
+            $baseUse           = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
+            $baseUse = str_replace('use \\', '', $baseUse);
+            $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
+            do {
+                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
+                $groupedAsContent = $baseUse. $tokens[$next]['content'];
+                $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
+                if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
+                    $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
+                    return;
+                }
+            } while ($next != false);
+        }
     }
 }
diff --git a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
index 13c889c8..50d339a1 100644
--- a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
+++ b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
@@ -1,4 +1,6 @@
 <?php
 use Magento\Tests;
 use Magento\Foo\Tests as FakeTest;
-use Magento\Real\Classes;
\ No newline at end of file
+use Magento\Real\Classes;
+use \Magento\{Tests\String, Tests\Int};
+use \Magento\{Foo\string, Bar\float};
\ No newline at end of file
diff --git a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
index 4cbcbc3b..8455257c 100644
--- a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
+++ b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
@@ -25,6 +25,9 @@ public function getErrorList()
      */
     public function getWarningList()
     {
-        return [2 => 1];
+        return [
+            2 => 1,
+            5 => 1
+        ];
     }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 9810723b..70c26495 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -189,7 +189,7 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Namespaces.ImportsFromTestNamespaceSniff">
+    <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
         <severity>8</severity>
         <type>warning</type>
     </rule>

From 199057a8ca960e0bb191ec8fd7a409fbd91c8a51 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 4 Dec 2019 09:00:32 +0200
Subject: [PATCH 048/630] magento/magento-coding-standard#149 No imports from
 test namespace

Exclude running for tests
---
 Magento2/ruleset.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 70c26495..c4fc6580 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -192,6 +192,11 @@
     <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
         <severity>8</severity>
         <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.NamingConvention.InterfaceName">
         <severity>8</severity>

From 4040cd53b27dd10379341fdcad3df726a956691e Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Wed, 11 Dec 2019 13:53:27 -0600
Subject: [PATCH 049/630] magento/magento-coding-standard#142: [New Rule] No
 imports from static tests namespaces

---
 Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
index 8d976b4b..3e5dbce7 100644
--- a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -14,7 +14,6 @@
  */
 class ImportsFromTestNamespaceSniff implements Sniff
 {
-
     /**
      * @var string
      */
@@ -53,7 +52,7 @@ public function process(File $phpcsFile, $stackPtr)
             && $tokens[$next]['code'] !== T_SEMICOLON
             && $tokens[$next]['code'] !== T_CLOSE_TAG
         ) {
-            $baseUse           = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
+            $baseUse  = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
             $baseUse = str_replace('use \\', '', $baseUse);
             $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
             do {
@@ -64,7 +63,7 @@ public function process(File $phpcsFile, $stackPtr)
                     $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
                     return;
                 }
-            } while ($next != false);
+            } while ($next !== false);
         }
     }
 }

From 1eeb017ba2e4ca331ae923c805a53da52ffef851 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <d.ruf@bitexpert.de>
Date: Tue, 7 Jan 2020 08:56:26 +0100
Subject: [PATCH 050/630] Use lowercase file extension

---
 LICENSE.TXT => LICENSE.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE.TXT => LICENSE.txt (100%)

diff --git a/LICENSE.TXT b/LICENSE.txt
similarity index 100%
rename from LICENSE.TXT
rename to LICENSE.txt

From be311024d7df8bdbea4327742d5b58d189b2073b Mon Sep 17 00:00:00 2001
From: rishatiwari <rishatiwari@outlook.com>
Date: Sun, 2 Feb 2020 14:17:26 +0530
Subject: [PATCH 051/630] cleanup: doc url updated in comment

---
 Magento2/Sniffs/Security/XssTemplateSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index 330999e9..aa2accbe 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -161,7 +161,7 @@ private function findSpecialAnnotation($stackPtr)
     /**
      * Find unescaped statement by following rules:
      *
-     * See http://devdocs.magento.com/guides/v2.0/frontend-dev-guide/templates/template-security.html
+     * See https://devdocs.magento.com/guides/v2.3/extension-dev-guide/xss-protection.html
      *
      * @param array $statement
      * @return void

From 7a06fb38f205d847ca5e2445eb93975bb8390469 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Mon, 10 Feb 2020 11:05:33 -0600
Subject: [PATCH 052/630] Fixed confusing message

---
 .../Commenting/ClassAndInterfacePHPDocFormattingSniff.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index 8976d67f..e757fe5c 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -65,7 +65,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($this->PHPDocFormattingValidator->providesMeaning($namePtr, $commentStartPtr, $tokens) !== true) {
             $phpcsFile->addWarning(
                 sprintf(
-                    '%s description should contain additional information beyond the name already supplies.',
+                    '%s description must contain meaningful information beyond what the class name provides or be removed.',
                     ucfirst($tokens[$stackPtr]['content'])
                 ),
                 $stackPtr,

From 8244534a62b8e1dc38622f904f47c6f6feac1369 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Mon, 10 Feb 2020 11:08:20 -0600
Subject: [PATCH 053/630] Fixed confusing message

---
 .../Commenting/ClassAndInterfacePHPDocFormattingSniff.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index e757fe5c..48426a1a 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -65,7 +65,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($this->PHPDocFormattingValidator->providesMeaning($namePtr, $commentStartPtr, $tokens) !== true) {
             $phpcsFile->addWarning(
                 sprintf(
-                    '%s description must contain meaningful information beyond what the class name provides or be removed.',
+                    '%s description must contain meaningful information beyond what its name provides or be removed.',
                     ucfirst($tokens[$stackPtr]['content'])
                 ),
                 $stackPtr,

From 2adeb479b06c86a41d32f05da2d8569df5379fff Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Fri, 20 Mar 2020 13:26:19 -0500
Subject: [PATCH 054/630] Added CODE_OF_CONDUCT.md and CONTRIBUTING.md

---
 .github/CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++
 .github/CONTRIBUTING.md    | 48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 .github/CODE_OF_CONDUCT.md
 create mode 100644 .github/CONTRIBUTING.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..8d5fa291
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language.
+* Being respectful of differing viewpoints and experiences.
+* Gracefully accepting constructive criticism.
+* Focusing on what is best for the community.
+* Showing empathy towards other community members.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances.
+* Trolling, insulting/derogatory comments, and personal or political attacks.
+* Public or private harassment.
+* Publishing others' private information, such as a physical or electronic address, without explicit permission.
+* Other conduct which could reasonably be considered inappropriate in a professional setting.
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at engcom@magento.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version].
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 00000000..630b827e
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,48 @@
+# Contributing to Magento Coding Standard code
+
+Contributions to the Magento Coding Standard codebase are done using the fork & pull model.
+This contribution model has contributors maintaining their own fork of the Magento Coding Standard repository.
+The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
+For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
+
+Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
+
+The Magento Coding Standard development team or community maintainers will review all issues and contributions submitted by the community of developers in the first in, first out order.
+During the review we might require clarifications from the contributor.
+If there is no response from the contributor within two weeks, the pull request will be closed.
+
+For more detailed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
+
+## Contribution requirements
+
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
+2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
+3. Commits must be accompanied by meaningful commit messages.
+4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
+3. PRs which include new logic or new rules must be submitted along with:
+* Unit test coverage
+* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+4. For larger features or changes, please [open an issue](https://github.com/magento/magento-coding-standard/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.com/github/magento/magento-coding-standard) must be green).
+
+## Contribution process
+
+If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free).
+This will allow you to collaborate with the Magento Coding Standard development team, fork the Magento Coding Standard project and send pull requests.
+
+1. Search current [listed issues](https://github.com/magento/magento-coding-standard/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
+2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
+3. Create and test your work.
+4. Fork the Magento Coding Standard repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
+5. Once your contribution is received the Magento Coding Standard development team will review the contribution and collaborate with you as needed.
+
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
+The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
+
+## Connecting with Community!
+
+If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/messages/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.
+
+Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).

From f17991156d9c9b1cebb1eedc24d2a23aa0f931f8 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Fri, 20 Mar 2020 14:04:37 -0500
Subject: [PATCH 055/630] Updated CLA link in the CONTRIBUTING.md

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 630b827e..36a99355 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -31,7 +31,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
 This will allow you to collaborate with the Magento Coding Standard development team, fork the Magento Coding Standard project and send pull requests.
 
 1. Search current [listed issues](https://github.com/magento/magento-coding-standard/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
-2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
+2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
 4. Fork the Magento Coding Standard repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received the Magento Coding Standard development team will review the contribution and collaborate with you as needed.

From bd837c51ce32693489036d797ae31033ce663381 Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Sat, 4 Apr 2020 15:00:05 +0300
Subject: [PATCH 056/630] Fixed the discouraged functions

---
 .../Functions/DiscouragedFunctionSniff.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index a5a583ac..e1db0341 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -58,17 +58,21 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^dngettext$' => null,
         '^domxml_.*$' => null,
         '^fbsql_.*$' => null,
+        '^fbsql$' => null,
         '^fdf_add_doc_javascript$' => null,
         '^fdf_open$' => null,
         '^fopen$' => 'Magento\Framework\Filesystem\DriverInterface::fileOpen()',
         '^fclose$' => 'Magento\Framework\Filesystem\DriverInterface::fileClose()',
-        '^fsockopen$' => null,
+        '^fsockopen$' => 'Magento\Framework\Filesystem\Driver\Http::open()',
         '^ftp_.*$' => null,
         '^fwrite$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite()',
-        '^gettext$' => null,
+        '^fputs$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite()',
+        '^gettext$' => 'Magento\Framework\Translate\AdapterInterface::translate()',
+        '^_$' => 'Magento\Framework\Translate\AdapterInterface::translate()',
         '^gz.*$' => null,
         '^header$' => null,
         '^highlight_file$' => null,
+        '^show_source$' => null,
         '^ibase_.*$' => null,
         '^id3_set_tag$' => null,
         '^ifx_.*$' => null,
@@ -88,6 +92,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^msql_.*$' => null,
         '^mssql_.*$' => null,
         '^mysql_.*$' => null,
+        '^mysql.*$' => null,
         '^odbc_.*$' => null,
         '^opendir$' => null,
         '^openlog$' => null,
@@ -119,9 +124,10 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^session_.*$' => null,
         '^set_include_path$' => null,
         '^ini_set$' => null,
+        '^ini_alter$' => null,
         '^set_time_limit$' => null,
         '^setcookie$' => null,
-        '^setlocale$' => null,
+        '^setlocale$' => 'Magento\Framework\Translate\AdapterInterface::setlocale()',
         '^setrawcookie$' => null,
         '^sleep$' => null,
         '^socket_.*$' => null,
@@ -135,7 +141,9 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^vprintf$' => null,
         '^mysqli.*$' => null,
         '^oci_connect$' => null,
+        '^ocilogon$' => null,
         '^oci_pconnect$' => null,
+        '^ociplogon$' => null,
         '^quotemeta$' => null,
         '^sqlite_popen$' => null,
         '^time_nanosleep$' => null,
@@ -168,6 +176,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^ircg_nickname_unescape$' => null,
         '^ldap_get_values$' => null,
         '^mb_decode_mimeheader$' => null,
+        '^i18n_mime_header_decode$' => null,
         '^mb_parse_str$' => null,
         '^mcrypt_decrypt$' => null,
         '^mdecrypt_generic$' => null,
@@ -201,7 +210,6 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^stat$' => null,
         '^lchgrp$' => null,
         '^lchown$' => null,
-        '^show_source$' => null,
         '^is_dir$' => 'Magento\Framework\Filesystem\DriverInterface::isDirectory()',
         '^is_executable$' => null,
         '^is_file$' => 'Magento\Framework\Filesystem\DriverInterface::isFile()',

From e4cbc97f5a041c79226981f212fd9788c60a6cb3 Mon Sep 17 00:00:00 2001
From: Sinisa Nedeljkovic <sinisa86@gmail.com>
Date: Sat, 4 Apr 2020 21:35:58 +0200
Subject: [PATCH 057/630] #147 - Fixed include / exclude patterns in
 ruleset.xml

---
 Magento2/ruleset.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index c4fc6580..96188ad7 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -13,7 +13,7 @@
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
         <severity>10</severity>
         <type>error</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.DeprecatedFunctions">
         <severity>10</severity>
@@ -76,7 +76,7 @@
         <type>error</type>
     </rule>
     <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.Superglobal.SuperglobalUsageError">
         <severity>10</severity>
@@ -99,7 +99,7 @@
     <rule ref="PSR2.Files.ClosingTag">
         <severity>10</severity>
         <type>error</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.PHP.Eval">
         <severity>10</severity>
@@ -122,7 +122,7 @@
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.XssTemplate">
-        <include-pattern>*.phtml</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
         <severity>9</severity>
         <type>warning</type>
     </rule>
@@ -207,7 +207,7 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Templates.ThisInTemplate">
-        <include-pattern>*.phtml</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>
@@ -302,7 +302,7 @@
     <rule ref="Squiz.Operators.IncrementDecrementUsage">
         <severity>7</severity>
         <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.Operators.ValidLogicalOperators">
         <severity>7</severity>
@@ -404,7 +404,7 @@
     <rule ref="PEAR.ControlStructures.ControlSignature">
         <severity>6</severity>
         <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="PSR1.Files.SideEffects">
         <severity>6</severity>
@@ -483,7 +483,7 @@
         </properties>
     </rule>
     <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration">
         <severity>6</severity>
@@ -533,7 +533,7 @@
     <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
         <severity>6</severity>
         <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing">
         <severity>6</severity>

From 6a3f52f57df5c6227944e17d8342fd43b5153398 Mon Sep 17 00:00:00 2001
From: Sinisa Nedeljkovic <sinisa86@gmail.com>
Date: Sat, 4 Apr 2020 22:27:13 +0200
Subject: [PATCH 058/630] #162 Modified @deprecated validator to consider it
 valid if comment is absent but @see tag is set

---
 .../Helpers/Commenting/PHPDocFormattingValidator.php     | 9 +++++++--
 .../ClassAndInterfacePHPDocFormattingUnitTest.1.inc      | 9 +++++++++
 .../Commenting/ConstantsPHPDocFormattingUnitTest.1.inc   | 6 ++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index 9b462e36..74ff72ab 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -122,13 +122,18 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
             return true;
         }
 
+        $seeTagRequired = false;
         if ($tokens[$deprecatedPtr + 2]['code'] !== T_DOC_COMMENT_STRING) {
-            return false;
+            $seeTagRequired = true;
         }
 
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            return true;
+            if ($seeTagRequired) {
+                return false;
+            } else {
+                return true;
+            }
         }
         if ($tokens[$seePtr + 2]['code'] !== T_DOC_COMMENT_STRING) {
             return false;
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index 14ba369a..e5895e32 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -153,3 +153,12 @@ class DoNotCareHandler
 {
 
 }
+
+/**
+ * @deprecated
+ * @see Magento\Framework\NewHandler
+ */
+class OldHandler
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
index 05dfdb52..6e0b16f0 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
@@ -38,6 +38,12 @@ class Profiler
      */
     const COMPUTER = 'Deep Thought';
 
+    /**
+     * @deprecated
+     * @see \ComputationalMatrix\Mars
+     */
+    const KEYBOARD = 'Ergonomic';
+
     /**
      * @see
      */

From 080046c85e5c32648df661d760850f7d62c9bb56 Mon Sep 17 00:00:00 2001
From: sergey-nechaev <nechaev.sergey@gmail.com>
Date: Sat, 25 Apr 2020 22:50:22 +0500
Subject: [PATCH 059/630] README fixes - typos, layout, markdown, urls

---
 README.md | 92 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index dfc6e391..5150e045 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,18 @@
 
 A set of Magento rules for [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) tool.
 
-#### Installation within a Magento 2 site
+## Installation within a Magento 2 site
+
 To use within your Magento 2 project you can use:
-````
+
+```bash
 composer require --dev magento/magento-coding-standard
-````
+```
+
 Due to security, when installed this way the Magento standard for phpcs cannot be added automatically.
 You can achieve this by adding the following to your project's `composer.json`:
-````
+
+```json
 "scripts": {
     "post-install-cmd": [
       "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"
@@ -18,65 +22,85 @@ You can achieve this by adding the following to your project's `composer.json`:
       "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"
     ]
 }
-````
+```
 
 ### Installation for development
-You can install Magento Coding Standard by cloning this GitHub repo
-```
-$ git clone git@github.com:magento/magento-coding-standard.git
-$ cd magento-coding-standard
-$ composer install
+
+You can install Magento Coding Standard by cloning this GitHub repo:
+
+```bash
+git clone git@github.com:magento/magento-coding-standard.git
+cd magento-coding-standard
+composer install
 ```
+
 It is possible also to install a standalone application via [Composer](https://getcomposer.org)
-```
-$ composer create-project magento/magento-coding-standard --stability=dev magento-coding-standard
+
+```bash
+composer create-project magento/magento-coding-standard --stability=dev magento-coding-standard
 ```
 
-#### Verify installation
+### Verify installation
+
 Command should return the list of installed coding standards including Magento2.
+
+```bash
+vendor/bin/phpcs -i
 ```
-$ vendor/bin/phpcs -i
-```
-### Usage
-Once installed, you can run `phpcs` from the command-line to analyse your code `MyAwesomeExtension`
-```
-$ vendor/bin/phpcs --standard=Magento2 app/code/MyAwesomeExtension
+
+## Usage
+
+Once installed, you can run `phpcs` from the command-line to analyze your code `MyAwesomeExtension`
+
+```bash
+vendor/bin/phpcs --standard=Magento2 app/code/MyAwesomeExtension
 ```
 
 ### Fixing issues automatically
-Also you can run `phpcbf` from the command-line to fix your code `MyAwesomeExtension` for warnings like
- "PHPCBF CAN FIX THE [0-9]+ MARKED SNIFF VIOLATIONS AUTOMATICALLY"
+
+Also, you can run `phpcbf` from the command-line to fix your code `MyAwesomeExtension` for warnings like "PHPCBF CAN FIX THE [0-9]+ MARKED SNIFF VIOLATIONS AUTOMATICALLY"
+
+```bash
+vendor/bin/phpcbf --standard=Magento2 app/code/MyAwesomeExtension
 ```
-$ vendor/bin/phpcbf --standard=Magento2 app/code/MyAwesomeExtension
-``` 
- 
-## Where to contribute
+
+## Contribution
+
+See the community [contribution model](https://github.com/magento/magento-coding-standard/blob/develop/.github/CONTRIBUTING.md).
+
+### Where to contribute
+
 - Documentation of existing rules. See [ExtDN PHP CodeSniffer rules for Magento 2](https://github.com/extdn/extdn-phpcs) as a good example.
 - Bug fixes and improvements of existing rules.
 - Creation of new PHP CodeSniffer rules.
 - Discussions on new rules (through periodic hangouts or discussions per GitHub issue).
 
-## How to contribute
+### How to contribute
+
 1) Start with looking into [Community Dashboard](https://github.com/magento/magento-coding-standard/projects/1). Any ticket in `Up for grabs` is a good candidate to start.
 2) Didn't satisfy your requirements? [Create one of three types of issues](https://github.com/magento/magento-coding-standard/issues/new/choose):
    - **Bug report** - Found a bug in the code? Let us know!
    - **Existing rule enhancement** - Know how to improve existing rules? Open an issue describe how to enhance Magento Coding Standard.
    - **New rule proposal** - Know how to improve Magento ecosystem code quality? Do not hesitate to open a proposal.
-3) The issue will appear in the `Backlog` column of the [Community Dashboard](https://github.com/magento/magento-coding-standard/projects/1). Once it will be discussed and get `Accepted` label the issue will appear in the `Up for grabs` column.
+3) The issue will appear in the `Backlog` column of the [Community Dashboard](https://github.com/magento/magento-coding-standard/projects/1). Once it will be discussed and get `accepted` label the issue will appear in the `Up for grabs` column.
 
 ## Testing
-All rules should be covered by unit tests. Each `Test.php` class should be accompanied by a `Test.inc` file to allow for unit testing based upon the PHP CodeSniffer parent class `AbstractSniffUnitTest`.
+
+All rules should be covered by unit tests. Each `Test.php` class should be accompanied by a `Test.inc` file to allow for unit testing based upon the PHP_CodeSniffer parent class `AbstractSniffUnitTest`.
 You can verify your code by running
-```
-$ vendor/bin/phpunit
+
+```bash
+vendor/bin/phpunit
 ```
 
 Also, verify that the sniffer code itself is written according to the Magento Coding Standard:
-```
-$ vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
+
+```bash
+vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
 ```
 
 ## License
-Each Magento source file included in this distribution is licensed under OSL-3.0 license.
 
-Please see [LICENSE.txt](https://github.com/magento/magento-coding-standard/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](http://opensource.org/licenses/osl-3.0.php).
+Each Magento source file included in this distribution is licensed under the OSL-3.0 license.
+
+Please see [LICENSE.txt](https://github.com/magento/magento-coding-standard/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](https://opensource.org/licenses/osl-3.0.php).

From c6bc189ebf7dbc063e52df3408678c363afd94d4 Mon Sep 17 00:00:00 2001
From: Sinisa Nedeljkovic <sinisa86@gmail.com>
Date: Tue, 28 Apr 2020 21:56:19 +0200
Subject: [PATCH 060/630] #162 Reduced code around IF condition on
 seeTagRequired variable

---
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index 74ff72ab..a656051c 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -129,11 +129,7 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
 
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            if ($seeTagRequired) {
-                return false;
-            } else {
-                return true;
-            }
+            return !$seeTagRequired;
         }
         if ($tokens[$seePtr + 2]['code'] !== T_DOC_COMMENT_STRING) {
             return false;

From 466aecfca171d93194f6733a3af3f28cafa53cdf Mon Sep 17 00:00:00 2001
From: Fabian Schmengler <fs@integer-net.de>
Date: Thu, 7 May 2020 11:11:32 +0200
Subject: [PATCH 061/630] Suggest \Magento\Framework\Shell::execute as
 alternative to exec

---
 Magento2/Sniffs/Security/InsecureFunctionSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Security/InsecureFunctionSniff.php b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
index 16c69030..b5253193 100644
--- a/Magento2/Sniffs/Security/InsecureFunctionSniff.php
+++ b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
@@ -20,7 +20,7 @@ class InsecureFunctionSniff extends ForbiddenFunctionsSniff
     public $forbiddenFunctions = [
         'assert' => null,
         'create_function' => null,
-        'exec' => null,
+        'exec' => '\Magento\Framework\Shell::execute',
         'md5' => 'improved hash functions (SHA-256, SHA-512 etc.)',
         'passthru' => null,
         'pcntl_exec' => null,

From 1d380aa40c92491d2c0b751aa3211f1e0c99ccb0 Mon Sep 17 00:00:00 2001
From: milindsingh <milind7@live.com>
Date: Sun, 24 May 2020 00:03:32 +0530
Subject: [PATCH 062/630] Added sniff for deprecated model methods. #187

---
 .../Methods/DeprecatedModelMethodSniff.php    | 79 +++++++++++++++++++
 .../Methods/DeprecatedModelMethodUnitTest.inc |  4 +
 .../Methods/DeprecatedModelMethodUnitTest.php | 31 ++++++++
 Magento2/ruleset.xml                          |  4 +
 4 files changed, 118 insertions(+)
 create mode 100644 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
 create mode 100644 Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
 create mode 100644 Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php

diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
new file mode 100644
index 00000000..08ee94d3
--- /dev/null
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Methods;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Detects possible use of deprecated model methods.
+ */
+class DeprecatedModelMethodSniff implements Sniff
+{
+    /**
+     * String representation of warning.
+     *
+     * @var string
+     */
+    protected $warningMessage = "Possible use of the deprecated model method 'getResource()'" .
+    " to '%s' the data detected.";
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    protected $warningCode = 'FoundDeprecatedModelMethod';
+
+    /**
+     * List of deprecated method.
+     *
+     * @var array
+     */
+    protected $methods = [
+        'save',
+        'load',
+        'delete'
+    ];
+
+    protected $severity = 0;
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_OBJECT_OPERATOR,
+            T_DOUBLE_COLON
+        ];
+    }
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $methodPosition = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+
+        if ($methodPosition !== false &&
+            in_array($tokens[$methodPosition]['content'], $this->methods)
+        ) {
+            $resourcePosition = $phpcsFile->findPrevious([T_STRING, T_VARIABLE], $stackPtr - 1);
+            if ($resourcePosition !== false) {
+                $methodName = $tokens[$resourcePosition]['content'];
+                if ($methodName === "getResource") {
+                    $phpcsFile->addWarning(
+                        sprintf($this->warningMessage, $tokens[$methodPosition]['content']),
+                        $stackPtr,
+                        $this->warningCode
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
new file mode 100644
index 00000000..e81954f3
--- /dev/null
+++ b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
@@ -0,0 +1,4 @@
+<?php
+$model->getResource()->save();
+$model->getResource()->load();
+$model->getResource()->delete();
\ No newline at end of file
diff --git a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
new file mode 100644
index 00000000..024c660a
--- /dev/null
+++ b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Methods;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class DeprecatedModelMethodUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [
+            2 => 1,
+            3 => 1,
+            4 => 1
+        ];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 96188ad7..0a0bed7b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -215,6 +215,10 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Methods.DeprecatedModelMethod">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From a5b372313356548e2e9183fabd7d3285e6e3182b Mon Sep 17 00:00:00 2001
From: milindsingh <milind7@live.com>
Date: Wed, 27 May 2020 09:52:22 +0530
Subject: [PATCH 063/630] code review fixes

---
 .../Methods/DeprecatedModelMethodSniff.php    | 36 ++++++++++---------
 .../Methods/DeprecatedModelMethodUnitTest.inc |  9 +++--
 .../Methods/DeprecatedModelMethodUnitTest.php |  4 +--
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index 08ee94d3..283d74ad 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -14,6 +14,8 @@
  */
 class DeprecatedModelMethodSniff implements Sniff
 {
+    const RESOURCE_METHOD = "getResource";
+
     /**
      * String representation of warning.
      *
@@ -48,8 +50,7 @@ class DeprecatedModelMethodSniff implements Sniff
     public function register()
     {
         return [
-            T_OBJECT_OPERATOR,
-            T_DOUBLE_COLON
+            T_OBJECT_OPERATOR
         ];
     }
     /**
@@ -58,21 +59,22 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-        $methodPosition = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-
-        if ($methodPosition !== false &&
-            in_array($tokens[$methodPosition]['content'], $this->methods)
-        ) {
-            $resourcePosition = $phpcsFile->findPrevious([T_STRING, T_VARIABLE], $stackPtr - 1);
-            if ($resourcePosition !== false) {
-                $methodName = $tokens[$resourcePosition]['content'];
-                if ($methodName === "getResource") {
-                    $phpcsFile->addWarning(
-                        sprintf($this->warningMessage, $tokens[$methodPosition]['content']),
-                        $stackPtr,
-                        $this->warningCode
-                    );
-                }
+        $endOfStatement = $phpcsFile->findEndOfStatement($stackPtr);
+        $resourcePosition = $phpcsFile->findNext(
+            T_STRING,
+            $stackPtr + 1,
+            $endOfStatement,
+            false,
+            self::RESOURCE_METHOD
+        );
+        if ($resourcePosition !== false) {
+            $methodPosition = $phpcsFile->findNext([T_STRING, T_VARIABLE], $resourcePosition + 1, $endOfStatement);
+            if ($methodPosition !== false && in_array($tokens[$methodPosition]['content'], $this->methods)) {
+                $phpcsFile->addWarning(
+                    sprintf($this->warningMessage, $tokens[$methodPosition]['content']),
+                    $stackPtr,
+                    $this->warningCode
+                );
             }
         }
     }
diff --git a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
index e81954f3..322df84c 100644
--- a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
+++ b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
@@ -1,4 +1,7 @@
 <?php
-$model->getResource()->save();
-$model->getResource()->load();
-$model->getResource()->delete();
\ No newline at end of file
+
+$model->getResource()->save($model);
+
+$model->getResource()->load($model, $id);
+
+$model->getResource()->delete($model);
diff --git a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
index 024c660a..43d88dd3 100644
--- a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
+++ b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
@@ -23,9 +23,9 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            2 => 1,
             3 => 1,
-            4 => 1
+            5 => 1,
+            7 => 1,
         ];
     }
 }

From eb170637dc659f38095f0232dc6b1c5b98e1f445 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Mon, 17 Aug 2020 15:45:43 +0300
Subject: [PATCH 064/630] Added sniff for deprecated model methods

Add few negative cases
---
 Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
index 322df84c..38e7a817 100644
--- a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
+++ b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc
@@ -5,3 +5,9 @@ $model->getResource()->save($model);
 $model->getResource()->load($model, $id);
 
 $model->getResource()->delete($model);
+
+$model->getResource()->myCustomMethod();
+
+$model->myCustomMethod();
+
+$model->anotherMethodWithResource()->save($model);

From dd9dd328f17f092dda302f3defd45cf80efb9467 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Mon, 17 Aug 2020 15:48:09 +0300
Subject: [PATCH 065/630] Run tests on php 7.4

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 0de98557..5db8871f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 install: composer install --no-interaction --prefer-source
 script:
   - vendor/bin/phpunit

From 902b134d4911ac2e29541b5521f4219b898d8cd1 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Mon, 17 Aug 2020 15:10:46 -0500
Subject: [PATCH 066/630] magento/magento-coding-standard#187: Added sniff for
 deprecated model methods - minor fixes

---
 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index 283d74ad..94bfc2d5 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -7,7 +7,6 @@
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Detects possible use of deprecated model methods.
@@ -21,8 +20,7 @@ class DeprecatedModelMethodSniff implements Sniff
      *
      * @var string
      */
-    protected $warningMessage = "Possible use of the deprecated model method 'getResource()'" .
-    " to '%s' the data detected.";
+    protected $warningMessage = "The use of the deprecated method 'getResource()' to '%s' the data detected.";
 
     /**
      * Warning violation code.
@@ -69,7 +67,7 @@ public function process(File $phpcsFile, $stackPtr)
         );
         if ($resourcePosition !== false) {
             $methodPosition = $phpcsFile->findNext([T_STRING, T_VARIABLE], $resourcePosition + 1, $endOfStatement);
-            if ($methodPosition !== false && in_array($tokens[$methodPosition]['content'], $this->methods)) {
+            if ($methodPosition !== false && in_array($tokens[$methodPosition]['content'], $this->methods, true)) {
                 $phpcsFile->addWarning(
                     sprintf($this->warningMessage, $tokens[$methodPosition]['content']),
                     $stackPtr,

From b35e3a4527112c6b8caeae60ee66a86a06331f76 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Mon, 17 Aug 2020 16:29:30 -0500
Subject: [PATCH 067/630] magento/magento-coding-standard#191: PHP 7.4
 compatibility - update PHP_CodeSniffer version

---
 composer.json |  2 +-
 composer.lock | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 2c9a1844..a700503a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "version": "5",
     "require": {
         "php": ">=5.6.0",
-        "squizlabs/php_codesniffer": "^3.4",
+        "squizlabs/php_codesniffer": "^3.5",
         "webonyx/graphql-php": ">=0.12.6 <1.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 34b78adc..8a7111b9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "de90fd51a20a688a7385615a0fd7d86e",
+    "content-hash": "45be18e23c6041ce36bc5d0ffb9c85d6",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.4.2",
+            "version": "3.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
+                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
+                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
                 "shasum": ""
             },
             "require": {
@@ -55,7 +55,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2019-04-10T23:49:02+00:00"
+            "time": "2020-08-10T04:50:15+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -659,6 +659,7 @@
             "keywords": [
                 "tokenizer"
             ],
+            "abandoned": true,
             "time": "2017-12-04T08:55:13+00:00"
         },
         {
@@ -1492,5 +1493,6 @@
     "platform": {
         "php": ">=5.6.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From 1f62186588909bab53a4d02c6c9ba0c4d3d7dffe Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Tue, 18 Aug 2020 07:11:59 +0300
Subject: [PATCH 068/630] Speed up composer install on travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5db8871f..10321df9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
-install: composer install --no-interaction --prefer-source
+install: composer install --no-interaction --prefer-dist
 script:
   - vendor/bin/phpunit
   - vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php

From aee022ffa2e7fe9573f756fba2a3ce5beeecc90b Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Tue, 18 Aug 2020 07:19:15 +0300
Subject: [PATCH 069/630] Speed up composer install on travis

Add caching between builds
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 10321df9..ea3eb825 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ php:
   - 7.2
   - 7.3
   - 7.4
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 install: composer install --no-interaction --prefer-dist
 script:
   - vendor/bin/phpunit

From 4bd41131fbb5771c9abf2a28199ff253b56d1622 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Wed, 2 Sep 2020 15:46:15 -0500
Subject: [PATCH 070/630] magento/magento-coding-standard#162: @deprecated
 without @see tag false positive - simplified logic

---
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index a656051c..fb98db7c 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -126,16 +126,11 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         if ($tokens[$deprecatedPtr + 2]['code'] !== T_DOC_COMMENT_STRING) {
             $seeTagRequired = true;
         }
-
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
             return !$seeTagRequired;
         }
-        if ($tokens[$seePtr + 2]['code'] !== T_DOC_COMMENT_STRING) {
-            return false;
-        }
-
-        return true;
+        return $tokens[$seePtr + 2]['code'] === T_DOC_COMMENT_STRING;
     }
 
     /**

From 30ed54ffbf7c2f908e16ef1b8b2b3833e09dc85f Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:42:29 +0300
Subject: [PATCH 071/630] Better solution for fixing array_merge in loop

---
 Magento2/Sniffs/Performance/ForeachArrayMergeSniff.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.md b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.md
index 90bc6211..55f6969c 100644
--- a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.md
+++ b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.md
@@ -15,12 +15,11 @@ Typical example when `array_merge` is being used in the loop:
 
 In order to reduce execution time `array_merge` can be called only once:
 ``` php
-    $options = [[]];
+    $options = [];
     foreach ($configurationSources as $source) {
         // code here
         $options[] = $source->getOptions();
     }
 
-    // PHP 5.6+
-    $options = array_merge(...$options);
+    $options = array_merge([], ...$options);
 ```

From 94c155c24db0cea187707bf2de85bb5883793aca Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Thu, 12 Nov 2020 10:25:32 -0600
Subject: [PATCH 072/630] MC-38508: Add static checks for PHP FS calls

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index e1db0341..bced9283 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -228,5 +228,6 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^intval$' => '(int) construction',
         '^strval$' => '(string) construction',
         '^htmlspecialchars$' => '\Magento\Framework\Escaper->escapeHtml',
+        'getimagesize' => 'getimagesizefromstring',
     ];
 }

From 7959427e0a6f81150c5082610179831f48c4b0bd Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Thu, 19 Nov 2020 09:56:30 -0600
Subject: [PATCH 073/630] MC-38508: Add static checks for PHP FS calls

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index bced9283..55001802 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -228,6 +228,6 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^intval$' => '(int) construction',
         '^strval$' => '(string) construction',
         '^htmlspecialchars$' => '\Magento\Framework\Escaper->escapeHtml',
-        'getimagesize' => 'getimagesizefromstring',
+        '^getimagesize$' => 'getimagesizefromstring',
     ];
 }

From dc1e4b330ad2d47d4d0d9c394c56ffef2dd4ba0b Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Mon, 30 Nov 2020 15:55:50 -0600
Subject: [PATCH 074/630] MC-38508: Add static checks for PHP FS calls

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md
new file mode 100644
index 00000000..603d7def
--- /dev/null
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md
@@ -0,0 +1,11 @@
+# Rule: getimagesize() is discouraged
+
+## Reason
+
+[getimagesize()](https://www.php.net/manual/en/function.getimagesize.php) function works only with local and supported streams. 
+With introduction of more advanced storages, like AWS S3 or Azure Blob Storage this function will cause issues where file is not accessible.
+
+## How to fix
+
+[getimagesizefromstring](https://www.php.net/manual/en/function.getimagesizefromstring.php) can be used instead to retrieve all the information from file.
+This function works with data strings, so you should read the file content using specific adapter before using it.

From 98e9fffb693c0a072f0bc19c1f7e700295652029 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Tue, 1 Dec 2020 09:49:54 -0600
Subject: [PATCH 075/630] MC-38508: Add static checks for PHP FS calls

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md
index 603d7def..ceb49e4c 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.md
@@ -2,7 +2,7 @@
 
 ## Reason
 
-[getimagesize()](https://www.php.net/manual/en/function.getimagesize.php) function works only with local and supported streams. 
+[getimagesize](https://www.php.net/manual/en/function.getimagesize.php) function works only with local and supported streams. 
 With introduction of more advanced storages, like AWS S3 or Azure Blob Storage this function will cause issues where file is not accessible.
 
 ## How to fix

From d25936146cecf68baff394a85dadd4a28751258d Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 3 Dec 2020 14:25:15 +0000
Subject: [PATCH 076/630] Version 6

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a700503a..bdc7b5be 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "5",
+    "version": "6",
     "require": {
         "php": ">=5.6.0",
         "squizlabs/php_codesniffer": "^3.5",
diff --git a/composer.lock b/composer.lock
index 8a7111b9..fa66436c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "45be18e23c6041ce36bc5d0ffb9c85d6",
+    "content-hash": "3384f4bb74dc1b1c36fa3c7cc697a28b",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From 5e9eb9fc83912e39c668b0a676dddf0f09640132 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Wed, 3 Feb 2021 00:01:24 +0000
Subject: [PATCH 077/630] Avoid infinite loop when Parse Error occurs

---
 Magento2/Sniffs/Security/XssTemplateSniff.php   | 6 ++++--
 Magento2/Tests/Security/XssTemplateUnitTest.inc | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index aa2accbe..43bdfecc 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -249,8 +249,10 @@ private function parseLineStatement($start, $end)
         $posOfLastInlineThen = $this->findLastInScope(T_INLINE_THEN, $start, $end);
         if ($posOfLastInlineThen !== false) {
             $posOfInlineElse = $this->file->findNext(T_INLINE_ELSE, $posOfLastInlineThen, $end);
-            $this->addStatement($posOfLastInlineThen + 1, $posOfInlineElse);
-            $this->addStatement($posOfInlineElse + 1, $end);
+            if ($posOfInlineElse !== false) {
+                $this->addStatement($posOfLastInlineThen + 1, $posOfInlineElse);
+                $this->addStatement($posOfInlineElse + 1, $end);
+            }
             $parsed = true;
         } else {
             do {
diff --git a/Magento2/Tests/Security/XssTemplateUnitTest.inc b/Magento2/Tests/Security/XssTemplateUnitTest.inc
index eefb2c70..6a9f225d 100644
--- a/Magento2/Tests/Security/XssTemplateUnitTest.inc
+++ b/Magento2/Tests/Security/XssTemplateUnitTest.inc
@@ -57,3 +57,6 @@ echo $var;
 <?php echo $block->escapeCss($css); ?>
 <?php echo $block->getJsLayout($jsLayout); ?>
 <?= /* @noEscape */ json_encode($config) ?>
+
+<!-- intentional parse error -->
+<?= $block->escapeUrl($block->getUrl('no-route')) <?= $block->getBaseUrl() ?>

From 437f8f3e2dad835edf4738c3c2f26238017f0095 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 24 May 2021 16:21:00 +0100
Subject: [PATCH 078/630] Fix PHP TypeError

    Fatal error: Uncaught TypeError: vsprintf(): Argument #2 ($values) must be of type array, int given in /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php:1056
    Stack trace:
    #0 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(1056): vsprintf('Direct throw of...', 531)
    #1 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(706): PHP_CodeSniffer\Files\File->addMessage(false, 'Direct throw of...', 67, 4, 'FoundDirectThro...', 531, 8, false)
    #2 /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Exceptions/DirectThrowSniff.php(48): PHP_CodeSniffer\Files\File->addWarning('Direct throw of...', 526, 'FoundDirectThro...', 531)
    #3 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(498): Magento2\Sniffs\Exceptions\DirectThrowSniff->process(Object(PHP_CodeSniffer\Files\LocalFile), 526)
    #4 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/LocalFile.php(92): PHP_CodeSniffer\Files\File->process()
    #5 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(630): PHP_CodeSniffer\Files\LocalFile->process()
    #6 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(434): PHP_CodeSniffer\Runner->processFile(Object(PHP_CodeSniffer\Files\LocalFile))
    #7 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(114): PHP_CodeSniffer\Runner->run()
    #8 /srv/www/vendor/squizlabs/php_codesniffer/bin/phpcs(18): PHP_CodeSniffer\Runner->runPHPCS()
    #9 {main}
      thrown in /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php on line 1056
---
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 9612d84c..d5ce80c1 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -48,7 +48,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $this->warningMessage,
                 $stackPtr,
                 $this->warningCode,
-                $posOfException
+                [$posOfException]
             );
         }
     }

From 9901dcffbb32a48d051b7bc9fdf1613367f250c8 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 24 May 2021 16:23:05 +0100
Subject: [PATCH 079/630] Make argument type clearer

---
 Magento2/Sniffs/Legacy/MageEntitySniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index 13bc8beb..637c3b1c 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -77,7 +77,7 @@ public function process(File $phpcsFile, $stackPtr)
                 return;
             }
             $entityName = $tokens[$stackPtr]['content'];
-            $error = [$entityName . $tokens[$oldPosition]['content']];
+            $error = $entityName . $tokens[$oldPosition]['content'];
         } else {
             $oldPosition = $stackPtr;
             $stackPtr = $phpcsFile->findNext(T_STRING, $oldPosition + 1, null, false, null, true);
@@ -85,14 +85,14 @@ public function process(File $phpcsFile, $stackPtr)
                 return;
             }
             $entityName = $tokens[$stackPtr]['content'];
-            $error = [$tokens[$oldPosition]['content'] . ' ' . $entityName];
+            $error = $tokens[$oldPosition]['content'] . ' ' . $entityName;
         }
         if ($entityName === $this->legacyEntity || $this->isPrefixLegacy($entityName)) {
             $phpcsFile->addError(
                 $this->errorMessage,
                 $stackPtr,
                 $this->errorCode,
-                $error
+                [$error]
             );
         }
     }

From e106351b626c33bafdd41cdd838290ecac18ee9f Mon Sep 17 00:00:00 2001
From: Adarsh Manickam <adarsh.apple@icloud.com>
Date: Sun, 20 Jun 2021 15:47:31 +0530
Subject: [PATCH 080/630] Updated webonyx/graphql-php to ^14.9

---
 composer.json |  2 +-
 composer.lock | 41 +++++++++++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index bdc7b5be..e958d572 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": ">=5.6.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "webonyx/graphql-php": ">=0.12.6 <1.0"
+        "webonyx/graphql-php": "^14.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
diff --git a/composer.lock b/composer.lock
index fa66436c..39e43998 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3384f4bb74dc1b1c36fa3c7cc697a28b",
+    "content-hash": "f0408a03c988315899dcc124b8c4cdef",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -59,26 +59,37 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.12.6",
+            "version": "v14.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
+                "reference": "36b83621deb5eae354347a2e86dc7aec81b32a82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
-                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/36b83621deb5eae354347a2e86dc7aec81b32a82",
+                "reference": "36b83621deb5eae354347a2e86dc7aec81b32a82",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
                 "ext-mbstring": "*",
-                "php": ">=5.6"
+                "php": "^7.1||^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
+                "amphp/amp": "^2.3",
+                "doctrine/coding-standard": "^6.0",
+                "nyholm/psr7": "^1.2",
+                "phpbench/phpbench": "^0.16.10",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "0.12.82",
+                "phpstan/phpstan-phpunit": "0.12.18",
+                "phpstan/phpstan-strict-rules": "0.12.9",
+                "phpunit/phpunit": "^7.2|^8.5",
                 "psr/http-message": "^1.0",
-                "react/promise": "2.*"
+                "react/promise": "2.*",
+                "simpod/php-coveralls-mirror": "^3.0",
+                "squizlabs/php_codesniffer": "3.5.4"
             },
             "suggest": {
                 "psr/http-message": "To use standard GraphQL server",
@@ -100,7 +111,17 @@
                 "api",
                 "graphql"
             ],
-            "time": "2018-09-02T14:59:54+00:00"
+            "support": {
+                "issues": "https://github.com/webonyx/graphql-php/issues",
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/webonyx-graphql-php",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2021-06-15T16:14:17+00:00"
         }
     ],
     "packages-dev": [
@@ -1494,5 +1515,5 @@
         "php": ">=5.6.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }

From a460bda519dc96454d861de32406bd21b22bf698 Mon Sep 17 00:00:00 2001
From: Jose Orsini <orsini.jose@gmail.com>
Date: Tue, 29 Jun 2021 14:37:13 -0500
Subject: [PATCH 081/630] MTS-2096: Added functions marked as insecure by Sec
 Team.

---
 Magento2/Sniffs/Security/InsecureFunctionSniff.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Magento2/Sniffs/Security/InsecureFunctionSniff.php b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
index b5253193..66b6f5f0 100644
--- a/Magento2/Sniffs/Security/InsecureFunctionSniff.php
+++ b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
@@ -33,5 +33,19 @@ class InsecureFunctionSniff extends ForbiddenFunctionsSniff
         'srand' => null,
         'mt_srand' => null,
         'mt_rand' => 'random_int',
+        // Custom Rules - MTS-2096
+        'eval' => null,
+        'preg_replace' => null,
+        'preg_replace_callback' => null,
+        'preg_replace_callback_array' => null,
+        'include' => null,
+        'include_once' => null,
+        'require' => null,
+        'require_once' => null,
+        'proc_nice' => null,
+        'proc_open' => null,
+        'proc_close' => null,
+        'proc_terminate' => null,
+        'proc_get_status' => null,
     ];
 }

From 0ab21436453cb30ab47540336e9fe4b1320c4f0d Mon Sep 17 00:00:00 2001
From: Jose Orsini <orsini.jose@gmail.com>
Date: Tue, 29 Jun 2021 15:40:54 -0500
Subject: [PATCH 082/630] exclude vendor folder

---
 phpunit.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6d1afb07..ecee1f73 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,4 +8,5 @@
     <php>
         <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,Squiz,Zend"/>
     </php>
+    <exclude-pattern>*/vendor/*</exclude-pattern>
 </phpunit>

From cacb2dea8b612cc00059580029e8e4ce76ad29d0 Mon Sep 17 00:00:00 2001
From: Jose Orsini <orsini.jose@gmail.com>
Date: Tue, 29 Jun 2021 16:09:07 -0500
Subject: [PATCH 083/630] discard

---
 phpunit.xml.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ecee1f73..6d1afb07 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,5 +8,4 @@
     <php>
         <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,Squiz,Zend"/>
     </php>
-    <exclude-pattern>*/vendor/*</exclude-pattern>
 </phpunit>

From f256543381a439e24dde9fb2f679eb3d048de9a2 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 23 Jul 2021 16:17:01 +0300
Subject: [PATCH 084/630] Run tests on Github Actions

---
 .github/workflows/php.yml | 47 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/php.yml

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
new file mode 100644
index 00000000..0b159a9d
--- /dev/null
+++ b/.github/workflows/php.yml
@@ -0,0 +1,47 @@
+name: CI
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['5.6', '7.0', '7.0', '7.1', '7.2', '7.3', '7.4']
+    name: Tests with PHP ${{ matrix.php-versions }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+      env:
+        COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Validate composer
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-composer-
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-interaction
+
+    - name: Run unit tests suite
+      run: vendor/bin/phpunit
+
+    - name: Run code style suite
+      run: vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php

From 74323730b9c33a6e558320fd1b2e544795abfcad Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 23 Jul 2021 16:25:45 +0300
Subject: [PATCH 085/630] Run tests on Github Actions

Fix php 7.0 duplication
---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 0b159a9d..de2e2d85 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['5.6', '7.0', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
     name: Tests with PHP ${{ matrix.php-versions }}
 
     steps:

From 60fed78a406b7d3990ff21e635853bf4b0547ef4 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Mon, 26 Jul 2021 11:23:52 +0300
Subject: [PATCH 086/630] Run tests on Github Actions

Disable fail fast
---
 .github/workflows/php.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index de2e2d85..be39f0dd 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -11,6 +11,7 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
     name: Tests with PHP ${{ matrix.php-versions }}

From 6a362030e034431b520c6afbf3fa58cee9f324c0 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 26 Jul 2021 20:29:18 +0100
Subject: [PATCH 087/630] magento/magento-coding-standard#206: Updated minimal
 required PHP version to 7.1

---
 .github/workflows/php.yml |    2 +-
 .travis.yml               |   15 -
 composer.json             |    4 +-
 composer.lock             | 1046 ++++++++++++++++++++++++-------------
 4 files changed, 685 insertions(+), 382 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index be39f0dd..2f7f46c3 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.1', '7.2', '7.3', '7.4']
     name: Tests with PHP ${{ matrix.php-versions }}
 
     steps:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ea3eb825..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: php
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-install: composer install --no-interaction --prefer-dist
-script:
-  - vendor/bin/phpunit
-  - vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
diff --git a/composer.json b/composer.json
index e958d572..c3b6c654 100644
--- a/composer.json
+++ b/composer.json
@@ -8,12 +8,12 @@
     "type": "phpcodesniffer-standard",
     "version": "6",
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.1",
         "squizlabs/php_codesniffer": "^3.5",
         "webonyx/graphql-php": "^14.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "classmap": [
diff --git a/composer.lock b/composer.lock
index 39e43998..fa96e115 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f0408a03c988315899dcc124b8c4cdef",
+    "content-hash": "1552fa061d5ee668ccf28b11417cd28e",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.6",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
-                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
                 "shasum": ""
             },
             "require": {
@@ -55,7 +55,12 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2020-08-10T04:50:15+00:00"
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2021-04-09T00:54:41+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -127,34 +132,31 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -168,38 +170,59 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.7.0",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1 || ^8.0"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
             },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "autoload": {
@@ -222,39 +245,154 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-10-19T19:58:43+00:00"
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-13T09:40:50+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^2.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
+            "time": "2018-07-08T19:23:20+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/master"
+            },
+            "time": "2018-07-08T19:19:57+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -276,38 +414,45 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "3.3.2",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
-                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -318,44 +463,49 @@
                 {
                     "name": "Mike van Riel",
                     "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "account@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-10T14:09:06+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -368,42 +518,47 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.1",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -431,44 +586,48 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-08-05T17:53:17+00:00"
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+            },
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "4.0.8",
+            "version": "6.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
-                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xmlwriter": "*",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "^1.3",
-                "phpunit/php-text-template": "^1.2",
-                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0",
-                "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "^1.0 || ^2.0"
+                "php": "^7.1",
+                "phpunit/php-file-iterator": "^2.0",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^3.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^3.1 || ^4.0",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"
             },
             "require-dev": {
-                "ext-xdebug": "^2.1.4",
-                "phpunit/phpunit": "^5.7"
+                "phpunit/phpunit": "^7.0"
             },
             "suggest": {
-                "ext-xdebug": "^2.5.1"
+                "ext-xdebug": "^2.6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -483,7 +642,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -494,29 +653,36 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-04-02T07:44:40+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master"
+            },
+            "time": "2018-10-31T16:06:48+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05",
+                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -531,7 +697,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -541,7 +707,17 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2017-11-27T13:52:08+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-19T06:46:01+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -582,32 +758,36 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.9",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -622,7 +802,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -631,33 +811,43 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26T11:10:40+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:20:02+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.12",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
+                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768",
+                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.2"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -680,56 +870,68 @@
             "keywords": [
                 "tokenizer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "abandoned": true,
-            "time": "2017-12-04T08:55:13+00:00"
+            "time": "2021-07-26T12:15:06+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.27",
+            "version": "7.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
-                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
                 "shasum": ""
             },
             "require": {
+                "doctrine/instantiator": "^1.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.6.2",
-                "phpunit/php-code-coverage": "^4.0.4",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "^1.2.4",
-                "sebastian/diff": "^1.4.3",
-                "sebastian/environment": "^1.3.4 || ^2.0",
-                "sebastian/exporter": "~2.0",
-                "sebastian/global-state": "^1.1",
-                "sebastian/object-enumerator": "~2.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "^1.0.6|^2.0.1",
-                "symfony/yaml": "~2.1|~3.0|~4.0"
+                "myclabs/deep-copy": "^1.7",
+                "phar-io/manifest": "^1.0.2",
+                "phar-io/version": "^2.0",
+                "php": "^7.1",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^6.0.7",
+                "phpunit/php-file-iterator": "^2.0.1",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^2.1",
+                "sebastian/comparator": "^3.0",
+                "sebastian/diff": "^3.0",
+                "sebastian/environment": "^4.0",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^2.0",
+                "sebastian/version": "^2.0.1"
             },
             "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2"
+                "phpunit/phpunit-mock-objects": "*"
             },
             "require-dev": {
                 "ext-pdo": "*"
             },
             "suggest": {
+                "ext-soap": "*",
                 "ext-xdebug": "*",
-                "phpunit/php-invoker": "~1.1"
+                "phpunit/php-invoker": "^2.0"
             },
             "bin": [
                 "phpunit"
@@ -737,7 +939,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.7.x-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -763,87 +965,31 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-02-01T05:50:59+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118",
-                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2 || ^2.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.20"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "abandoned": true,
-            "time": "2017-06-30T09:13:00+00:00"
+            "time": "2020-01-08T08:45:45+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=5.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -868,34 +1014,44 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:15:22+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.2.4",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
+                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
+                "php": ">=7.1",
+                "sebastian/diff": "^3.0",
+                "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -908,6 +1064,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -919,45 +1079,52 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
                 "equality"
             ],
-            "time": "2017-01-29T09:50:25+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:04:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.4.3",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^7.5 || ^8.0",
+                "symfony/process": "^2 || ^3.3 || ^4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -970,46 +1137,62 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
             "description": "Diff implementation",
             "homepage": "https://github.com/sebastianbergmann/diff",
             "keywords": [
-                "diff"
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
             ],
-            "time": "2017-05-22T07:24:03+00:00"
+            "time": "2020-11-30T07:59:04+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "2.0.0",
+            "version": "4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.0"
+                "phpunit/phpunit": "^7.5"
+            },
+            "suggest": {
+                "ext-posix": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1034,34 +1217,44 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-11-26T07:53:53+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:53:42+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "2.0.0",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~2.0"
+                "php": ">=7.0",
+                "sebastian/recursion-context": "^3.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.1.x-dev"
                 }
             },
             "autoload": {
@@ -1074,6 +1267,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -1082,17 +1279,13 @@
                     "name": "Volker Dusch",
                     "email": "github@wallbash.com"
                 },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
@@ -1101,27 +1294,37 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-11-19T08:54:04+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:47:53+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "1.1.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.2"
+                "phpunit/phpunit": "^6.0"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -1129,7 +1332,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1152,33 +1355,38 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12T03:26:01+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+            },
+            "time": "2017-04-27T15:39:26+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "2.0.1",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6",
-                "sebastian/recursion-context": "~2.0"
+                "php": ">=7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5"
+                "phpunit/phpunit": "^6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -1198,32 +1406,97 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-02-18T15:18:39+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:40:27+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:37:18+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "2.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -1236,14 +1509,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
@@ -1251,29 +1524,39 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-11-19T07:33:16+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:34:24+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "1.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6.0"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1293,7 +1576,18 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "abandoned": true,
+            "time": "2020-11-30T07:30:19+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1336,24 +1630,28 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -1361,7 +1659,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1378,12 +1680,12 @@
             ],
             "authors": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
                 },
                 {
-                    "name": "Gert de Pagter",
-                    "email": "backendtea@gmail.com"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -1394,92 +1696,104 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
-            "name": "symfony/yaml",
-            "version": "v3.4.20",
+            "name": "theseer/tokenizer",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "291e13d808bec481eab83f301f7bff3e699ef603"
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603",
-                "reference": "291e13d808bec481eab83f301f7bff3e699ef603",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/master"
+            },
+            "funding": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "url": "https://github.com/theseer",
+                    "type": "github"
                 }
             ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2020-07-12T23:59:07+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.3.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.2 || ^8.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.10-dev"
                 }
             },
             "autoload": {
@@ -1503,7 +1817,11 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29T19:49:41+00:00"
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+            },
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],
@@ -1512,7 +1830,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.6.0"
+        "php": ">=7.1"
     },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"

From e80e696bd6dc65649b539b8caa90cb7e2c5e106d Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 26 Jul 2021 20:32:46 +0100
Subject: [PATCH 088/630] magento/magento-coding-standard#206: Updated minimal
 required PHP version to 7.2

---
 .github/workflows/php.yml | 2 +-
 composer.json             | 2 +-
 composer.lock             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2f7f46c3..eee1bfeb 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4']
     name: Tests with PHP ${{ matrix.php-versions }}
 
     steps:
diff --git a/composer.json b/composer.json
index c3b6c654..89c193c8 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "type": "phpcodesniffer-standard",
     "version": "6",
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "squizlabs/php_codesniffer": "^3.5",
         "webonyx/graphql-php": "^14.9"
     },
diff --git a/composer.lock b/composer.lock
index fa96e115..0bbf81ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1552fa061d5ee668ccf28b11417cd28e",
+    "content-hash": "ded4734336bc43d824498918b37b815c",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -1830,7 +1830,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1"
+        "php": ">=7.2"
     },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"

From b4c0fa542efc3ee786b5336c941c5e976a0aca63 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Tue, 27 Jul 2021 13:20:21 +0300
Subject: [PATCH 089/630] Test on lowest and highest dependencies

---
 .github/workflows/php.yml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index eee1bfeb..133cec38 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -10,11 +10,25 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
-    name: Tests with PHP ${{ matrix.php-versions }}
+        php-version:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+        dependencies:
+          - "lowest"
+          - "highest"
+        experimental:
+          - false
+        include:
+          - php-version: "8.0"
+            dependencies: "highest"
+            composer-options: "--ignore-platform-reqs"
+            experimental: true
+    name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:
     - uses: actions/checkout@v2
@@ -22,24 +36,18 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: ${{ matrix.php-versions }}
+        php-version: ${{ matrix.php-version }}
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Validate composer
       run: composer validate
 
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
+    - name: Composer install
+      uses: "ramsey/composer-install@v1"
       with:
-        path: vendor
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-composer-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-interaction
+        dependency-versions: "${{ matrix.dependencies }}"
+        composer-options: "${{ matrix.composer-options }}"
 
     - name: Run unit tests suite
       run: vendor/bin/phpunit

From 3d68361dde3d2eba32be4b42b20465258da79479 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 28 Jul 2021 12:33:34 +0200
Subject: [PATCH 090/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Move files from Annotation folder

---
 .../Annotation/AnnotationFormatValidator.php  | 374 ++++++++++
 .../MethodAnnotationStructureSniff.php        |  86 +++
 .../Annotation/MethodArgumentsSniff.php       | 684 ++++++++++++++++++
 Magento2/ruleset.xml                          |   5 +
 4 files changed, 1149 insertions(+)
 create mode 100644 Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
 create mode 100644 Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
 create mode 100644 Magento2/Sniffs/Annotation/MethodArgumentsSniff.php

diff --git a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
new file mode 100644
index 00000000..cd4c8689
--- /dev/null
+++ b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class to validate annotation format
+ */
+class AnnotationFormatValidator
+{
+    /**
+     * Gets the short description end pointer position
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     * @return int
+     */
+    private function getShortDescriptionEndPosition(File $phpcsFile, int $shortPtr, $commentEndPtr): int
+    {
+        $tokens = $phpcsFile->getTokens();
+        $shortPtrEnd = $shortPtr;
+        for ($i = ($shortPtr + 1); $i < $commentEndPtr; $i++) {
+            if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
+                if ($tokens[$i]['line'] === $tokens[$shortPtrEnd]['line'] + 1) {
+                    $shortPtrEnd = $i;
+                } else {
+                    break;
+                }
+            }
+        }
+        return $shortPtrEnd;
+    }
+
+    /**
+     * Validates whether the short description has multi lines in description
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     */
+    private function validateMultiLinesInShortDescription(
+        File $phpcsFile,
+        int $shortPtr,
+        int $commentEndPtr
+    ): void {
+        $tokens = $phpcsFile->getTokens();
+        $shortPtrEnd = $this->getShortDescriptionEndPosition(
+            $phpcsFile,
+            (int)$shortPtr,
+            $commentEndPtr
+        );
+        $shortPtrEndContent = $tokens[$shortPtrEnd]['content'];
+        if (preg_match('/^[a-z]/', $shortPtrEndContent)
+            && $shortPtrEnd != $shortPtr
+            && !preg_match('/\bSee\b/', $shortPtrEndContent)
+            && $tokens[$shortPtr]['line'] + 1 === $tokens[$shortPtrEnd]['line']
+            && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
+        ) {
+            $error = 'Short description should not be in multi lines';
+            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+        }
+    }
+
+    /**
+     * Validates whether the spacing between short and long descriptions
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateSpacingBetweenShortAndLongDescriptions(
+        File $phpcsFile,
+        int $shortPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ): void {
+        $tokens = $phpcsFile->getTokens();
+        $shortPtrEnd = $this->getShortDescriptionEndPosition(
+            $phpcsFile,
+            (int)$shortPtr,
+            $commentEndPtr
+        );
+        $shortPtrEndContent = $tokens[$shortPtrEnd]['content'];
+        if (preg_match('/^[A-Z]/', $shortPtrEndContent)
+            && !preg_match('/\bSee\b/', $shortPtrEndContent)
+            && $tokens[$shortPtr]['line'] + 1 === $tokens[$shortPtrEnd]['line']
+            && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
+        ) {
+            $error = 'There must be exactly one blank line between lines short and long descriptions';
+            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+        }
+        if ($shortPtrEnd != $shortPtr) {
+            $this->validateLongDescriptionFormat($phpcsFile, $shortPtrEnd, $commentEndPtr, $emptyTypeTokens);
+        } else {
+            $this->validateLongDescriptionFormat($phpcsFile, $shortPtr, $commentEndPtr, $emptyTypeTokens);
+        }
+    }
+
+    /**
+     * Validates short description format
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $stackPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateShortDescriptionFormat(
+        File $phpcsFile,
+        int $shortPtr,
+        int $stackPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ): void {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$shortPtr]['line'] !== $tokens[$stackPtr]['line'] + 1) {
+            $error = 'No blank lines are allowed before short description';
+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+        }
+        if (strtolower($tokens[$shortPtr]['content']) === '{@inheritdoc}') {
+            $error = 'If the @inheritdoc not inline it shouldn’t have braces';
+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+        }
+        $shortPtrContent = $tokens[$shortPtr]['content'];
+        if (preg_match('/^\p{Ll}/u', $shortPtrContent) === 1) {
+            $error = 'Short description must start with a capital letter';
+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+        }
+        $this->validateNoExtraNewLineBeforeShortDescription(
+            $phpcsFile,
+            $stackPtr,
+            $commentEndPtr,
+            $emptyTypeTokens
+        );
+        $this->validateSpacingBetweenShortAndLongDescriptions(
+            $phpcsFile,
+            $shortPtr,
+            $commentEndPtr,
+            $emptyTypeTokens
+        );
+        $this->validateMultiLinesInShortDescription(
+            $phpcsFile,
+            $shortPtr,
+            $commentEndPtr
+        );
+    }
+
+    /**
+     * Validates long description format
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtrEnd
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateLongDescriptionFormat(
+        File $phpcsFile,
+        int $shortPtrEnd,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ): void {
+        $tokens = $phpcsFile->getTokens();
+        $longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
+        if (strtolower($tokens[$longPtr]['content']) === '@inheritdoc') {
+            $error = '@inheritdoc imports only short description, annotation must have long description';
+            $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+        }
+        if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
+            if ($tokens[$longPtr]['line'] !== $tokens[$shortPtrEnd]['line'] + 2) {
+                $error = 'There must be exactly one blank line between descriptions';
+                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+            }
+            if (preg_match('/^\p{Ll}/u', $tokens[$longPtr]['content']) === 1) {
+                $error = 'Long description must start with a capital letter';
+                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+            }
+        }
+    }
+
+    /**
+     * Validates tags spacing format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     * @param array $emptyTypeTokens
+     */
+    public function validateTagsSpacingFormat(File $phpcsFile, int $commentStartPtr, array $emptyTypeTokens): void
+    {
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$commentStartPtr]['comment_tags'][0])) {
+            $firstTagPtr = $tokens[$commentStartPtr]['comment_tags'][0];
+            $commentTagPtrContent = $tokens[$firstTagPtr]['content'];
+            $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $firstTagPtr - 1, $commentStartPtr, true);
+            if ($tokens[$firstTagPtr]['line'] !== $tokens[$prevPtr]['line'] + 2
+                && strtolower($commentTagPtrContent) !== '@inheritdoc'
+            ) {
+                $error = 'There must be exactly one blank line before tags';
+                $phpcsFile->addFixableError($error, $firstTagPtr, 'MethodAnnotation');
+            }
+        }
+    }
+
+    /**
+     * Validates tag grouping format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     */
+    public function validateTagGroupingFormat(File $phpcsFile, int $commentStartPtr): void
+    {
+        $tokens = $phpcsFile->getTokens();
+        $tagGroups = [];
+        $groupId = 0;
+        $paramGroupId = null;
+        foreach ($tokens[$commentStartPtr]['comment_tags'] as $position => $tag) {
+            if ($position > 0) {
+                $prevPtr = $phpcsFile->findPrevious(
+                    T_DOC_COMMENT_STRING,
+                    $tag - 1,
+                    $tokens[$commentStartPtr]['comment_tags'][$position - 1]
+                );
+                if ($prevPtr === false) {
+                    $prevPtr = $tokens[$commentStartPtr]['comment_tags'][$position - 1];
+                }
+
+                if ($tokens[$prevPtr]['line'] !== $tokens[$tag]['line'] - 1) {
+                    $groupId++;
+                }
+            }
+
+            if (strtolower($tokens[$tag]['content']) === '@param') {
+                if ($paramGroupId !== null
+                    && $paramGroupId !== $groupId) {
+                    $error = 'Parameter tags must be grouped together';
+                    $phpcsFile->addFixableError($error, $tag, 'MethodAnnotation');
+                }
+                if ($paramGroupId === null) {
+                    $paramGroupId = $groupId;
+                }
+            }
+            $tagGroups[$groupId][] = $tag;
+        }
+    }
+
+    /**
+     * Validates tag aligning format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     */
+    public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr): void
+    {
+        $tokens = $phpcsFile->getTokens();
+        $noAlignmentPositions = [];
+        $actualPositions = [];
+        $stackPtr = null;
+        foreach ($tokens[$commentStartPtr]['comment_tags'] as $tag) {
+            $content = $tokens[$tag]['content'];
+            if (preg_match('/^@/', $content) && ($tokens[$tag]['line'] === $tokens[$tag + 2]['line'])) {
+                $noAlignmentPositions[] = $tokens[$tag + 1]['column'] + 1;
+                $actualPositions[] = $tokens[$tag + 2]['column'];
+                $stackPtr = $stackPtr ?? $tag;
+            }
+        }
+
+        if (!$this->allTagsAligned($actualPositions)
+            && !$this->noneTagsAligned($actualPositions, $noAlignmentPositions)) {
+            $phpcsFile->addFixableError(
+                'Tags visual alignment must be consistent',
+                $stackPtr,
+                'MethodArguments'
+            );
+        }
+    }
+
+    /**
+     * Check whether all docblock params are aligned.
+     *
+     * @param array $actualPositions
+     * @return bool
+     */
+    private function allTagsAligned(array $actualPositions): bool
+    {
+        return count(array_unique($actualPositions)) === 1;
+    }
+
+    /**
+     * Check whether all docblock params are not aligned.
+     *
+     * @param array $actualPositions
+     * @param array $noAlignmentPositions
+     * @return bool
+     */
+    private function noneTagsAligned(array $actualPositions, array $noAlignmentPositions): bool
+    {
+        return $actualPositions === $noAlignmentPositions;
+    }
+
+    /**
+     * Validates extra newline before short description
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateNoExtraNewLineBeforeShortDescription(
+        File $phpcsFile,
+        int $commentStartPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ): void {
+        $tokens = $phpcsFile->getTokens();
+        $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $commentEndPtr - 1, $commentStartPtr, true);
+        if ($tokens[$prevPtr]['line'] < ($tokens[$commentEndPtr]['line'] - 1)) {
+            $error = 'Additional blank lines found at end of the annotation block';
+            $phpcsFile->addFixableError($error, $commentEndPtr, 'MethodAnnotation');
+        }
+    }
+
+    /**
+     * Validates structure description format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    public function validateDescriptionFormatStructure(
+        File $phpcsFile,
+        int $commentStartPtr,
+        int $shortPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ): void {
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$commentStartPtr]['comment_tags'][0])
+        ) {
+            $commentTagPtr = $tokens[$commentStartPtr]['comment_tags'][0];
+            $commentTagPtrContent = $tokens[$commentTagPtr]['content'];
+            if ($tokens[$shortPtr]['code'] !== T_DOC_COMMENT_STRING
+                && strtolower($commentTagPtrContent) !== '@inheritdoc'
+            ) {
+                $error = 'Missing short description';
+                $phpcsFile->addFixableError($error, $commentStartPtr, 'MethodAnnotation');
+            } else {
+                $this->validateShortDescriptionFormat(
+                    $phpcsFile,
+                    (int)$shortPtr,
+                    (int)$commentStartPtr,
+                    (int)$commentEndPtr,
+                    $emptyTypeTokens
+                );
+            }
+        } else {
+            $this->validateShortDescriptionFormat(
+                $phpcsFile,
+                (int)$shortPtr,
+                $commentStartPtr,
+                $commentEndPtr,
+                $emptyTypeTokens
+            );
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
new file mode 100644
index 00000000..3df07533
--- /dev/null
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Sniff to validate structure of public, private, protected method annotations
+ */
+class MethodAnnotationStructureSniff implements Sniff
+{
+    /**
+     * @var AnnotationFormatValidator
+     */
+    private $annotationFormatValidator;
+
+    /**
+     * AnnotationStructureSniff constructor.
+     */
+    public function __construct()
+    {
+        $this->annotationFormatValidator = new AnnotationFormatValidator();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_FUNCTION
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
+        $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
+        if (!$commentStartPtr) {
+            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
+            return;
+        }
+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
+        $functionPtrContent = $tokens[$stackPtr + 2]['content'];
+        if (preg_match('/(?i)__construct/', $functionPtrContent)) {
+            return;
+        }
+        $emptyTypeTokens = [
+            T_DOC_COMMENT_WHITESPACE,
+            T_DOC_COMMENT_STAR
+        ];
+        $shortPtr = $phpcsFile->findNext($emptyTypeTokens, $commentStartPtr + 1, $commentCloserPtr, true);
+        if ($shortPtr === false) {
+            $error = 'Annotation block is empty';
+            $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
+        } else {
+            $this->annotationFormatValidator->validateDescriptionFormatStructure(
+                $phpcsFile,
+                $commentStartPtr,
+                (int)$shortPtr,
+                $commentEndPtr,
+                $emptyTypeTokens
+            );
+            if (empty($tokens[$commentStartPtr]['comment_tags'])) {
+                return;
+            }
+            $this->annotationFormatValidator->validateTagsSpacingFormat(
+                $phpcsFile,
+                $commentStartPtr,
+                $emptyTypeTokens
+            );
+            $this->annotationFormatValidator->validateTagGroupingFormat($phpcsFile, $commentStartPtr);
+            $this->annotationFormatValidator->validateTagAligningFormat($phpcsFile, $commentStartPtr);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
new file mode 100644
index 00000000..54e10100
--- /dev/null
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -0,0 +1,684 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Sniff to validate method arguments annotations
+ */
+class MethodArgumentsSniff implements Sniff
+{
+    /**
+     * @var array
+     */
+    private $validTokensBeforeClosingCommentTag = [
+        'T_WHITESPACE',
+        'T_PUBLIC',
+        'T_PRIVATE',
+        'T_PROTECTED',
+        'T_STATIC',
+        'T_ABSTRACT',
+        'T_FINAL'
+    ];
+
+    /**
+     * @var array
+     */
+    private $invalidTypes = [
+        'null',
+        'false',
+        'true',
+        'self'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_FUNCTION
+        ];
+    }
+
+    /**
+     * Validates whether valid token exists before closing comment tag
+     *
+     * @param string $type
+     * @return bool
+     */
+    private function isTokenBeforeClosingCommentTagValid(string $type): bool
+    {
+        return in_array($type, $this->validTokensBeforeClosingCommentTag);
+    }
+
+    /**
+     * Validates whether comment block exists
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentClosePtr
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function validateCommentBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr): bool
+    {
+        $tokens = $phpcsFile->getTokens();
+        for ($tempPtr = $previousCommentClosePtr + 1; $tempPtr < $stackPtr; $tempPtr++) {
+            if (!$this->isTokenBeforeClosingCommentTagValid($tokens[$tempPtr]['type'])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether the parameter type is invalid
+     *
+     * @param string $type
+     * @return bool
+     */
+    private function isInvalidType(string $type): bool
+    {
+        return in_array(strtolower($type), $this->invalidTypes);
+    }
+
+    /**
+     * Get arguments from method signature
+     *
+     * @param File $phpcsFile
+     * @param int $openParenthesisPtr
+     * @param int $closedParenthesisPtr
+     * @return array
+     */
+    private function getMethodArguments(File $phpcsFile, int $openParenthesisPtr, int $closedParenthesisPtr): array
+    {
+        $tokens = $phpcsFile->getTokens();
+        $methodArguments = [];
+        for ($i = $openParenthesisPtr; $i < $closedParenthesisPtr; $i++) {
+            $argumentsPtr = $phpcsFile->findNext(T_VARIABLE, $i + 1, $closedParenthesisPtr);
+            if ($argumentsPtr === false) {
+                break;
+            } elseif ($argumentsPtr < $closedParenthesisPtr) {
+                $arguments = $tokens[$argumentsPtr]['content'];
+                $methodArguments[] = $arguments;
+                $i = $argumentsPtr - 1;
+            }
+        }
+        return $methodArguments;
+    }
+
+    /**
+     * Get parameters from method annotation
+     *
+     * @param array $paramDefinitions
+     * @return array
+     */
+    private function getMethodParameters(array $paramDefinitions): array
+    {
+        $paramName = [];
+        foreach ($paramDefinitions as $paramDefinition) {
+            if (isset($paramDefinition['paramName'])) {
+                $paramName[] = $paramDefinition['paramName'];
+            }
+        }
+        return $paramName;
+    }
+
+    /**
+     * Validates whether @inheritdoc without braces [@inheritdoc] exists or not
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     */
+    private function validateInheritdocAnnotationWithoutBracesExists(
+        File $phpcsFile,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr
+    ): bool {
+        return $this->validateInheritdocAnnotationExists(
+            $phpcsFile,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr,
+            '@inheritdoc'
+        );
+    }
+
+    /**
+     * Validates whether @inheritdoc with braces [{@inheritdoc}] exists or not
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     */
+    private function validateInheritdocAnnotationWithBracesExists(
+        File $phpcsFile,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr
+    ): bool {
+        return $this->validateInheritdocAnnotationExists(
+            $phpcsFile,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr,
+            '{@inheritdoc}'
+        );
+    }
+
+    /**
+     * Validates inheritdoc annotation exists
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     * @param string $inheritdocAnnotation
+     * @return bool
+     */
+    private function validateInheritdocAnnotationExists(
+        File $phpcsFile,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr,
+        string $inheritdocAnnotation
+    ): bool {
+        $tokens = $phpcsFile->getTokens();
+        for ($ptr = $previousCommentOpenPtr; $ptr < $previousCommentClosePtr; $ptr++) {
+            if (strtolower($tokens[$ptr]['content']) === $inheritdocAnnotation) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Validates if annotation exists for parameter in method annotation
+     *
+     * @param File $phpcsFile
+     * @param int $argumentsCount
+     * @param int $parametersCount
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     * @param int $stackPtr
+     */
+    private function validateParameterAnnotationForArgumentExists(
+        File $phpcsFile,
+        int $argumentsCount,
+        int $parametersCount,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr,
+        int $stackPtr
+    ): void {
+        if ($argumentsCount > 0 && $parametersCount === 0) {
+            $inheritdocAnnotationWithoutBracesExists = $this->validateInheritdocAnnotationWithoutBracesExists(
+                $phpcsFile,
+                $previousCommentOpenPtr,
+                $previousCommentClosePtr
+            );
+            $inheritdocAnnotationWithBracesExists = $this->validateInheritdocAnnotationWithBracesExists(
+                $phpcsFile,
+                $previousCommentOpenPtr,
+                $previousCommentClosePtr
+            );
+            if ($inheritdocAnnotationWithBracesExists) {
+                $phpcsFile->addFixableError(
+                    '{@inheritdoc} does not import parameter annotation',
+                    $stackPtr,
+                    'MethodArguments'
+                );
+            } elseif ($this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)
+                && !$inheritdocAnnotationWithoutBracesExists
+            ) {
+                $phpcsFile->addFixableError(
+                    'Missing @param for argument in method annotation',
+                    $stackPtr,
+                    'MethodArguments'
+                );
+            }
+        }
+    }
+
+    /**
+     * Validates whether comment block have extra the parameters listed in method annotation
+     *
+     * @param File $phpcsFile
+     * @param int $argumentsCount
+     * @param int $parametersCount
+     * @param int $stackPtr
+     */
+    private function validateCommentBlockDoesnotHaveExtraParameterAnnotation(
+        File $phpcsFile,
+        int $argumentsCount,
+        int $parametersCount,
+        int $stackPtr
+    ): void {
+        if ($argumentsCount < $parametersCount && $argumentsCount > 0) {
+            $phpcsFile->addFixableError(
+                'Extra @param found in method annotation',
+                $stackPtr,
+                'MethodArguments'
+            );
+        } elseif ($argumentsCount > 0 && $argumentsCount != $parametersCount && $parametersCount != 0) {
+            $phpcsFile->addFixableError(
+                '@param is not found for one or more params in method annotation',
+                $stackPtr,
+                'MethodArguments'
+            );
+        }
+    }
+
+    /**
+     * Validates whether the argument name exists in method parameter annotation
+     *
+     * @param int $stackPtr
+     * @param int $ptr
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     * @param array $paramDefinitions
+     */
+    private function validateArgumentNameInParameterAnnotationExists(
+        int $stackPtr,
+        int $ptr,
+        File $phpcsFile,
+        array $methodArguments,
+        array $paramDefinitions
+    ): void {
+        $parameterNames = $this->getMethodParameters($paramDefinitions);
+        if (!in_array($methodArguments[$ptr], $parameterNames)) {
+            $error = $methodArguments[$ptr] . ' parameter is missing in method annotation';
+            $phpcsFile->addFixableError($error, $stackPtr, 'MethodArguments');
+        }
+    }
+
+    /**
+     * Validates whether parameter present in method signature
+     *
+     * @param int $ptr
+     * @param int $paramDefinitionsArguments
+     * @param array $methodArguments
+     * @param File $phpcsFile
+     * @param array $paramPointers
+     */
+    private function validateParameterPresentInMethodSignature(
+        int $ptr,
+        string $paramDefinitionsArguments,
+        array $methodArguments,
+        File $phpcsFile,
+        array $paramPointers
+    ): void {
+        if (!in_array($paramDefinitionsArguments, $methodArguments)) {
+            $phpcsFile->addFixableError(
+                $paramDefinitionsArguments . ' parameter is missing in method arguments signature',
+                $paramPointers[$ptr],
+                'MethodArguments'
+            );
+        }
+    }
+
+    /**
+     * Validates whether the parameters are in order or not in method annotation
+     *
+     * @param array $paramDefinitions
+     * @param array $methodArguments
+     * @param File $phpcsFile
+     * @param array $paramPointers
+     */
+    private function validateParameterOrderIsCorrect(
+        array $paramDefinitions,
+        array $methodArguments,
+        File $phpcsFile,
+        array $paramPointers
+    ): void {
+        $parameterNames = $this->getMethodParameters($paramDefinitions);
+        $paramDefinitionsCount = count($paramDefinitions);
+        for ($ptr = 0; $ptr < $paramDefinitionsCount; $ptr++) {
+            if (isset($methodArguments[$ptr]) && isset($parameterNames[$ptr])
+                && in_array($methodArguments[$ptr], $parameterNames)
+            ) {
+                if ($methodArguments[$ptr] != $parameterNames[$ptr]) {
+                    $phpcsFile->addFixableError(
+                        $methodArguments[$ptr] . ' parameter is not in order',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Validate whether duplicate annotation present in method annotation
+     *
+     * @param int $stackPtr
+     * @param array $paramDefinitions
+     * @param array $paramPointers
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     */
+    private function validateDuplicateAnnotationDoesnotExists(
+        int $stackPtr,
+        array $paramDefinitions,
+        array $paramPointers,
+        File $phpcsFile,
+        array $methodArguments
+    ): void {
+        $argumentsCount = count($methodArguments);
+        $parametersCount = count($paramPointers);
+        if ($argumentsCount <= $parametersCount && $argumentsCount > 0) {
+            $duplicateParameters = [];
+            foreach ($paramDefinitions as $i => $paramDefinition) {
+                if (isset($paramDefinition['paramName'])) {
+                    $parameterContent = $paramDefinition['paramName'];
+                    foreach (array_slice($paramDefinitions, $i + 1) as $nextParamDefinition) {
+                        if (isset($nextParamDefinition['paramName'])
+                            && $parameterContent === $nextParamDefinition['paramName']
+                        ) {
+                            $duplicateParameters[] = $parameterContent;
+                        }
+                    }
+                }
+            }
+            foreach ($duplicateParameters as $value) {
+                $phpcsFile->addFixableError(
+                    $value . ' duplicate found in method annotation',
+                    $stackPtr,
+                    'MethodArguments'
+                );
+            }
+        }
+    }
+
+    /**
+     * Validate parameter annotation format is correct or not
+     *
+     * @param int $ptr
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     * @param array $paramDefinitions
+     * @param array $paramPointers
+     */
+    private function validateParameterAnnotationFormatIsCorrect(
+        int $ptr,
+        File $phpcsFile,
+        array $methodArguments,
+        array $paramDefinitions,
+        array $paramPointers
+    ): void {
+        switch (count($paramDefinitions)) {
+            case 0:
+                $phpcsFile->addFixableError(
+                    'Missing both type and parameter',
+                    $paramPointers[$ptr],
+                    'MethodArguments'
+                );
+                break;
+            case 1:
+                if (preg_match('/^\$.*/', $paramDefinitions[0])) {
+                    $phpcsFile->addError(
+                        'Type is not specified',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                }
+                break;
+            case 2:
+                if ($this->isInvalidType($paramDefinitions[0])) {
+                    $phpcsFile->addFixableError(
+                        $paramDefinitions[0] . ' is not a valid PHP type',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                }
+                $this->validateParameterPresentInMethodSignature(
+                    $ptr,
+                    ltrim($paramDefinitions[1], '&'),
+                    $methodArguments,
+                    $phpcsFile,
+                    $paramPointers
+                );
+                break;
+            default:
+                if (preg_match('/^\$.*/', $paramDefinitions[0])) {
+                    $phpcsFile->addError(
+                        'Type is not specified',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                    if ($this->isInvalidType($paramDefinitions[0])) {
+                        $phpcsFile->addFixableError(
+                            $paramDefinitions[0] . ' is not a valid PHP type',
+                            $paramPointers[$ptr],
+                            'MethodArguments'
+                        );
+                    }
+                }
+                break;
+        }
+    }
+
+    /**
+     * Validate method parameter annotations
+     *
+     * @param int $stackPtr
+     * @param array $paramDefinitions
+     * @param array $paramPointers
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function validateMethodParameterAnnotations(
+        int $stackPtr,
+        array $paramDefinitions,
+        array $paramPointers,
+        File $phpcsFile,
+        array $methodArguments,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr
+    ): void {
+        $argumentCount = count($methodArguments);
+        $paramCount = count($paramPointers);
+        $this->validateParameterAnnotationForArgumentExists(
+            $phpcsFile,
+            $argumentCount,
+            $paramCount,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr,
+            $stackPtr
+        );
+        $this->validateCommentBlockDoesnotHaveExtraParameterAnnotation(
+            $phpcsFile,
+            $argumentCount,
+            $paramCount,
+            $stackPtr
+        );
+        $this->validateDuplicateAnnotationDoesnotExists(
+            $stackPtr,
+            $paramDefinitions,
+            $paramPointers,
+            $phpcsFile,
+            $methodArguments
+        );
+        $this->validateParameterOrderIsCorrect(
+            $paramDefinitions,
+            $methodArguments,
+            $phpcsFile,
+            $paramPointers
+        );
+        $this->validateFormattingConsistency(
+            $paramDefinitions,
+            $methodArguments,
+            $phpcsFile,
+            $paramPointers
+        );
+        $tokens = $phpcsFile->getTokens();
+
+        foreach ($methodArguments as $ptr => $methodArgument) {
+            if (isset($paramPointers[$ptr])) {
+                $this->validateArgumentNameInParameterAnnotationExists(
+                    $stackPtr,
+                    $ptr,
+                    $phpcsFile,
+                    $methodArguments,
+                    $paramDefinitions
+                );
+                $paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
+                $paramContentExplode = explode(' ', $paramContent);
+                $this->validateParameterAnnotationFormatIsCorrect(
+                    $ptr,
+                    $phpcsFile,
+                    $methodArguments,
+                    $paramContentExplode,
+                    $paramPointers
+                );
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $numTokens = count($tokens);
+        $previousCommentOpenPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
+        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
+        if ($previousCommentClosePtr && $previousCommentOpenPtr) {
+            if (!$this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)) {
+                $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
+                return;
+            }
+        } else {
+            return;
+        }
+        $openParenthesisPtr = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr + 1, $numTokens);
+        $closedParenthesisPtr = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr + 1, $numTokens);
+        $methodArguments = $this->getMethodArguments($phpcsFile, $openParenthesisPtr, $closedParenthesisPtr);
+        $paramPointers = $paramDefinitions = [];
+        for ($tempPtr = $previousCommentOpenPtr; $tempPtr < $previousCommentClosePtr; $tempPtr++) {
+            if (strtolower($tokens[$tempPtr]['content']) === '@param') {
+                $paramPointers[] = $tempPtr;
+                $content = preg_replace('/\s+/', ' ', $tokens[$tempPtr + 2]['content'], 2);
+                $paramAnnotationParts = explode(' ', $content, 3);
+                if (count($paramAnnotationParts) === 1) {
+                    if ((preg_match('/^\$.*/', $paramAnnotationParts[0]))) {
+                        $paramDefinitions[] = [
+                            'type' => null,
+                            'paramName' => rtrim(ltrim($tokens[$tempPtr + 2]['content'], '&'), ','),
+                            'comment' => null
+                        ];
+                    } else {
+                        $paramDefinitions[] = [
+                            'type' => $tokens[$tempPtr + 2]['content'],
+                            'paramName' => null,
+                            'comment' => null
+                        ];
+                    }
+                } else {
+                    $paramDefinitions[] = [
+                        'type' => $paramAnnotationParts[0],
+                        'paramName' => rtrim(ltrim($paramAnnotationParts[1], '&'), ','),
+                        'comment' => $paramAnnotationParts[2] ?? null,
+                    ];
+                }
+            }
+        }
+        $this->validateMethodParameterAnnotations(
+            $stackPtr,
+            $paramDefinitions,
+            $paramPointers,
+            $phpcsFile,
+            $methodArguments,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr
+        );
+    }
+
+    /**
+     * Validates function params format consistency.
+     *
+     * @param array $paramDefinitions
+     * @param array $methodArguments
+     * @param File $phpcsFile
+     * @param array $paramPointers
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     *
+     * @see https://devdocs.magento.com/guides/v2.4/coding-standards/docblock-standard-general.html#format-consistency
+     */
+    private function validateFormattingConsistency(
+        array $paramDefinitions,
+        array $methodArguments,
+        File $phpcsFile,
+        array $paramPointers
+    ): void {
+        $argumentPositions = [];
+        $commentPositions = [];
+        $tokens = $phpcsFile->getTokens();
+        foreach ($methodArguments as $ptr => $methodArgument) {
+            if (isset($paramPointers[$ptr])) {
+                $paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
+                $paramDefinition = $paramDefinitions[$ptr];
+                $argumentPositions[] = strpos($paramContent, $paramDefinition['paramName']);
+                $commentPositions[] = $paramDefinition['comment']
+                    ? strrpos($paramContent, $paramDefinition['comment']) : null;
+            }
+        }
+        if (!$this->allParamsAligned($argumentPositions, $commentPositions)
+            && !$this->noneParamsAligned($argumentPositions, $commentPositions, $paramDefinitions)) {
+            $phpcsFile->addFixableError(
+                'Method arguments visual alignment must be consistent',
+                $paramPointers[0],
+                'MethodArguments'
+            );
+        }
+    }
+
+    /**
+     * Check all params are aligned.
+     *
+     * @param array $argumentPositions
+     * @param array $commentPositions
+     * @return bool
+     */
+    private function allParamsAligned(array $argumentPositions, array $commentPositions): bool
+    {
+        return count(array_unique($argumentPositions)) === 1
+            && count(array_unique(array_filter($commentPositions))) <= 1;
+    }
+
+    /**
+     * Check none of params are aligned.
+     *
+     * @param array $argumentPositions
+     * @param array $commentPositions
+     * @param array $paramDefinitions
+     * @return bool
+     */
+    private function noneParamsAligned(array $argumentPositions, array $commentPositions, array $paramDefinitions): bool
+    {
+        $flag = true;
+        foreach ($argumentPositions as $index => $argumentPosition) {
+            $commentPosition = $commentPositions[$index];
+            $type = $paramDefinitions[$index]['type'];
+            if ($type === null) {
+                continue;
+            }
+            $paramName = $paramDefinitions[$index]['paramName'];
+            if (($argumentPosition !== strlen($type) + 1) ||
+                (isset($commentPosition) && ($commentPosition !== $argumentPosition + strlen($paramName) + 1))) {
+                $flag = false;
+                break;
+            }
+        }
+
+        return $flag;
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 0a0bed7b..ef9b9aca 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -580,4 +580,9 @@
         <severity>5</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Annotation">
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+    </rule>
 </ruleset>

From 73181d9d8bdd0a738efca49c773a4bc4dfe9c53f Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 28 Jul 2021 12:45:01 +0200
Subject: [PATCH 091/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Move files from Html folder

---
 Magento2/Sniffs/Html/HtmlBindingSniff.php   |  91 +++++++
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php | 257 ++++++++++++++++++++
 2 files changed, 348 insertions(+)
 create mode 100644 Magento2/Sniffs/Html/HtmlBindingSniff.php
 create mode 100644 Magento2/Sniffs/Html/HtmlDirectiveSniff.php

diff --git a/Magento2/Sniffs/Html/HtmlBindingSniff.php b/Magento2/Sniffs/Html/HtmlBindingSniff.php
new file mode 100644
index 00000000..1d09b7a6
--- /dev/null
+++ b/Magento2/Sniffs/Html/HtmlBindingSniff.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sniffs\Html;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniffing improper HTML bindings.
+ */
+class HtmlBindingSniff implements Sniff
+{
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Load HTML document to validate.
+     *
+     * @param int $stackPointer
+     * @param File $file
+     * @return \DOMDocument|null
+     */
+    private function loadHtmlDocument(int $stackPointer, File $file): ?\DOMDocument
+    {
+        if ($stackPointer === 0) {
+            $html = $file->getTokensAsString($stackPointer, count($file->getTokens()));
+            $dom = new \DOMDocument();
+            try {
+                // phpcs:disable Generic.PHP.NoSilencedErrors
+                @$dom->loadHTML($html);
+                return $dom;
+            } catch (\Throwable $exception) {
+                return null;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * Find HTML data bindings and check variables used.
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if (!$dom = $this->loadHtmlDocument($stackPtr, $phpcsFile)) {
+            return;
+        }
+
+        /** @var string[] $htmlBindings */
+        $htmlBindings = [];
+        $domXpath = new \DOMXPath($dom);
+        $dataBindAttributes = $domXpath->query('//@*[name() = "data-bind"]');
+        foreach ($dataBindAttributes as $dataBindAttribute) {
+            $knockoutBinding = $dataBindAttribute->nodeValue;
+            preg_match('/^(.+\s*?)?html\s*?\:(.+)/ims', $knockoutBinding, $htmlBindingStart);
+            if ($htmlBindingStart) {
+                $htmlBinding = trim(preg_replace('/\,[a-z0-9\_\s]+\:.+/ims', '', $htmlBindingStart[2]));
+                $htmlBindings[] = $htmlBinding;
+            }
+        }
+        $htmlAttributes = $domXpath->query('//@*[name() = "html"]');
+        foreach ($htmlAttributes as $htmlAttribute) {
+            $magentoBinding = $htmlAttribute->nodeValue;
+            $htmlBindings[] = trim($magentoBinding);
+        }
+        foreach ($htmlBindings as $htmlBinding) {
+            if (!preg_match('/^[0-9\\\'\"]/ims', $htmlBinding)
+                && !preg_match('/UnsanitizedHtml(\(.*?\))*?$/', $htmlBinding)
+            ) {
+                $phpcsFile->addError(
+                    'Variables/functions used for HTML binding must have UnsanitizedHtml suffix'
+                    . ' - "' . $htmlBinding . '" doesn\'t,' . PHP_EOL
+                    . 'consider using text binding if the value is supposed to be text',
+                    null,
+                    'UIComponentTemplate.KnockoutBinding.HtmlSuffix'
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
new file mode 100644
index 00000000..33ffdf29
--- /dev/null
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Html;
+
+use Magento\Framework\Filter\Template;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff for invalid directive usage in HTML templates
+ */
+class HtmlDirectiveSniff implements Sniff
+{
+    /**
+     * @var array
+     */
+    private $usedVariables = [];
+
+    /**
+     * @var array
+     */
+    private $unfilteredVariables = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Detect invalid usage of template filter directives
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $this->usedVariables = [];
+        $this->unfilteredVariables = [];
+        if ($stackPtr !== 0) {
+            return;
+        }
+
+        $html = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+
+        if (empty($html)) {
+            return;
+        }
+
+        $html = $this->processIfDirectives($html, $phpcsFile);
+        $html = $this->processDependDirectives($html, $phpcsFile);
+        $html = $this->processForDirectives($html, $phpcsFile);
+        $html = $this->processVarDirectivesAndParams($html, $phpcsFile);
+
+        $this->validateDefinedVariables($phpcsFile, $html);
+    }
+
+    /**
+     * Process the {{if}} directives in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processIfDirectives(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::CONSTRUCTION_IF_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                // validate {{if <var>}}
+                $this->validateVariableUsage($phpcsFile, $construction[1]);
+                $html = str_replace($construction[0], $construction[2] . ($construction[4] ?? ''), $html);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Process the {{depend}} directives in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processDependDirectives(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::CONSTRUCTION_DEPEND_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                // validate {{depend <var>}}
+                $this->validateVariableUsage($phpcsFile, $construction[1]);
+                $html = str_replace($construction[0], $construction[2], $html);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Process the {{for}} directives in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processForDirectives(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::LOOP_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                // validate {{for in <var>}}
+                $this->validateVariableUsage($phpcsFile, $construction['loopData']);
+                $html = str_replace($construction[0], $construction['loopBody'], $html);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Process the all var directives and var directive params in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processVarDirectivesAndParams(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::CONSTRUCTION_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                if (empty($construction[2])) {
+                    continue;
+                }
+
+                if ($construction[1] === 'var') {
+                    $this->validateVariableUsage($phpcsFile, $construction[2]);
+                } else {
+                    $this->validateDirectiveBody($phpcsFile, $construction[2]);
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Validate directive body is valid. e.g. {{somedir <directive body>}}
+     *
+     * @param File $phpcsFile
+     * @param string $body
+     */
+    private function validateDirectiveBody(File $phpcsFile, string $body): void
+    {
+        $parameterTokenizer = new Template\Tokenizer\Parameter();
+        $parameterTokenizer->setString($body);
+        $params = $parameterTokenizer->tokenize();
+
+        foreach ($params as $param) {
+            if (substr($param, 0, 1) === '$') {
+                $this->validateVariableUsage($phpcsFile, substr($param, 1));
+            }
+        }
+    }
+
+    /**
+     * Validate directive variable usage is valid. e.g. {{var <variable body>}} or {{somedir some_param="$foo.bar()"}}
+     *
+     * @param File $phpcsFile
+     * @param string $body
+     */
+    private function validateVariableUsage(File $phpcsFile, string $body): void
+    {
+        $this->usedVariables[] = 'var ' . trim($body);
+        if (strpos($body, '|') !== false) {
+            $this->unfilteredVariables[] = 'var ' . trim(explode('|', $body, 2)[0]);
+        }
+        $variableTokenizer = new Template\Tokenizer\Variable();
+        $variableTokenizer->setString($body);
+        $stack = $variableTokenizer->tokenize();
+
+        if (empty($stack)) {
+            return;
+        }
+
+        foreach ($stack as $token) {
+            // As a static analyzer there are no data types to know if this is a DataObject so allow all get* methods
+            if ($token['type'] === 'method' && substr($token['name'], 0, 3) !== 'get') {
+                $phpcsFile->addError(
+                    'Template directives may not invoke methods. Only scalar array access is allowed.' . PHP_EOL
+                    . 'Found "' . trim($body) . '"',
+                    null,
+                    'HtmlTemplates.DirectiveUsage.ProhibitedMethodCall'
+                );
+            }
+        }
+    }
+
+    /**
+     * Validate the variables defined in the template comment block match the variables actually used in the template
+     *
+     * @param File $phpcsFile
+     * @param string $templateText
+     */
+    private function validateDefinedVariables(File $phpcsFile, string $templateText): void
+    {
+        preg_match('/<!--@vars\s*((?:.)*?)\s*@-->/us', $templateText, $matches);
+
+        $definedVariables = [];
+
+        if (!empty($matches[1])) {
+            $definedVariables = json_decode(str_replace("\n", '', $matches[1]), true);
+            if (json_last_error()) {
+                $phpcsFile->addError(
+                    'Template @vars comment block contains invalid JSON.',
+                    null,
+                    'HtmlTemplates.DirectiveUsage.InvalidVarsJSON'
+                );
+                return;
+            }
+
+            foreach ($definedVariables as $var => $label) {
+                if (empty($label)) {
+                    $phpcsFile->addError(
+                        'Template @vars comment block contains invalid label.' . PHP_EOL
+                        . 'Label for variable "' . $var . '" is empty.',
+                        null,
+                        'HtmlTemplates.DirectiveUsage.InvalidVariableLabel'
+                    );
+                }
+            }
+
+            $definedVariables = array_keys($definedVariables);
+            foreach ($definedVariables as $definedVariable) {
+                if (strpos($definedVariable, '|') !== false) {
+                    $definedVariables[] = trim(explode('|', $definedVariable, 2)[0]);
+                }
+            }
+        }
+
+        $undefinedVariables = array_diff($this->usedVariables, $definedVariables, $this->unfilteredVariables);
+        foreach ($undefinedVariables as $undefinedVariable) {
+            $phpcsFile->addError(
+                'Template @vars comment block is missing a variable used in the template.' . PHP_EOL
+                 . 'Missing variable: ' . $undefinedVariable,
+                null,
+                'HtmlTemplates.DirectiveUsage.UndefinedVariable'
+            );
+        }
+    }
+}

From 8054864f6418000db921332ac7234dc283d3f768 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 28 Jul 2021 12:46:28 +0200
Subject: [PATCH 092/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Move files from Less folder

---
 Magento2/Sniffs/Less/AvoidIdSniff.php         | 100 ++++++++
 .../Sniffs/Less/BracesFormattingSniff.php     |  88 +++++++
 Magento2/Sniffs/Less/ClassNamingSniff.php     |  68 ++++++
 Magento2/Sniffs/Less/ColonSpacingSniff.php    | 113 +++++++++
 .../Sniffs/Less/ColourDefinitionSniff.php     |  65 ++++++
 .../Less/CombinatorIndentationSniff.php       |  49 ++++
 Magento2/Sniffs/Less/CommentLevelsSniff.php   | 214 ++++++++++++++++++
 .../Sniffs/Less/ImportantPropertySniff.php    |  51 +++++
 Magento2/Sniffs/Less/IndentationSniff.php     | 107 +++++++++
 .../Sniffs/Less/PropertiesLineBreakSniff.php  |  52 +++++
 .../Sniffs/Less/PropertiesSortingSniff.php    | 119 ++++++++++
 Magento2/Sniffs/Less/QuotesSniff.php          |  46 ++++
 .../Sniffs/Less/SelectorDelimiterSniff.php    |  90 ++++++++
 .../Sniffs/Less/SemicolonSpacingSniff.php     | 115 ++++++++++
 .../Sniffs/Less/TokenizerSymbolsInterface.php |  27 +++
 .../Less/TypeSelectorConcatenationSniff.php   |  56 +++++
 Magento2/Sniffs/Less/TypeSelectorsSniff.php   |  98 ++++++++
 Magento2/Sniffs/Less/VariablesSniff.php       |  80 +++++++
 Magento2/Sniffs/Less/ZeroUnitsSniff.php       |  78 +++++++
 19 files changed, 1616 insertions(+)
 create mode 100644 Magento2/Sniffs/Less/AvoidIdSniff.php
 create mode 100644 Magento2/Sniffs/Less/BracesFormattingSniff.php
 create mode 100644 Magento2/Sniffs/Less/ClassNamingSniff.php
 create mode 100644 Magento2/Sniffs/Less/ColonSpacingSniff.php
 create mode 100644 Magento2/Sniffs/Less/ColourDefinitionSniff.php
 create mode 100644 Magento2/Sniffs/Less/CombinatorIndentationSniff.php
 create mode 100644 Magento2/Sniffs/Less/CommentLevelsSniff.php
 create mode 100644 Magento2/Sniffs/Less/ImportantPropertySniff.php
 create mode 100644 Magento2/Sniffs/Less/IndentationSniff.php
 create mode 100644 Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
 create mode 100644 Magento2/Sniffs/Less/PropertiesSortingSniff.php
 create mode 100644 Magento2/Sniffs/Less/QuotesSniff.php
 create mode 100644 Magento2/Sniffs/Less/SelectorDelimiterSniff.php
 create mode 100644 Magento2/Sniffs/Less/SemicolonSpacingSniff.php
 create mode 100644 Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
 create mode 100644 Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
 create mode 100644 Magento2/Sniffs/Less/TypeSelectorsSniff.php
 create mode 100644 Magento2/Sniffs/Less/VariablesSniff.php
 create mode 100644 Magento2/Sniffs/Less/ZeroUnitsSniff.php

diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
new file mode 100644
index 00000000..bfdeee24
--- /dev/null
+++ b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class AvoidIdSniff
+ *
+ * Ensure that id selector is not used
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#types
+ */
+class AvoidIdSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * Tokens that can appear in a selector
+     *
+     * @var array
+     */
+    private $selectorTokens = [
+        T_HASH,
+        T_WHITESPACE,
+        T_STRING_CONCAT,
+        T_OPEN_PARENTHESIS,
+        T_CLOSE_PARENTHESIS,
+        T_OPEN_SQUARE_BRACKET,
+        T_CLOSE_SQUARE_BRACKET,
+        T_DOUBLE_QUOTED_STRING,
+        T_CONSTANT_ENCAPSED_STRING,
+        T_DOUBLE_COLON,
+        T_COLON,
+        T_EQUAL,
+        T_MUL_EQUAL,
+        T_OR_EQUAL,
+        T_STRING,
+        T_NONE,
+        T_DOLLAR,
+        T_GREATER_THAN,
+        T_PLUS,
+        T_NS_SEPARATOR,
+        T_LNUMBER,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_HASH];
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * Will flag any selector that looks like the following:
+     * #foo[bar],
+     * #foo[bar=bash],
+     * #foo[bar~=bash],
+     * #foo[bar$=bash],
+     * #foo[bar*=bash],
+     * #foo[bar|=bash],
+     * #foo[bar='bash'],
+     * #foo:hover,
+     * #foo:nth-last-of-type(n),
+     * #foo::before,
+     * #foo + div,
+     * #foo > div,
+     * #foo ~ div,
+     * #foo\3Abar ~ div,
+     * #foo\:bar ~ div,
+     * #foo.bar .baz,
+     * div#foo {
+     *     blah: 'abc';
+     * }
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Find the next non-selector token
+        $nextToken = $phpcsFile->findNext($this->selectorTokens, $stackPtr + 1, null, true);
+
+        // Anything except a { or a , means this is not a selector
+        if ($nextToken !== false && in_array($tokens[$nextToken]['code'], [T_OPEN_CURLY_BRACKET, T_COMMA])) {
+            $phpcsFile->addError('Id selector is used', $stackPtr, 'IdSelectorUsage');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/BracesFormattingSniff.php b/Magento2/Sniffs/Less/BracesFormattingSniff.php
new file mode 100644
index 00000000..3ca941c8
--- /dev/null
+++ b/Magento2/Sniffs/Less/BracesFormattingSniff.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Class BracesFormattingSniff
+ *
+ * Ensure there is a single blank line after the closing brace of a class definition
+ *
+ * @see Squiz_Sniffs_CSS_ClassDefinitionClosingBraceSpaceSniff
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#braces
+ */
+class BracesFormattingSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_OPEN_CURLY_BRACKET, T_CLOSE_CURLY_BRACKET];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (T_OPEN_CURLY_BRACKET === $tokens[$stackPtr]['code']) {
+            if (TokenizerSymbolsInterface::WHITESPACE !== $tokens[$stackPtr - 1]['content']) {
+                $phpcsFile->addError('Space before opening brace is missing', $stackPtr, 'SpacingBeforeOpen');
+            }
+
+            return;
+        }
+
+        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+        if ($next === false) {
+            return;
+        }
+
+        if (!in_array($tokens[$next]['code'], [T_CLOSE_TAG, T_CLOSE_CURLY_BRACKET])) {
+            $found = (($tokens[$next]['line'] - $tokens[$stackPtr]['line']) - 1);
+            if ($found !== 1) {
+                $error = 'Expected one blank line after closing brace of class definition; %s found';
+                $data = [$found];
+                // Will be implemented in MAGETWO-49778
+                //$phpcsFile->addWarning($error, $stackPtr, 'SpacingAfterClose', $data);
+            }
+        }
+
+        // Ignore nested style definitions from here on. The spacing before the closing brace
+        // (a single blank line) will be enforced by the above check, which ensures there is a
+        // blank line after the last nested class.
+        $found = $phpcsFile->findPrevious(
+            T_CLOSE_CURLY_BRACKET,
+            ($stackPtr - 1),
+            $tokens[$stackPtr]['bracket_opener']
+        );
+
+        if ($found !== false) {
+            return;
+        }
+
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        if ($prev !== false && $tokens[$prev]['line'] !== ($tokens[$stackPtr]['line'] - 1)) {
+            $num = ($tokens[$stackPtr]['line'] - $tokens[$prev]['line'] - 1);
+            $error = 'Expected 0 blank lines before closing brace of class definition; %s found';
+            $data = [$num];
+            $phpcsFile->addError($error, $stackPtr, 'SpacingBeforeClose', $data);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
new file mode 100644
index 00000000..c20c79b4
--- /dev/null
+++ b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class ClassNamingSniff
+ *
+ * Ensure that class name responds to the following requirements:
+ *
+ * - names should be lowercase;
+ * - start with a letter (except helper classes);
+ * - words should be separated with dash '-';
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#standard-classes
+ */
+class ClassNamingSniff implements Sniff
+{
+
+    const STRING_HELPER_CLASSES_PREFIX = '_';
+
+    const STRING_ALLOWED_UNDERSCORES = '__';
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_STRING_CONCAT];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (T_WHITESPACE !== $tokens[$stackPtr - 1]['code']
+            && !in_array(
+                $tokens[$stackPtr - 1]['content'],
+                [
+                    TokenizerSymbolsInterface::INDENT_SPACES,
+                    TokenizerSymbolsInterface::NEW_LINE,
+                ]
+            )
+        ) {
+            return;
+        }
+
+        $className = $tokens[$stackPtr + 1]['content'];
+        if (preg_match_all('/[^a-z0-9\-_]/U', $className, $matches)) {
+            $phpcsFile->addError('Class name contains not allowed symbols', $stackPtr, 'NotAllowedSymbol', $matches);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
new file mode 100644
index 00000000..31ef0a8e
--- /dev/null
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Class ColonSpacingSniff
+ *
+ * Ensure that single quotes are used
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#properties-colon-indents
+ */
+class ColonSpacingSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_COLON];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if ($this->needValidateSpaces($phpcsFile, $stackPtr, $tokens)) {
+            $this->validateSpaces($phpcsFile, $stackPtr, $tokens);
+        }
+    }
+
+    /**
+     * Check is it need to check spaces
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     *
+     * @return bool
+     */
+    private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
+    {
+        $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
+
+        if (false === $nextSemicolon
+            || ($tokens[$nextSemicolon]['line'] !== $tokens[$stackPtr]['line'])
+            || TokenizerSymbolsInterface::BITWISE_AND === $tokens[$stackPtr - 1]['content']
+        ) {
+            return false;
+        }
+
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        if ($tokens[$prev]['code'] !== T_STYLE) {
+            // The colon is not part of a style definition.
+            return false;
+        }
+
+        if ($tokens[$prev]['content'] === 'progid') {
+            // Special case for IE filters.
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate Colon Spacing according to requirements
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     *
+     * @return void
+     */
+    private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
+    {
+        if (T_WHITESPACE === $tokens[($stackPtr - 1)]['code']) {
+            $phpcsFile->addError('There must be no space before a colon in a style definition', $stackPtr, 'Before');
+        }
+
+        if (T_WHITESPACE !== $tokens[($stackPtr + 1)]['code']) {
+            $phpcsFile->addError('Expected 1 space after colon in style definition; 0 found', $stackPtr, 'NoneAfter');
+        } else {
+            $content = $tokens[($stackPtr + 1)]['content'];
+            if (false === strpos($content, $phpcsFile->eolChar)) {
+                $length  = strlen($content);
+                if ($length !== 1) {
+                    $error = 'Expected 1 space after colon in style definition; %s found';
+                    $phpcsFile->addError($error, $stackPtr, 'After');
+                }
+            } else {
+                $error = 'Expected 1 space after colon in style definition; newline found';
+                $phpcsFile->addError($error, $stackPtr, 'AfterNewline');
+            }
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/ColourDefinitionSniff.php b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
new file mode 100644
index 00000000..60cea825
--- /dev/null
+++ b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class ColourDefinitionSniff
+ *
+ * Ensure that hexadecimal values are used for variables not for properties
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#hexadecimal-notation
+ */
+class ColourDefinitionSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_COLOUR];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $colour = $tokens[$stackPtr]['content'];
+
+        $variablePtr = $phpcsFile->findPrevious(T_ASPERAND, $stackPtr);
+        if ((false === $variablePtr) || ($tokens[$stackPtr]['line'] !== $tokens[$variablePtr]['line'])) {
+            $phpcsFile->addError('Hexadecimal value should be used for variable', $stackPtr, 'NotInVariable');
+        }
+
+        $expected = strtolower($colour);
+        if ($colour !== $expected) {
+            $error = 'CSS colours must be defined in lowercase; expected %s but found %s';
+            $phpcsFile->addError($error, $stackPtr, 'NotLower', [$expected, $colour]);
+        }
+
+        // Now check if shorthand can be used.
+        if (strlen($colour) !== 7) {
+            return;
+        }
+
+        if ($colour[1] === $colour[2] && $colour[3] === $colour[4] && $colour[5] === $colour[6]) {
+            $expected = '#' . $colour[1] . $colour[3] . $colour[5];
+            $error = 'CSS colours must use shorthand if available; expected %s but found %s';
+            $phpcsFile->addError($error, $stackPtr, 'Shorthand', [$expected, $colour]);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/CombinatorIndentationSniff.php b/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
new file mode 100644
index 00000000..776e0533
--- /dev/null
+++ b/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class CombinatorIndentationSniff
+ *
+ * Ensure that spaces are used before and after combinators
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#combinator-indents
+ */
+class CombinatorIndentationSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_PLUS];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $prevPtr = $stackPtr - 1;
+        $nextPtr = $stackPtr + 1;
+
+        if (($tokens[$prevPtr]['code'] !== T_WHITESPACE) || ($tokens[$nextPtr]['code'] !== T_WHITESPACE)) {
+            $phpcsFile->addError('Spaces should be before and after combinators', $stackPtr, 'NoSpaces');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/CommentLevelsSniff.php b/Magento2/Sniffs/Less/CommentLevelsSniff.php
new file mode 100644
index 00000000..b53aa81a
--- /dev/null
+++ b/Magento2/Sniffs/Less/CommentLevelsSniff.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Class CommentLevelsSniff
+ *
+ * First and second level comments must be surrounded by empty lines.
+ * First, second and third level comments should have two spaces after "//".
+ * Inline comments should have one space after "//".
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#comments
+ */
+class CommentLevelsSniff implements Sniff
+{
+    const COMMENT_STRING = '//';
+
+    const FIRST_LEVEL_COMMENT = '_____________________________________________';
+
+    const SECOND_LEVEL_COMMENT = '--';
+
+    /**
+     * @var array
+     */
+    protected $levelComments = [
+        self::FIRST_LEVEL_COMMENT   => T_STRING,
+        self::SECOND_LEVEL_COMMENT  => T_DEC,
+    ];
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_STRING];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if ((T_STRING !== $tokens[$stackPtr]['code'])
+            || (self::COMMENT_STRING !== $tokens[$stackPtr]['content'])
+            || (1 === $tokens[$stackPtr]['line'])
+        ) {
+            return;
+        }
+
+        $textInSameLine = $phpcsFile->findPrevious([T_STRING, T_STYLE], $stackPtr - 1);
+
+        // is inline comment
+        if ((false !== $textInSameLine)
+            && ($tokens[$textInSameLine]['line'] === $tokens[$stackPtr]['line'])
+        ) {
+            $this->validateInlineComment($phpcsFile, $stackPtr, $tokens);
+            return;
+        }
+
+        $this->validateCommentLevel($phpcsFile, $stackPtr, $tokens);
+
+        if (!$this->isNthLevelComment($phpcsFile, $stackPtr, $tokens)) {
+            return;
+        }
+
+        if (!$this->checkNthLevelComment($phpcsFile, $stackPtr, $tokens)) {
+            $phpcsFile->addError(
+                'First and second level comments must be surrounded by empty lines',
+                $stackPtr,
+                'SpaceMissed'
+            );
+        }
+    }
+
+    /**
+     * Validate that inline comment responds to given requirements
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     * @return bool
+     */
+    private function validateInlineComment(File $phpcsFile, $stackPtr, array $tokens)
+    {
+        if ($tokens[$stackPtr + 1]['content'] !== TokenizerSymbolsInterface::WHITESPACE) {
+            $phpcsFile->addError('Inline comment should have 1 space after "//"', $stackPtr, 'SpaceMissedAfter');
+        }
+        if ($tokens[$stackPtr - 1]['content'] !== TokenizerSymbolsInterface::WHITESPACE) {
+            $phpcsFile->addError('Inline comment should have 1 space before "//"', $stackPtr, 'SpaceMissedBefore');
+        }
+    }
+
+    /**
+     * Check is it n-th level comment was found
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     * @return bool
+     */
+    private function isNthLevelComment(File $phpcsFile, $stackPtr, array $tokens)
+    {
+        $nthLevelCommentFound = false;
+        $levelComment = 0;
+
+        foreach ($this->levelComments as $code => $comment) {
+            $levelComment = $phpcsFile->findNext($comment, $stackPtr, null, false, $code);
+            if (false !== $levelComment) {
+                $nthLevelCommentFound = true;
+                break;
+            }
+        }
+
+        if (false === $nthLevelCommentFound) {
+            return false;
+        }
+
+        $currentLine = $tokens[$stackPtr]['line'];
+        $levelCommentLine = $tokens[$levelComment]['line'];
+
+        if ($currentLine !== $levelCommentLine) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check is it n-th level comment is correct
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     * @return bool
+     */
+    private function checkNthLevelComment(File $phpcsFile, $stackPtr, array $tokens)
+    {
+        $correct = false;
+
+        $nextLine = $phpcsFile->findNext(
+            T_WHITESPACE,
+            $stackPtr,
+            null,
+            false,
+            TokenizerSymbolsInterface::NEW_LINE
+        );
+
+        if (false === $nextLine) {
+            return $correct;
+        }
+
+        if (($tokens[$nextLine]['content'] !== TokenizerSymbolsInterface::NEW_LINE)
+            || ($tokens[$nextLine + 1]['content'] !== TokenizerSymbolsInterface::NEW_LINE)
+        ) {
+            return $correct;
+        }
+
+        $commentLinePtr = $stackPtr;
+        while ($tokens[$commentLinePtr - 2]['line'] > 1) {
+            $commentLinePtr = $phpcsFile->findPrevious(T_STRING, $commentLinePtr - 1, null, false, '//');
+
+            if (false === $commentLinePtr) {
+                continue;
+            }
+
+            if (($tokens[$commentLinePtr - 1]['content'] === TokenizerSymbolsInterface::NEW_LINE)
+                && ($tokens[$commentLinePtr - 2]['content'] === TokenizerSymbolsInterface::NEW_LINE)
+            ) {
+                $correct = true;
+                break;
+            }
+        }
+
+        return $correct;
+    }
+
+    /**
+     * Validation of comment level.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     */
+    private function validateCommentLevel(File $phpcsFile, int $stackPtr, array $tokens): void
+    {
+        if ($tokens[$stackPtr + 2]['content'] !== 'magento_import' &&
+            !in_array(
+                $tokens[$stackPtr + 1]['content'],
+                [
+                    TokenizerSymbolsInterface::DOUBLE_WHITESPACE,
+                    TokenizerSymbolsInterface::NEW_LINE,
+                ],
+                true
+            )
+        ) {
+            $phpcsFile->addError('Level\'s comment does not have 2 spaces after "//"', $stackPtr, 'SpacesMissed');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/ImportantPropertySniff.php b/Magento2/Sniffs/Less/ImportantPropertySniff.php
new file mode 100644
index 00000000..17120f7f
--- /dev/null
+++ b/Magento2/Sniffs/Less/ImportantPropertySniff.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class ImportantPropertySniff
+ *
+ * Ensure that single quotes are used
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#important-property
+ */
+class ImportantPropertySniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_BOOLEAN_NOT];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Will be implemented in MAGETWO-49778
+        //$phpcsFile->addWarning('!important is used', $stackPtr, '!ImportantIsUsed');
+
+        if (($tokens[$stackPtr + 1]['content'] === 'important')
+            && ($tokens[$stackPtr - 1]['content'] !== TokenizerSymbolsInterface::WHITESPACE)
+        ) {
+            $phpcsFile->addError('Space before !important is missing', $stackPtr, 'NoSpace');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/IndentationSniff.php b/Magento2/Sniffs/Less/IndentationSniff.php
new file mode 100644
index 00000000..811f877e
--- /dev/null
+++ b/Magento2/Sniffs/Less/IndentationSniff.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class IndentationSniff
+ *
+ * Ensures styles are indented 4 spaces.
+ *
+ * @see Squiz_Sniffs_CSS_IndentationSniff
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#indentation
+ */
+class IndentationSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * The number of spaces code should be indented.
+     *
+     * @var int
+     */
+    public $indent = 4;
+
+    /**
+     * A nesting level than this value will throw a warning.
+     *
+     * @var int
+     */
+    public $maxIndentLevel = 3;
+
+    /** Skip codes that can be detected by sniffer incorrectly
+     *
+     * @var array
+     */
+    private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_OPEN_TAG];
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $numTokens = (count($tokens) - 2);
+        $indentLevel = 0;
+        for ($i = 1; $i < $numTokens; $i++) {
+            if ($tokens[$i]['code'] === T_COMMENT) {
+                // Don't check the indent of comments.
+                continue;
+            }
+
+            if ($tokens[$i]['code'] === T_OPEN_CURLY_BRACKET) {
+                $indentLevel++;
+            } elseif ($tokens[($i + 1)]['code'] === T_CLOSE_CURLY_BRACKET) {
+                $indentLevel--;
+            }
+
+            if ($tokens[$i]['column'] !== 1) {
+                continue;
+            }
+
+            // We started a new line, so check indent.
+            if ($tokens[$i]['code'] === T_WHITESPACE) {
+                $content = str_replace($phpcsFile->eolChar, '', $tokens[$i]['content']);
+                $foundIndent = strlen($content);
+            } else {
+                $foundIndent = 0;
+            }
+
+            $expectedIndent = ($indentLevel * $this->indent);
+            if (!($expectedIndent > 0 && strpos($tokens[$i]['content'], $phpcsFile->eolChar) !== false)
+                && ($foundIndent !== $expectedIndent)
+                && (!in_array($tokens[$i + 1]['code'], $this->styleCodesToSkip))
+            ) {
+                $error = 'Line indented incorrectly; expected %s spaces, found %s';
+                $phpcsFile->addError($error, $i, 'Incorrect', [$expectedIndent, $foundIndent]);
+            }
+
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+            if ($indentLevel > $this->maxIndentLevel) {
+                // Will be implemented in MAGETWO-49778
+                // $phpcsFile->addWarning('Avoid using more than three levels of nesting', $i, 'IncorrectNestingLevel');
+            }
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php b/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
new file mode 100644
index 00000000..98b81f95
--- /dev/null
+++ b/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class PropertiesLineBreakSniff
+ *
+ * Start each property declaration in a new line
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#properties-line-break
+ */
+class PropertiesLineBreakSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_SEMICOLON];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $prevPtr = $phpcsFile->findPrevious(T_SEMICOLON, ($stackPtr - 1));
+        if (false === $prevPtr) {
+            return;
+        }
+
+        if ($tokens[$prevPtr]['line'] === $tokens[$stackPtr]['line']) {
+            $error = 'Each property must be on a line by itself';
+            $phpcsFile->addError($error, $stackPtr, 'SameLine');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/PropertiesSortingSniff.php b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
new file mode 100644
index 00000000..8757207f
--- /dev/null
+++ b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class PropertiesSortingSniff
+ *
+ * Ensure that properties are sorted alphabetically
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#sorting
+ */
+class PropertiesSortingSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * List of properties that belong to class
+     *
+     * @var array
+     */
+    private $properties = [];
+
+    /**
+     * Skip symbols that can be detected by sniffer incorrectly
+     *
+     * @var array
+     */
+    private $styleSymbolsToSkip = [
+        TokenizerSymbolsInterface::BITWISE_AND,
+        TokenizerSymbolsInterface::COLON,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_OPEN_CURLY_BRACKET,
+            T_CLOSE_CURLY_BRACKET,
+            T_OPEN_PARENTHESIS,
+            T_CLOSE_PARENTHESIS,
+            T_STYLE
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $currentToken = $tokens[$stackPtr];
+
+        // if variables, mixins, extends area used - skip
+        if ((T_ASPERAND === $tokens[$stackPtr - 1]['code'])
+            || in_array($tokens[$stackPtr]['content'], $this->styleSymbolsToSkip)
+        ) {
+            return;
+        }
+
+        $nextCurlyBracket = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, $stackPtr + 1);
+        if (in_array($currentToken['code'], [T_OPEN_CURLY_BRACKET, T_CLOSE_CURLY_BRACKET])
+            || ((false !== $nextCurlyBracket) && ($tokens[$nextCurlyBracket]['line'] === $tokens[$stackPtr]['line']))
+        ) {
+            if ($this->properties) {
+                // validate collected properties before erase them
+                $this->validatePropertiesSorting($phpcsFile, $stackPtr, $this->properties);
+            }
+
+            $this->properties = [];
+            return;
+        }
+
+        if (T_STYLE === $currentToken['code']) {
+            $this->properties[] = $currentToken['content'];
+        }
+    }
+
+    /**
+     * Validate sorting of properties of class
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $properties
+     *
+     * @return void
+     */
+    private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties)
+    {
+        // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
+        $symbolsForSkip = ['(', 'block', 'field'];
+        $properties = array_filter(
+            $properties,
+            function ($var) use ($symbolsForSkip) {
+                return !in_array($var, $symbolsForSkip);
+            }
+        );
+
+        $originalProperties = $properties;
+        sort($properties);
+
+        if ($originalProperties !== $properties) {
+            $delimiter = $phpcsFile->findPrevious(T_SEMICOLON, $stackPtr);
+            $phpcsFile->addError('Properties sorted not alphabetically', $delimiter, 'PropertySorting');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/QuotesSniff.php b/Magento2/Sniffs/Less/QuotesSniff.php
new file mode 100644
index 00000000..d605cc13
--- /dev/null
+++ b/Magento2/Sniffs/Less/QuotesSniff.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class QuotesSniff
+ *
+ * Ensure that single quotes are used
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#quotes
+ */
+class QuotesSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_CONSTANT_ENCAPSED_STRING];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (false !== strpos($tokens[$stackPtr]['content'], '"')) {
+            $phpcsFile->addError('Use single quotes', $stackPtr, 'DoubleQuotes');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/SelectorDelimiterSniff.php b/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
new file mode 100644
index 00000000..6318eeab
--- /dev/null
+++ b/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class SelectorDelimiterSniff
+ *
+ * Ensure that a line break exists after each selector delimiter.
+ * No spaces should be before or after delimiters.
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#selector-delimiters
+ */
+class SelectorDelimiterSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_COMMA];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Check that there's no spaces before delimiter
+        if ($tokens[$stackPtr - 1]['code'] === T_WHITESPACE) {
+            $phpcsFile->addError('Spaces should not be before delimiter', $stackPtr - 1, 'SpacesBeforeDelimiter');
+        }
+
+        $this->validateParenthesis($phpcsFile, $stackPtr, $tokens);
+    }
+
+    /**
+     * Parenthesis validation.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     * @return void
+     */
+    private function validateParenthesis(File $phpcsFile, $stackPtr, array $tokens)
+    {
+        $nextPtr = $stackPtr + 1;
+
+        $nextClassPtr = $phpcsFile->findNext(T_STRING_CONCAT, $nextPtr);
+        $nextOpenBrace = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, $nextPtr);
+
+        if ($nextClassPtr === false || $nextOpenBrace === false) {
+            return;
+        }
+
+        $stackLine = $tokens[$stackPtr]['line'];
+        $nextClassLine = $tokens[$nextPtr]['line'];
+        $nextOpenBraceLine = $tokens[$nextOpenBrace]['line'];
+
+        // Check that each class declaration goes from new line
+        if (($stackLine === $nextClassLine) && ($stackLine === $nextOpenBraceLine)) {
+            $prevParenthesis = $phpcsFile->findPrevious(T_OPEN_PARENTHESIS, $stackPtr);
+            $nextParenthesis = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr);
+
+            if ((false !== $prevParenthesis) && (false !== $nextParenthesis)
+                && ($tokens[$prevParenthesis]['line'] === $tokens[$stackPtr]['line'])
+                && ($tokens[$nextParenthesis]['line'] === $tokens[$stackPtr]['line'])
+            ) {
+                return;
+            }
+
+            $error = 'Add a line break after each selector delimiter';
+            $phpcsFile->addError($error, $nextOpenBrace, 'LineBreakAfterDelimiter');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
new file mode 100644
index 00000000..16967cf7
--- /dev/null
+++ b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class SemicolonSpacingSniff
+ *
+ * Property should have a semicolon at the end of line
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#end-of-the-property-line
+ */
+class SemicolonSpacingSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * Skip symbols that can be detected by sniffer incorrectly
+     *
+     * @var array
+     */
+    private $styleSymbolsToSkip = [
+        TokenizerSymbolsInterface::BITWISE_AND,
+        TokenizerSymbolsInterface::COLON,
+        TokenizerSymbolsInterface::OPEN_PARENTHESIS,
+        TokenizerSymbolsInterface::CLOSE_PARENTHESIS,
+    ];
+
+    /** Skip codes that can be detected by sniffer incorrectly
+     *
+     * @var array
+     */
+    private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_STYLE];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (in_array($tokens[$stackPtr]['content'], $this->styleSymbolsToSkip)) {
+            return;
+        }
+
+        $semicolonPtr = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
+        if ($tokens[$semicolonPtr]['line'] !== $tokens[$stackPtr]['line']) {
+            $semicolonPtr = $phpcsFile->findNext(T_STYLE, ($stackPtr + 1), null, false, ";");
+        }
+
+        $this->validateSemicolon($phpcsFile, $stackPtr, $tokens, $semicolonPtr);
+        $this->validateSpaces($phpcsFile, $stackPtr, $tokens, $semicolonPtr);
+    }
+
+    /**
+     * Semicolon validation.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     * @param int $semicolonPtr
+     * @return void
+     */
+    private function validateSemicolon(File $phpcsFile, $stackPtr, array $tokens, $semicolonPtr)
+    {
+        if ((false === $semicolonPtr || $tokens[$semicolonPtr]['line'] !== $tokens[$stackPtr]['line'])
+            && (isset($tokens[$stackPtr - 1]) && !in_array($tokens[$stackPtr - 1]['code'], $this->styleCodesToSkip))
+            && (T_COLON !== $tokens[$stackPtr + 1]['code'])
+        ) {
+            $error = 'Style definitions must end with a semicolon';
+            $phpcsFile->addError($error, $stackPtr, 'NotAtEnd');
+        }
+    }
+
+    /**
+     * Spaces validation.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     * @param int $semicolonPtr
+     * @return void
+     */
+    private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens, $semicolonPtr)
+    {
+        if (!isset($tokens[($semicolonPtr - 1)])) {
+            return;
+        }
+
+        if ($tokens[($semicolonPtr - 1)]['code'] === T_WHITESPACE) {
+            $length  = strlen($tokens[($semicolonPtr - 1)]['content']);
+            $error = 'Expected 0 spaces before semicolon in style definition; %s found';
+            $data  = [$length];
+            $phpcsFile->addError($error, $stackPtr, 'SpaceFound', $data);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
new file mode 100644
index 00000000..db6a2fe1
--- /dev/null
+++ b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+/**
+ * Interface TokenizerSymbolsInterface
+ */
+interface TokenizerSymbolsInterface
+{
+    const TOKENIZER_CSS = 'CSS';
+
+    /**#@+
+     * Symbols for usage into Sniffers
+     */
+    const BITWISE_AND         = '&';
+    const COLON               = ';';
+    const OPEN_PARENTHESIS    = '(';
+    const CLOSE_PARENTHESIS   = ')';
+    const NEW_LINE            = "\n";
+    const WHITESPACE          = ' ';
+    const DOUBLE_WHITESPACE   = '  ';
+    const INDENT_SPACES       = '    ';
+    /**#@-*/
+}
diff --git a/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php b/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
new file mode 100644
index 00000000..8928028c
--- /dev/null
+++ b/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class TypeSelectorConcatenation
+ *
+ * Ensure that selector in one line, concatenation is not used
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#formatting-1
+ */
+class TypeSelectorConcatenationSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @var array
+     */
+    private $symbolsBeforeConcat = [
+        TokenizerSymbolsInterface::INDENT_SPACES,
+        TokenizerSymbolsInterface::NEW_LINE,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_BITWISE_AND];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (0 === strpos($tokens[$stackPtr + 1]['content'], '-')
+            && in_array($tokens[$stackPtr - 1]['content'], $this->symbolsBeforeConcat)
+        ) {
+            $phpcsFile->addError('Concatenation is used', $stackPtr, 'ConcatenationUsage');
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/TypeSelectorsSniff.php b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
new file mode 100644
index 00000000..95a45b80
--- /dev/null
+++ b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class TypeSelectorsSniff
+ *
+ * Ensure that Type selectors respond to the following requirements:
+ *
+ * - avoid qualifying class names with type selectors;
+ * - Unless necessary (for example with helper classes), do not use element names in conjunction with IDs or classes.
+ * - Type selectors must be lowercase
+ * - Write selector in one line, do not use concatenation
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#selectors-naming
+ */
+class TypeSelectorsSniff implements Sniff
+{
+    /**
+     * Tags that are not allowed as type selector
+     *
+     * @var array
+     */
+    private $tags = [
+        'a', 'abbr', 'acronym', 'address', 'area', 'b', 'base', 'bdo',
+        'big', 'blockquote', 'body', 'br', 'button', 'caption', 'cite',
+        'code', 'col', 'colgroup', 'dd', 'del', 'div', 'dfn', 'dl',
+        'dt', 'em', 'fieldset', 'form', 'frame', 'frameset', 'h1', 'h2',
+        'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'iframe',
+        'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'link',
+        'map', 'meta', 'noframes', 'noscript', 'object', 'ol', 'optgroup',
+        'option', 'p', 'param', 'pre', 'q', 'samp', 'script', 'select',
+        'small', 'span', 'strong', 'style', 'sub', 'sup', 'table',
+        'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title',
+        'tr', 'tt', 'ul', 'var',
+            // HTML5
+        'article', 'aside', 'audio', 'bdi', 'canvas', 'command',
+        'datalist', 'details', 'dialog', 'embed', 'figure', 'figcaption',
+        'footer', 'header', 'hgroup', 'keygen', 'mark', 'meter', 'nav',
+        'output', 'progress', 'ruby', 'rt', 'rp', 'track', 'section',
+        'source', 'summary', 'time', 'video', 'wbr'
+    ];
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_STRING_CONCAT];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $bracketPtr = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, $stackPtr);
+
+        if (false === $bracketPtr) {
+            return;
+        }
+
+        $isBracketOnSameLane = (bool)($tokens[$bracketPtr]['line'] === $tokens[$stackPtr]['line']);
+
+        if (!$isBracketOnSameLane) {
+            return;
+        }
+
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+        if ((T_STRING === $tokens[$stackPtr - 1]['code'])
+            && in_array($tokens[$stackPtr - 1]['content'], $this->tags)
+        ) {
+            // Will be implemented in MAGETWO-49778
+            //$phpcsFile->addWarning('Type selector is used', $stackPtr, 'TypeSelector');
+        }
+
+        for ($i = $stackPtr; $i < $bracketPtr; $i++) {
+            if (preg_match('/[A-Z]/', $tokens[$i]['content'])) {
+                $phpcsFile->addError('Selector contains uppercase symbols', $stackPtr, 'UpperCaseSelector');
+            }
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/VariablesSniff.php b/Magento2/Sniffs/Less/VariablesSniff.php
new file mode 100644
index 00000000..ec9f5108
--- /dev/null
+++ b/Magento2/Sniffs/Less/VariablesSniff.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class VariablesSniff
+ *
+ * Ensure that the variables are responds to the following requirements:
+ * - If variables are local and used only in a module scope,
+ *   they should be located in the module file, in the beginning of the general comment.
+ * - All variable names must be lowercase
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#local-variables
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#naming
+ */
+class VariablesSniff implements Sniff
+{
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_ASPERAND];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $currentToken = $tokens[$stackPtr];
+
+        $nextColon = $phpcsFile->findNext(T_COLON, $stackPtr);
+        $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
+        if ((false === $nextColon) || (false === $nextSemicolon)) {
+            return;
+        }
+
+        $isVariableDeclaration = ($currentToken['line'] === $tokens[$nextColon]['line'])
+            && ($currentToken['line'] === $tokens[$nextSemicolon]['line'])
+            && (T_STRING === $tokens[$stackPtr + 1]['code'])
+            && (T_COLON === $tokens[$stackPtr + 2]['code']);
+
+        if (!$isVariableDeclaration) {
+            return;
+        }
+
+        $classBefore = $phpcsFile->findPrevious(T_STYLE, $stackPtr);
+        if (false !== $classBefore) {
+            $phpcsFile->addError(
+                'Variable declaration located not in the beginning of general comments',
+                $stackPtr,
+                'VariableLocation'
+            );
+        }
+
+        $variableName = $tokens[$stackPtr + 1]['content'];
+        if (preg_match('/[A-Z]/', $variableName)) {
+            $phpcsFile->addError(
+                'Variable declaration contains uppercase symbols',
+                $stackPtr,
+                'VariableUppercase'
+            );
+        }
+    }
+}
diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
new file mode 100644
index 00000000..7cf3bfb2
--- /dev/null
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\Less;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class ZeroUnitsSniff
+ *
+ * Ensure that units for 0 is not specified
+ * Omit leading "0"s in values, use dot instead
+ *
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#and-units
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#floating-values
+ */
+class ZeroUnitsSniff implements Sniff
+{
+    const CSS_PROPERTY_UNIT_PX = 'px';
+    const CSS_PROPERTY_UNIT_EM = 'em';
+    const CSS_PROPERTY_UNIT_REM = 'rem';
+
+    /**
+     * List of available CSS Property units
+     *
+     * @var array
+     */
+    private $units = [
+        self::CSS_PROPERTY_UNIT_PX,
+        self::CSS_PROPERTY_UNIT_EM,
+        self::CSS_PROPERTY_UNIT_REM,
+    ];
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_LNUMBER, T_DNUMBER];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $tokenCode = $tokens[$stackPtr]['code'];
+        $tokenContent = $tokens[$stackPtr]['content'];
+
+        $nextToken = $tokens[$stackPtr + 1];
+
+        if (T_LNUMBER === $tokenCode
+            && "0" === $tokenContent
+            && T_STRING === $nextToken['code']
+            && in_array($nextToken['content'], $this->units)
+        ) {
+            $phpcsFile->addError('Units specified for "0" value', $stackPtr, 'ZeroUnitFound');
+        }
+
+        if ((T_DNUMBER === $tokenCode)
+            && 0 === strpos($tokenContent, "0")
+            && ((float)$tokenContent < 1)
+        ) {
+            $phpcsFile->addError('Values starts from "0"', $stackPtr, 'ZeroUnitFound');
+        }
+    }
+}

From 6cfce180b53adcbef97e4b257da586c61a955cfa Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 28 Jul 2021 15:43:23 +0200
Subject: [PATCH 093/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Fix namespace

---
 Magento2/Sniffs/Annotation/AnnotationFormatValidator.php      | 2 +-
 Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php | 2 +-
 Magento2/Sniffs/Annotation/MethodArgumentsSniff.php           | 2 +-
 Magento2/Sniffs/Html/HtmlBindingSniff.php                     | 2 +-
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php                   | 2 +-
 Magento2/Sniffs/Less/AvoidIdSniff.php                         | 2 +-
 Magento2/Sniffs/Less/BracesFormattingSniff.php                | 2 +-
 Magento2/Sniffs/Less/ClassNamingSniff.php                     | 2 +-
 Magento2/Sniffs/Less/ColonSpacingSniff.php                    | 2 +-
 Magento2/Sniffs/Less/ColourDefinitionSniff.php                | 2 +-
 Magento2/Sniffs/Less/CombinatorIndentationSniff.php           | 2 +-
 Magento2/Sniffs/Less/CommentLevelsSniff.php                   | 2 +-
 Magento2/Sniffs/Less/ImportantPropertySniff.php               | 2 +-
 Magento2/Sniffs/Less/IndentationSniff.php                     | 2 +-
 Magento2/Sniffs/Less/PropertiesLineBreakSniff.php             | 2 +-
 Magento2/Sniffs/Less/PropertiesSortingSniff.php               | 2 +-
 Magento2/Sniffs/Less/QuotesSniff.php                          | 2 +-
 Magento2/Sniffs/Less/SelectorDelimiterSniff.php               | 2 +-
 Magento2/Sniffs/Less/SemicolonSpacingSniff.php                | 2 +-
 Magento2/Sniffs/Less/TokenizerSymbolsInterface.php            | 2 +-
 Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php       | 2 +-
 Magento2/Sniffs/Less/TypeSelectorsSniff.php                   | 2 +-
 Magento2/Sniffs/Less/VariablesSniff.php                       | 2 +-
 Magento2/Sniffs/Less/ZeroUnitsSniff.php                       | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
index cd4c8689..220d1a19 100644
--- a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
+++ b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Sniffs\Annotation;
+namespace Magento2\Sniffs\Annotation;
 
 use PHP_CodeSniffer\Files\File;
 
diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index 3df07533..fed274a9 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Sniffs\Annotation;
+namespace Magento2\Sniffs\Annotation;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
index 54e10100..2ebb12d4 100644
--- a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Sniffs\Annotation;
+namespace Magento2\Sniffs\Annotation;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Sniffs/Html/HtmlBindingSniff.php b/Magento2/Sniffs/Html/HtmlBindingSniff.php
index 1d09b7a6..63718b5b 100644
--- a/Magento2/Sniffs/Html/HtmlBindingSniff.php
+++ b/Magento2/Sniffs/Html/HtmlBindingSniff.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sniffs\Html;
+namespace Magento2\Sniffs\Html;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
index 33ffdf29..6179f90f 100644
--- a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\Sniffs\Html;
+namespace Magento2\Sniffs\Html;
 
 use Magento\Framework\Filter\Template;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
index bfdeee24..d4e1b213 100644
--- a/Magento2/Sniffs/Less/AvoidIdSniff.php
+++ b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/BracesFormattingSniff.php b/Magento2/Sniffs/Less/BracesFormattingSniff.php
index 3ca941c8..54575160 100644
--- a/Magento2/Sniffs/Less/BracesFormattingSniff.php
+++ b/Magento2/Sniffs/Less/BracesFormattingSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
index c20c79b4..90d44280 100644
--- a/Magento2/Sniffs/Less/ClassNamingSniff.php
+++ b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index 31ef0a8e..6ada0fac 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/ColourDefinitionSniff.php b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
index 60cea825..82568824 100644
--- a/Magento2/Sniffs/Less/ColourDefinitionSniff.php
+++ b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/CombinatorIndentationSniff.php b/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
index 776e0533..e6954c31 100644
--- a/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
+++ b/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/CommentLevelsSniff.php b/Magento2/Sniffs/Less/CommentLevelsSniff.php
index b53aa81a..e192f659 100644
--- a/Magento2/Sniffs/Less/CommentLevelsSniff.php
+++ b/Magento2/Sniffs/Less/CommentLevelsSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Sniffs/Less/ImportantPropertySniff.php b/Magento2/Sniffs/Less/ImportantPropertySniff.php
index 17120f7f..ad1fd10c 100644
--- a/Magento2/Sniffs/Less/ImportantPropertySniff.php
+++ b/Magento2/Sniffs/Less/ImportantPropertySniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/IndentationSniff.php b/Magento2/Sniffs/Less/IndentationSniff.php
index 811f877e..76a6fbcc 100644
--- a/Magento2/Sniffs/Less/IndentationSniff.php
+++ b/Magento2/Sniffs/Less/IndentationSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php b/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
index 98b81f95..06eb9c6a 100644
--- a/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/PropertiesSortingSniff.php b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
index 8757207f..d1c7c387 100644
--- a/Magento2/Sniffs/Less/PropertiesSortingSniff.php
+++ b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/QuotesSniff.php b/Magento2/Sniffs/Less/QuotesSniff.php
index d605cc13..a1328c51 100644
--- a/Magento2/Sniffs/Less/QuotesSniff.php
+++ b/Magento2/Sniffs/Less/QuotesSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/SelectorDelimiterSniff.php b/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
index 6318eeab..cdbd5117 100644
--- a/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
+++ b/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
index 16967cf7..cad13290 100644
--- a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
index db6a2fe1..da690f79 100644
--- a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
+++ b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 /**
  * Interface TokenizerSymbolsInterface
diff --git a/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php b/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
index 8928028c..5b42c9b2 100644
--- a/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
+++ b/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/TypeSelectorsSniff.php b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
index 95a45b80..00c8b35c 100644
--- a/Magento2/Sniffs/Less/TypeSelectorsSniff.php
+++ b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/VariablesSniff.php b/Magento2/Sniffs/Less/VariablesSniff.php
index ec9f5108..ec9986a6 100644
--- a/Magento2/Sniffs/Less/VariablesSniff.php
+++ b/Magento2/Sniffs/Less/VariablesSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
index 7cf3bfb2..51971c78 100644
--- a/Magento2/Sniffs/Less/ZeroUnitsSniff.php
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Less;
+namespace Magento2\Sniffs\Less;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

From ebc647dfc099fd03fb8eec352538e5c4dd046ac3 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 28 Jul 2021 17:31:32 +0200
Subject: [PATCH 094/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - WIP: Update ruleset.xml

---
 Magento2/ruleset.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index ef9b9aca..cf1ca9b0 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -585,4 +585,8 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Html">
+    </rule>
+    <rule ref="Magento2.Less">
+    </rule>
 </ruleset>

From 491f1cb62f4a0848611187ca3f35cafb91b3d867 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 28 Jul 2021 22:59:50 +0300
Subject: [PATCH 095/630] Test on lowest and highest dependencies

Remove experimental flag
---
 .github/workflows/php.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 133cec38..5a7cb023 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -10,7 +10,6 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
@@ -27,7 +26,6 @@ jobs:
           - php-version: "8.0"
             dependencies: "highest"
             composer-options: "--ignore-platform-reqs"
-            experimental: true
     name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:

From db1745af0ac497e8ad3e01ab5f8b0fd610302011 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 29 Jul 2021 11:26:49 +0200
Subject: [PATCH 096/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Add other rules from previous ruleset files on
 Magento

---
 Magento2/ruleset.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index cf1ca9b0..8eef795c 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -589,4 +589,8 @@
     </rule>
     <rule ref="Magento2.Less">
     </rule>
+    <rule ref="Internal.NoCodeFound">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.CSS.NamedColours"/>
 </ruleset>

From 0d84b92d98e1e804ce8042b49a2e37425c74807c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 29 Jul 2021 11:42:39 +0200
Subject: [PATCH 097/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Clean XML code

---
 Magento2/ruleset.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 8eef795c..f77859e9 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -585,10 +585,8 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Html">
-    </rule>
-    <rule ref="Magento2.Less">
-    </rule>
+    <rule ref="Magento2.Html"/>
+    <rule ref="Magento2.Less"/>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>

From 832be5377133de56fc2fa84a35c7c9e25bc6c927 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 29 Jul 2021 17:04:50 +0200
Subject: [PATCH 098/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Add missing comment block

---
 Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
index 19bcd586..dc921b17 100644
--- a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
+++ b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
@@ -13,6 +13,9 @@
  */
 abstract class AbstractGraphQLSniffUnitTestCase extends AbstractSniffUnitTest
 {
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         //let parent do its job

From b0f13657a80cec2ab5d5cf2b46a7cf4a1e2b3606 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 29 Jul 2021 17:56:02 +0200
Subject: [PATCH 099/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Fix CS errors

---
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php | 3 +--
 Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php    | 8 +++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index d7a19621..34c6831d 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -128,8 +128,7 @@ private function getArgumentListClosePointer($openParenthesisPointer, array $tok
     }
 
     /**
-     * Seeks the next available {@link T_OPEN_PARENTHESIS} token that comes directly after <var>$stackPointer</var>.
-     * token.
+     * Seeks the next available {@link T_OPEN_PARENTHESIS} token that comes directly after <var>$stackPointer</var> token.
      *
      * @param int $stackPointer
      * @param array $tokens
diff --git a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
index a9c5f245..1e64dcf4 100644
--- a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
@@ -68,8 +68,7 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * Seeks the next available token of type {@link T_CLOSE_CURLY_BRACKET} in <var>$tokens</var> and returns its
-     * pointer.
+     * Seeks the next available token of type {@link T_CLOSE_CURLY_BRACKET} in <var>$tokens</var> and returns its pointer.
      *
      * @param int $startPointer
      * @param array $tokens
@@ -81,10 +80,9 @@ private function getClosingCurlyBracketPointer($startPointer, array $tokens)
     }
 
     /**
-     * Seeks the next available token of type {@link T_OPEN_CURLY_BRACKET} in <var>$tokens</var> and returns its
-     * pointer.
+     * Seeks the next available token of type {@link T_OPEN_CURLY_BRACKET} in <var>$tokens</var> and returns its pointer.
      *
-     * @param $startPointer
+     * @param int $startPointer
      * @param array $tokens
      * @return bool|int
      */

From 6fb644fd0e7d185447030bdd49aef39fa30e0269 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 30 Jul 2021 12:33:42 +0200
Subject: [PATCH 100/630] AC-201: Move phpcs checks from magento2 to
 magento-coding-standard repo - Format multi-line comments

---
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php |  5 ++++-
 Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php    | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index 34c6831d..f127cf17 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -128,7 +128,10 @@ private function getArgumentListClosePointer($openParenthesisPointer, array $tok
     }
 
     /**
-     * Seeks the next available {@link T_OPEN_PARENTHESIS} token that comes directly after <var>$stackPointer</var> token.
+     * Find the argument list open pointer
+     *
+     * Seeks the next available {@link T_OPEN_PARENTHESIS} token
+     * that comes directly after <var>$stackPointer</var> token.
      *
      * @param int $stackPointer
      * @param array $tokens
diff --git a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
index 1e64dcf4..466f2c27 100644
--- a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
@@ -68,7 +68,10 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * Seeks the next available token of type {@link T_CLOSE_CURLY_BRACKET} in <var>$tokens</var> and returns its pointer.
+     * Find the closing curly bracket pointer
+     *
+     * Seeks the next available token of type {@link T_CLOSE_CURLY_BRACKET}
+     * in <var>$tokens</var> and returns its pointer.
      *
      * @param int $startPointer
      * @param array $tokens
@@ -80,7 +83,10 @@ private function getClosingCurlyBracketPointer($startPointer, array $tokens)
     }
 
     /**
-     * Seeks the next available token of type {@link T_OPEN_CURLY_BRACKET} in <var>$tokens</var> and returns its pointer.
+     * Find the opening curly bracket pointer
+     *
+     * Seeks the next available token of type {@link T_OPEN_CURLY_BRACKET}
+     * in <var>$tokens</var> and returns its pointer.
      *
      * @param int $startPointer
      * @param array $tokens

From 1a0f854aca74ae46dab828ce8898c0f89c3700fe Mon Sep 17 00:00:00 2001
From: Asheem Patro <asheem.patro@borngroup.com>
Date: Mon, 2 Aug 2021 14:30:14 +0530
Subject: [PATCH 101/630] #210: Fixed HtmlDirectiveSniff.php from causing the
 Fatal Error for class not found

---
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
index 6179f90f..b14ae7ba 100644
--- a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -8,7 +8,6 @@
 
 namespace Magento2\Sniffs\Html;
 
-use Magento\Framework\Filter\Template;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
@@ -17,6 +16,11 @@
  */
 class HtmlDirectiveSniff implements Sniff
 {
+    const CONSTRUCTION_DEPEND_PATTERN = '/{{depend\s*(.*?)}}(.*?){{\\/depend\s*}}/si';
+    const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
+    const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
+    const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
+    
     /**
      * @var array
      */
@@ -73,7 +77,7 @@ public function process(File $phpcsFile, $stackPtr)
      */
     private function processIfDirectives(string $html, File $phpcsFile): string
     {
-        if (preg_match_all(Template::CONSTRUCTION_IF_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+        if (preg_match_all(self::CONSTRUCTION_IF_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
             foreach ($constructions as $construction) {
                 // validate {{if <var>}}
                 $this->validateVariableUsage($phpcsFile, $construction[1]);
@@ -93,7 +97,7 @@ private function processIfDirectives(string $html, File $phpcsFile): string
      */
     private function processDependDirectives(string $html, File $phpcsFile): string
     {
-        if (preg_match_all(Template::CONSTRUCTION_DEPEND_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+        if (preg_match_all(self::CONSTRUCTION_DEPEND_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
             foreach ($constructions as $construction) {
                 // validate {{depend <var>}}
                 $this->validateVariableUsage($phpcsFile, $construction[1]);
@@ -113,7 +117,7 @@ private function processDependDirectives(string $html, File $phpcsFile): string
      */
     private function processForDirectives(string $html, File $phpcsFile): string
     {
-        if (preg_match_all(Template::LOOP_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+        if (preg_match_all(self::LOOP_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
             foreach ($constructions as $construction) {
                 // validate {{for in <var>}}
                 $this->validateVariableUsage($phpcsFile, $construction['loopData']);
@@ -133,7 +137,7 @@ private function processForDirectives(string $html, File $phpcsFile): string
      */
     private function processVarDirectivesAndParams(string $html, File $phpcsFile): string
     {
-        if (preg_match_all(Template::CONSTRUCTION_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+        if (preg_match_all(self::CONSTRUCTION_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
             foreach ($constructions as $construction) {
                 if (empty($construction[2])) {
                     continue;

From 825857b83a4be6d891e95448f658bc4417214168 Mon Sep 17 00:00:00 2001
From: Eduard Muradov <eduard.muradov@amasty.com>
Date: Mon, 9 Aug 2021 17:11:24 +0300
Subject: [PATCH 102/630] Fix magento/magento-coding-standard#214 with class
 not found

---
 .../Helpers/Tokenizer/AbstractTokenizer.php   | 128 +++++++
 Magento2/Helpers/Tokenizer/Parameter.php      |  76 ++++
 Magento2/Helpers/Tokenizer/Variable.php       | 326 ++++++++++++++++++
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php   |   6 +-
 4 files changed, 533 insertions(+), 3 deletions(-)
 create mode 100644 Magento2/Helpers/Tokenizer/AbstractTokenizer.php
 create mode 100644 Magento2/Helpers/Tokenizer/Parameter.php
 create mode 100644 Magento2/Helpers/Tokenizer/Variable.php

diff --git a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
new file mode 100644
index 00000000..f49c753f
--- /dev/null
+++ b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Helpers\Tokenizer;
+
+/**
+ * Template constructions tokenizer
+ */
+abstract class AbstractTokenizer
+{
+    /**
+     * Current index in string
+     *
+     * @var int
+     */
+    protected $_currentIndex;
+
+    /**
+     * String for tokenize
+     *
+     * @var string
+     */
+    protected $_string;
+
+    /**
+     * Move current index to next char.
+     *
+     * If index out of bounds returns false
+     *
+     * @return boolean
+     */
+    public function next()
+    {
+        if ($this->_currentIndex + 1 >= strlen($this->_string)) {
+            return false;
+        }
+
+        $this->_currentIndex++;
+        return true;
+    }
+
+    /**
+     * Move current index to previous char.
+     *
+     * If index out of bounds returns false
+     *
+     * @return boolean
+     */
+    public function prev()
+    {
+        if ($this->_currentIndex - 1 < 0) {
+            return false;
+        }
+
+        $this->_currentIndex--;
+        return true;
+    }
+
+    /**
+     * Move current index backwards.
+     *
+     * If index out of bounds returns false
+     *
+     * @param int $distance number of characters to backtrack
+     * @return bool
+     */
+    public function back($distance)
+    {
+        if ($this->_currentIndex - $distance < 0) {
+            return false;
+        }
+
+        $this->_currentIndex -= $distance;
+        return true;
+    }
+
+    /**
+     * Return current char
+     *
+     * @return string
+     */
+    public function char()
+    {
+        return $this->_string[$this->_currentIndex];
+    }
+
+    /**
+     * Set string for tokenize
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setString($value)
+    {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $this->_string = rawurldecode($value);
+        $this->reset();
+    }
+
+    /**
+     * Move char index to begin of string
+     *
+     * @return void
+     */
+    public function reset()
+    {
+        $this->_currentIndex = 0;
+    }
+
+    /**
+     * Return true if current char is white-space
+     *
+     * @return boolean
+     */
+    public function isWhiteSpace()
+    {
+        return $this->_string === '' ?: trim($this->char()) !== $this->char();
+    }
+
+    /**
+     * Tokenize string
+     *
+     * @return array
+     */
+    abstract public function tokenize();
+}
diff --git a/Magento2/Helpers/Tokenizer/Parameter.php b/Magento2/Helpers/Tokenizer/Parameter.php
new file mode 100644
index 00000000..ec3a3564
--- /dev/null
+++ b/Magento2/Helpers/Tokenizer/Parameter.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Helpers\Tokenizer;
+
+/**
+ * Template constructions parameters tokenizer
+ */
+class Parameter extends AbstractTokenizer
+{
+    /**
+     * Tokenize string and return getted parameters
+     *
+     * @return array
+     */
+    public function tokenize()
+    {
+        $parameters = [];
+        $parameterName = '';
+        do {
+            if ($this->isWhiteSpace()) {
+                continue;
+            }
+
+            if ($this->char() !== '=') {
+                $parameterName .= $this->char();
+            } else {
+                $parameters[$parameterName] = $this->getValue();
+                $parameterName = '';
+            }
+        } while ($this->next());
+        return $parameters;
+    }
+
+    /**
+     * Get string value in parameters through tokenize
+     *
+     * @return string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function getValue()
+    {
+        $this->next();
+        $value = '';
+        if ($this->isWhiteSpace()) {
+            return $value;
+        }
+        $quoteStart = $this->char() == "'" || $this->char() == '"';
+
+        if ($quoteStart) {
+            $breakSymbol = $this->char();
+        } else {
+            $breakSymbol = false;
+            $value .= $this->char();
+        }
+
+        while ($this->next()) {
+            if (!$breakSymbol && $this->isWhiteSpace()) {
+                break;
+            } elseif ($breakSymbol && $this->char() == $breakSymbol) {
+                break;
+            } elseif ($this->char() == '\\') {
+                $this->next();
+                if ($this->char() != '\\') {
+                    $value .= '\\';
+                }
+                $value .= $this->char();
+            } else {
+                $value .= $this->char();
+            }
+        }
+        return $value;
+    }
+}
diff --git a/Magento2/Helpers/Tokenizer/Variable.php b/Magento2/Helpers/Tokenizer/Variable.php
new file mode 100644
index 00000000..81c8b1d8
--- /dev/null
+++ b/Magento2/Helpers/Tokenizer/Variable.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Helpers\Tokenizer;
+
+/**
+ * Template constructions variables tokenizer
+ */
+class Variable extends AbstractTokenizer
+{
+    /**
+     * Internal counter used to keep track of how deep in array parsing we are
+     *
+     * @var int
+     */
+    protected $arrayDepth = 0;
+
+    /**
+     * Tokenize string and return getted variable stack path
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function tokenize()
+    {
+        $actions = [];
+        $parameterName = '';
+        $variableSet = false;
+        do {
+            if ($this->isWhiteSpace()) {
+                // Ignore white spaces
+                continue;
+            } elseif ($this->char() != '.' && $this->char() != '(') {
+                // Property or method name
+                $parameterName .= $this->char();
+            } elseif ($this->char() == '(') {
+                // Method declaration
+                $methodArgs = $this->getMethodArgs();
+                $actions[] = ['type' => 'method', 'name' => $parameterName, 'args' => $methodArgs];
+                $parameterName = '';
+            } elseif ($parameterName != '') {
+                // Property or variable declaration
+                if ($variableSet) {
+                    $actions[] = ['type' => 'property', 'name' => $parameterName];
+                } else {
+                    $variableSet = true;
+                    $actions[] = ['type' => 'variable', 'name' => $parameterName];
+                }
+                $parameterName = '';
+            }
+        } while ($this->next());
+
+        if ($parameterName != '') {
+            if ($variableSet) {
+                $actions[] = ['type' => 'property', 'name' => $parameterName];
+            } else {
+                $actions[] = ['type' => 'variable', 'name' => $parameterName];
+            }
+        }
+
+        return $actions;
+    }
+
+    /**
+     * Get string value for method args
+     *
+     * @return string
+     */
+    public function getString()
+    {
+        $value = '';
+        if ($this->isWhiteSpace()) {
+            return $value;
+        }
+        $quoteStart = $this->isQuote();
+
+        if ($quoteStart) {
+            $breakSymbol = $this->char();
+        } else {
+            $breakSymbol = false;
+            $value .= $this->char();
+        }
+
+        while ($this->next()) {
+            if (!$breakSymbol && $this->isStringBreak()) {
+                $this->prev();
+                break;
+            } elseif ($breakSymbol && $this->char() == $breakSymbol) {
+                break;
+            } elseif ($this->char() == '\\') {
+                $this->next();
+                $value .= $this->char();
+            } else {
+                $value .= $this->char();
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get array member key or return false if none present
+     *
+     * @return bool|string
+     */
+    public function getMemberKey()
+    {
+        $value = '';
+        if ($this->isWhiteSpace()) {
+            return $value;
+        }
+
+        $quoteStart = $this->isQuote();
+
+        if ($quoteStart) {
+            $closeQuote = $this->char();
+        } else {
+            $closeQuote = false;
+            $value .= $this->char();
+        }
+
+        while ($this->next()) {
+            if ($closeQuote) {
+                if ($this->char() == $closeQuote) {
+                    $closeQuote = false;
+                    continue;
+                }
+                $value .= $this->char();
+            } elseif ($this->char() == ':') {
+                $this->next();
+
+                return $value;
+            } elseif ($this->isStringBreak()) {
+                $this->prev();
+                break;
+            } else {
+                $value .= $this->char();
+            }
+        }
+
+        if ($quoteStart) {
+            $this->back(strlen($value) + 1);
+        } else {
+            $this->back(strlen($value) - 1);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get array value for method args
+     *
+     * Parses arrays demarcated via open/closing brackets. Keys/value pairs are separated by a
+     * single colon character. Multi-dimensional arrays are supported. Example input:
+     *
+     * [key:value, "key2":"value2", [
+     *     [123, foo],
+     * ]]
+     *
+     * @return array
+     */
+    public function getArray()
+    {
+        $values = [];
+        if (!$this->isArray()) {
+            return $values;
+        }
+
+        $this->incArrayDepth();
+
+        while ($this->next()) {
+            if ($this->char() == ']') {
+                break;
+            } elseif ($this->isWhiteSpace() || $this->char() == ',') {
+                continue;
+            }
+
+            $key = $this->getMemberKey();
+
+            if ($this->isNumeric()) {
+                $val = $this->getNumber();
+            } elseif ($this->isArray()) {
+                $val = $this->getArray();
+            } else {
+                $val = $this->getString();
+            }
+
+            if ($key) {
+                $values[$key] = $val;
+            } else {
+                $values[] = $val;
+            }
+        }
+
+        $this->decArrayDepth();
+
+        return $values;
+    }
+
+    /**
+     * Return the internal array depth counter
+     *
+     * @return int
+     */
+    protected function getArrayDepth()
+    {
+        return $this->arrayDepth;
+    }
+
+    /**
+     * Increment the internal array depth counter
+     *
+     * @return void
+     */
+    protected function incArrayDepth()
+    {
+        $this->arrayDepth++;
+    }
+
+    /**
+     * Decrement the internal array depth counter
+     *
+     * If depth is already 0 do nothing
+     *
+     * @return void
+     */
+    protected function decArrayDepth()
+    {
+        if ($this->arrayDepth == 0) {
+            return;
+        }
+        $this->arrayDepth--;
+    }
+
+    /**
+     * Return true if current char is a number
+     *
+     * @return boolean
+     */
+    public function isNumeric()
+    {
+        return $this->char() >= '0' && $this->char() <= '9';
+    }
+
+    /**
+     * Return true if current char is quote or apostrophe
+     *
+     * @return boolean
+     */
+    public function isQuote()
+    {
+        return $this->char() == '"' || $this->char() == "'";
+    }
+
+    /**
+     * Retrun true if current char is opening boundary for an array
+     *
+     * @return bool
+     */
+    public function isArray()
+    {
+        return $this->char() == '[';
+    }
+
+    /**
+     * Return true if current char is closing boundary for string
+     *
+     * @return bool
+     */
+    public function isStringBreak()
+    {
+        if ($this->getArrayDepth() == 0 && ($this->isWhiteSpace() || $this->char() == ',' || $this->char() == ')')) {
+            return true;
+        } elseif ($this->getArrayDepth() > 0 && ($this->char() == ',' || $this->char() == ']')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return array of arguments for method
+     *
+     * @return array
+     */
+    public function getMethodArgs()
+    {
+        $value = [];
+
+        while ($this->next() && $this->char() != ')') {
+            if ($this->isWhiteSpace() || $this->char() == ',') {
+                continue;
+            } elseif ($this->isNumeric()) {
+                $value[] = $this->getNumber();
+            } elseif ($this->isArray()) {
+                $value[] = $this->getArray();
+            } else {
+                $value[] = $this->getString();
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return number value for method args
+     *
+     * @return float
+     */
+    public function getNumber()
+    {
+        $value = $this->char();
+        while (($this->isNumeric() || $this->char() == '.') && $this->next()) {
+            $value .= $this->char();
+        }
+
+        if (!$this->isNumeric()) {
+            $this->prev();
+        }
+
+        return (float)$value;
+    }
+}
diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
index b14ae7ba..62267ec1 100644
--- a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -20,7 +20,7 @@ class HtmlDirectiveSniff implements Sniff
     const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
     const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
     const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
-    
+
     /**
      * @var array
      */
@@ -162,7 +162,7 @@ private function processVarDirectivesAndParams(string $html, File $phpcsFile): s
      */
     private function validateDirectiveBody(File $phpcsFile, string $body): void
     {
-        $parameterTokenizer = new Template\Tokenizer\Parameter();
+        $parameterTokenizer = new \Magento2\Helpers\Tokenizer\Parameter();
         $parameterTokenizer->setString($body);
         $params = $parameterTokenizer->tokenize();
 
@@ -185,7 +185,7 @@ private function validateVariableUsage(File $phpcsFile, string $body): void
         if (strpos($body, '|') !== false) {
             $this->unfilteredVariables[] = 'var ' . trim(explode('|', $body, 2)[0]);
         }
-        $variableTokenizer = new Template\Tokenizer\Variable();
+        $variableTokenizer = new \Magento2\Helpers\Tokenizer\Variable();
         $variableTokenizer->setString($body);
         $stack = $variableTokenizer->tokenize();
 

From 276fabcf6617ed851225f9151a3ce8dcaadce3ea Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Tue, 10 Aug 2021 14:53:31 +0300
Subject: [PATCH 103/630] Run tests for all file types

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5a7cb023..c226c73e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -51,4 +51,4 @@ jobs:
       run: vendor/bin/phpunit
 
     - name: Run code style suite
-      run: vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
+      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers/ Magento2/Sniffs

From 68369d6d28a6e4fcc060c365cd226849394905e5 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Tue, 10 Aug 2021 16:19:48 +0300
Subject: [PATCH 104/630] Add test coverage from HtmlBindingSniff

---
 Magento2/Sniffs/Html/HtmlBindingSniff.php     |  2 +-
 .../Tests/Html/HtmlBindingSniffUnitTest.1.inc | 30 +++++++++++++++++++
 Magento2/Tests/Html/HtmlBindingUnitTest.php   | 27 +++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc
 create mode 100644 Magento2/Tests/Html/HtmlBindingUnitTest.php

diff --git a/Magento2/Sniffs/Html/HtmlBindingSniff.php b/Magento2/Sniffs/Html/HtmlBindingSniff.php
index 63718b5b..cf498da1 100644
--- a/Magento2/Sniffs/Html/HtmlBindingSniff.php
+++ b/Magento2/Sniffs/Html/HtmlBindingSniff.php
@@ -83,7 +83,7 @@ public function process(File $phpcsFile, $stackPtr)
                     . ' - "' . $htmlBinding . '" doesn\'t,' . PHP_EOL
                     . 'consider using text binding if the value is supposed to be text',
                     null,
-                    'UIComponentTemplate.KnockoutBinding.HtmlSuffix'
+                    'KnockoutBindingHtmlSuffix'
                 );
             }
         }
diff --git a/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc b/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc
new file mode 100644
index 00000000..37e71322
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc
@@ -0,0 +1,30 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div data-bind="attr: test.value"></div>
+<p>Test</p>
+<span data-bind="html: testError()"></span>
+<div data-bind="
+    attr : tst,
+    html: test.getSomething().value.error()
+"></div>
+<p data-bind="html: '<b>Some html</b>', attr: test"></p>
+<div data-bind="html: valueUnsanitizedHtml"></div>
+<div data-bind="attr: testhtml, html: valueUnsanitizedHtml()"></div>
+<p data-bind="other_html: bind, html: bind_stuff(1, 2)"></p>
+
+<div style="tst()"></div>
+<span html="testError()"></span>
+<div html="
+    test.getSomething().value.error(1)
+"></div>
+<p html="'<b>Some html</b>'"></p>
+<div html="valueUnsanitizedHtml"></div>
+<div html="
+valueUnsanitizedHtml('test')
+"></div>
+<p html="bind_stuff()"></p>
diff --git a/Magento2/Tests/Html/HtmlBindingUnitTest.php b/Magento2/Tests/Html/HtmlBindingUnitTest.php
new file mode 100644
index 00000000..fe033afd
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlBindingUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlBindingUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [1 => 6];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 9d650e1778c84a456b7f9baa15d08d6a1c4288f2 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 19 Aug 2021 10:02:56 +0200
Subject: [PATCH 105/630] AC-601: Create phpcs static check for
 AbstractBlockTest

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php | 88 +++++++++++++++++++
 .../Tests/Legacy/AbstractBlockUnitTest.inc    | 36 ++++++++
 .../Tests/Legacy/AbstractBlockUnitTest.php    | 33 +++++++
 Magento2/ruleset.xml                          |  4 +
 4 files changed, 161 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/AbstractBlockSniff.php
 create mode 100644 Magento2/Tests/Legacy/AbstractBlockUnitTest.inc
 create mode 100644 Magento2/Tests/Legacy/AbstractBlockUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
new file mode 100644
index 00000000..be4d2fad
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class AbstractBlockSniff implements Sniff
+{
+    const CHILD_HTML_METHOD = 'getChildHtml';
+    const CHILD_CHILD_HTML_METHOD = 'getChildChildHtml';
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    protected $errorCode = 'FoundCountOfParametersIncorrect';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_OBJECT_OPERATOR
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if (!isset($phpcsFile->getTokens()[$stackPtr + 1]['content'])) {
+            return;
+        }
+        $content = $phpcsFile->getTokens()[$stackPtr + 1]['content'];
+        $isTheNextMethodGetChildSomething = in_array(
+            $content,
+            [
+                self::CHILD_HTML_METHOD,
+                self::CHILD_CHILD_HTML_METHOD
+            ]
+        );
+        if (!$isTheNextMethodGetChildSomething) {
+            return;
+        }
+
+        $paramsCount = $this->getParametersCount($phpcsFile, $stackPtr + 1);
+        if ($content === self::CHILD_HTML_METHOD && $paramsCount >= 3) {
+            $phpcsFile->addError(
+                '3rd parameter is not needed anymore for getChildHtml()',
+                $stackPtr,
+                $this->errorCode
+            );
+        }
+        if ($content === self::CHILD_CHILD_HTML_METHOD && $paramsCount >= 4) {
+            $phpcsFile->addError(
+                '4th parameter is not needed anymore for getChildChildHtml()',
+                $stackPtr,
+                $this->errorCode
+            );
+        }
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $methodHtmlPosition
+     * @return int
+     */
+    private function getParametersCount(File $phpcsFile, int $methodHtmlPosition): int
+    {
+        $closePosition = $phpcsFile->getTokens()[$methodHtmlPosition +1]['parenthesis_closer'];
+        $getTokenAsContent = $phpcsFile->getTokensAsString(
+            $methodHtmlPosition + 2, 
+            ($closePosition - $methodHtmlPosition) - 2
+        );
+        if ($getTokenAsContent) {
+            $parameters = explode(',' , $getTokenAsContent);
+            return count($parameters);
+        }
+        return 0;
+    }
+}
diff --git a/Magento2/Tests/Legacy/AbstractBlockUnitTest.inc b/Magento2/Tests/Legacy/AbstractBlockUnitTest.inc
new file mode 100644
index 00000000..ca350548
--- /dev/null
+++ b/Magento2/Tests/Legacy/AbstractBlockUnitTest.inc
@@ -0,0 +1,36 @@
+<?php
+
+return $this->getChildHtml(
+    function($param){
+        $param->something();
+    },
+    'aa'
+);
+
+$this->getChildHtml(
+    function($param){
+        $param->something();
+    },
+    'aa',
+    2
+);
+
+return $this->getChildHtml('aa', 'bb');
+
+return $this->getChildHtml('aa', 'bb', 1, true);
+
+$this->getChildHtml();
+
+$this->testMethod()->getChildHtml('aa', 'bb', 'cc');
+
+$this->getChildChildHtml('aa', true, 'cc');
+
+$this->getChildChildHtml('aa', true, 'cc', 1);
+
+$this->getChildChildHtml('aa' . 'bb', !(1 + 1) * (int) $this, 'cc', 1);
+
+private function getChildHtml($aa, $bb, $cc = 'cc')
+{
+}
+
+$this->getChilChilddHtml();
diff --git a/Magento2/Tests/Legacy/AbstractBlockUnitTest.php b/Magento2/Tests/Legacy/AbstractBlockUnitTest.php
new file mode 100644
index 00000000..62e9517c
--- /dev/null
+++ b/Magento2/Tests/Legacy/AbstractBlockUnitTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class AbstractBlockUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            10 => 1,
+            20 => 1,
+            24 => 1,
+            28 => 1,
+            30 => 1
+        ];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index f77859e9..3ea0c969 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -105,6 +105,10 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.Legacy.AbstractBlock">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
 
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">

From 515563ce0d7c83c112494d63420e57f1af4e3d48 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 19 Aug 2021 10:25:27 +0200
Subject: [PATCH 106/630] AC-601: Create phpcs static check for
 AbstractBlockTest

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index be4d2fad..6aeb67dd 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -68,6 +68,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Get the quantity of parameters on a method
+     *
      * @param File $phpcsFile
      * @param int $methodHtmlPosition
      * @return int
@@ -76,11 +78,11 @@ private function getParametersCount(File $phpcsFile, int $methodHtmlPosition): i
     {
         $closePosition = $phpcsFile->getTokens()[$methodHtmlPosition +1]['parenthesis_closer'];
         $getTokenAsContent = $phpcsFile->getTokensAsString(
-            $methodHtmlPosition + 2, 
+            $methodHtmlPosition + 2,
             ($closePosition - $methodHtmlPosition) - 2
         );
         if ($getTokenAsContent) {
-            $parameters = explode(',' , $getTokenAsContent);
+            $parameters = explode(',', $getTokenAsContent);
             return count($parameters);
         }
         return 0;

From 750260eb7136c0da6e6ada848f35c8479efcb04f Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 19 Aug 2021 11:16:37 +0200
Subject: [PATCH 107/630] AC-601: Create phpcs static check for
 AbstractBlockTest

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index 6aeb67dd..77cff626 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -10,8 +10,8 @@
 
 class AbstractBlockSniff implements Sniff
 {
-    const CHILD_HTML_METHOD = 'getChildHtml';
-    const CHILD_CHILD_HTML_METHOD = 'getChildChildHtml';
+    private const CHILD_HTML_METHOD = 'getChildHtml';
+    private const CHILD_CHILD_HTML_METHOD = 'getChildChildHtml';
 
     /**
      * Warning violation code.
@@ -38,18 +38,13 @@ public function process(File $phpcsFile, $stackPtr)
         if (!isset($phpcsFile->getTokens()[$stackPtr + 1]['content'])) {
             return;
         }
+
         $content = $phpcsFile->getTokens()[$stackPtr + 1]['content'];
-        $isTheNextMethodGetChildSomething = in_array(
-            $content,
-            [
-                self::CHILD_HTML_METHOD,
-                self::CHILD_CHILD_HTML_METHOD
-            ]
-        );
-        if (!$isTheNextMethodGetChildSomething) {
+
+        if (!$this->isApplicable($content)) {
             return;
         }
-
+        
         $paramsCount = $this->getParametersCount($phpcsFile, $stackPtr + 1);
         if ($content === self::CHILD_HTML_METHOD && $paramsCount >= 3) {
             $phpcsFile->addError(
@@ -67,6 +62,17 @@ public function process(File $phpcsFile, $stackPtr)
         }
     }
 
+    /**
+     * Return if it is applicable to do the check
+     *
+     * @param String $content
+     * @return bool
+     */
+    private function isApplicable(String $content): bool
+    {
+        return in_array($content, [self::CHILD_HTML_METHOD, self::CHILD_CHILD_HTML_METHOD]);
+    }
+
     /**
      * Get the quantity of parameters on a method
      *

From 3479d07a006c7731932862d76d3068f0ed2f37cc Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 19 Aug 2021 12:44:05 +0200
Subject: [PATCH 108/630] AC-601: Create phpcs static check for
 AbstractBlockTest

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index 77cff626..86041d13 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types = 1 );
 /**
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.

From 614429441dc7605631232ee465a1ad93391f2a0d Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 19 Aug 2021 14:44:28 +0200
Subject: [PATCH 109/630] AC-601: Create phpcs static check for
 AbstractBlockTest

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index 86041d13..dd1575b2 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -1,9 +1,10 @@
 <?php
-declare( strict_types = 1 );
 /**
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
+
 namespace Magento2\Sniffs\Legacy;
 
 use PHP_CodeSniffer\Files\File;
@@ -66,10 +67,10 @@ public function process(File $phpcsFile, $stackPtr)
     /**
      * Return if it is applicable to do the check
      *
-     * @param String $content
+     * @param string $content
      * @return bool
      */
-    private function isApplicable(String $content): bool
+    private function isApplicable(string $content): bool
     {
         return in_array($content, [self::CHILD_HTML_METHOD, self::CHILD_CHILD_HTML_METHOD]);
     }

From 0b9aaa2fde9d55f9ee68b235cf57fc05360ec76e Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 19 Aug 2021 14:45:03 +0200
Subject: [PATCH 110/630] AC-601: Create phpcs static check for
 AbstractBlockTest

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index dd1575b2..41a7da00 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -16,7 +16,7 @@ class AbstractBlockSniff implements Sniff
     private const CHILD_CHILD_HTML_METHOD = 'getChildChildHtml';
 
     /**
-     * Warning violation code.
+     * Error violation code.
      *
      * @var string
      */

From c9c072fdb244190c42abcfa36274aa3be9792300 Mon Sep 17 00:00:00 2001
From: Franciszek Wawrzak <frank@wawrzak.com>
Date: Fri, 20 Aug 2021 12:44:19 +0200
Subject: [PATCH 111/630] Prevent ImportsFromTestNamespaceSniff from hanging
 when group use declaration has trailing coma.

If a grouped use statement has a trailing coma like this:
```
use Magento\Something{
  Foo,
  Bar,
};
```
`findNext` on line 59 was returning false and next call was starting to search again from line 1 (`$next + 1`) and this function was looping indefinitely through input tokens.
---
 .../Namespaces/ImportsFromTestNamespaceSniff.php     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
index 3e5dbce7..1266c0dc 100644
--- a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -57,11 +57,13 @@ public function process(File $phpcsFile, $stackPtr)
             $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
             do {
                 $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
-                $groupedAsContent = $baseUse. $tokens[$next]['content'];
-                $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
-                if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
-                    $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
-                    return;
+                if ($next !== false) {
+                    $groupedAsContent = $baseUse. $tokens[$next]['content'];
+                    $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
+                    if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
+                        $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
+                        return;
+                    }
                 }
             } while ($next !== false);
         }

From 02f1438219d66e5cf427b771941a1286ab2a5b91 Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Fri, 20 Aug 2021 09:22:11 +0300
Subject: [PATCH 112/630] The `phpunit/phpunit` composer dependency has been
 updated to 9.5.8

---
 .github/workflows/php.yml                     |   6 +-
 .../AbstractGraphQLSniffUnitTestCase.php      |   2 +-
 .../Tests/Standards/AbstractSniffUnitTest.php | 461 ++++++++++
 composer.json                                 |  11 +-
 composer.lock                                 | 862 +++++++++++++-----
 5 files changed, 1100 insertions(+), 242 deletions(-)
 create mode 100644 PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5a7cb023..48a7089f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -14,18 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
         dependencies:
           - "lowest"
           - "highest"
         experimental:
           - false
-        include:
-          - php-version: "8.0"
-            dependencies: "highest"
-            composer-options: "--ignore-platform-reqs"
     name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:
diff --git a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
index dc921b17..c9451e88 100644
--- a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
+++ b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
@@ -16,7 +16,7 @@ abstract class AbstractGraphQLSniffUnitTestCase extends AbstractSniffUnitTest
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         //let parent do its job
         parent::setUp();
diff --git a/PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php b/PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php
new file mode 100644
index 00000000..206cc374
--- /dev/null
+++ b/PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php
@@ -0,0 +1,461 @@
+<?php
+/**
+ * An abstract class that all sniff unit tests must extend.
+ *
+ * A sniff unit test checks a .inc file for expected violations of a single
+ * coding standard. Expected errors and warnings that are not found, or
+ * warnings and errors that are not expected, are considered test failures.
+ *
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Standards;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Files\LocalFile;
+use PHP_CodeSniffer\Util\Common;
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractSniffUnitTest extends TestCase
+{
+
+    /**
+     * Enable or disable the backup and restoration of the $GLOBALS array.
+     * Overwrite this attribute in a child class of TestCase.
+     * Setting this attribute in setUp() has no effect!
+     *
+     * @var boolean
+     */
+    protected $backupGlobals = false;
+
+    /**
+     * The path to the standard's main directory.
+     *
+     * @var string
+     */
+    public $standardsDir = null;
+
+    /**
+     * The path to the standard's test directory.
+     *
+     * @var string
+     */
+    public $testsDir = null;
+
+
+    /**
+     * Sets up this unit test.
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $class = get_class($this);
+        $this->standardsDir = $GLOBALS['PHP_CODESNIFFER_STANDARD_DIRS'][$class];
+        $this->testsDir     = $GLOBALS['PHP_CODESNIFFER_TEST_DIRS'][$class];
+
+    }//end setUp()
+
+
+    /**
+     * Get a list of all test files to check.
+     *
+     * These will have the same base as the sniff name but different extensions.
+     * We ignore the .php file as it is the class.
+     *
+     * @param string $testFileBase The base path that the unit tests files will have.
+     *
+     * @return string[]
+     */
+    protected function getTestFiles($testFileBase)
+    {
+        $testFiles = [];
+
+        $dir = substr($testFileBase, 0, strrpos($testFileBase, DIRECTORY_SEPARATOR));
+        $di  = new \DirectoryIterator($dir);
+
+        foreach ($di as $file) {
+            $path = $file->getPathname();
+            if (substr($path, 0, strlen($testFileBase)) === $testFileBase) {
+                if ($path !== $testFileBase.'php' && substr($path, -5) !== 'fixed' && substr($path, -4) !== '.bak') {
+                    $testFiles[] = $path;
+                }
+            }
+        }
+
+        // Put them in order.
+        sort($testFiles);
+
+        return $testFiles;
+
+    }//end getTestFiles()
+
+
+    /**
+     * Should this test be skipped for some reason.
+     *
+     * @return boolean
+     */
+    protected function shouldSkipTest()
+    {
+        return false;
+
+    }//end shouldSkipTest()
+
+
+    /**
+     * Tests the extending classes Sniff class.
+     *
+     * @return void
+     * @throws \PHPUnit\Framework\Exception
+     */
+    final public function testSniff()
+    {
+        // Skip this test if we can't run in this environment.
+        if ($this->shouldSkipTest() === true) {
+            $this->markTestSkipped();
+        }
+
+        $sniffCode = Common::getSniffCode(get_class($this));
+        list($standardName, $categoryName, $sniffName) = explode('.', $sniffCode);
+
+        $testFileBase = $this->testsDir.$categoryName.DIRECTORY_SEPARATOR.$sniffName.'UnitTest.';
+
+        // Get a list of all test files to check.
+        $testFiles = $this->getTestFiles($testFileBase);
+        $GLOBALS['PHP_CODESNIFFER_SNIFF_CASE_FILES'][] = $testFiles;
+
+        if (isset($GLOBALS['PHP_CODESNIFFER_CONFIG']) === true) {
+            $config = $GLOBALS['PHP_CODESNIFFER_CONFIG'];
+        } else {
+            $config        = new Config();
+            $config->cache = false;
+            $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
+        }
+
+        $config->standards = [$standardName];
+        $config->sniffs    = [$sniffCode];
+        $config->ignored   = [];
+
+        if (isset($GLOBALS['PHP_CODESNIFFER_RULESETS']) === false) {
+            $GLOBALS['PHP_CODESNIFFER_RULESETS'] = [];
+        }
+
+        if (isset($GLOBALS['PHP_CODESNIFFER_RULESETS'][$standardName]) === false) {
+            $ruleset = new Ruleset($config);
+            $GLOBALS['PHP_CODESNIFFER_RULESETS'][$standardName] = $ruleset;
+        }
+
+        $ruleset = $GLOBALS['PHP_CODESNIFFER_RULESETS'][$standardName];
+
+        $sniffFile = $this->standardsDir.DIRECTORY_SEPARATOR.'Sniffs'.DIRECTORY_SEPARATOR.$categoryName.DIRECTORY_SEPARATOR.$sniffName.'Sniff.php';
+
+        $sniffClassName = substr(get_class($this), 0, -8).'Sniff';
+        $sniffClassName = str_replace('\Tests\\', '\Sniffs\\', $sniffClassName);
+        $sniffClassName = Common::cleanSniffClass($sniffClassName);
+
+        $restrictions = [strtolower($sniffClassName) => true];
+        $ruleset->registerSniffs([$sniffFile], $restrictions, []);
+        $ruleset->populateTokenListeners();
+
+        $failureMessages = [];
+        foreach ($testFiles as $testFile) {
+            $filename  = basename($testFile);
+            $oldConfig = $config->getSettings();
+
+            try {
+                $this->setCliValues($filename, $config);
+                $phpcsFile = new LocalFile($testFile, $ruleset, $config);
+                $phpcsFile->process();
+            } catch (RuntimeException $e) {
+                $this->fail('An unexpected exception has been caught: '.$e->getMessage());
+            }
+
+            $failures        = $this->generateFailureMessages($phpcsFile);
+            $failureMessages = array_merge($failureMessages, $failures);
+
+            if ($phpcsFile->getFixableCount() > 0) {
+                // Attempt to fix the errors.
+                $phpcsFile->fixer->fixFile();
+                $fixable = $phpcsFile->getFixableCount();
+                if ($fixable > 0) {
+                    $failureMessages[] = "Failed to fix $fixable fixable violations in $filename";
+                }
+
+                // Check for a .fixed file to check for accuracy of fixes.
+                $fixedFile = $testFile.'.fixed';
+                if (file_exists($fixedFile) === true) {
+                    $diff = $phpcsFile->fixer->generateDiff($fixedFile);
+                    if (trim($diff) !== '') {
+                        $filename          = basename($testFile);
+                        $fixedFilename     = basename($fixedFile);
+                        $failureMessages[] = "Fixed version of $filename does not match expected version in $fixedFilename; the diff is\n$diff";
+                    }
+                }
+            }
+
+            // Restore the config.
+            $config->setSettings($oldConfig);
+        }//end foreach
+
+        if (empty($failureMessages) === false) {
+            $this->fail(implode(PHP_EOL, $failureMessages));
+        }
+
+    }//end testSniff()
+
+
+    /**
+     * Generate a list of test failures for a given sniffed file.
+     *
+     * @param \PHP_CodeSniffer\Files\LocalFile $file The file being tested.
+     *
+     * @return array
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
+     */
+    public function generateFailureMessages(LocalFile $file)
+    {
+        $testFile = $file->getFilename();
+
+        $foundErrors      = $file->getErrors();
+        $foundWarnings    = $file->getWarnings();
+        $expectedErrors   = $this->getErrorList(basename($testFile));
+        $expectedWarnings = $this->getWarningList(basename($testFile));
+
+        if (is_array($expectedErrors) === false) {
+            throw new RuntimeException('getErrorList() must return an array');
+        }
+
+        if (is_array($expectedWarnings) === false) {
+            throw new RuntimeException('getWarningList() must return an array');
+        }
+
+        /*
+            We merge errors and warnings together to make it easier
+            to iterate over them and produce the errors string. In this way,
+            we can report on errors and warnings in the same line even though
+            it's not really structured to allow that.
+        */
+
+        $allProblems     = [];
+        $failureMessages = [];
+
+        foreach ($foundErrors as $line => $lineErrors) {
+            foreach ($lineErrors as $column => $errors) {
+                if (isset($allProblems[$line]) === false) {
+                    $allProblems[$line] = [
+                        'expected_errors'   => 0,
+                        'expected_warnings' => 0,
+                        'found_errors'      => [],
+                        'found_warnings'    => [],
+                    ];
+                }
+
+                $foundErrorsTemp = [];
+                foreach ($allProblems[$line]['found_errors'] as $foundError) {
+                    $foundErrorsTemp[] = $foundError;
+                }
+
+                $errorsTemp = [];
+                foreach ($errors as $foundError) {
+                    $errorsTemp[] = $foundError['message'].' ('.$foundError['source'].')';
+
+                    $source = $foundError['source'];
+                    if (in_array($source, $GLOBALS['PHP_CODESNIFFER_SNIFF_CODES'], true) === false) {
+                        $GLOBALS['PHP_CODESNIFFER_SNIFF_CODES'][] = $source;
+                    }
+
+                    if ($foundError['fixable'] === true
+                        && in_array($source, $GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'], true) === false
+                    ) {
+                        $GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'][] = $source;
+                    }
+                }
+
+                $allProblems[$line]['found_errors'] = array_merge($foundErrorsTemp, $errorsTemp);
+            }//end foreach
+
+            if (isset($expectedErrors[$line]) === true) {
+                $allProblems[$line]['expected_errors'] = $expectedErrors[$line];
+            } else {
+                $allProblems[$line]['expected_errors'] = 0;
+            }
+
+            unset($expectedErrors[$line]);
+        }//end foreach
+
+        foreach ($expectedErrors as $line => $numErrors) {
+            if (isset($allProblems[$line]) === false) {
+                $allProblems[$line] = [
+                    'expected_errors'   => 0,
+                    'expected_warnings' => 0,
+                    'found_errors'      => [],
+                    'found_warnings'    => [],
+                ];
+            }
+
+            $allProblems[$line]['expected_errors'] = $numErrors;
+        }
+
+        foreach ($foundWarnings as $line => $lineWarnings) {
+            foreach ($lineWarnings as $column => $warnings) {
+                if (isset($allProblems[$line]) === false) {
+                    $allProblems[$line] = [
+                        'expected_errors'   => 0,
+                        'expected_warnings' => 0,
+                        'found_errors'      => [],
+                        'found_warnings'    => [],
+                    ];
+                }
+
+                $foundWarningsTemp = [];
+                foreach ($allProblems[$line]['found_warnings'] as $foundWarning) {
+                    $foundWarningsTemp[] = $foundWarning;
+                }
+
+                $warningsTemp = [];
+                foreach ($warnings as $warning) {
+                    $warningsTemp[] = $warning['message'].' ('.$warning['source'].')';
+
+                    $source = $warning['source'];
+                    if (in_array($source, $GLOBALS['PHP_CODESNIFFER_SNIFF_CODES'], true) === false) {
+                        $GLOBALS['PHP_CODESNIFFER_SNIFF_CODES'][] = $source;
+                    }
+
+                    if ($warning['fixable'] === true
+                        && in_array($source, $GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'], true) === false
+                    ) {
+                        $GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'][] = $source;
+                    }
+                }
+
+                $allProblems[$line]['found_warnings'] = array_merge($foundWarningsTemp, $warningsTemp);
+            }//end foreach
+
+            if (isset($expectedWarnings[$line]) === true) {
+                $allProblems[$line]['expected_warnings'] = $expectedWarnings[$line];
+            } else {
+                $allProblems[$line]['expected_warnings'] = 0;
+            }
+
+            unset($expectedWarnings[$line]);
+        }//end foreach
+
+        foreach ($expectedWarnings as $line => $numWarnings) {
+            if (isset($allProblems[$line]) === false) {
+                $allProblems[$line] = [
+                    'expected_errors'   => 0,
+                    'expected_warnings' => 0,
+                    'found_errors'      => [],
+                    'found_warnings'    => [],
+                ];
+            }
+
+            $allProblems[$line]['expected_warnings'] = $numWarnings;
+        }
+
+        // Order the messages by line number.
+        ksort($allProblems);
+
+        foreach ($allProblems as $line => $problems) {
+            $numErrors        = count($problems['found_errors']);
+            $numWarnings      = count($problems['found_warnings']);
+            $expectedErrors   = $problems['expected_errors'];
+            $expectedWarnings = $problems['expected_warnings'];
+
+            $errors      = '';
+            $foundString = '';
+
+            if ($expectedErrors !== $numErrors || $expectedWarnings !== $numWarnings) {
+                $lineMessage     = "[LINE $line]";
+                $expectedMessage = 'Expected ';
+                $foundMessage    = 'in '.basename($testFile).' but found ';
+
+                if ($expectedErrors !== $numErrors) {
+                    $expectedMessage .= "$expectedErrors error(s)";
+                    $foundMessage    .= "$numErrors error(s)";
+                    if ($numErrors !== 0) {
+                        $foundString .= 'error(s)';
+                        $errors      .= implode(PHP_EOL.' -> ', $problems['found_errors']);
+                    }
+
+                    if ($expectedWarnings !== $numWarnings) {
+                        $expectedMessage .= ' and ';
+                        $foundMessage    .= ' and ';
+                        if ($numWarnings !== 0) {
+                            if ($foundString !== '') {
+                                $foundString .= ' and ';
+                            }
+                        }
+                    }
+                }
+
+                if ($expectedWarnings !== $numWarnings) {
+                    $expectedMessage .= "$expectedWarnings warning(s)";
+                    $foundMessage    .= "$numWarnings warning(s)";
+                    if ($numWarnings !== 0) {
+                        $foundString .= 'warning(s)';
+                        if (empty($errors) === false) {
+                            $errors .= PHP_EOL.' -> ';
+                        }
+
+                        $errors .= implode(PHP_EOL.' -> ', $problems['found_warnings']);
+                    }
+                }
+
+                $fullMessage = "$lineMessage $expectedMessage $foundMessage.";
+                if ($errors !== '') {
+                    $fullMessage .= " The $foundString found were:".PHP_EOL." -> $errors";
+                }
+
+                $failureMessages[] = $fullMessage;
+            }//end if
+        }//end foreach
+
+        return $failureMessages;
+
+    }//end generateFailureMessages()
+
+
+    /**
+     * Get a list of CLI values to set before the file is tested.
+     *
+     * @param string                  $filename The name of the file being tested.
+     * @param \PHP_CodeSniffer\Config $config   The config data for the run.
+     *
+     * @return void
+     */
+    public function setCliValues($filename, $config)
+    {
+        return;
+
+    }//end setCliValues()
+
+
+    /**
+     * Returns the lines where errors should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of errors that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    abstract protected function getErrorList();
+
+
+    /**
+     * Returns the lines where warnings should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of warnings that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    abstract protected function getWarningList();
+
+
+}//end class
diff --git a/composer.json b/composer.json
index 89c193c8..fef78240 100644
--- a/composer.json
+++ b/composer.json
@@ -8,12 +8,12 @@
     "type": "phpcodesniffer-standard",
     "version": "6",
     "require": {
-        "php": ">=7.2",
-        "squizlabs/php_codesniffer": "^3.5",
+        "php": ">=7.3",
+        "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.5.8"
     },
     "autoload": {
         "classmap": [
@@ -21,7 +21,10 @@
         ],
         "psr-4": {
             "Magento2\\": "Magento2/"
-        }
+        },
+        "files": [
+            "PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php"
+        ]
     },
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..",
diff --git a/composer.lock b/composer.lock
index 0bbf81ae..8a7ddd72 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ded4734336bc43d824498918b37b815c",
+    "content-hash": "9da12284ef127e6443c2207e471f5970",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -257,30 +257,87 @@
             ],
             "time": "2020-11-13T09:40:50+00:00"
         },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
+            },
+            "time": "2021-07-21T10:44:31+00:00"
+        },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.3",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -312,26 +369,26 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2018-07-08T19:23:20+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "2.0.1",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -363,9 +420,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/master"
+                "source": "https://github.com/phar-io/version/tree/3.1.0"
             },
-            "time": "2018-07-08T19:19:57+00:00"
+            "time": "2021-02-23T14:00:09+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -594,40 +651,44 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "6.1.4",
+            "version": "9.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.1",
-                "phpunit/php-file-iterator": "^2.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1 || ^4.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
+                "nikic/php-parser": "^4.10.2",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.6.0"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.1-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -655,34 +716,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
             },
-            "time": "2018-10-31T16:06:48+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-28T07:26:59+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.4",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05"
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05",
-                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -709,7 +776,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
             },
             "funding": [
                 {
@@ -717,26 +784,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-19T06:46:01+00:00"
+            "time": "2020-09-28T05:57:25+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -753,41 +832,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
             "keywords": [
-                "template"
+                "process"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.3",
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -806,14 +891,14 @@
                     "role": "lead"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "timer"
+                "template"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
             "funding": [
                 {
@@ -821,33 +906,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:20:02+00:00"
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "3.1.3",
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768",
-                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -862,17 +946,18 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "tokenizer"
+                "timer"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
             "funding": [
                 {
@@ -880,58 +965,59 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2021-07-26T12:15:06+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.20",
+            "version": "9.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
+                "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
-                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb",
+                "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.1",
+                "doctrine/instantiator": "^1.3.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.7",
-                "phar-io/manifest": "^1.0.2",
-                "phar-io/version": "^2.0",
-                "php": "^7.1",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^6.0.7",
-                "phpunit/php-file-iterator": "^2.0.1",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0",
-                "sebastian/environment": "^4.0",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpunit/phpunit-mock-objects": "*"
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpspec/prophecy": "^1.12.1",
+                "phpunit/php-code-coverage": "^9.2.3",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^2.3.4",
+                "sebastian/version": "^3.0.2"
             },
             "require-dev": {
-                "ext-pdo": "*"
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0.1"
             },
             "suggest": {
                 "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0"
+                "ext-xdebug": "*"
             },
             "bin": [
                 "phpunit"
@@ -939,12 +1025,15 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.5-dev"
+                    "dev-master": "9.5-dev"
                 }
             },
             "autoload": {
                 "classmap": [
                     "src/"
+                ],
+                "files": [
+                    "src/Framework/Assert/Functions.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -967,34 +1056,156 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8"
             },
-            "time": "2020-01-08T08:45:45+00:00"
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-31T15:17:34+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1016,7 +1227,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -1024,34 +1235,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.3",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1090,7 +1301,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
             },
             "funding": [
                 {
@@ -1098,33 +1309,90 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:04:30+00:00"
+            "time": "2020-10-26T15:49:45+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1156,7 +1424,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1164,27 +1432,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.4",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -1192,7 +1460,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -1219,7 +1487,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
             },
             "funding": [
                 {
@@ -1227,34 +1495,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:53:42+00:00"
+            "time": "2020-09-28T05:52:38+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.3",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1296,7 +1564,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
             },
             "funding": [
                 {
@@ -1304,27 +1572,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:47:53+00:00"
+            "time": "2020-09-28T05:24:23+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "2.0.0",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -1332,7 +1603,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1357,36 +1628,99 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-06-11T13:31:12+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
             },
-            "time": "2017-04-27T15:39:26+00:00"
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1408,7 +1742,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1416,32 +1750,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1463,7 +1797,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -1471,32 +1805,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1526,7 +1860,7 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1534,29 +1868,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -1578,7 +1915,7 @@
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
             },
             "funding": [
                 {
@@ -1586,30 +1923,85 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2020-11-30T07:30:19+00:00"
+            "time": "2020-09-28T06:45:17+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "2.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-06-15T12:49:02+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -1632,9 +2024,15 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1717,16 +2115,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -1755,7 +2153,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
             "funding": [
                 {
@@ -1763,7 +2161,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -1830,8 +2228,8 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.2"
+        "php": ">=7.3"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }

From 5507110b08e6d48cf10b5956819133523fc4f501 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 20 Aug 2021 13:18:56 +0100
Subject: [PATCH 113/630] Version 7

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index fef78240..d6004a88 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "6",
+    "version": "7",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index 8a7ddd72..72a2ad6a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9da12284ef127e6443c2207e471f5970",
+    "content-hash": "1ed3638000f0e172d4e01c45333fcfb6",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From 696c3aae04492499c249c4c0340bd0d64021d742 Mon Sep 17 00:00:00 2001
From: Franciszek Szczepan Wawrzak <frank@wawrzak.com>
Date: Fri, 20 Aug 2021 14:26:06 +0200
Subject: [PATCH 114/630] add test case for #220

---
 Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
index 50d339a1..b3ca9957 100644
--- a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
+++ b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
@@ -3,4 +3,5 @@ use Magento\Tests;
 use Magento\Foo\Tests as FakeTest;
 use Magento\Real\Classes;
 use \Magento\{Tests\String, Tests\Int};
-use \Magento\{Foo\string, Bar\float};
\ No newline at end of file
+use \Magento\{Foo\string, Bar\float};
+use \Foo\{Trailing, Space,};
\ No newline at end of file

From 146bfb099583f7ee26bbafec66fe6560eab4373a Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 22 Aug 2021 16:51:28 +0530
Subject: [PATCH 115/630] Resolved test failure

---
 .../Classes/DiscouragedDependenciesSniff.php  |  6 ---
 .../ClassPropertyPHPDocFormattingSniff.php    | 42 +++++++++++++++----
 .../Methods/DeprecatedModelMethodSniff.php    |  2 -
 Magento2/Sniffs/Security/XssTemplateSniff.php |  2 -
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index ed106d4b..85c1f103 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -32,22 +32,16 @@ class DiscouragedDependenciesSniff implements Sniff
     protected $warningCode = 'ConstructorProxyInterceptor';
 
     /**
-     * Aliases of proxies or plugins from use statements
-     *
      * @var string[]
      */
     private $aliases = [];
 
     /**
-     * The current file - used for clearing USE aliases when file changes
-     *
      * @var null|string
      */
     private $currentFile = null;
 
     /**
-     * Terms to search for in variables and namespaces
-     *
      * @var string[]
      */
     public $incorrectClassNames = ['proxy','interceptor'];
diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index cf006d56..268e4696 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -89,11 +89,24 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         }
 
         // Check if class has already have meaningful description after @var tag
-        $isShortDescriptionAfterVar = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar + 4, $commentEnd, false,
+        $isShortDescriptionAfterVar = $phpcsFile->findNext(
+            T_DOC_COMMENT_STRING,
+            $foundVar + 4,
+            $commentEnd,
+            false,
             null,
-            false);
-        if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescriptionAfterVar, $commentStart, $tokens) !== true) {
-            preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i', $tokens[($foundVar + 2)]['content'], $varParts);
+            false
+        );
+        if ($this->PHPDocFormattingValidator->providesMeaning(
+            $isShortDescriptionAfterVar,
+            $commentStart,
+            $tokens
+        ) !== true) {
+            preg_match(
+                '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
+                $tokens[($foundVar + 2)]['content'],
+                $varParts
+            );
             if ($varParts[1]) {
                 return;
             }
@@ -102,11 +115,24 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         }
         // Check if class has already have meaningful description before @var tag
-        $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $foundVar, $commentStart, false,
+        $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(
+            T_DOC_COMMENT_STRING,
+            $foundVar,
+            $commentStart,
+            false,
             null,
-            false);
-        if ($this->PHPDocFormattingValidator->providesMeaning($isShortDescriptionPreviousVar, $commentStart, $tokens) !== true) {
-            preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i', $tokens[($foundVar + 2)]['content'], $varParts);
+            false
+        );
+        if ($this->PHPDocFormattingValidator->providesMeaning(
+            $isShortDescriptionPreviousVar,
+            $commentStart,
+            $tokens
+        ) !== true) {
+            preg_match(
+                '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
+                $tokens[($foundVar + 2)]['content'],
+                $varParts
+            );
             if ($varParts[1]) {
                 return;
             }
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index 94bfc2d5..df8fba14 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -40,8 +40,6 @@ class DeprecatedModelMethodSniff implements Sniff
         'delete'
     ];
 
-    protected $severity = 0;
-
     /**
      * @inheritdoc
      */
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index aa2accbe..dc17f03b 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -50,8 +50,6 @@ class XssTemplateSniff implements Sniff
     ];
 
     /**
-     * Allowed method name - {suffix}Html{postfix}()
-     *
      * @var string
      */
     protected $methodNameContains = 'html';

From 83f7609a946596a6305c5122abe54740ba87fa56 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sun, 22 Aug 2021 17:13:05 +0530
Subject: [PATCH 116/630] Resolved test failure

---
 Magento2/Helpers/Tokenizer/AbstractTokenizer.php     |  4 ----
 Magento2/Helpers/Tokenizer/Variable.php              |  2 --
 .../ClassPropertyPHPDocFormattingSniff.php           | 12 +++---------
 Magento2/Sniffs/Less/AvoidIdSniff.php                |  2 --
 Magento2/Sniffs/Less/IndentationSniff.php            |  3 +--
 Magento2/Sniffs/Less/PropertiesSortingSniff.php      |  4 ----
 Magento2/Sniffs/Less/SemicolonSpacingSniff.php       |  5 +----
 Magento2/Sniffs/Less/TypeSelectorsSniff.php          |  2 --
 Magento2/Sniffs/Less/ZeroUnitsSniff.php              |  2 --
 9 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
index f49c753f..1a3c4a63 100644
--- a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
+++ b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
@@ -11,15 +11,11 @@
 abstract class AbstractTokenizer
 {
     /**
-     * Current index in string
-     *
      * @var int
      */
     protected $_currentIndex;
 
     /**
-     * String for tokenize
-     *
      * @var string
      */
     protected $_string;
diff --git a/Magento2/Helpers/Tokenizer/Variable.php b/Magento2/Helpers/Tokenizer/Variable.php
index 81c8b1d8..43938c03 100644
--- a/Magento2/Helpers/Tokenizer/Variable.php
+++ b/Magento2/Helpers/Tokenizer/Variable.php
@@ -12,8 +12,6 @@
 class Variable extends AbstractTokenizer
 {
     /**
-     * Internal counter used to keep track of how deep in array parsing we are
-     *
      * @var int
      */
     protected $arrayDepth = 0;
diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 268e4696..a402fbd8 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -46,9 +46,7 @@ public function __construct()
     }
 
     /**
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return int|void
+     * @inheritDoc
      */
     public function processMemberVar(File $phpcsFile, $stackPtr)
     {
@@ -143,9 +141,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return int|void
+     * @inheritDoc
      * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     protected function processVariable(File $phpcsFile, $stackPtr)
@@ -153,9 +149,7 @@ protected function processVariable(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return int|void
+     * @inheritDoc
      * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     protected function processVariableInString(File $phpcsFile, $stackPtr)
diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
index d4e1b213..62346274 100644
--- a/Magento2/Sniffs/Less/AvoidIdSniff.php
+++ b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -25,8 +25,6 @@ class AvoidIdSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * Tokens that can appear in a selector
-     *
      * @var array
      */
     private $selectorTokens = [
diff --git a/Magento2/Sniffs/Less/IndentationSniff.php b/Magento2/Sniffs/Less/IndentationSniff.php
index 76a6fbcc..57947a07 100644
--- a/Magento2/Sniffs/Less/IndentationSniff.php
+++ b/Magento2/Sniffs/Less/IndentationSniff.php
@@ -39,8 +39,7 @@ class IndentationSniff implements Sniff
      */
     public $maxIndentLevel = 3;
 
-    /** Skip codes that can be detected by sniffer incorrectly
-     *
+    /**
      * @var array
      */
     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
diff --git a/Magento2/Sniffs/Less/PropertiesSortingSniff.php b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
index d1c7c387..2c5fe9e5 100644
--- a/Magento2/Sniffs/Less/PropertiesSortingSniff.php
+++ b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
@@ -25,15 +25,11 @@ class PropertiesSortingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * List of properties that belong to class
-     *
      * @var array
      */
     private $properties = [];
 
     /**
-     * Skip symbols that can be detected by sniffer incorrectly
-     *
      * @var array
      */
     private $styleSymbolsToSkip = [
diff --git a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
index cad13290..8db8d216 100644
--- a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
@@ -25,8 +25,6 @@ class SemicolonSpacingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * Skip symbols that can be detected by sniffer incorrectly
-     *
      * @var array
      */
     private $styleSymbolsToSkip = [
@@ -36,8 +34,7 @@ class SemicolonSpacingSniff implements Sniff
         TokenizerSymbolsInterface::CLOSE_PARENTHESIS,
     ];
 
-    /** Skip codes that can be detected by sniffer incorrectly
-     *
+    /**
      * @var array
      */
     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
diff --git a/Magento2/Sniffs/Less/TypeSelectorsSniff.php b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
index 00c8b35c..4735c761 100644
--- a/Magento2/Sniffs/Less/TypeSelectorsSniff.php
+++ b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
@@ -23,8 +23,6 @@
 class TypeSelectorsSniff implements Sniff
 {
     /**
-     * Tags that are not allowed as type selector
-     *
      * @var array
      */
     private $tags = [
diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
index 51971c78..c62eaa52 100644
--- a/Magento2/Sniffs/Less/ZeroUnitsSniff.php
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -24,8 +24,6 @@ class ZeroUnitsSniff implements Sniff
     const CSS_PROPERTY_UNIT_REM = 'rem';
 
     /**
-     * List of available CSS Property units
-     *
      * @var array
      */
     private $units = [

From 98edd6adbcd6e176ebda04959a72c75ce57b0219 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 23 Aug 2021 15:35:25 +0200
Subject: [PATCH 117/630] AC-957: Create unit test for
 Magento2\Html\HtmlDirectiveSniff check

---
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php   |   8 +-
 ...itTest.1.inc => HtmlBindingUnitTest.1.inc} |   0
 .../Tests/Html/HtmlDirectiveUnitTest.1.inc    | 117 ++++++++++++++++++
 .../Tests/Html/HtmlDirectiveUnitTest.2.inc    |  12 ++
 Magento2/Tests/Html/HtmlDirectiveUnitTest.php |  33 +++++
 5 files changed, 166 insertions(+), 4 deletions(-)
 rename Magento2/Tests/Html/{HtmlBindingSniffUnitTest.1.inc => HtmlBindingUnitTest.1.inc} (100%)
 create mode 100644 Magento2/Tests/Html/HtmlDirectiveUnitTest.1.inc
 create mode 100644 Magento2/Tests/Html/HtmlDirectiveUnitTest.2.inc
 create mode 100644 Magento2/Tests/Html/HtmlDirectiveUnitTest.php

diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
index 62267ec1..d140f96c 100644
--- a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -200,7 +200,7 @@ private function validateVariableUsage(File $phpcsFile, string $body): void
                     'Template directives may not invoke methods. Only scalar array access is allowed.' . PHP_EOL
                     . 'Found "' . trim($body) . '"',
                     null,
-                    'HtmlTemplates.DirectiveUsage.ProhibitedMethodCall'
+                    'HtmlTemplatesProhibitedMethodCall'
                 );
             }
         }
@@ -224,7 +224,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
                 $phpcsFile->addError(
                     'Template @vars comment block contains invalid JSON.',
                     null,
-                    'HtmlTemplates.DirectiveUsage.InvalidVarsJSON'
+                    'HtmlTemplatesInvalidVarsJSON'
                 );
                 return;
             }
@@ -235,7 +235,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
                         'Template @vars comment block contains invalid label.' . PHP_EOL
                         . 'Label for variable "' . $var . '" is empty.',
                         null,
-                        'HtmlTemplates.DirectiveUsage.InvalidVariableLabel'
+                        'HtmlTemplatesInvalidVariableLabel'
                     );
                 }
             }
@@ -254,7 +254,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
                 'Template @vars comment block is missing a variable used in the template.' . PHP_EOL
                  . 'Missing variable: ' . $undefinedVariable,
                 null,
-                'HtmlTemplates.DirectiveUsage.UndefinedVariable'
+                'HtmlTemplatesUndefinedVariable'
             );
         }
     }
diff --git a/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc b/Magento2/Tests/Html/HtmlBindingUnitTest.1.inc
similarity index 100%
rename from Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc
rename to Magento2/Tests/Html/HtmlBindingUnitTest.1.inc
diff --git a/Magento2/Tests/Html/HtmlDirectiveUnitTest.1.inc b/Magento2/Tests/Html/HtmlDirectiveUnitTest.1.inc
new file mode 100644
index 00000000..250b162f
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlDirectiveUnitTest.1.inc
@@ -0,0 +1,117 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@vars {
+"var foo.good":"Some variable",
+"var foo.good|stillfine":"Some variable",
+"var foo.bad()":"Some variable",
+"var foo.bad()|alsobad":"Some variable",
+"var foo.getGood()":"Some variable",
+"var foo.foo.getGood()":"Some variable",
+"var foo.getGood().fine":"Some variable",
+"var foo.getGood().fine|alsofine":"Some variable",
+"var foo.bad($bad.param())":"Some variable",
+"var foo.bad.baz()":"Some variable",
+"var foo.good.trans":"Some variable",
+"var extra.var.getOhNo()":"Uh Oh, Error time!",
+"var foo.bad.trans()":"Some variable",
+"var bad.bad()":"Some variable",
+"var foo.goodif":"Some Variable",
+"var foo.goodif":"Some Variable",
+"var foo.badif().bad":"Some Variable",
+"var foo.badif3()":"Some Variable",
+"var foo.gooddepend":"Some Variable",
+"var foo.badDepend().bad":"Some Variable",
+"var foo.goodFor":"Some Variable",
+"var foo.getGoodFor()":"Some Variable",
+"var foo.badForLoop()":"Some Variable",
+"var foo.goodif2":"Some Variable",
+"var foo.goodif2":"Some Variable",
+"var foo.goodif3":"Some Variable",
+"var foo.badif2()":"Some Variable",
+"var foo.badif4()":"Some Variable",
+"var foo.badif5()":"Some Variable",
+"var foo.gooddepend2":"Some Variable",
+"var foo.baddepend2()":"Some Variable",
+"var foo.goodFor":"Some Variable",
+"var foo.goodFor|stillfine":"Some Variable",
+"var foo.badFor()":"Some Variable",
+"var foo.badFor()|alsobad":"Some Variable",
+"foobar baz":"Some other directive as a variable",
+"var iusefilterslater|raw":"Some Variable",
+"var bad.multiline()":""
+} @-->
+
+<div>{{var foo.good}}</div>
+<div>{{var foo.good|stillfine}}</div>
+<div>{{var foo.bad()}}</div>
+<div>{{var foo.bad()|alsobad}}</div>
+<div>{{var foo.getGood()}}</div>
+<div>{{var foo.foo.getGood()}}</div>
+<div>{{var foo.getGood().fine}}</div>
+<div>{{var foo.getGood().fine|alsofine}}</div>
+<div>{{var foo.bad($bad.param())}}</div>
+<div>{{var foo.bad.baz()}}</div>
+<div>{{var foo.undeclared.baz}}</div>
+<div>{{trans "foo %bar" bar=$foo.good.trans}}</div>
+<div>{{trans "foo %bar" bar=$foo.bad.trans()}}</div>
+<div>{{trans "foo %bar" bar="something"}}</div>
+<div>{{trans "foo %bar" bar="something" bad="$bad.bad()" something=$undeclared.var.error}}</div>
+<div>{{something "
+    <blah>foo %bar</blah>blah
+    " bar="something"
+    }}</div>
+<div>{{something "
+    <blah>foo %bar</blah>blah
+    " bar="something" bad=$bad.multiline()
+    }}</div>
+
+{{if foo.goodif}}
+<div>{{var foo.goodif2}}</div>
+{{/if}}
+
+{{if foo.goodif}}
+<div>{{var foo.goodif2}}</div>
+{{else}}
+<div>{{var foo.goodif3}}</div>
+{{/if}}
+
+{{if foo.badif().bad}}
+<div>{{var foo.badif2()}}</div>
+{{/if}}
+
+{{if foo.badif3()}}
+<div>{{var foo.badif4()}}</div>
+{{else}}
+<div>{{var foo.badif5()}}</div>
+{{/if}}
+
+{{depend foo.gooddepend}}
+<div>{{var foo.gooddepend2}}</div>
+{{/depend}}
+
+{{depend foo.badDepend().bad}}
+<div>{{var foo.baddepend2()}}</div>
+{{/depend}}
+
+{{for item in foo.goodFor}}
+<div>{{var foo.goodFor}}</div>
+<div>{{var foo.goodFor|stillfine}}</div>
+<div>{{var foo.badFor()}}</div>
+<div>{{var foo.badFor()|alsobad}}</div>
+{{/for}}
+
+{{for item in foo.getGoodFor()}}
+<div>loopy</div>
+{{/for}}
+
+{{for item in foo.badForLoop()}}
+<div>this loop has a bad variable</div>
+{{/for}}
+
+{{depend iusefilterslater}}
+{{var iusefilterslater|raw}}
+{{/depend}}
diff --git a/Magento2/Tests/Html/HtmlDirectiveUnitTest.2.inc b/Magento2/Tests/Html/HtmlDirectiveUnitTest.2.inc
new file mode 100644
index 00000000..6a6b222c
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlDirectiveUnitTest.2.inc
@@ -0,0 +1,12 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@vars {
+"var foo.good":"Some variable",
+"var foo.good|stillfine""Some variable"
+} @-->
+
+Template content doesn't matter. The JSON is invalid.
diff --git a/Magento2/Tests/Html/HtmlDirectiveUnitTest.php b/Magento2/Tests/Html/HtmlDirectiveUnitTest.php
new file mode 100644
index 00000000..6d7a0034
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlDirectiveUnitTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlDirectiveUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        if ($testFile === 'HtmlDirectiveUnitTest.1.inc') {
+            return [1 => 20];
+        } elseif ($testFile === 'HtmlDirectiveUnitTest.2.inc') {
+            return [1 => 1];
+        }
+
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 533dde2a8207587b4f2810e054a1e77112be1156 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 23 Aug 2021 15:46:15 +0200
Subject: [PATCH 118/630] AC-958: create unit test for Magento2\Annotation
 checks

---
 .../MethodAnnotationStructureUnitTest.inc     | 309 ++++++++++++++++++
 .../MethodAnnotationStructureUnitTest.php     |  51 +++
 .../Annotation/MethodArgumentsUnitTest.inc    |  24 ++
 .../Annotation/MethodArgumentsUnitTest.php    |  30 ++
 4 files changed, 414 insertions(+)
 create mode 100644 Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
 create mode 100644 Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
 create mode 100644 Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
 create mode 100644 Magento2/Tests/Annotation/MethodArgumentsUnitTest.php

diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
new file mode 100644
index 00000000..8124bc75
--- /dev/null
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -0,0 +1,309 @@
+<?php
+
+/**
+* Class for method structure for annotations test cases
+*/
+class MethodAnnotationFixture
+{
+    /**
+    *
+    * @inheritdoc
+    */
+    public function getProductListDefaultSortBy1()
+    {
+    }
+
+    /**
+    *
+    * @inheritdoc
+    */
+    public function getProductListDefaultSortBy10($store = null)
+    {
+        return $store;
+    }
+
+    /**
+    * Block for short
+    *
+    * {@inheritdoc}
+    *
+    */
+    public function getProductListDefaultSortBy102()
+    {
+    }
+
+    /**
+    * {@inheritdoc}
+    */
+    public function getProductListDefaultBy()
+    {
+        return;
+    }
+
+    /**
+    *
+    * {@inheritdoc}
+    *
+    */
+    public function getProductListDefaultSortBy13()
+    {
+        return;
+    }
+
+    /**
+    * ProductVisibilityCondition constructor
+    * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
+    */
+    public function content(\Magento\Catalog\Model\Product\Visibility $productVisibility)
+    {
+        $this->productVisibility = $productVisibility;
+    }
+
+    /**
+    * block description
+    *
+    * {@inheritdoc}
+    *
+    * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+    * @return void
+    */
+    public function construct(AbstractDb $collection)
+    {
+        /** @var */
+        $collection->setVisibility($this->productVisibility->getVisibleInCatalogIds());
+    }
+
+    /**
+    * Move category
+    *
+    *
+    * @param int $parentId new parent category id
+    *
+    * @return $this
+    * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+    */
+    public function move($parentId)
+    {
+        /**
+        * Validate new parent category id. (category model is used for backward
+        * compatibility in event params)
+        */
+        try {
+            $this->categoryRepository->get($parentId, $this->getStoreId());
+        }
+        catch (NoSuchEntityException $e) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Sorry, but we can\'t find the new parent category you selected.'),
+                $e
+            );
+        }
+        return true;
+    }
+
+    /**
+    * Block for short description
+    *
+    * This a long description {@inheritdoc} consists more lines as part of the long description
+    * on multi line.
+    *
+    * @param int $store
+    *
+    *
+    */
+    public function getProductListDefaultSortBy26032($store)
+    {
+        return $store;
+    }
+
+    /**
+    *
+    *
+    *
+    */
+    public function getProductListDefaultSortBy2632()
+    {
+    }
+
+    /**
+    * Block for short description
+    *
+    * This a long description {@inheritdoc} consists more lines as part of the long description
+    * on multi line.
+    *
+    * @param int $store
+    *
+    *
+    *
+    */
+    public function getProductListDefaultSortBy2002($store)
+    {
+        return $store;
+    }
+
+    /**
+    *
+    * block for short description
+    *
+    * @param int $store
+    * @return int
+    */
+    public function getProductListDefaultSortBy3002($store)
+    {
+        return $store;
+    }
+
+    /**
+    * Block for short description
+    *
+    * @see consists more lines as part of the long description
+    * on multi line.
+    *
+    * @param string $store
+    * @param string $foo
+    */
+    public function getProductListDefaultSortBy12($store, $foo)
+    {
+        return $store === $foo;
+    }
+
+    /**
+    * Block for short description
+    *
+    * {@inheritdoc}
+    *
+    * @param string $store
+    * @param string $foo
+    */
+    public function getProductListDefaultSort2($store, $foo)
+    {
+        return $store === $foo;
+    }
+
+    /**
+    * Block for short description
+    *
+    * a long description {@inheritdoc} consists more lines as part of the long description
+    * on multi line.
+    *
+    * @param string $store
+    * @param string $foo
+    */
+    public function getProductListDefault($store, $foo)
+    {
+        return $store === $foo;
+    }
+
+    /**
+    * Retrieve custom options
+    *
+    * @param ProductOptionInterface $productOption
+    *
+    * @return array
+    */
+    protected function getCustomOptions(ProductOptionInterface $productOption)
+    {
+        if ($productOption
+        && $productOption->getExtensionAttributes()
+        && $productOption->getExtensionAttributes()->getCustomOptions()
+        ) {
+            return $productOption->getExtensionAttributes()->getCustomOptions();
+        }
+        return [];
+    }
+
+    /**
+    * This is the summary for a DocBlock.
+    *
+    * This is the description for a DocBlock. This text may contain
+    * multiple lines and even some _markdown_.
+    * * Markdown style lists function too
+    * * Just try this out once
+    * The section after the description contains the tags; which provide
+    * structured meta-data concerning the given element.
+    *
+    * @param int $example  This is an example function/method parameter description.
+    * @param string $example2 This is a second example.
+    *
+    */
+    public function getProductListDefaultSortBy2($example, $example2)
+    {
+        return $example === $example2;
+    }
+
+    /**
+    * Returns the content of the tokens from the specified start position in
+    * the token stack for the specified length.
+    *
+    * @param int $start
+    * @param int $length
+    *
+    * @return string The token contents.
+    */
+    public function getProductListDefaultSortBy($start, $length)
+    {
+        return $start === $length;
+    }
+
+    /**
+    * Some text about this step/method returns the content of the tokens the token stack for the specified length
+    *
+    * @param string $name
+    * @param string $folder
+    *
+    * @see this file
+    * @When I create a file called :name in :folder
+    */
+    public function getProductListDefaultSortBy222($name, $folder)
+    {
+        return $name === $folder;
+    }
+
+    public function setExtensionAs(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+    *
+    * short description
+    * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
+    * @return mixed
+    */
+    public function setEn(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+    * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
+    * @return mixed
+    */
+    public function setExtenw(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+    *
+    * Short description
+    * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
+    * @return mixed
+    */
+    public function setExff(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+    * {@inheritdoc}
+    *
+    * @param int $start
+    * @param int $length
+    *
+    * @return string The token contents.
+    */
+    public function getProductSortBy($start, $length)
+    {
+        return $start === $length;
+    }
+}
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
new file mode 100644
index 00000000..8c2ac4a1
--- /dev/null
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Annotation;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class MethodAnnotationStructureUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            10 => 1,
+            18 => 1,
+            30 => 1,
+            36 => 1,
+            45 => 2,
+            47 => 1,
+            55 => 1,
+            63 => 1,
+            80 => 1,
+            112 => 1,
+            118 => 1,
+            137 => 1,
+            145 => 2,
+            185 => 1,
+            227 => 1,
+            235 => 1,
+            268 => 2,
+            269 => 1,
+            277 => 1,
+            278 => 1,
+            288 => 1,
+            289 => 1,
+            298 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
new file mode 100644
index 00000000..f3cbbb54
--- /dev/null
+++ b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
@@ -0,0 +1,24 @@
+<?php
+/**
+* This is the summary for a DocBlock.
+*
+* This is the description for a DocBlock. This text may contain
+* multiple lines and even some _markdown_.
+* * Markdown style lists function too
+* * Just try this out once
+* The section after the description contains the tags; which provide
+* structured meta-data concerning the given element.
+*
+* @param int $example  This is an example function/method parameter description.
+* @param string $example2 This is a second example.
+*
+*/
+public function getProductListDefaultSortBy2($example, $example2)
+{
+return $example === $example2;
+}
+
+public function setExtensionAs(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+{
+    return $this->_setExtensionAttributes($extensionAttributes);
+}
diff --git a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
new file mode 100644
index 00000000..623c7539
--- /dev/null
+++ b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Annotation;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class MethodArgumentsUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            12 => 1,
+            21 => 1
+        ];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From cab2f92f973d0887fb78bd20d15354ceef588736 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 23 Aug 2021 16:06:50 +0200
Subject: [PATCH 119/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php   | 57 +++++++++++++++++++++
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php | 29 +++++++++++
 Magento2/Tests/Legacy/ModuleXMLUnitTest.xml | 10 ++++
 Magento2/ruleset.xml                        |  7 +++
 composer.json                               |  3 +-
 5 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Sniffs/Legacy/ModuleXMLSniff.php
 create mode 100644 Magento2/Tests/Legacy/ModuleXMLUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/ModuleXMLUnitTest.xml

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
new file mode 100644
index 00000000..087027e9
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Test for obsolete nodes/attributes in the module.xml
+ */
+class ModuleXMLSniff implements Sniff
+{
+    /**
+     * Error violation code.
+     *
+     * @var string
+     */
+    protected $warningCode = 'FoundObsoleteAttribute';
+    
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $xml = simplexml_load_string($phpcsFile->getTokensAsString(0, 999999));
+        
+        if ($xml->xpath('/config/module/@version') !== false) {
+            $phpcsFile->addWarning(
+                'The "version" attribute is obsolete. Use "setup_version" instead.',
+                $stackPtr,
+                $this->warningCode
+            );
+        }
+        
+        if ($xml->xpath('/config/module/@active') !== false) {
+            $phpcsFile->addWarning(
+                'The "active" attribute is obsolete. The list of active modules is defined in deployment configuration.',
+                $stackPtr,
+                $this->warningCode
+            );
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
new file mode 100644
index 00000000..d5c4328f
--- /dev/null
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ModuleXMLUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [
+            1 => 2
+        ];
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
new file mode 100644
index 00000000..e94daaf7
--- /dev/null
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModule" active="true" version="1" />
+</config>
\ No newline at end of file
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 3ea0c969..dcf3c608 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -223,6 +223,13 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ModuleXML">
+        <exclude-pattern>*\.php$</exclude-pattern>
+        <include-pattern>module.xml</include-pattern>
+        <include-pattern>ModuleXMLUnitTest.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
diff --git a/composer.json b/composer.json
index d6004a88..42cbd3be 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,8 @@
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
-        "webonyx/graphql-php": "^14.9"
+        "webonyx/graphql-php": "^14.9",
+        "ext-simplexml": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"

From e935df801705227ed7743d5da691d64ed2bb1168 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 23 Aug 2021 16:10:03 +0200
Subject: [PATCH 120/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php | 2 +-
 Magento2/Tests/Legacy/ModuleXMLUnitTest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index d5c4328f..718ebf9f 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -26,4 +26,4 @@ public function getWarningList()
             1 => 2
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
index e94daaf7..28c02b6f 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
@@ -7,4 +7,4 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_TestModule" active="true" version="1" />
-</config>
\ No newline at end of file
+</config>

From aa530654413d585b77662e25ab21a9e711d9a28f Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 23 Aug 2021 16:12:14 +0200
Subject: [PATCH 121/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 composer.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index 72a2ad6a..fc31a666 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1ed3638000f0e172d4e01c45333fcfb6",
+    "content-hash": "148dc78a64f9790450688c1d3310f3e7",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -2228,7 +2228,8 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3"
+        "php": ">=7.3",
+        "ext-simplexml": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"

From 38f32af3f77a3af999e5258d6f4e6dcea92e7c27 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 24 Aug 2021 12:55:40 +0100
Subject: [PATCH 122/630] AC-958: Corrected error reporting where fix is not
 provided

---
 .../Annotation/AnnotationFormatValidator.php  | 26 +++++++++----------
 .../Annotation/MethodArgumentsSniff.php       | 24 ++++++++---------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
index 220d1a19..b69d2ad6 100644
--- a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
+++ b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -64,7 +64,7 @@ private function validateMultiLinesInShortDescription(
             && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
         ) {
             $error = 'Short description should not be in multi lines';
-            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtrEnd + 1, 'MethodAnnotation');
         }
     }
 
@@ -95,7 +95,7 @@ private function validateSpacingBetweenShortAndLongDescriptions(
             && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
         ) {
             $error = 'There must be exactly one blank line between lines short and long descriptions';
-            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtrEnd + 1, 'MethodAnnotation');
         }
         if ($shortPtrEnd != $shortPtr) {
             $this->validateLongDescriptionFormat($phpcsFile, $shortPtrEnd, $commentEndPtr, $emptyTypeTokens);
@@ -123,16 +123,16 @@ private function validateShortDescriptionFormat(
         $tokens = $phpcsFile->getTokens();
         if ($tokens[$shortPtr]['line'] !== $tokens[$stackPtr]['line'] + 1) {
             $error = 'No blank lines are allowed before short description';
-            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
         }
         if (strtolower($tokens[$shortPtr]['content']) === '{@inheritdoc}') {
             $error = 'If the @inheritdoc not inline it shouldn’t have braces';
-            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
         }
         $shortPtrContent = $tokens[$shortPtr]['content'];
         if (preg_match('/^\p{Ll}/u', $shortPtrContent) === 1) {
             $error = 'Short description must start with a capital letter';
-            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
         }
         $this->validateNoExtraNewLineBeforeShortDescription(
             $phpcsFile,
@@ -171,16 +171,16 @@ private function validateLongDescriptionFormat(
         $longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
         if (strtolower($tokens[$longPtr]['content']) === '@inheritdoc') {
             $error = '@inheritdoc imports only short description, annotation must have long description';
-            $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
         }
         if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
             if ($tokens[$longPtr]['line'] !== $tokens[$shortPtrEnd]['line'] + 2) {
                 $error = 'There must be exactly one blank line between descriptions';
-                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
             }
             if (preg_match('/^\p{Ll}/u', $tokens[$longPtr]['content']) === 1) {
                 $error = 'Long description must start with a capital letter';
-                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
             }
         }
     }
@@ -203,7 +203,7 @@ public function validateTagsSpacingFormat(File $phpcsFile, int $commentStartPtr,
                 && strtolower($commentTagPtrContent) !== '@inheritdoc'
             ) {
                 $error = 'There must be exactly one blank line before tags';
-                $phpcsFile->addFixableError($error, $firstTagPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $firstTagPtr, 'MethodAnnotation');
             }
         }
     }
@@ -240,7 +240,7 @@ public function validateTagGroupingFormat(File $phpcsFile, int $commentStartPtr)
                 if ($paramGroupId !== null
                     && $paramGroupId !== $groupId) {
                     $error = 'Parameter tags must be grouped together';
-                    $phpcsFile->addFixableError($error, $tag, 'MethodAnnotation');
+                    $phpcsFile->addError($error, $tag, 'MethodAnnotation');
                 }
                 if ($paramGroupId === null) {
                     $paramGroupId = $groupId;
@@ -273,7 +273,7 @@ public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr)
 
         if (!$this->allTagsAligned($actualPositions)
             && !$this->noneTagsAligned($actualPositions, $noAlignmentPositions)) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 'Tags visual alignment must be consistent',
                 $stackPtr,
                 'MethodArguments'
@@ -322,7 +322,7 @@ private function validateNoExtraNewLineBeforeShortDescription(
         $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $commentEndPtr - 1, $commentStartPtr, true);
         if ($tokens[$prevPtr]['line'] < ($tokens[$commentEndPtr]['line'] - 1)) {
             $error = 'Additional blank lines found at end of the annotation block';
-            $phpcsFile->addFixableError($error, $commentEndPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $commentEndPtr, 'MethodAnnotation');
         }
     }
 
@@ -351,7 +351,7 @@ public function validateDescriptionFormatStructure(
                 && strtolower($commentTagPtrContent) !== '@inheritdoc'
             ) {
                 $error = 'Missing short description';
-                $phpcsFile->addFixableError($error, $commentStartPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
             } else {
                 $this->validateShortDescriptionFormat(
                     $phpcsFile,
diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
index 2ebb12d4..655bd37c 100644
--- a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -225,7 +225,7 @@ private function validateParameterAnnotationForArgumentExists(
                 $previousCommentClosePtr
             );
             if ($inheritdocAnnotationWithBracesExists) {
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     '{@inheritdoc} does not import parameter annotation',
                     $stackPtr,
                     'MethodArguments'
@@ -233,7 +233,7 @@ private function validateParameterAnnotationForArgumentExists(
             } elseif ($this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)
                 && !$inheritdocAnnotationWithoutBracesExists
             ) {
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     'Missing @param for argument in method annotation',
                     $stackPtr,
                     'MethodArguments'
@@ -257,13 +257,13 @@ private function validateCommentBlockDoesnotHaveExtraParameterAnnotation(
         int $stackPtr
     ): void {
         if ($argumentsCount < $parametersCount && $argumentsCount > 0) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 'Extra @param found in method annotation',
                 $stackPtr,
                 'MethodArguments'
             );
         } elseif ($argumentsCount > 0 && $argumentsCount != $parametersCount && $parametersCount != 0) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 '@param is not found for one or more params in method annotation',
                 $stackPtr,
                 'MethodArguments'
@@ -290,7 +290,7 @@ private function validateArgumentNameInParameterAnnotationExists(
         $parameterNames = $this->getMethodParameters($paramDefinitions);
         if (!in_array($methodArguments[$ptr], $parameterNames)) {
             $error = $methodArguments[$ptr] . ' parameter is missing in method annotation';
-            $phpcsFile->addFixableError($error, $stackPtr, 'MethodArguments');
+            $phpcsFile->addError($error, $stackPtr, 'MethodArguments');
         }
     }
 
@@ -311,7 +311,7 @@ private function validateParameterPresentInMethodSignature(
         array $paramPointers
     ): void {
         if (!in_array($paramDefinitionsArguments, $methodArguments)) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 $paramDefinitionsArguments . ' parameter is missing in method arguments signature',
                 $paramPointers[$ptr],
                 'MethodArguments'
@@ -340,7 +340,7 @@ private function validateParameterOrderIsCorrect(
                 && in_array($methodArguments[$ptr], $parameterNames)
             ) {
                 if ($methodArguments[$ptr] != $parameterNames[$ptr]) {
-                    $phpcsFile->addFixableError(
+                    $phpcsFile->addError(
                         $methodArguments[$ptr] . ' parameter is not in order',
                         $paramPointers[$ptr],
                         'MethodArguments'
@@ -383,7 +383,7 @@ private function validateDuplicateAnnotationDoesnotExists(
                 }
             }
             foreach ($duplicateParameters as $value) {
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     $value . ' duplicate found in method annotation',
                     $stackPtr,
                     'MethodArguments'
@@ -410,7 +410,7 @@ private function validateParameterAnnotationFormatIsCorrect(
     ): void {
         switch (count($paramDefinitions)) {
             case 0:
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     'Missing both type and parameter',
                     $paramPointers[$ptr],
                     'MethodArguments'
@@ -427,7 +427,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                 break;
             case 2:
                 if ($this->isInvalidType($paramDefinitions[0])) {
-                    $phpcsFile->addFixableError(
+                    $phpcsFile->addError(
                         $paramDefinitions[0] . ' is not a valid PHP type',
                         $paramPointers[$ptr],
                         'MethodArguments'
@@ -449,7 +449,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                         'MethodArguments'
                     );
                     if ($this->isInvalidType($paramDefinitions[0])) {
-                        $phpcsFile->addFixableError(
+                        $phpcsFile->addError(
                             $paramDefinitions[0] . ' is not a valid PHP type',
                             $paramPointers[$ptr],
                             'MethodArguments'
@@ -633,7 +633,7 @@ private function validateFormattingConsistency(
         }
         if (!$this->allParamsAligned($argumentPositions, $commentPositions)
             && !$this->noneParamsAligned($argumentPositions, $commentPositions, $paramDefinitions)) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 'Method arguments visual alignment must be consistent',
                 $paramPointers[0],
                 'MethodArguments'

From 757171f8b74c841d2e2669fa731da7bc0e7b6490 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 24 Aug 2021 13:06:50 +0100
Subject: [PATCH 123/630] Moved abstract unit test to autoload-dev

---
 composer.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index d6004a88..cc1950eb 100644
--- a/composer.json
+++ b/composer.json
@@ -15,16 +15,18 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
     },
+    "autoload-dev": {
+        "files": [
+            "PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php"
+        ]
+    },
     "autoload": {
         "classmap": [
             "PHP_CodeSniffer/Tokenizers/"
         ],
         "psr-4": {
             "Magento2\\": "Magento2/"
-        },
-        "files": [
-            "PHP_CodeSniffer/Tests/Standards/AbstractSniffUnitTest.php"
-        ]
+        }
     },
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..",

From e6a43fe26035a8a402f822b861f88f3529131db0 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 24 Aug 2021 14:40:57 +0200
Subject: [PATCH 124/630] AC-939: Create unit test for
 Magento2\Less\AvoidIdSniff check

---
 Magento2/Sniffs/Less/AvoidIdSniff.php   |  1 +
 Magento2/Tests/Less/AvoidIdUnitTest.inc | 39 ++++++++++++++++++++
 Magento2/Tests/Less/AvoidIdUnitTest.php | 48 +++++++++++++++++++++++++
 Magento2/ruleset.xml                    |  6 ++--
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 Magento2/Tests/Less/AvoidIdUnitTest.inc
 create mode 100644 Magento2/Tests/Less/AvoidIdUnitTest.php

diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
index d4e1b213..387b5ed8 100644
--- a/Magento2/Sniffs/Less/AvoidIdSniff.php
+++ b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -51,6 +51,7 @@ class AvoidIdSniff implements Sniff
         T_PLUS,
         T_NS_SEPARATOR,
         T_LNUMBER,
+        T_BITWISE_NOT
     ];
 
     /**
diff --git a/Magento2/Tests/Less/AvoidIdUnitTest.inc b/Magento2/Tests/Less/AvoidIdUnitTest.inc
new file mode 100644
index 00000000..070c2eec
--- /dev/null
+++ b/Magento2/Tests/Less/AvoidIdUnitTest.inc
@@ -0,0 +1,39 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+#foo[bar],
+#foo[bar=bash],
+#foo[bar~=bash],
+#foo[bar$=bash],
+#foo[bar*=bash],
+#foo[bar|=bash],
+#foo[bar='bash'],
+#foo:hover,
+#foo:nth-last-of-type(n),
+#foo::before,
+#foo + div,
+#foo > div,
+#foo ~ div,
+#foo\3Abar ~ div,
+#foo\:bar ~ div,
+#foo.bar .baz,
+div#foo {
+blah: 'abc';
+}
+
+.my #foo,
+#foo .blah,
+.my #foo .blah {
+some: 'stuff';
+}
+.blah {
+#bar .baz();
+.foo #bar .baz();
+#bar .baz();
+
+#bar .baz;
+.foo #bar .baz;
+#bar .baz;
+}
diff --git a/Magento2/Tests/Less/AvoidIdUnitTest.php b/Magento2/Tests/Less/AvoidIdUnitTest.php
new file mode 100644
index 00000000..962af35f
--- /dev/null
+++ b/Magento2/Tests/Less/AvoidIdUnitTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class AvoidIdUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            6 => 1,
+            7 => 1,
+            8 => 1,
+            9 => 1,
+            10 => 1,
+            11 => 1,
+            12 => 1,
+            13 => 1,
+            14 => 1,
+            15 => 1,
+            16 => 1,
+            17 => 1,
+            18 => 1,
+            19 => 1,
+            20 => 1,
+            21 => 3,
+            22 => 1,
+            26 => 1,
+            27 => 1,
+            28 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 3ea0c969..daf54da8 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -3,7 +3,7 @@
     <description>Magento Coding Standard</description>
 
     <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml,graphqls/GraphQL"/>
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.Functions.CallTimePassByReference">
@@ -590,7 +590,9 @@
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
     <rule ref="Magento2.Html"/>
-    <rule ref="Magento2.Less"/>
+    <rule ref="Magento2.Less">
+        <include-pattern>*\.less$</include-pattern>
+    </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>

From 8d23aa4fc00f03f141a1013a95c475af5a1ccfd8 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 14:42:45 +0200
Subject: [PATCH 125/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php   | 57 ++++++++++++++++-----
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php |  2 +-
 Magento2/ruleset.xml                        |  8 +--
 composer.json                               |  3 +-
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index 087027e9..a60c9fdb 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -8,6 +8,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use SimpleXMLElement;
 
 /**
  * Test for obsolete nodes/attributes in the module.xml
@@ -36,22 +37,52 @@ public function register(): array
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $xml = simplexml_load_string($phpcsFile->getTokensAsString(0, 999999));
+        $line = $phpcsFile->getTokens()[$stackPtr]['content'];
+        if (strpos(trim($line), '<module ') === false) {
+            return;
+        }
         
-        if ($xml->xpath('/config/module/@version') !== false) {
-            $phpcsFile->addWarning(
-                'The "version" attribute is obsolete. Use "setup_version" instead.',
-                $stackPtr,
-                $this->warningCode
-            );
+        $xml = simplexml_load_string($phpcsFile->getTokensAsString(0, 999999));
+
+        $foundElements = $xml->xpath('/config/module');
+        if ($foundElements === false) {
+            return;
         }
         
-        if ($xml->xpath('/config/module/@active') !== false) {
-            $phpcsFile->addWarning(
-                'The "active" attribute is obsolete. The list of active modules is defined in deployment configuration.',
-                $stackPtr,
-                $this->warningCode
-            );
+        foreach ($foundElements as $element) {
+            if (!$this->elementIsCurrentlySniffedLine($element, $stackPtr)) {
+                continue;
+            }
+            
+            if (property_exists($element->attributes(), 'version')) {
+                $phpcsFile->addWarning(
+                    'The "version" attribute is obsolete. Use "setup_version" instead.',
+                    $stackPtr,
+                    $this->warningCode
+                );
+            }
+
+            if (property_exists($element->attributes(), 'active')) {
+                $phpcsFile->addWarning(
+                    'The "active" attribute is obsolete. The list of active modules is defined in deployment configuration.',
+                    $stackPtr,
+                    $this->warningCode
+                );
+            }
+        }
+    }
+
+    /**
+     * @param SimpleXMLElement $element
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $stackPtr): bool
+    {
+        $node = dom_import_simplexml($element);
+        if ($node->getLineNo() === $stackPtr+1) {
+            return true;
         }
+        return false;
     }
 }
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index 718ebf9f..0220b1d8 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -23,7 +23,7 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            1 => 2
+            9 => 2
         ];
     }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index dcf3c608..bc9f4385 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -3,7 +3,7 @@
     <description>Magento Coding Standard</description>
 
     <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml,graphqls/GraphQL"/>
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL,xml"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.Functions.CallTimePassByReference">
@@ -224,9 +224,8 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Legacy.ModuleXML">
-        <exclude-pattern>*\.php$</exclude-pattern>
-        <include-pattern>module.xml</include-pattern>
-        <include-pattern>ModuleXMLUnitTest.xml</include-pattern>
+        <include-pattern>*\/module.xml$</include-pattern>
+        <include-pattern>*\/ModuleXMLUnitTest.xml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>
@@ -265,6 +264,7 @@
         <type>warning</type>
     </rule>
     <rule ref="Generic.PHP.DisallowShortOpenTag">
+        <exclude-pattern>*\.xml$</exclude-pattern>
         <severity>7</severity>
         <type>warning</type>
     </rule>
diff --git a/composer.json b/composer.json
index 42cbd3be..f5037b17 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9",
-        "ext-simplexml": "*"
+        "ext-simplexml": "*",
+        "ext-dom": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"

From a9ef69fb91391df629b460adcd106dff70c511e6 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 24 Aug 2021 14:45:19 +0200
Subject: [PATCH 126/630] AC-939: Create unit test for
 Magento2\Less\AvoidIdSniff check

---
 Magento2/Tests/Less/{AvoidIdUnitTest.inc => AvoidIdUnitTest.less} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Magento2/Tests/Less/{AvoidIdUnitTest.inc => AvoidIdUnitTest.less} (100%)

diff --git a/Magento2/Tests/Less/AvoidIdUnitTest.inc b/Magento2/Tests/Less/AvoidIdUnitTest.less
similarity index 100%
rename from Magento2/Tests/Less/AvoidIdUnitTest.inc
rename to Magento2/Tests/Less/AvoidIdUnitTest.less

From 135630e5804b0fd760f48c1651def302ee292276 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 14:48:33 +0200
Subject: [PATCH 127/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 composer.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index fc31a666..04231d90 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "148dc78a64f9790450688c1d3310f3e7",
+    "content-hash": "8c3c7509df274fdeaf09edfd7eac6cf5",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -2229,7 +2229,8 @@
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.3",
-        "ext-simplexml": "*"
+        "ext-simplexml": "*",
+        "ext-dom": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"

From 85de47c2a62f3b538dd4ee8bd80e179f395136a0 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 14:50:59 +0200
Subject: [PATCH 128/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index a60c9fdb..b7fe303b 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -64,7 +64,8 @@ public function process(File $phpcsFile, $stackPtr)
 
             if (property_exists($element->attributes(), 'active')) {
                 $phpcsFile->addWarning(
-                    'The "active" attribute is obsolete. The list of active modules is defined in deployment configuration.',
+                    'The "active" attribute is obsolete. The list of active modules '.
+                            'is defined in deployment configuration.',
                     $stackPtr,
                     $this->warningCode
                 );
@@ -73,6 +74,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Check if the element passed is in the currently sniffed line
+     * 
      * @param SimpleXMLElement $element
      * @param int $stackPtr
      * @return bool

From 5f4d45f06d5217ae35c08b719f72d0e0cc945b12 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 15:00:09 +0200
Subject: [PATCH 129/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index b7fe303b..1cfa6ef9 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -65,7 +65,7 @@ public function process(File $phpcsFile, $stackPtr)
             if (property_exists($element->attributes(), 'active')) {
                 $phpcsFile->addWarning(
                     'The "active" attribute is obsolete. The list of active modules '.
-                            'is defined in deployment configuration.',
+                    'is defined in deployment configuration.',
                     $stackPtr,
                     $this->warningCode
                 );
@@ -75,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr)
 
     /**
      * Check if the element passed is in the currently sniffed line
-     * 
+     *
      * @param SimpleXMLElement $element
      * @param int $stackPtr
      * @return bool

From 70636590ce96dc8be89df5e14ae877c9ff8f9968 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 15:27:37 +0200
Subject: [PATCH 130/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index 1cfa6ef9..a3b9cbd9 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -17,10 +17,8 @@ class ModuleXMLSniff implements Sniff
 {
     /**
      * Error violation code.
-     *
-     * @var string
      */
-    protected $warningCode = 'FoundObsoleteAttribute';
+    const WARNING_CODE = 'FoundObsoleteAttribute';
     
     /**
      * @inheritdoc
@@ -43,6 +41,16 @@ public function process(File $phpcsFile, $stackPtr)
         }
         
         $xml = simplexml_load_string($phpcsFile->getTokensAsString(0, 999999));
+        if ($xml === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    basename($phpcsFile->getFilename()),
+                ),
+                $stackPtr,
+                self::WARNING_CODE
+            );
+        }
 
         $foundElements = $xml->xpath('/config/module');
         if ($foundElements === false) {
@@ -58,7 +66,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $phpcsFile->addWarning(
                     'The "version" attribute is obsolete. Use "setup_version" instead.',
                     $stackPtr,
-                    $this->warningCode
+                    self::WARNING_CODE
                 );
             }
 
@@ -67,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr)
                     'The "active" attribute is obsolete. The list of active modules '.
                     'is defined in deployment configuration.',
                     $stackPtr,
-                    $this->warningCode
+                    self::WARNING_CODE
                 );
             }
         }

From c2786fe1b7ac6c7867ae8e7837a425d378d1b060 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 15:32:29 +0200
Subject: [PATCH 131/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index a3b9cbd9..ca1b3084 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -45,7 +45,7 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->addError(
                 sprintf(
                     "Couldn't parse contents of '%s', check that they are in valid XML format",
-                    basename($phpcsFile->getFilename()),
+                    $phpcsFile->getFilename(),
                 ),
                 $stackPtr,
                 self::WARNING_CODE

From aca6b41a8160ed603d856ba77dbaa79c025698f5 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 16:53:12 +0200
Subject: [PATCH 132/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php   | 27 +++++++++++++++------
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php |  3 ++-
 Magento2/Tests/Legacy/ModuleXMLUnitTest.xml |  5 ++++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index ca1b3084..5a741156 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -6,6 +6,7 @@
 
 namespace Magento2\Sniffs\Legacy;
 
+use DOMDocument;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use SimpleXMLElement;
@@ -15,10 +16,8 @@
  */
 class ModuleXMLSniff implements Sniff
 {
-    /**
-     * Error violation code.
-     */
-    const WARNING_CODE = 'FoundObsoleteAttribute';
+    private const WARNING_CODE = 'FoundObsoleteAttribute';
+    private const ERROR_CODE = 'WrongXML';
     
     /**
      * @inheritdoc
@@ -36,11 +35,11 @@ public function register(): array
     public function process(File $phpcsFile, $stackPtr)
     {
         $line = $phpcsFile->getTokens()[$stackPtr]['content'];
-        if (strpos(trim($line), '<module ') === false) {
+        if (strpos(trim($line), '<module') === false) {
             return;
         }
-        
-        $xml = simplexml_load_string($phpcsFile->getTokensAsString(0, 999999));
+
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {
             $phpcsFile->addError(
                 sprintf(
@@ -48,7 +47,7 @@ public function process(File $phpcsFile, $stackPtr)
                     $phpcsFile->getFilename(),
                 ),
                 $stackPtr,
-                self::WARNING_CODE
+                self::ERROR_CODE
             );
         }
 
@@ -96,4 +95,16 @@ private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $s
         }
         return false;
     }
+
+    /**
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
 }
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index 0220b1d8..f75673d8 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -23,7 +23,8 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            9 => 2
+            9 => 2,
+            10 => 2
         ];
     }
 }
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
index 28c02b6f..9d545a65 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
@@ -7,4 +7,9 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_TestModule" active="true" version="1" />
+    <module
+            name="Magento_TestModule2" 
+            active="true" 
+            version="1" 
+    />
 </config>

From 754e84c471e3c5749c399788a49c3f9184bc8b5c Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 17:01:47 +0200
Subject: [PATCH 133/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index 5a741156..efb903c1 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -97,6 +97,9 @@ private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $s
     }
 
     /**
+     * We need to format the incoming XML to avoid tags split into several lines. In that case, PHP's DOMElement
+     * returns the position of the closing /> as the position of the tag.
+     *
      * @param File $phpcsFile
      * @return false|string
      */

From 75f43afb48f407472659ab64fe66054d6deef1a2 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 17:04:59 +0200
Subject: [PATCH 134/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index efb903c1..5f016d5e 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -39,6 +39,8 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        // We need to format the incoming XML to avoid tags split into several lines. In that case, PHP's DOMElement
+        // returns the position of the closing /> as the position of the tag.
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {
             $phpcsFile->addError(
@@ -97,8 +99,7 @@ private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $s
     }
 
     /**
-     * We need to format the incoming XML to avoid tags split into several lines. In that case, PHP's DOMElement
-     * returns the position of the closing /> as the position of the tag.
+     * Format the incoming XML to avoid tags split into several lines.
      *
      * @param File $phpcsFile
      * @return false|string

From d0fe1500e648f4dbf1164582ab22b0a0300a3541 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 24 Aug 2021 17:09:23 +0200
Subject: [PATCH 135/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index 5f016d5e..da25de0d 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -40,7 +40,8 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         // We need to format the incoming XML to avoid tags split into several lines. In that case, PHP's DOMElement
-        // returns the position of the closing /> as the position of the tag.
+        // returns the position of the closing /> as the position of the tag, and we need the position of <module
+        // instead, as it is the one we compare with $stackPtr later on.
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {
             $phpcsFile->addError(

From bd8c956301d22813945263770bf2572dc5dba361 Mon Sep 17 00:00:00 2001
From: Jose Orsini <orsini.jose@gmail.com>
Date: Tue, 24 Aug 2021 16:58:07 -0500
Subject: [PATCH 136/630] Update list of functions to block

---
 Magento2/Sniffs/Security/InsecureFunctionSniff.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Magento2/Sniffs/Security/InsecureFunctionSniff.php b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
index 66b6f5f0..a4df7a76 100644
--- a/Magento2/Sniffs/Security/InsecureFunctionSniff.php
+++ b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
@@ -35,13 +35,6 @@ class InsecureFunctionSniff extends ForbiddenFunctionsSniff
         'mt_rand' => 'random_int',
         // Custom Rules - MTS-2096
         'eval' => null,
-        'preg_replace' => null,
-        'preg_replace_callback' => null,
-        'preg_replace_callback_array' => null,
-        'include' => null,
-        'include_once' => null,
-        'require' => null,
-        'require_once' => null,
         'proc_nice' => null,
         'proc_open' => null,
         'proc_close' => null,

From e538e6f9fac9eaabba920c70c1ed4bfdbeadbbb4 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 25 Aug 2021 12:39:03 +0200
Subject: [PATCH 137/630] AC-939: Create unit test for
 Magento2\Less\AvoidIdSniff check

---
 .../Less/AbstractLessSniffUnitTestCase.php    | 33 +++++++++++++++++++
 Magento2/Tests/Less/AvoidIdUnitTest.php       |  6 ++--
 Magento2/ruleset.xml                          |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php

diff --git a/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php b/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php
new file mode 100644
index 00000000..71edcbee
--- /dev/null
+++ b/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Implements an abstract base for unit tests that cover less sniffs.
+ */
+abstract class AbstractLessSniffUnitTestCase extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        
+        $config = new Config();
+        $config->extensions = array_merge(
+            $config->extensions,
+            [
+                'less' => 'CSS'
+            ]
+        );
+        
+        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
+    }
+}
diff --git a/Magento2/Tests/Less/AvoidIdUnitTest.php b/Magento2/Tests/Less/AvoidIdUnitTest.php
index 962af35f..33012879 100644
--- a/Magento2/Tests/Less/AvoidIdUnitTest.php
+++ b/Magento2/Tests/Less/AvoidIdUnitTest.php
@@ -5,9 +5,7 @@
  */
 namespace Magento2\Tests\Less;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-class AvoidIdUnitTest extends AbstractSniffUnitTest
+class AvoidIdUnitTest extends AbstractLessSniffUnitTestCase
 {
     /**
      * @inheritdoc
@@ -30,7 +28,7 @@ public function getErrorList()
             18 => 1,
             19 => 1,
             20 => 1,
-            21 => 3,
+            21 => 1,
             22 => 1,
             26 => 1,
             27 => 1,
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index daf54da8..204946d0 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -3,7 +3,7 @@
     <description>Magento Coding Standard</description>
 
     <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less"/>
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.Functions.CallTimePassByReference">

From b1c005c3f5ed687f149c9b0f285818c2123dd6de Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 25 Aug 2021 11:47:31 +0100
Subject: [PATCH 138/630] Version 8

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index cc1950eb..f30fd7fd 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "7",
+    "version": "8",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index 72a2ad6a..c26f9e74 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1ed3638000f0e172d4e01c45333fcfb6",
+    "content-hash": "93bec1b3a36cf67f2511aec0219bcc06",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From f0b61be7a03a002ac5dcf9ce8027fb64c1ed5ded Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 Aug 2021 13:03:06 +0200
Subject: [PATCH 139/630] AC-660: Create phpcs static check for DiConfigTest -
 DiConfigTest: Test for obsolete nodes in di.xml

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php   | 80 ++++++++++++++++++++++
 Magento2/Tests/Legacy/DiConfigUnitTest.php | 34 +++++++++
 Magento2/Tests/Legacy/DiConfigUnitTest.xml | 19 +++++
 Magento2/ruleset.xml                       |  5 ++
 composer.json                              |  4 +-
 5 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Sniffs/Legacy/DiConfigSniff.php
 create mode 100644 Magento2/Tests/Legacy/DiConfigUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/DiConfigUnitTest.xml

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
new file mode 100644
index 00000000..680eb318
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class DiConfigSniff implements Sniff
+{
+    private const WARNING_CODE = 'FoundObsoleteAttribute';
+    private const ERROR_CODE = 'WrongXML';
+
+    private $xpathObsoleteElems = [
+        'param',
+        'instance',
+        'array',
+        'item[@key]',
+        'value'
+    ];
+
+    private $messages = [
+        'param' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">',
+        'instance' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">',
+        'array' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">',
+        'item[@key]' => 'The <item key="..."> node is obsolete. Instead, use the <item name="..." xsi:type="...">',
+        'value' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal.'
+    ];
+
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    public function process(File $phpcsFile, $stackPtr): int
+    {
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        if ($xml === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                $stackPtr,
+                self::ERROR_CODE
+            );
+        }
+
+        foreach ($this->xpathObsoleteElems as $obsoleteElem) {
+            $found = $xml->xpath($obsoleteElem);
+            if ($found === true) {
+                $phpcsFile->addWarning(
+                    $this->messages[$obsoleteElem],
+                    $stackPtr,
+                    self::WARNING_CODE
+                );
+            }
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/DiConfigUnitTest.php b/Magento2/Tests/Legacy/DiConfigUnitTest.php
new file mode 100644
index 00000000..8df8fa91
--- /dev/null
+++ b/Magento2/Tests/Legacy/DiConfigUnitTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class DiConfigUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList(): array
+    {
+        return [
+            9 => 1,
+            10 => 1,
+            11 => 1,
+            12 => 1,
+            13 => 1,
+            15 => 1
+        ];
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/DiConfigUnitTest.xml b/Magento2/Tests/Legacy/DiConfigUnitTest.xml
new file mode 100644
index 00000000..83b29690
--- /dev/null
+++ b/Magento2/Tests/Legacy/DiConfigUnitTest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<root>
+    <instance>
+        <param name="param1" new_attribute="2">
+            <array key="amounts">
+                <item key="item1" new_attribute="3">
+                    <value new_attribute="4">scalar20</value>
+                </item>
+                <item>50.00</item>
+            </array>
+        </param>
+    </instance>
+</root>
\ No newline at end of file
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 3ea0c969..0a0621f9 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -223,6 +223,11 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.DiConfig">
+        <severity>8</severity>
+        <type>warning</type>
+        <include-pattern>*\/DiConfigUnitTest.xml$</include-pattern>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
diff --git a/composer.json b/composer.json
index d6004a88..f5037b17 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,9 @@
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
-        "webonyx/graphql-php": "^14.9"
+        "webonyx/graphql-php": "^14.9",
+        "ext-simplexml": "*",
+        "ext-dom": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"

From 7be675fbbf7c0126fac003faa4a7dcadf5be965d Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 Aug 2021 14:49:10 +0200
Subject: [PATCH 140/630] AC-660: Create phpcs static check for DiConfigTest -
 Add missing composer.lock

---
 composer.lock | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index 72a2ad6a..04231d90 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1ed3638000f0e172d4e01c45333fcfb6",
+    "content-hash": "8c3c7509df274fdeaf09edfd7eac6cf5",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -2228,7 +2228,9 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3"
+        "php": ">=7.3",
+        "ext-simplexml": "*",
+        "ext-dom": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"

From d58d4b5d0dc9724acd5dfdd000d7b6974f9295ad Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 Aug 2021 15:01:40 +0200
Subject: [PATCH 141/630] Update Magento2/ruleset.xml

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 74d59535..04731e74 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -226,7 +226,7 @@
     <rule ref="Magento2.Legacy.DiConfig">
         <severity>8</severity>
         <type>warning</type>
-        <include-pattern>*\/DiConfigUnitTest.xml$</include-pattern>
+        <include-pattern>*\/di.xml$</include-pattern>
     </rule>
 
     <!-- Severity 7 warnings: General code issues. -->

From d0039ffc610630ce5bfc46e2c1aecc882f11fcc3 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 Aug 2021 15:05:04 +0200
Subject: [PATCH 142/630] AC-660: Create phpcs static check for DiConfigTest -
 Run composer update --lock

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 04231d90..fa12108d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8c3c7509df274fdeaf09edfd7eac6cf5",
+    "content-hash": "503b3dff10c4885d5f5b196d159c1fdd",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From d8d8cb78a516a9267ede95096d5134e22e39552c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 Aug 2021 15:40:10 +0200
Subject: [PATCH 143/630] AC-660: Create phpcs static check for DiConfigTest -
 Fix return type

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 680eb318..164036f7 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -38,7 +38,7 @@ public function register(): array
         ];
     }
 
-    public function process(File $phpcsFile, $stackPtr): int
+    public function process(File $phpcsFile, $stackPtr)
     {
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {

From 5e4b15b4f61331ea8f877a5fc412ac52b0086deb Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 Aug 2021 18:08:42 +0200
Subject: [PATCH 144/630] AC-660: Create phpcs static check for DiConfigTest -
 Update XML files

---
 Magento2/Tests/Legacy/DiConfigUnitTest.xml | 24 +++++++++++++---------
 Magento2/ruleset.xml                       |  6 ++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Magento2/Tests/Legacy/DiConfigUnitTest.xml b/Magento2/Tests/Legacy/DiConfigUnitTest.xml
index 83b29690..a1328a22 100644
--- a/Magento2/Tests/Legacy/DiConfigUnitTest.xml
+++ b/Magento2/Tests/Legacy/DiConfigUnitTest.xml
@@ -5,15 +5,19 @@
  * See COPYING.txt for license details.
  */
 -->
-<root>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type>
+        <arguments>
+            <argument name="prices" xsi:type="array">
+                <item key="regular_price" xsi:type="string">Magento\Catalog\Pricing\Price\RegularPrice</item>
+            </argument>
+        </arguments>
+    </type>
     <instance>
-        <param name="param1" new_attribute="2">
-            <array key="amounts">
-                <item key="item1" new_attribute="3">
-                    <value new_attribute="4">scalar20</value>
-                </item>
-                <item>50.00</item>
-            </array>
-        </param>
+        <array key="params">
+            <param name="default_value" new_attribute="0">
+                <value new_attribute="5">scalar5</value>
+            </param>
+        </array>
     </instance>
-</root>
\ No newline at end of file
+</config>
\ No newline at end of file
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 04731e74..7d2c9fc1 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -3,7 +3,7 @@
     <description>Magento Coding Standard</description>
 
     <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP"/>
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.Functions.CallTimePassByReference">
@@ -224,9 +224,10 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Legacy.DiConfig">
+        <include-pattern>*\/di.xml$</include-pattern>
+        <include-pattern>*\/DiConfigUnitTest.xml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>
-        <include-pattern>*\/di.xml$</include-pattern>
     </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
@@ -263,6 +264,7 @@
         <type>warning</type>
     </rule>
     <rule ref="Generic.PHP.DisallowShortOpenTag">
+        <exclude-pattern>*\.xml$</exclude-pattern>
         <severity>7</severity>
         <type>warning</type>
     </rule>

From d08c40f4cfcfc61db58f55b3791b3b3666b7b0c4 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 27 Aug 2021 16:26:24 +0200
Subject: [PATCH 145/630] AC-660: Create phpcs static check for DiConfigTest -
 Refactor: Simplify approach

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php   | 55 ++++------------------
 Magento2/Tests/Legacy/DiConfigUnitTest.php | 11 ++---
 Magento2/Tests/Legacy/DiConfigUnitTest.xml |  2 +-
 Magento2/ruleset.xml                       |  1 -
 composer.json                              |  4 +-
 composer.lock                              |  6 +--
 6 files changed, 19 insertions(+), 60 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 164036f7..98f072f0 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -6,29 +6,19 @@
 
 namespace Magento2\Sniffs\Legacy;
 
-use DOMDocument;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 class DiConfigSniff implements Sniff
 {
     private const WARNING_CODE = 'FoundObsoleteAttribute';
-    private const ERROR_CODE = 'WrongXML';
 
     private $xpathObsoleteElems = [
-        'param',
-        'instance',
-        'array',
-        'item[@key]',
-        'value'
-    ];
-
-    private $messages = [
-        'param' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">',
-        'instance' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">',
-        'array' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">',
-        'item[@key]' => 'The <item key="..."> node is obsolete. Instead, use the <item name="..." xsi:type="...">',
-        'value' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal.'
+        '<param' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">',
+        '<instance' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">',
+        '<array' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">',
+        '<item key=' => 'The <item key="..."> node is obsolete. Instead, use the <item name="..." xsi:type="...">',
+        '<value' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal.'
     ];
 
     public function register(): array
@@ -40,41 +30,16 @@ public function register(): array
 
     public function process(File $phpcsFile, $stackPtr)
     {
-        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
-        if ($xml === false) {
-            $phpcsFile->addError(
-                sprintf(
-                    "Couldn't parse contents of '%s', check that they are in valid XML format",
-                    $phpcsFile->getFilename(),
-                ),
-                $stackPtr,
-                self::ERROR_CODE
-            );
-        }
+        $lineContent = $phpcsFile->getTokensAsString($stackPtr, 1);
 
-        foreach ($this->xpathObsoleteElems as $obsoleteElem) {
-            $found = $xml->xpath($obsoleteElem);
-            if ($found === true) {
+        foreach ($this->xpathObsoleteElems as $elem => $message ) {
+            if (strpos($lineContent, $elem) !== false) {
                 $phpcsFile->addWarning(
-                    $this->messages[$obsoleteElem],
+                    $message,
                     $stackPtr,
                     self::WARNING_CODE
                 );
             }
         }
     }
-
-    /**
-     * Format the incoming XML to avoid tags split into several lines.
-     *
-     * @param File $phpcsFile
-     * @return false|string
-     */
-    private function getFormattedXML(File $phpcsFile)
-    {
-        $doc = new DomDocument('1.0');
-        $doc->formatOutput = true;
-        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
-        return $doc->saveXML();
-    }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Legacy/DiConfigUnitTest.php b/Magento2/Tests/Legacy/DiConfigUnitTest.php
index 8df8fa91..d5dad883 100644
--- a/Magento2/Tests/Legacy/DiConfigUnitTest.php
+++ b/Magento2/Tests/Legacy/DiConfigUnitTest.php
@@ -23,12 +23,11 @@ public function getErrorList(): array
     public function getWarningList(): array
     {
         return [
-            9 => 1,
-            10 => 1,
-            11 => 1,
             12 => 1,
-            13 => 1,
-            15 => 1
+            16 => 1,
+            17 => 1,
+            18 => 1,
+            19 => 1
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Legacy/DiConfigUnitTest.xml b/Magento2/Tests/Legacy/DiConfigUnitTest.xml
index a1328a22..048e31b4 100644
--- a/Magento2/Tests/Legacy/DiConfigUnitTest.xml
+++ b/Magento2/Tests/Legacy/DiConfigUnitTest.xml
@@ -20,4 +20,4 @@
             </param>
         </array>
     </instance>
-</config>
\ No newline at end of file
+</config>
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 7d2c9fc1..7b1e78f7 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -225,7 +225,6 @@
     </rule>
     <rule ref="Magento2.Legacy.DiConfig">
         <include-pattern>*\/di.xml$</include-pattern>
-        <include-pattern>*\/DiConfigUnitTest.xml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>
diff --git a/composer.json b/composer.json
index 267fcaa3..f30fd7fd 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,7 @@
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
-        "webonyx/graphql-php": "^14.9",
-        "ext-simplexml": "*",
-        "ext-dom": "*"
+        "webonyx/graphql-php": "^14.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index fa12108d..c26f9e74 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "503b3dff10c4885d5f5b196d159c1fdd",
+    "content-hash": "93bec1b3a36cf67f2511aec0219bcc06",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -2228,9 +2228,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3",
-        "ext-simplexml": "*",
-        "ext-dom": "*"
+        "php": ">=7.3"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"

From 6031c1e7e9e4fa570e125290cbef22bae4c4487d Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 27 Aug 2021 16:29:48 +0200
Subject: [PATCH 146/630] AC-660: Create phpcs static check for DiConfigTest -
 Fix phpcs

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 98f072f0..41dea6e7 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -21,6 +21,9 @@ class DiConfigSniff implements Sniff
         '<value' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal.'
     ];
 
+    /**
+     * @inheritDoc
+     */
     public function register(): array
     {
         return [
@@ -28,11 +31,14 @@ public function register(): array
         ];
     }
 
+    /**
+     * @inheritDoc
+     */
     public function process(File $phpcsFile, $stackPtr)
     {
         $lineContent = $phpcsFile->getTokensAsString($stackPtr, 1);
 
-        foreach ($this->xpathObsoleteElems as $elem => $message ) {
+        foreach ($this->xpathObsoleteElems as $elem => $message) {
             if (strpos($lineContent, $elem) !== false) {
                 $phpcsFile->addWarning(
                     $message,

From 8c600476101fb590a797b697810b4d7111d58aed Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Sat, 28 Aug 2021 10:42:27 +0200
Subject: [PATCH 147/630] AC-660: Create phpcs static check for DiConfigTest -
 Refactor: Rename variables and add phpdoc

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 41dea6e7..954c32e0 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -13,7 +13,10 @@ class DiConfigSniff implements Sniff
 {
     private const WARNING_CODE = 'FoundObsoleteAttribute';
 
-    private $xpathObsoleteElems = [
+    /**
+     * @var string[] Associative array containing the obsolete nodes and the message to display when they are found.
+     */
+    private $obsoleteDiNodes = [
         '<param' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">',
         '<instance' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">',
         '<array' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">',
@@ -38,8 +41,8 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $lineContent = $phpcsFile->getTokensAsString($stackPtr, 1);
 
-        foreach ($this->xpathObsoleteElems as $elem => $message) {
-            if (strpos($lineContent, $elem) !== false) {
+        foreach ($this->obsoleteDiNodes as $element => $message) {
+            if (strpos($lineContent, $element) !== false) {
                 $phpcsFile->addWarning(
                     $message,
                     $stackPtr,

From a4538fe599750ebb92b6174d75747d0da3505803 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 30 Aug 2021 12:52:02 +0200
Subject: [PATCH 148/630] AC-940: Create unit test for
 Magento2\Less\BracesFormattingSniff check

---
 .../Tests/Less/BracesFormattingUnitTest.less  | 16 +++++++++++
 .../Tests/Less/BracesFormattingUnitTest.php   | 28 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 Magento2/Tests/Less/BracesFormattingUnitTest.less
 create mode 100644 Magento2/Tests/Less/BracesFormattingUnitTest.php

diff --git a/Magento2/Tests/Less/BracesFormattingUnitTest.less b/Magento2/Tests/Less/BracesFormattingUnitTest.less
new file mode 100644
index 00000000..952237f4
--- /dev/null
+++ b/Magento2/Tests/Less/BracesFormattingUnitTest.less
@@ -0,0 +1,16 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.my{
+  some: 'stuff';
+}
+.foo {
+  anything: 'else';
+}
+
+.bar {
+  #bar .baz();
+  
+}
diff --git a/Magento2/Tests/Less/BracesFormattingUnitTest.php b/Magento2/Tests/Less/BracesFormattingUnitTest.php
new file mode 100644
index 00000000..ebbea8ee
--- /dev/null
+++ b/Magento2/Tests/Less/BracesFormattingUnitTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class BracesFormattingUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            6 => 1,
+            16 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From fad9a4472b0fba3d621685bd68bcd881a2dd9125 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 30 Aug 2021 13:18:38 +0200
Subject: [PATCH 149/630] AC-942: Create unit test for
 Magento2\Less\ColonSpacingSniff check

---
 Magento2/Sniffs/Less/ColonSpacingSniff.php    |  4 +--
 Magento2/Tests/Less/ColonSpacingUnitTest.less | 26 +++++++++++++++++
 Magento2/Tests/Less/ColonSpacingUnitTest.php  | 29 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 Magento2/Tests/Less/ColonSpacingUnitTest.less
 create mode 100644 Magento2/Tests/Less/ColonSpacingUnitTest.php

diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index 6ada0fac..dd8fee7f 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -12,7 +12,7 @@
 /**
  * Class ColonSpacingSniff
  *
- * Ensure that single quotes are used
+ * Ensure that colon spacing is right
  *
  * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#properties-colon-indents
  */
@@ -101,7 +101,7 @@ private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
             if (false === strpos($content, $phpcsFile->eolChar)) {
                 $length  = strlen($content);
                 if ($length !== 1) {
-                    $error = 'Expected 1 space after colon in style definition; %s found';
+                    $error = sprintf('Expected 1 space after colon in style definition; %s found', $length);
                     $phpcsFile->addError($error, $stackPtr, 'After');
                 }
             } else {
diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.less b/Magento2/Tests/Less/ColonSpacingUnitTest.less
new file mode 100644
index 00000000..d888af2e
--- /dev/null
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.less
@@ -0,0 +1,26 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+
+div#foo {
+  blah:'abc';
+}
+
+.my #foo .blah {
+  some:  'stuff';
+}
+
+.blah {
+  foo :'xyz';
+}
+
+.foo {
+  bar:
+          'xyz';
+}
+
+.right {
+  way: 'good'
+}
diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.php b/Magento2/Tests/Less/ColonSpacingUnitTest.php
new file mode 100644
index 00000000..b50e47d0
--- /dev/null
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class ColonSpacingUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            8 => 1,
+            12 => 1,
+            16 => 2,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 0b6fe4b2aaa000dc5b8d3bfba49e7ee11cf9583c Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 30 Aug 2021 13:55:52 +0200
Subject: [PATCH 150/630] AC-943: Create unit test for
 Magento2\Less\ColourDefinitionSniff check

---
 .../Sniffs/Less/ColourDefinitionSniff.php     |  2 +-
 .../Tests/Less/ColourDefinitionUnitTest.less  | 24 +++++++++++++++
 .../Tests/Less/ColourDefinitionUnitTest.php   | 29 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Tests/Less/ColourDefinitionUnitTest.less
 create mode 100644 Magento2/Tests/Less/ColourDefinitionUnitTest.php

diff --git a/Magento2/Sniffs/Less/ColourDefinitionSniff.php b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
index 82568824..afebb9a9 100644
--- a/Magento2/Sniffs/Less/ColourDefinitionSniff.php
+++ b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
@@ -42,7 +42,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $variablePtr = $phpcsFile->findPrevious(T_ASPERAND, $stackPtr);
         if ((false === $variablePtr) || ($tokens[$stackPtr]['line'] !== $tokens[$variablePtr]['line'])) {
-            $phpcsFile->addError('Hexadecimal value should be used for variable', $stackPtr, 'NotInVariable');
+            $phpcsFile->addError('Hexadecimal value should be get from a variable', $stackPtr, 'NotInVariable');
         }
 
         $expected = strtolower($colour);
diff --git a/Magento2/Tests/Less/ColourDefinitionUnitTest.less b/Magento2/Tests/Less/ColourDefinitionUnitTest.less
new file mode 100644
index 00000000..e32323f9
--- /dev/null
+++ b/Magento2/Tests/Less/ColourDefinitionUnitTest.less
@@ -0,0 +1,24 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+@red: #aaaaaa;
+@blue: #00F;
+@green: #0f0;
+
+.my{
+  color: @red;
+}
+
+.foo {
+  color: #aaa;
+}
+
+.baz {
+  color: @blue;
+}
+
+.bar {
+  color: @green;
+}
diff --git a/Magento2/Tests/Less/ColourDefinitionUnitTest.php b/Magento2/Tests/Less/ColourDefinitionUnitTest.php
new file mode 100644
index 00000000..34862ed2
--- /dev/null
+++ b/Magento2/Tests/Less/ColourDefinitionUnitTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class ColourDefinitionUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            6 => 1,
+            7 => 1,
+            15 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 1153ab2177f93520f507e8e766c837fb1ed39c5d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 31 Aug 2021 12:07:41 +0200
Subject: [PATCH 151/630] AC-943: Create unit test for
 Magento2\Less\ColourDefinitionSniff check

---
 Magento2/Sniffs/Less/ColourDefinitionSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Less/ColourDefinitionSniff.php b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
index afebb9a9..945abffd 100644
--- a/Magento2/Sniffs/Less/ColourDefinitionSniff.php
+++ b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
@@ -42,7 +42,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $variablePtr = $phpcsFile->findPrevious(T_ASPERAND, $stackPtr);
         if ((false === $variablePtr) || ($tokens[$stackPtr]['line'] !== $tokens[$variablePtr]['line'])) {
-            $phpcsFile->addError('Hexadecimal value should be get from a variable', $stackPtr, 'NotInVariable');
+            $phpcsFile->addError('A variable should be used for a CSS colour', $stackPtr, 'NotInVariable');
         }
 
         $expected = strtolower($colour);

From ba918266ed9276316d8ff5d599f2f0acd3453178 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 31 Aug 2021 15:15:57 +0200
Subject: [PATCH 152/630] AC-948: Create unit test for
 Magento2\Less\PropertiesLineBreakSniff check

---
 .../Less/PropertiesLineBreakUnitTest.less     | 12 +++++++++
 .../Less/PropertiesLineBreakUnitTest.php      | 27 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 Magento2/Tests/Less/PropertiesLineBreakUnitTest.less
 create mode 100644 Magento2/Tests/Less/PropertiesLineBreakUnitTest.php

diff --git a/Magento2/Tests/Less/PropertiesLineBreakUnitTest.less b/Magento2/Tests/Less/PropertiesLineBreakUnitTest.less
new file mode 100644
index 00000000..885a2fa9
--- /dev/null
+++ b/Magento2/Tests/Less/PropertiesLineBreakUnitTest.less
@@ -0,0 +1,12 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.my{
+  some: 'stuff'; anything: 'else';
+}
+
+.foo {
+  anything: 'else';
+}
diff --git a/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php b/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php
new file mode 100644
index 00000000..61477f03
--- /dev/null
+++ b/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class PropertiesLineBreakUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            7 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From cf9c0dd7d21e0b283085d5ac99cf081c1fb3a348 Mon Sep 17 00:00:00 2001
From: Magento Community Engineering
 <31669971+magento-engcom-team@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:01:55 -0500
Subject: [PATCH 153/630] [Imported] AC-945: Create unit test for
 Magento2\Less\CommentLevelsSniff check (#34)

https://jira.corp.magento.com/browse/AC-945
---
 .../Tests/Less/CommentLevelsUnitTest.less     | 48 +++++++++++++++++++
 Magento2/Tests/Less/CommentLevelsUnitTest.php | 32 +++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 Magento2/Tests/Less/CommentLevelsUnitTest.less
 create mode 100644 Magento2/Tests/Less/CommentLevelsUnitTest.php

diff --git a/Magento2/Tests/Less/CommentLevelsUnitTest.less b/Magento2/Tests/Less/CommentLevelsUnitTest.less
new file mode 100644
index 00000000..77d3dbd7
--- /dev/null
+++ b/Magento2/Tests/Less/CommentLevelsUnitTest.less
@@ -0,0 +1,48 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  First level comment
+//  _____________________________________________
+
+.first-level {
+  background-color: green;
+}
+
+//
+//  Incorrect First level comment
+//  _____________________________________________
+.incorrect-first-level {
+  background-color: red;
+}
+
+//
+//  Second level comment
+//  ---------------------------------------------
+
+.second-level {
+  background-color: green;
+}
+
+//
+// Incorrect Second level comment
+// ---------------------------------------------
+
+.incorrect-second-level {
+  background-color: red;
+}
+
+//  third level comment
+.third-level-nav {
+  //  New line comment, considered third level too
+  background-color: green; // ToDo UI: todo inline comment
+  color: white; // inline comment
+}
+
+//Incorrect third level comment
+.incorrect-third-level {
+  //   Incorrect new line comment
+  color: red; //  incorrect inline comment
+}
diff --git a/Magento2/Tests/Less/CommentLevelsUnitTest.php b/Magento2/Tests/Less/CommentLevelsUnitTest.php
new file mode 100644
index 00000000..9e5315d9
--- /dev/null
+++ b/Magento2/Tests/Less/CommentLevelsUnitTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class CommentLevelsUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            16 => 1,
+            30 => 1,
+            31 => 1,
+            44 => 1,
+            46 => 1,
+            47 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From e71dbf8b46409c222ba9fa3811fcec47ba6b57f0 Mon Sep 17 00:00:00 2001
From: Magento Community Engineering
 <31669971+magento-engcom-team@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:08:20 -0500
Subject: [PATCH 154/630] [Imported] AC-946: Create unit test for
 Magento2\Less\ImportantPropertySniff check (#35)

https://jira.corp.magento.com/browse/AC-946
---
 .../Tests/Less/ImportantPropertyUnitTest.less | 12 +++++++++
 .../Tests/Less/ImportantPropertyUnitTest.php  | 27 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 Magento2/Tests/Less/ImportantPropertyUnitTest.less
 create mode 100644 Magento2/Tests/Less/ImportantPropertyUnitTest.php

diff --git a/Magento2/Tests/Less/ImportantPropertyUnitTest.less b/Magento2/Tests/Less/ImportantPropertyUnitTest.less
new file mode 100644
index 00000000..0a0783ba
--- /dev/null
+++ b/Magento2/Tests/Less/ImportantPropertyUnitTest.less
@@ -0,0 +1,12 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.correct-important-property {
+  background-color: green !important;
+}
+
+.incorrect-important-property {
+  background-color: red!important;
+}
diff --git a/Magento2/Tests/Less/ImportantPropertyUnitTest.php b/Magento2/Tests/Less/ImportantPropertyUnitTest.php
new file mode 100644
index 00000000..c3044415
--- /dev/null
+++ b/Magento2/Tests/Less/ImportantPropertyUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class ImportantPropertyUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            11 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 4b2ca825d0fe1bb26804ad6c0d2c7d68dc2f7cbb Mon Sep 17 00:00:00 2001
From: Magento Community Engineering
 <31669971+magento-engcom-team@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:11:04 -0500
Subject: [PATCH 155/630] [Imported] AC-947: Create unit test for
 Magento2\Less\IndentationSniff check (#36)

https://jira.corp.magento.com/browse/AC-947
---
 Magento2/Tests/Less/IndentationUnitTest.less | 21 +++++++++++++
 Magento2/Tests/Less/IndentationUnitTest.php  | 33 ++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 Magento2/Tests/Less/IndentationUnitTest.less
 create mode 100644 Magento2/Tests/Less/IndentationUnitTest.php

diff --git a/Magento2/Tests/Less/IndentationUnitTest.less b/Magento2/Tests/Less/IndentationUnitTest.less
new file mode 100644
index 00000000..1ddbff6f
--- /dev/null
+++ b/Magento2/Tests/Less/IndentationUnitTest.less
@@ -0,0 +1,21 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.nav {
+    background: green;
+    .nav-item {
+        background: green;
+    }
+}
+
+.bar {
+  background: red;
+  .bar-item {
+     background: red;
+     .bar-item-child {
+           background: red;
+     }
+  }
+}
diff --git a/Magento2/Tests/Less/IndentationUnitTest.php b/Magento2/Tests/Less/IndentationUnitTest.php
new file mode 100644
index 00000000..a7bf6502
--- /dev/null
+++ b/Magento2/Tests/Less/IndentationUnitTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class IndentationUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            14 => 1,
+            15 => 1,
+            16 => 1,
+            17 => 1,
+            18 => 1,
+            19 => 1,
+            20 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 0759da94ae2c489bf46077b43fe30bc83b89fb11 Mon Sep 17 00:00:00 2001
From: Magento Community Engineering
 <31669971+magento-engcom-team@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:21:24 -0500
Subject: [PATCH 156/630] [Imported] AC-941: Create unit test for
 Magento2\Less\ClassNamingSniff check (#38)

https://jira.corp.magento.com/browse/AC-941
---
 Magento2/Sniffs/Less/ClassNamingSniff.php    | 19 +++++++++---
 Magento2/Tests/Less/ClassNamingUnitTest.less | 32 ++++++++++++++++++++
 Magento2/Tests/Less/ClassNamingUnitTest.php  | 30 ++++++++++++++++++
 3 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 Magento2/Tests/Less/ClassNamingUnitTest.less
 create mode 100644 Magento2/Tests/Less/ClassNamingUnitTest.php

diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
index 90d44280..e684172b 100644
--- a/Magento2/Sniffs/Less/ClassNamingSniff.php
+++ b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -21,10 +21,7 @@
  */
 class ClassNamingSniff implements Sniff
 {
-
-    const STRING_HELPER_CLASSES_PREFIX = '_';
-
-    const STRING_ALLOWED_UNDERSCORES = '__';
+    private const STRING_HELPER_CLASSES_PREFIX = '_';
 
     /**
      * A list of tokenizers this sniff supports.
@@ -62,7 +59,19 @@ public function process(File $phpcsFile, $stackPtr)
 
         $className = $tokens[$stackPtr + 1]['content'];
         if (preg_match_all('/[^a-z0-9\-_]/U', $className, $matches)) {
-            $phpcsFile->addError('Class name contains not allowed symbols', $stackPtr, 'NotAllowedSymbol', $matches);
+            $phpcsFile->addError(
+                'CSS class name does not follow class naming requirements: %s',
+                $stackPtr,
+                'NotAllowedSymbol',
+                [implode("", $matches[0])]
+            );
+        }
+        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
+            $phpcsFile->addError(
+                'CSS class names should be separated with "-" (dash) instead of "_" (underscore)',
+                $stackPtr,
+                'NotAllowedSymbol'
+            );
         }
     }
 }
diff --git a/Magento2/Tests/Less/ClassNamingUnitTest.less b/Magento2/Tests/Less/ClassNamingUnitTest.less
new file mode 100644
index 00000000..ba60c205
--- /dev/null
+++ b/Magento2/Tests/Less/ClassNamingUnitTest.less
@@ -0,0 +1,32 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.UPPERCASE {
+  background: red;
+}
+
+.Capital {
+  background: red;
+}
+
+.camelCase {
+  background: red;
+}
+
+.snake_case {
+  background: red;
+}
+
+._helper {
+  background: green;
+}
+
+.__another-helper {
+  background: green;
+}
+
+.category-title {
+  background: green;
+}
diff --git a/Magento2/Tests/Less/ClassNamingUnitTest.php b/Magento2/Tests/Less/ClassNamingUnitTest.php
new file mode 100644
index 00000000..c50ff1bf
--- /dev/null
+++ b/Magento2/Tests/Less/ClassNamingUnitTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class ClassNamingUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            6 => 1,
+            10 => 1,
+            14 => 1,
+            18 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From faddd308916a331a3157fbc88df5cc8c4358279d Mon Sep 17 00:00:00 2001
From: Magento Community Engineering
 <31669971+magento-engcom-team@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:23:43 -0500
Subject: [PATCH 157/630] AC-949: Create unit test for
 Magento2\Less\PropertiesSortingSniff check (#37)

https://jira.corp.magento.com/browse/AC-949
---
 .../Tests/Less/PropertiesSortingUnitTest.less | 28 +++++++++++++++++++
 .../Tests/Less/PropertiesSortingUnitTest.php  | 28 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 Magento2/Tests/Less/PropertiesSortingUnitTest.less
 create mode 100644 Magento2/Tests/Less/PropertiesSortingUnitTest.php

diff --git a/Magento2/Tests/Less/PropertiesSortingUnitTest.less b/Magento2/Tests/Less/PropertiesSortingUnitTest.less
new file mode 100644
index 00000000..9e67fff8
--- /dev/null
+++ b/Magento2/Tests/Less/PropertiesSortingUnitTest.less
@@ -0,0 +1,28 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.menu {
+  color: white;
+  text-align: center;
+  background-color: red;
+
+  .item {
+    background-color: green;
+    color: white;
+    text-align: center;
+  }
+}
+
+.nav {
+  background-color: green;
+  color: white;
+  text-align: center;
+
+  .item {
+    color: white;
+    text-align: center;
+    background-color: red;
+  }
+}
diff --git a/Magento2/Tests/Less/PropertiesSortingUnitTest.php b/Magento2/Tests/Less/PropertiesSortingUnitTest.php
new file mode 100644
index 00000000..e32561e5
--- /dev/null
+++ b/Magento2/Tests/Less/PropertiesSortingUnitTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class PropertiesSortingUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            9 => 1,
+            26 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From d4dc9e2fd2881e4400444891012b2229e45de64a Mon Sep 17 00:00:00 2001
From: Magento Community Engineering
 <31669971+magento-engcom-team@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:27:50 -0500
Subject: [PATCH 158/630] AC-951: Create unit test for
 Magento2\Less\SelectorDelimiterSniff check (#39)

https://jira.corp.magento.com/browse/AC-951
---
 .../Tests/Less/SelectorDelimiterUnitTest.less | 13 +++++++++
 .../Tests/Less/SelectorDelimiterUnitTest.php  | 27 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Magento2/Tests/Less/SelectorDelimiterUnitTest.less
 create mode 100644 Magento2/Tests/Less/SelectorDelimiterUnitTest.php

diff --git a/Magento2/Tests/Less/SelectorDelimiterUnitTest.less b/Magento2/Tests/Less/SelectorDelimiterUnitTest.less
new file mode 100644
index 00000000..1ff936ea
--- /dev/null
+++ b/Magento2/Tests/Less/SelectorDelimiterUnitTest.less
@@ -0,0 +1,13 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.nav,
+.bar {
+  background: green;
+}
+
+.nav, .bar {
+  background: red;
+}
diff --git a/Magento2/Tests/Less/SelectorDelimiterUnitTest.php b/Magento2/Tests/Less/SelectorDelimiterUnitTest.php
new file mode 100644
index 00000000..9fced2eb
--- /dev/null
+++ b/Magento2/Tests/Less/SelectorDelimiterUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class SelectorDelimiterUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            11 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From fce7c6e231018ed09209c8014fa0b818ec3c1af6 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 31 Aug 2021 18:10:00 +0200
Subject: [PATCH 159/630] AC-952: Create unit test for
 Magento2\Less\SemicolonSpacingSniff check

---
 .../Tests/Less/SemicolonSpacingUnitTest.less  | 13 +++++++++
 .../Tests/Less/SemicolonSpacingUnitTest.php   | 27 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Magento2/Tests/Less/SemicolonSpacingUnitTest.less
 create mode 100644 Magento2/Tests/Less/SemicolonSpacingUnitTest.php

diff --git a/Magento2/Tests/Less/SemicolonSpacingUnitTest.less b/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
new file mode 100644
index 00000000..b7721cde
--- /dev/null
+++ b/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
@@ -0,0 +1,13 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.nav {
+  background-color: green
+}
+
+.bar {
+  background-color: red
+  color: white
+}
diff --git a/Magento2/Tests/Less/SemicolonSpacingUnitTest.php b/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
new file mode 100644
index 00000000..fe5d9d92
--- /dev/null
+++ b/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class SemicolonSpacingUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            11 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 6bf26ababffebaac3d98a75d54eef0773c0c0255 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 31 Aug 2021 18:32:27 +0200
Subject: [PATCH 160/630] AC-953: Create unit test for
 Magento2\Less\TypeSelectorConcatenationSniff check

---
 .../TypeSelectorConcatenationUnitTest.less    | 25 +++++++++++++++++
 .../TypeSelectorConcatenationUnitTest.php     | 28 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less
 create mode 100644 Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php

diff --git a/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less
new file mode 100644
index 00000000..74216d54
--- /dev/null
+++ b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less
@@ -0,0 +1,25 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.product-list-item {
+    background: green;
+}
+
+.product-image {
+    background: green;
+}
+
+.product {
+    random: 'stuff  ';
+    &-list {
+        background: red;
+        &-item {
+            background: red;
+        }
+    }
+    &-image {
+        background: red;
+    }
+}
diff --git a/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php
new file mode 100644
index 00000000..1fbe3227
--- /dev/null
+++ b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class TypeSelectorConcatenationUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            16 => 1,
+            22 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 4bc13c9f42ff9ec947fc9b235ddfc31c6f2de16a Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 31 Aug 2021 18:35:01 +0200
Subject: [PATCH 161/630] AC-953: Create unit test for
 Magento2\Less\TypeSelectorConcatenationSniff check - Amend typo

---
 Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less
index 74216d54..241af673 100644
--- a/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less
+++ b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.less
@@ -12,7 +12,7 @@
 }
 
 .product {
-    random: 'stuff  ';
+    random: 'stuff';
     &-list {
         background: red;
         &-item {

From 446372ac1623435627d84c385ad3fddc95f12404 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 1 Sep 2021 09:43:06 +0200
Subject: [PATCH 162/630] AC-952: Create unit test for
 Magento2\Less\SemicolonSpacingSniff check - Refactor: Fix indentation

---
 Magento2/Tests/Less/SemicolonSpacingUnitTest.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento2/Tests/Less/SemicolonSpacingUnitTest.less b/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
index b7721cde..bf68b499 100644
--- a/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
+++ b/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
@@ -4,10 +4,10 @@
 //  */
 
 .nav {
-  background-color: green
+    background-color: green
 }
 
-.bar {
-  background-color: red
-  color: white
+.nav-list {
+    background-color: red
+    color: white
 }

From 14ad98a4af6dda6f50387b3e180bd7c867467c5b Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 11:23:46 +0200
Subject: [PATCH 163/630] AC-950: Create unit test for
 Magento2\Less\QuotesSniff check

---
 Magento2/Tests/Less/QuotesSniffUnitTest.less | 12 +++++++++
 Magento2/Tests/Less/QuotesSniffUnitTest.php  | 27 ++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 Magento2/Tests/Less/QuotesSniffUnitTest.less
 create mode 100644 Magento2/Tests/Less/QuotesSniffUnitTest.php

diff --git a/Magento2/Tests/Less/QuotesSniffUnitTest.less b/Magento2/Tests/Less/QuotesSniffUnitTest.less
new file mode 100644
index 00000000..1b300703
--- /dev/null
+++ b/Magento2/Tests/Less/QuotesSniffUnitTest.less
@@ -0,0 +1,12 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.my{
+  some: "stuff";
+}
+
+.foo {
+  anything: 'else';
+}
diff --git a/Magento2/Tests/Less/QuotesSniffUnitTest.php b/Magento2/Tests/Less/QuotesSniffUnitTest.php
new file mode 100644
index 00000000..eb0fa5cb
--- /dev/null
+++ b/Magento2/Tests/Less/QuotesSniffUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class QuotesSniffUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            7 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From e619db357ee8490f9882934a50f40f037128a805 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 11:48:52 +0200
Subject: [PATCH 164/630] AC-950: Create unit test for
 Magento2\Less\QuotesSniff check

---
 .../Tests/Less/{QuotesSniffUnitTest.less => QuotesUnitTest.less}  | 0
 .../Tests/Less/{QuotesSniffUnitTest.php => QuotesUnitTest.php}    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename Magento2/Tests/Less/{QuotesSniffUnitTest.less => QuotesUnitTest.less} (100%)
 rename Magento2/Tests/Less/{QuotesSniffUnitTest.php => QuotesUnitTest.php} (100%)

diff --git a/Magento2/Tests/Less/QuotesSniffUnitTest.less b/Magento2/Tests/Less/QuotesUnitTest.less
similarity index 100%
rename from Magento2/Tests/Less/QuotesSniffUnitTest.less
rename to Magento2/Tests/Less/QuotesUnitTest.less
diff --git a/Magento2/Tests/Less/QuotesSniffUnitTest.php b/Magento2/Tests/Less/QuotesUnitTest.php
similarity index 100%
rename from Magento2/Tests/Less/QuotesSniffUnitTest.php
rename to Magento2/Tests/Less/QuotesUnitTest.php

From a9a1a467335cf4253e9e4092fac3668dcee9d467 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 12:23:06 +0200
Subject: [PATCH 165/630] AC-944: Create unit test for
 Magento2\Less\CombinatorIndentationSniff check

---
 .../Less/CombinatorIndentationUnitTest.less   | 20 +++++++++++++
 .../Less/CombinatorIndentationUnitTest.php    | 29 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 Magento2/Tests/Less/CombinatorIndentationUnitTest.less
 create mode 100644 Magento2/Tests/Less/CombinatorIndentationUnitTest.php

diff --git a/Magento2/Tests/Less/CombinatorIndentationUnitTest.less b/Magento2/Tests/Less/CombinatorIndentationUnitTest.less
new file mode 100644
index 00000000..0d8a4932
--- /dev/null
+++ b/Magento2/Tests/Less/CombinatorIndentationUnitTest.less
@@ -0,0 +1,20 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.nav+.bar {
+  color: @bar__color;
+}
+
+.nav +.foo {
+  color: @bar__color;
+}
+
+.nav+ .baz {
+  color: @bar__color;
+}
+
+.nav + .qux {
+  color: @bar__color;
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Less/CombinatorIndentationUnitTest.php b/Magento2/Tests/Less/CombinatorIndentationUnitTest.php
new file mode 100644
index 00000000..d3e5c882
--- /dev/null
+++ b/Magento2/Tests/Less/CombinatorIndentationUnitTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class CombinatorIndentationUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            6 => 1,
+            10 => 1,
+            14 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From a728d6efac41799642123894147e9cebe0a67f20 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 12:23:59 +0200
Subject: [PATCH 166/630] AC-944: Create unit test for
 Magento2\Less\CombinatorIndentationSniff check

---
 Magento2/Tests/Less/CombinatorIndentationUnitTest.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Less/CombinatorIndentationUnitTest.less b/Magento2/Tests/Less/CombinatorIndentationUnitTest.less
index 0d8a4932..fb66cd1d 100644
--- a/Magento2/Tests/Less/CombinatorIndentationUnitTest.less
+++ b/Magento2/Tests/Less/CombinatorIndentationUnitTest.less
@@ -17,4 +17,4 @@
 
 .nav + .qux {
   color: @bar__color;
-}
\ No newline at end of file
+}

From 7b565c5817d0b75a4e089b2e12e302291e0725ef Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 12:39:35 +0200
Subject: [PATCH 167/630] AC-954: Create unit test for
 Magento2\Less\TypeSelectorsSniff check

---
 .../Tests/Less/TypeSelectorsUnitTest.less     | 23 ++++++++++++++++
 Magento2/Tests/Less/TypeSelectorsUnitTest.php | 27 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 Magento2/Tests/Less/TypeSelectorsUnitTest.less
 create mode 100644 Magento2/Tests/Less/TypeSelectorsUnitTest.php

diff --git a/Magento2/Tests/Less/TypeSelectorsUnitTest.less b/Magento2/Tests/Less/TypeSelectorsUnitTest.less
new file mode 100644
index 00000000..1894d7b6
--- /dev/null
+++ b/Magento2/Tests/Less/TypeSelectorsUnitTest.less
@@ -0,0 +1,23 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.error {
+  some: 'stuff';
+}
+
+/**
+ * Should throw an error, Will be implemented in MAGETWO-49778
+ */
+div.error {
+  anything: 'else';
+}
+
+.nav > LI {
+  #bar .baz();
+}
+
+.nav > ul {
+  foo: 'bar';
+}
diff --git a/Magento2/Tests/Less/TypeSelectorsUnitTest.php b/Magento2/Tests/Less/TypeSelectorsUnitTest.php
new file mode 100644
index 00000000..1c6ab265
--- /dev/null
+++ b/Magento2/Tests/Less/TypeSelectorsUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class TypeSelectorsUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            17 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From a16e77e80849a42e7cec98610e8a39897b0e4789 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 12:54:15 +0200
Subject: [PATCH 168/630] AC-956: Create unit test for
 Magento2\Less\ZeroUnitsSniff check

---
 Magento2/Sniffs/Less/ZeroUnitsSniff.php    |  2 +-
 Magento2/Tests/Less/ZeroUnitsUnitTest.less | 14 +++++++++++
 Magento2/Tests/Less/ZeroUnitsUnitTest.php  | 28 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Tests/Less/ZeroUnitsUnitTest.less
 create mode 100644 Magento2/Tests/Less/ZeroUnitsUnitTest.php

diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
index 51971c78..05b26327 100644
--- a/Magento2/Sniffs/Less/ZeroUnitsSniff.php
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -14,7 +14,7 @@
  * Ensure that units for 0 is not specified
  * Omit leading "0"s in values, use dot instead
  *
- * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#and-units
+ * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#0-and-units
  * @link https://devdocs.magento.com/guides/v2.4/coding-standards/code-standard-less.html#floating-values
  */
 class ZeroUnitsSniff implements Sniff
diff --git a/Magento2/Tests/Less/ZeroUnitsUnitTest.less b/Magento2/Tests/Less/ZeroUnitsUnitTest.less
new file mode 100644
index 00000000..dcb794ad
--- /dev/null
+++ b/Magento2/Tests/Less/ZeroUnitsUnitTest.less
@@ -0,0 +1,14 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.my{
+  border-width: 0px;
+  margin-left: 0.5rem;
+}
+
+.foo {
+  border-width: 0;
+  margin-left: .5rem;
+}
diff --git a/Magento2/Tests/Less/ZeroUnitsUnitTest.php b/Magento2/Tests/Less/ZeroUnitsUnitTest.php
new file mode 100644
index 00000000..96c0d028
--- /dev/null
+++ b/Magento2/Tests/Less/ZeroUnitsUnitTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class ZeroUnitsUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            7 => 1,
+            8 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 61187535256341cb77eb45347e3b19300186c14d Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 1 Sep 2021 13:13:00 +0200
Subject: [PATCH 169/630] AC-955: Create unit test for
 Magento2\Less\VariablesSniff check

---
 Magento2/Tests/Less/VariablesUnitTest.less | 17 +++++++++++++
 Magento2/Tests/Less/VariablesUnitTest.php  | 28 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 Magento2/Tests/Less/VariablesUnitTest.less
 create mode 100644 Magento2/Tests/Less/VariablesUnitTest.php

diff --git a/Magento2/Tests/Less/VariablesUnitTest.less b/Magento2/Tests/Less/VariablesUnitTest.less
new file mode 100644
index 00000000..91590d20
--- /dev/null
+++ b/Magento2/Tests/Less/VariablesUnitTest.less
@@ -0,0 +1,17 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.nav {
+    random: 'stuff';
+}
+
+@INCORRECT-PROPERTY__color: red;
+
+//
+//  Variables not correctly located
+//  _____________________________________________
+
+//  Colors
+@btn__color: red;
diff --git a/Magento2/Tests/Less/VariablesUnitTest.php b/Magento2/Tests/Less/VariablesUnitTest.php
new file mode 100644
index 00000000..c6a49ec7
--- /dev/null
+++ b/Magento2/Tests/Less/VariablesUnitTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Less;
+
+class VariablesUnitTest extends AbstractLessSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            10 => 2,
+            17 => 1
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From 33d319696542441162c71fab1925bcb3357d90c5 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 1 Sep 2021 17:00:18 +0200
Subject: [PATCH 170/630] AC-943: Create unit test for
 Magento2\Less\ColourDefinitionSniff check

---
 Magento2/Tests/Less/ColourDefinitionUnitTest.less | 1 +
 Magento2/Tests/Less/ColourDefinitionUnitTest.php  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Tests/Less/ColourDefinitionUnitTest.less b/Magento2/Tests/Less/ColourDefinitionUnitTest.less
index e32323f9..49af23a9 100644
--- a/Magento2/Tests/Less/ColourDefinitionUnitTest.less
+++ b/Magento2/Tests/Less/ColourDefinitionUnitTest.less
@@ -6,6 +6,7 @@
 @red: #aaaaaa;
 @blue: #00F;
 @green: #0f0;
+@purple: #abcdef;
 
 .my{
   color: @red;
diff --git a/Magento2/Tests/Less/ColourDefinitionUnitTest.php b/Magento2/Tests/Less/ColourDefinitionUnitTest.php
index 34862ed2..890a39ca 100644
--- a/Magento2/Tests/Less/ColourDefinitionUnitTest.php
+++ b/Magento2/Tests/Less/ColourDefinitionUnitTest.php
@@ -15,7 +15,7 @@ public function getErrorList()
         return [
             6 => 1,
             7 => 1,
-            15 => 1,
+            16 => 1,
         ];
     }
 

From 1dd90d0caded5c604733e17afd78c5f76ee17596 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 1 Sep 2021 17:27:17 +0200
Subject: [PATCH 171/630] AC-952: Create unit test for
 Magento2\Less\SemicolonSpacingSniff check - Refactor: Fix wrong index and
 adapt tests accordingly

---
 Magento2/Sniffs/Less/SemicolonSpacingSniff.php    | 2 +-
 Magento2/Tests/Less/SemicolonSpacingUnitTest.less | 6 +++---
 Magento2/Tests/Less/SemicolonSpacingUnitTest.php  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
index cad13290..5acc7d2e 100644
--- a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
@@ -83,7 +83,7 @@ private function validateSemicolon(File $phpcsFile, $stackPtr, array $tokens, $s
     {
         if ((false === $semicolonPtr || $tokens[$semicolonPtr]['line'] !== $tokens[$stackPtr]['line'])
             && (isset($tokens[$stackPtr - 1]) && !in_array($tokens[$stackPtr - 1]['code'], $this->styleCodesToSkip))
-            && (T_COLON !== $tokens[$stackPtr + 1]['code'])
+            && (T_COLON !== $tokens[$stackPtr]['code'])
         ) {
             $error = 'Style definitions must end with a semicolon';
             $phpcsFile->addError($error, $stackPtr, 'NotAtEnd');
diff --git a/Magento2/Tests/Less/SemicolonSpacingUnitTest.less b/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
index bf68b499..4c621871 100644
--- a/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
+++ b/Magento2/Tests/Less/SemicolonSpacingUnitTest.less
@@ -4,10 +4,10 @@
 //  */
 
 .nav {
-    background-color: green
+    background-color: green;
 }
 
 .nav-list {
-    background-color: red
-    color: white
+    background-color: red  ;
+    color: red
 }
diff --git a/Magento2/Tests/Less/SemicolonSpacingUnitTest.php b/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
index fe5d9d92..e25e8d6d 100644
--- a/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
+++ b/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
@@ -13,7 +13,8 @@ class SemicolonSpacingUnitTest extends AbstractLessSniffUnitTestCase
     public function getErrorList()
     {
         return [
-            11 => 1
+            11 => 1,
+            12 => 1
         ];
     }
 

From 53e9d751141a1649caf53a8457de03cc2adc55a7 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 2 Sep 2021 11:54:29 +0200
Subject: [PATCH 172/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Tests/Legacy/ModuleXMLUnitTest.1.xml   | 10 ++++++++++
 ...eXMLUnitTest.xml => ModuleXMLUnitTest.2.xml} |  1 -
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php     | 17 ++++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/ModuleXMLUnitTest.1.xml
 rename Magento2/Tests/Legacy/{ModuleXMLUnitTest.xml => ModuleXMLUnitTest.2.xml} (85%)

diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.1.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.1.xml
new file mode 100644
index 00000000..28c02b6f
--- /dev/null
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModule" active="true" version="1" />
+</config>
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.2.xml
similarity index 85%
rename from Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
rename to Magento2/Tests/Legacy/ModuleXMLUnitTest.2.xml
index 9d545a65..13fbd752 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.xml
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.2.xml
@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModule" active="true" version="1" />
     <module
             name="Magento_TestModule2" 
             active="true" 
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index f75673d8..62300103 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -20,11 +20,18 @@ public function getErrorList()
     /**
      * @inheritdoc
      */
-    public function getWarningList()
+    public function getWarningList($testFile = '')
     {
-        return [
-            9 => 2,
-            10 => 2
-        ];
+        if ($testFile === 'ModuleXMLUnitTest.1.xml') {
+            return [
+                9 => 2,
+            ];
+        }
+        if ($testFile === 'ModuleXMLUnitTest.2.xml') {
+            return [
+                9 => 2,
+            ];
+        }
+        return [];
     }
 }

From 47a0536fe81a5d0a999542ada2773df59d9baa4a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 2 Sep 2021 12:03:27 +0200
Subject: [PATCH 173/630] AC-659: Create phpcs static check for ModuleXMLTest

---
 Magento2/Tests/Legacy/ModuleXMLUnitTest.3.xml | 10 ++++++++++
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php   |  3 +++
 2 files changed, 13 insertions(+)
 create mode 100644 Magento2/Tests/Legacy/ModuleXMLUnitTest.3.xml

diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.3.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.3.xml
new file mode 100644
index 00000000..93312a82
--- /dev/null
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModule2" />
+</config>
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index 62300103..eab099a4 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -32,6 +32,9 @@ public function getWarningList($testFile = '')
                 9 => 2,
             ];
         }
+        if ($testFile === 'ModuleXMLUnitTest.3.xml') {
+            return [];
+        }
         return [];
     }
 }

From 1b1eae2e464513f8df4b8a797732d605c1169baf Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 2 Sep 2021 16:06:07 +0200
Subject: [PATCH 174/630] AC-1128: Add severity and type (warning or error) for
 annotation, html and less checks

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

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index eb7460f8..f31b105d 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -144,6 +144,10 @@
         <severity>9</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Html.HtmlBinding">
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
     <rule ref="Magento2.Classes.AbstractApi">
@@ -233,6 +237,10 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Html.HtmlDirective">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
@@ -565,6 +573,15 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Squiz.CSS.NamedColours">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Less">
+        <severity>6</severity>
+        <type>warning</type>
+        <include-pattern>*\.less$</include-pattern>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile">
         <severity>0</severity>
     </rule>
@@ -596,16 +613,13 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Annotation">
+        <severity>5</severity>
+        <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Html"/>
-    <rule ref="Magento2.Less">
-        <include-pattern>*\.less$</include-pattern>
-    </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
-    <rule ref="Squiz.CSS.NamedColours"/>
 </ruleset>

From 31b1699de75f701fefdadc47361c42f4444ab0f3 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 2 Sep 2021 15:06:27 +0100
Subject: [PATCH 175/630] Ignore PHPUnit results cache file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index ba13e90d..6591b97d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 .project/
 .settings/
 .vscode/
+
+.phpunit.result.cache

From 3fd461e60b2cb60bf3f7e4326ab10e1da8a8d3e2 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 2 Sep 2021 15:07:58 +0100
Subject: [PATCH 176/630] Fix PHP Fatal error when docblock is invalid

  PHP Fatal error:  Uncaught TypeError: strpos(): Argument #2 ($needle) must be of type string, null given in /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php:629
  Stack trace:
  #0 /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php(629): strpos('\\VendorName\\Mod...', NULL)
  #1 /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php(515): Magento2\Sniffs\Annotation\MethodArgumentsSniff->validateFormattingConsistency(Array, Array, Object(PHP_CodeSniffer\Files\LocalFile), Array)
  #2 /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php(600): Magento2\Sniffs\Annotation\MethodArgumentsSniff->validateMethodParameterAnnotations(385, Array, Array, Object(PHP_CodeSniffer\Files\LocalFile), Array, 356, 380)
  #3 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(498): Magento2\Sniffs\Annotation\MethodArgumentsSniff->process(Object(PHP_CodeSniffer\Files\LocalFile), 385)
  #4 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/LocalFile.php(92): PHP_CodeSniffer\Files\File->process()
  #5 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(630): PHP_CodeSniffer\Files\LocalFile->process()
  #6 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(434): PHP_CodeSniffer\Runner->processFile(Object(PHP_CodeSniffer\Files\LocalFile))
  #7 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(114): PHP_CodeSniffer\Runner->run()
  #8 /srv/www/vendor/squizlabs/php_codesniffer/bin/phpcs(18): PHP_CodeSniffer\Runner->runPHPCS()
  #9 {main}
    thrown in /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php on line 629
---
 Magento2/Sniffs/Annotation/MethodArgumentsSniff.php   |  6 +++---
 Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc | 11 +++++++++++
 Magento2/Tests/Annotation/MethodArgumentsUnitTest.php |  5 +++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
index 655bd37c..09c8208b 100644
--- a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -609,8 +609,6 @@ public function process(File $phpcsFile, $stackPtr)
      * @param File $phpcsFile
      * @param array $paramPointers
      *
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     *
      * @see https://devdocs.magento.com/guides/v2.4/coding-standards/docblock-standard-general.html#format-consistency
      */
     private function validateFormattingConsistency(
@@ -626,7 +624,9 @@ private function validateFormattingConsistency(
             if (isset($paramPointers[$ptr])) {
                 $paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
                 $paramDefinition = $paramDefinitions[$ptr];
-                $argumentPositions[] = strpos($paramContent, $paramDefinition['paramName']);
+                if (isset($paramDefinition['paramName'])) {
+                    $argumentPositions[] = strpos($paramContent, $paramDefinition['paramName']);
+                }
                 $commentPositions[] = $paramDefinition['comment']
                     ? strrpos($paramContent, $paramDefinition['comment']) : null;
             }
diff --git a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
index f3cbbb54..7add3ae9 100644
--- a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
@@ -22,3 +22,14 @@ public function setExtensionAs(\Magento\Catalog\Api\Data\CategoryExtensionInterf
 {
     return $this->_setExtensionAttributes($extensionAttributes);
 }
+
+/**
+ * Short description of method
+ *
+ * @param int
+ * @return int
+ */
+public function invalidDocBlockShouldNotCauseFatalErrorInSniff(int $number): int
+{
+    return $number;
+}
diff --git a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
index 623c7539..86854e83 100644
--- a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
+++ b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
@@ -16,10 +16,11 @@ public function getErrorList()
     {
         return [
             12 => 1,
-            21 => 1
+            21 => 1,
+            32 => 1,
         ];
     }
-    
+
     /**
      * @inheritdoc
      */

From 142ef3bdc365327ab7a7c6cfae0b006cd8c62930 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 3 Sep 2021 09:28:25 +0200
Subject: [PATCH 177/630] AC-1100: Catch badly put newlines in LESS files

---
 Magento2/Sniffs/Less/ColonSpacingSniff.php    | 18 ++++++++----------
 Magento2/Tests/Less/ColonSpacingUnitTest.less |  2 +-
 Magento2/Tests/Less/ColonSpacingUnitTest.php  |  1 +
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index dd8fee7f..2868db29 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -40,6 +40,12 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
+        if (false !== $nextSemicolon && ($tokens[$nextSemicolon]['line'] !== $tokens[$stackPtr]['line'])) {
+            $error = 'Expected 1 space after colon in style definition; newline found';
+            $phpcsFile->addError($error, $stackPtr, 'AfterNewline');
+        }
+        
         if ($this->needValidateSpaces($phpcsFile, $stackPtr, $tokens)) {
             $this->validateSpaces($phpcsFile, $stackPtr, $tokens);
         }
@@ -56,12 +62,7 @@ public function process(File $phpcsFile, $stackPtr)
      */
     private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
     {
-        $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
-
-        if (false === $nextSemicolon
-            || ($tokens[$nextSemicolon]['line'] !== $tokens[$stackPtr]['line'])
-            || TokenizerSymbolsInterface::BITWISE_AND === $tokens[$stackPtr - 1]['content']
-        ) {
+        if (TokenizerSymbolsInterface::BITWISE_AND === $tokens[$stackPtr - 1]['content']) {
             return false;
         }
 
@@ -98,15 +99,12 @@ private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
             $phpcsFile->addError('Expected 1 space after colon in style definition; 0 found', $stackPtr, 'NoneAfter');
         } else {
             $content = $tokens[($stackPtr + 1)]['content'];
-            if (false === strpos($content, $phpcsFile->eolChar)) {
+            if (false !== strpos($content, ' ')) {
                 $length  = strlen($content);
                 if ($length !== 1) {
                     $error = sprintf('Expected 1 space after colon in style definition; %s found', $length);
                     $phpcsFile->addError($error, $stackPtr, 'After');
                 }
-            } else {
-                $error = 'Expected 1 space after colon in style definition; newline found';
-                $phpcsFile->addError($error, $stackPtr, 'AfterNewline');
             }
         }
     }
diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.less b/Magento2/Tests/Less/ColonSpacingUnitTest.less
index d888af2e..37de49e4 100644
--- a/Magento2/Tests/Less/ColonSpacingUnitTest.less
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.less
@@ -13,7 +13,7 @@ div#foo {
 }
 
 .blah {
-  foo :'xyz';
+  foo :'jkl';
 }
 
 .foo {
diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.php b/Magento2/Tests/Less/ColonSpacingUnitTest.php
index b50e47d0..81b596e5 100644
--- a/Magento2/Tests/Less/ColonSpacingUnitTest.php
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.php
@@ -16,6 +16,7 @@ public function getErrorList()
             8 => 1,
             12 => 1,
             16 => 2,
+            20 => 1,
         ];
     }
 

From 2fc6815b671b033a7891d44aa3bc0e0e4651e100 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 3 Sep 2021 09:29:54 +0200
Subject: [PATCH 178/630] AC-1100: Catch badly put newlines in LESS files

---
 Magento2/Sniffs/Less/ColonSpacingSniff.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index 2868db29..d623ab3e 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -39,12 +39,6 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-
-        $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
-        if (false !== $nextSemicolon && ($tokens[$nextSemicolon]['line'] !== $tokens[$stackPtr]['line'])) {
-            $error = 'Expected 1 space after colon in style definition; newline found';
-            $phpcsFile->addError($error, $stackPtr, 'AfterNewline');
-        }
         
         if ($this->needValidateSpaces($phpcsFile, $stackPtr, $tokens)) {
             $this->validateSpaces($phpcsFile, $stackPtr, $tokens);
@@ -95,6 +89,12 @@ private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
             $phpcsFile->addError('There must be no space before a colon in a style definition', $stackPtr, 'Before');
         }
 
+        $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
+        if (false !== $nextSemicolon && ($tokens[$nextSemicolon]['line'] !== $tokens[$stackPtr]['line'])) {
+            $error = 'Expected 1 space after colon in style definition; newline found';
+            $phpcsFile->addError($error, $stackPtr, 'AfterNewline');
+        }
+
         if (T_WHITESPACE !== $tokens[($stackPtr + 1)]['code']) {
             $phpcsFile->addError('Expected 1 space after colon in style definition; 0 found', $stackPtr, 'NoneAfter');
         } else {

From e2aa287eb60ed7afed1cdce1f9d5225e2b3f309d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 3 Sep 2021 13:26:55 +0200
Subject: [PATCH 179/630] AC-1100: Catch badly put newlines in LESS files

---
 Magento2/Sniffs/Less/ColonSpacingSniff.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index d623ab3e..505c44fd 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -39,7 +39,7 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-        
+
         if ($this->needValidateSpaces($phpcsFile, $stackPtr, $tokens)) {
             $this->validateSpaces($phpcsFile, $stackPtr, $tokens);
         }
@@ -75,7 +75,10 @@ private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
     }
 
     /**
-     * Validate Colon Spacing according to requirements
+     * Validate Colon Spacing according to requirements:
+     * - No spaces before colon
+     * - Exactly 1 space after colon
+     * - No property definition scattered among several lines
      *
      * @param File $phpcsFile
      * @param int $stackPtr

From 56e2de84fd8b46185fcd32082bbc0dca070e9e94 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 6 Sep 2021 13:40:14 +0200
Subject: [PATCH 180/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ClassesPHPSniff.php   | 93 ++++++++++++++++++++
 Magento2/Tests/Legacy/ClassesPHPUnitTest.inc | 10 +++
 Magento2/Tests/Legacy/ClassesPHPUnitTest.php | 30 +++++++
 3 files changed, 133 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ClassesPHPSniff.php
 create mode 100644 Magento2/Tests/Legacy/ClassesPHPUnitTest.inc
 create mode 100644 Magento2/Tests/Legacy/ClassesPHPUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ClassesPHPSniff.php b/Magento2/Sniffs/Legacy/ClassesPHPSniff.php
new file mode 100644
index 00000000..6849b46d
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ClassesPHPSniff.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class ClassesPHPSniff implements Sniff
+{
+
+    private const errorMessage = 'Obsolete factory name(s) detected';
+    
+    private const errorCode = 'ObsoleteFactoryName';
+
+    private $methodsThatReceiveClassNameAsFirstArgument = [
+        'getModel', 'getSingleton', 'getResourceModel', 'getResourceSingleton',
+        'addBlock', 'createBlock', 'getBlockSingleton',
+        'initReport', 'setEntityModelClass', 'setAttributeModel', 'setBackendModel', 'setFrontendModel',
+        'setSourceModel', 'setModel'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_OBJECT,
+            T_DOUBLE_COLON,
+        ];
+    }
+    
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $methodNameStackPtr = $phpcsFile->findNext(T_STRING, $stackPtr + 1, null, false, null, true);
+        if ($methodNameStackPtr === false) {
+            return;
+        }
+        $name = $tokens[$methodNameStackPtr]['content'];
+        if (in_array($name, $this->methodsThatReceiveClassNameAsFirstArgument)) {
+            $firstArgumentStackPtr = $phpcsFile->findNext(
+                [T_CONSTANT_ENCAPSED_STRING],
+                $methodNameStackPtr + 1,
+                null,
+                false,
+                null,
+                true
+            );
+            if ($firstArgumentStackPtr === false) {
+                return;
+            }
+            $name = $tokens[$firstArgumentStackPtr]['content'];
+            if (!$this->isAValidNonFactoryName($name)) {
+                $phpcsFile->addError(
+                    self::errorMessage,
+                    $methodNameStackPtr + 1,
+                    self::errorCode,
+                );
+            }
+        }
+    }
+
+    /**
+     * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
+     *
+     * @param string $name
+     * @return bool
+     */
+    private function isAValidNonFactoryName(string $name): bool
+    {
+        if (strpos($name, 'Magento') === false) {
+            return true;
+        }
+
+        if (false === strpos($name, '\\')) {
+            return false;
+        }
+
+        if (preg_match('/^([A-Z\\\\][A-Za-z\d\\\\]+)+$/', $name) !== 1) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Magento2/Tests/Legacy/ClassesPHPUnitTest.inc b/Magento2/Tests/Legacy/ClassesPHPUnitTest.inc
new file mode 100644
index 00000000..5482d3fe
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesPHPUnitTest.inc
@@ -0,0 +1,10 @@
+<?php
+
+namespace Magento;
+
+class foo_baz{};
+
+$model = Mage::getModel('Magento\foo_bar');
+$model = Mage::getModel('baz\FooBar');
+$model = Mage::getModel('Magento\FooBar');
+$model = Mage::getModel('MAGENTO\FooBar');
diff --git a/Magento2/Tests/Legacy/ClassesPHPUnitTest.php b/Magento2/Tests/Legacy/ClassesPHPUnitTest.php
new file mode 100644
index 00000000..1f87534e
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesPHPUnitTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ClassesPHPUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [
+            7 => 1,
+            9 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From c9703a6f40e8596285447000309182179a98a823 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 6 Sep 2021 15:31:47 +0200
Subject: [PATCH 181/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ClassesPHPSniff.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassesPHPSniff.php b/Magento2/Sniffs/Legacy/ClassesPHPSniff.php
index 6849b46d..866afefc 100644
--- a/Magento2/Sniffs/Legacy/ClassesPHPSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassesPHPSniff.php
@@ -11,9 +11,9 @@
 class ClassesPHPSniff implements Sniff
 {
 
-    private const errorMessage = 'Obsolete factory name(s) detected';
+    private const ERROR_MESSAGE = 'Obsolete factory name(s) detected';
     
-    private const errorCode = 'ObsoleteFactoryName';
+    private const ERROR_CODE = 'ObsoleteFactoryName';
 
     private $methodsThatReceiveClassNameAsFirstArgument = [
         'getModel', 'getSingleton', 'getResourceModel', 'getResourceSingleton',
@@ -32,7 +32,6 @@ public function register(): array
             T_DOUBLE_COLON,
         ];
     }
-    
 
     /**
      * @inheritdoc
@@ -60,9 +59,9 @@ public function process(File $phpcsFile, $stackPtr)
             $name = $tokens[$firstArgumentStackPtr]['content'];
             if (!$this->isAValidNonFactoryName($name)) {
                 $phpcsFile->addError(
-                    self::errorMessage,
+                    self::ERROR_MESSAGE,
                     $methodNameStackPtr + 1,
-                    self::errorCode,
+                    self::ERROR_CODE,
                 );
             }
         }

From ac5f9fde6e9be22a1f4c8cdb0107c562f60af38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 7 Sep 2021 10:16:55 +0200
Subject: [PATCH 182/630] AC-667: Create phpcs static check for
 EmailTemplateTest

---
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php | 50 +++++++++++++++++++
 .../Tests/Legacy/EmailTemplateUnitTest.1.html |  3 ++
 .../Tests/Legacy/EmailTemplateUnitTest.2.html |  4 ++
 .../Tests/Legacy/EmailTemplateUnitTest.php    | 38 ++++++++++++++
 Magento2/ruleset.xml                          |  7 +++
 5 files changed, 102 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/EmailTemplateSniff.php
 create mode 100644 Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
 create mode 100644 Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html
 create mode 100644 Magento2/Tests/Legacy/EmailTemplateUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
new file mode 100644
index 00000000..7fbcb7d9
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Test for obsolete email directives in view/email/*.html
+ */
+class EmailTemplateSniff implements Sniff
+{
+    private const OBSOLETE_EMAIL_DIRECTIVES = [
+        '/\{\{htmlescape.*?\}\}/i' => 'Directive {{htmlescape}} is obsolete. Use {{var}} instead.',
+        '/\{\{escapehtml.*?\}\}/i' => 'Directive {{escapehtml}} is obsolete. Use {{var}} instead.',
+    ];
+
+    private const WARNING_CODE = 'FoundObsoleteEmailDirective';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $content = $phpcsFile->getTokens()[$stackPtr]['content'];
+        foreach (self::OBSOLETE_EMAIL_DIRECTIVES as $directiveRegex => $errorMessage) {
+            if(preg_match($directiveRegex, $content)) {
+                $phpcsFile->addWarning(
+                    $errorMessage,
+                    $stackPtr,
+                    self::WARNING_CODE
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html b/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
new file mode 100644
index 00000000..435302e1
--- /dev/null
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
@@ -0,0 +1,3 @@
+<h1>{{var "H1"}}</h1>
+<h2>{{var "H2"}}</h2>
+<p>{{var "p"}} {{var "p"}}</p>
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html b/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html
new file mode 100644
index 00000000..6b24ea76
--- /dev/null
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html
@@ -0,0 +1,4 @@
+<h1>{{htmlescape "H1"}}</h1>
+<h2>{{escapehtml "H2"}}</h2>
+<p>{{escapehtml "p"}} {{htmlescape "p"}}</p>
+<p class="greeting">{{trans "Translateme"}}</p>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
new file mode 100644
index 00000000..b6df0c8e
--- /dev/null
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class EmailTemplateUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        if ($testFile === 'EmailTemplateUnitTest.1.html') {
+            return [];
+        }
+        if ($testFile === 'EmailTemplateUnitTest.2.html') {
+            return [
+                1 => 1,
+                2 => 1,
+                3 => 2,
+            ];
+        }
+
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index f31b105d..9e6202cb 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -242,6 +242,13 @@
         <type>warning</type>
     </rule>
 
+    <rule ref="Magento2.Legacy.EmailTemplate.FoundObsoleteEmailDirective">
+        <include-pattern>view/email/*.html</include-pattern>
+        <include-pattern>view/*/email/*.html</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <severity>7</severity>

From 0cb8f6763c2319e0a2ea9a219e4ee7e09af9f6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 7 Sep 2021 11:32:47 +0200
Subject: [PATCH 183/630] AC-667: Create phpcs static check for
 EmailTemplateTest

---
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php   | 2 +-
 Magento2/Tests/Legacy/EmailTemplateUnitTest.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
index 7fbcb7d9..4e240213 100644
--- a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -38,7 +38,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $content = $phpcsFile->getTokens()[$stackPtr]['content'];
         foreach (self::OBSOLETE_EMAIL_DIRECTIVES as $directiveRegex => $errorMessage) {
-            if(preg_match($directiveRegex, $content)) {
+            if (preg_match($directiveRegex, $content)) {
                 $phpcsFile->addWarning(
                     $errorMessage,
                     $stackPtr,
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
index b6df0c8e..2dbb5676 100644
--- a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento2\Tests\Legacy;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;

From 4a78a9439af2e5a7e6c47bbc9dac6ae38f1c1b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 7 Sep 2021 12:19:26 +0200
Subject: [PATCH 184/630] AC-667: Create phpcs static check for
 EmailTemplateTest

---
 Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html | 1 +
 Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html b/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
index 435302e1..9516974b 100644
--- a/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
@@ -1,3 +1,4 @@
 <h1>{{var "H1"}}</h1>
 <h2>{{var "H2"}}</h2>
 <p>{{var "p"}} {{var "p"}}</p>
+
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html b/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html
index 6b24ea76..422cea21 100644
--- a/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.2.html
@@ -1,4 +1,4 @@
 <h1>{{htmlescape "H1"}}</h1>
 <h2>{{escapehtml "H2"}}</h2>
 <p>{{escapehtml "p"}} {{htmlescape "p"}}</p>
-<p class="greeting">{{trans "Translateme"}}</p>
\ No newline at end of file
+<p class="greeting">{{trans "Translateme"}}</p>

From e4698fbf56ffa3011e114d331f480ea4b4ed9d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 7 Sep 2021 15:47:16 +0200
Subject: [PATCH 185/630] AC-667: Create phpcs static check for
 EmailTemplateTest

---
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php  |  6 +++---
 .../Tests/Legacy/EmailTemplateUnitTest.php     | 18 +++++++++---------
 Magento2/ruleset.xml                           |  3 +--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
index 4e240213..17ebbf08 100644
--- a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -19,7 +19,7 @@ class EmailTemplateSniff implements Sniff
         '/\{\{escapehtml.*?\}\}/i' => 'Directive {{escapehtml}} is obsolete. Use {{var}} instead.',
     ];
 
-    private const WARNING_CODE = 'FoundObsoleteEmailDirective';
+    private const ERROR_CODE = 'FoundObsoleteEmailDirective';
 
     /**
      * @inheritdoc
@@ -39,10 +39,10 @@ public function process(File $phpcsFile, $stackPtr)
         $content = $phpcsFile->getTokens()[$stackPtr]['content'];
         foreach (self::OBSOLETE_EMAIL_DIRECTIVES as $directiveRegex => $errorMessage) {
             if (preg_match($directiveRegex, $content)) {
-                $phpcsFile->addWarning(
+                $phpcsFile->addError(
                     $errorMessage,
                     $stackPtr,
-                    self::WARNING_CODE
+                    self::ERROR_CODE
                 );
             }
         }
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
index 2dbb5676..c0b42189 100644
--- a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
@@ -13,15 +13,7 @@ class EmailTemplateUnitTest extends AbstractSniffUnitTest
     /**
      * @inheritdoc
      */
-    public function getErrorList()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList($testFile = '')
+    public function getErrorList($testFile = '')
     {
         if ($testFile === 'EmailTemplateUnitTest.1.html') {
             return [];
@@ -36,4 +28,12 @@ public function getWarningList($testFile = '')
 
         return [];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 9e6202cb..4736026d 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -241,12 +241,11 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-
     <rule ref="Magento2.Legacy.EmailTemplate.FoundObsoleteEmailDirective">
         <include-pattern>view/email/*.html</include-pattern>
         <include-pattern>view/*/email/*.html</include-pattern>
         <severity>8</severity>
-        <type>warning</type>
+        <type>error</type>
     </rule>
 
     <!-- Severity 7 warnings: General code issues. -->

From 4f341fe3147bac1113fa8d18627125bcbb001f97 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 7 Sep 2021 17:38:17 +0100
Subject: [PATCH 186/630] Version 9

---
 composer.json |  2 +-
 composer.lock | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 267fcaa3..c06ab6c7 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "8",
+    "version": "9",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index fa12108d..025e27ee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "503b3dff10c4885d5f5b196d159c1fdd",
+    "content-hash": "9f04a53a3b02845918c714a149ab00b2",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -969,16 +969,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.8",
+            "version": "9.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb"
+                "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb",
-                "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
+                "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
                 "shasum": ""
             },
             "require": {
@@ -1056,7 +1056,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.9"
             },
             "funding": [
                 {
@@ -1068,7 +1068,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-31T15:17:34+00:00"
+            "time": "2021-08-31T06:47:40+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1923,6 +1923,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {

From e4f55405f684d530cd5c987c1a662a1bbd28c196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Wed, 8 Sep 2021 10:44:45 +0200
Subject: [PATCH 187/630] Update Magento2/ruleset.xml

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 4736026d..2a499391 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -244,7 +244,7 @@
     <rule ref="Magento2.Legacy.EmailTemplate.FoundObsoleteEmailDirective">
         <include-pattern>view/email/*.html</include-pattern>
         <include-pattern>view/*/email/*.html</include-pattern>
-        <severity>8</severity>
+        <severity>10</severity>
         <type>error</type>
     </rule>
 

From 2751031cef73853f8ba652135223c0083c1ea964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Wed, 8 Sep 2021 11:40:31 +0200
Subject: [PATCH 188/630] AC-667: Create phpcs static check for
 EmailTemplateTest

---
 Magento2/ruleset.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 2a499391..e1b0f521 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -109,6 +109,12 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.Legacy.EmailTemplate.FoundObsoleteEmailDirective">
+        <include-pattern>view/email/*.html</include-pattern>
+        <include-pattern>view/*/email/*.html</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
 
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">
@@ -241,12 +247,6 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Legacy.EmailTemplate.FoundObsoleteEmailDirective">
-        <include-pattern>view/email/*.html</include-pattern>
-        <include-pattern>view/*/email/*.html</include-pattern>
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From 8b2cd9041f1337aec04c28519984fc6eb5f7afc7 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 9 Sep 2021 11:35:52 +0200
Subject: [PATCH 189/630] AC-666: Create phpcs static check for CopyrightTest

---
 Magento2/Sniffs/Legacy/CopyrightSniff.php     | 46 +++++++++++++++++++
 Magento2/Tests/Legacy/CopyrightUnitTest.1.inc |  2 +
 Magento2/Tests/Legacy/CopyrightUnitTest.2.inc | 10 ++++
 Magento2/Tests/Legacy/CopyrightUnitTest.3.inc |  6 +++
 Magento2/Tests/Legacy/CopyrightUnitTest.4.inc |  7 +++
 Magento2/Tests/Legacy/CopyrightUnitTest.php   | 33 +++++++++++++
 6 files changed, 104 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/CopyrightSniff.php
 create mode 100644 Magento2/Tests/Legacy/CopyrightUnitTest.1.inc
 create mode 100644 Magento2/Tests/Legacy/CopyrightUnitTest.2.inc
 create mode 100644 Magento2/Tests/Legacy/CopyrightUnitTest.3.inc
 create mode 100644 Magento2/Tests/Legacy/CopyrightUnitTest.4.inc
 create mode 100644 Magento2/Tests/Legacy/CopyrightUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/CopyrightSniff.php b/Magento2/Sniffs/Legacy/CopyrightSniff.php
new file mode 100644
index 00000000..7e524b43
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/CopyrightSniff.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class CopyrightSniff implements Sniff
+{
+    private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
+    
+    private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
+    private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_OPEN_TAG];
+    }
+    
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $positionOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1);
+       
+        if ($positionOpenTag === false){
+            $positionComment = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $stackPtr);
+            $contentFile = $phpcsFile->getTokens()[$positionComment]['content'];
+            $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $contentFile);
+            
+            if (strpos($contentFile, self::COPYRIGHT_MAGENTO_TEXT) === false || $adobeCopyrightFound === false) {
+                $phpcsFile->addWarningOnLine(
+                    'Copyright is missing or has wrong format',
+                    null,
+                    self::WARNING_CODE
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.1.inc b/Magento2/Tests/Legacy/CopyrightUnitTest.1.inc
new file mode 100644
index 00000000..a4abe2da
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.1.inc
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.2.inc b/Magento2/Tests/Legacy/CopyrightUnitTest.2.inc
new file mode 100644
index 00000000..bbaf0812
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.2.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights different text.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php
+/**
+ * Another comment
+ */
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.3.inc b/Magento2/Tests/Legacy/CopyrightUnitTest.3.inc
new file mode 100644
index 00000000..55099129
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.3.inc
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Copyright Adobe 2020
+ */
+?>
+
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.4.inc b/Magento2/Tests/Legacy/CopyrightUnitTest.4.inc
new file mode 100644
index 00000000..1cadcad0
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.4.inc
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.php b/Magento2/Tests/Legacy/CopyrightUnitTest.php
new file mode 100644
index 00000000..887557f6
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class CopyrightUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = ''): array
+    {
+        if ($testFile === 'CopyrightUnitTest.4.inc') {
+            return [];
+        }
+        
+        return [
+            null => 1,
+        ];
+    }
+}

From 702cd60d087c65061e5ebc6a017a4a20ee4360d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 11:38:04 +0200
Subject: [PATCH 190/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php     | 114 ++++++++++++++++++
 Magento2/Tests/Legacy/WidgetXMLUnitTest.1.xml |  19 +++
 Magento2/Tests/Legacy/WidgetXMLUnitTest.php   |  31 +++++
 3 files changed, 164 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/WidgetXMLSniff.php
 create mode 100644 Magento2/Tests/Legacy/WidgetXMLUnitTest.1.xml
 create mode 100644 Magento2/Tests/Legacy/WidgetXMLUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
new file mode 100644
index 00000000..f15b8a94
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Test for obsolete nodes/attributes in the module.xml
+ */
+class WidgetXMLSniff implements Sniff
+{
+    private const ERROR_CODE_OBSOLETE = 'FoundObsoleteNode';
+    private const ERROR_CODE_FACTORY = 'FoundFactory';
+    private const ERROR_CODE_XML = 'WrongXML';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if($stackPtr > 0) {
+            return;
+        }
+
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        if ($xml === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                1,
+                self::ERROR_CODE_XML
+            );
+        }
+
+        $foundElements = $xml->xpath('/widgets/*[@type]');
+
+        foreach ($foundElements as $element) {
+            if (property_exists($element->attributes(), 'type')) {
+                $type = $element['type'];
+                if (preg_match('/\//', $type)) {
+                    $phpcsFile->addError(
+                        "Factory name detected: {$type}.",
+                        dom_import_simplexml($element)->getLineNo() - 1,
+                        self::ERROR_CODE_FACTORY
+                    );
+                }
+            }
+        }
+
+        $foundElements = $xml->xpath('/widgets/*/supported_blocks');
+        foreach ($foundElements as $element) {
+            $phpcsFile->addError(
+                "Obsolete node: <supported_blocks>. To be replaced with <supported_containers>",
+                dom_import_simplexml($element)->getLineNo() - 1,
+                self::ERROR_CODE_OBSOLETE
+            );
+        }
+
+        $foundElements = $xml->xpath('/widgets/*/*/*/block_name');
+        foreach ($foundElements as $element) {
+            $phpcsFile->addError(
+                "Obsolete node: <block_name>. To be replaced with <container_name>",
+                dom_import_simplexml($element)->getLineNo() - 1,
+                self::ERROR_CODE_OBSOLETE
+            );
+        }
+    }
+
+    /**
+     * Check if the element passed is in the currently sniffed line
+     *
+     * @param SimpleXMLElement $element
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $stackPtr): bool
+    {
+        $node = dom_import_simplexml($element);
+
+        return $node->getLineNo() === $stackPtr + 1;
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+}
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.1.xml b/Magento2/Tests/Legacy/WidgetXMLUnitTest.1.xml
new file mode 100644
index 00000000..9c70a9cf
--- /dev/null
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<widgets>
+    <widget type="/Deprecated">
+        <label translate="true">Catalog New Products List</label>
+        <description translate="true">List of Products that are set as New</description>
+        <supported_blocks>Deprecated
+            <block>
+                <block_name>Deprecated</block_name>
+            </block>
+        </supported_blocks>
+    </widget>
+</widgets>
+
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.php b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
new file mode 100644
index 00000000..36026b93
--- /dev/null
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class WidgetXMLUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        return [
+            9 => 1,
+            12 => 1,
+            14 => 1,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}

From 76359c2f8daf43e9478d3cc6dd60615ee8fb9a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 11:40:55 +0200
Subject: [PATCH 191/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index f15b8a94..6bc673b8 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -34,7 +34,7 @@ public function register(): array
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        if($stackPtr > 0) {
+        if ($stackPtr > 0) {
             return;
         }
 

From 5a83385431d2b0628f341c757b761ab663c9039e Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 9 Sep 2021 11:45:49 +0200
Subject: [PATCH 192/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...niff.php => ObsoleteMethodsUsageSniff.php} | 46 ++++---------------
 ...t.inc => ObsoleteMethodsUsageUnitTest.inc} |  6 +--
 ...t.php => ObsoleteMethodsUsageUnitTest.php} |  7 +--
 3 files changed, 15 insertions(+), 44 deletions(-)
 rename Magento2/Sniffs/Legacy/{ClassesPHPSniff.php => ObsoleteMethodsUsageSniff.php} (53%)
 rename Magento2/Tests/Legacy/{ClassesPHPUnitTest.inc => ObsoleteMethodsUsageUnitTest.inc} (64%)
 rename Magento2/Tests/Legacy/{ClassesPHPUnitTest.php => ObsoleteMethodsUsageUnitTest.php} (76%)

diff --git a/Magento2/Sniffs/Legacy/ClassesPHPSniff.php b/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
similarity index 53%
rename from Magento2/Sniffs/Legacy/ClassesPHPSniff.php
rename to Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
index 866afefc..44ae964b 100644
--- a/Magento2/Sniffs/Legacy/ClassesPHPSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
@@ -8,14 +8,13 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
-class ClassesPHPSniff implements Sniff
+class ObsoleteMethodsUsageSniff implements Sniff
 {
-
-    private const ERROR_MESSAGE = 'Obsolete factory name(s) detected';
+    private const ERROR_MESSAGE = 'Obsolete methods usage detected';
     
-    private const ERROR_CODE = 'ObsoleteFactoryName';
+    private const ERROR_CODE = 'ObsoleteMethodsUsage';
 
-    private $methodsThatReceiveClassNameAsFirstArgument = [
+    private $obsoleteStaticMethods = [
         'getModel', 'getSingleton', 'getResourceModel', 'getResourceSingleton',
         'addBlock', 'createBlock', 'getBlockSingleton',
         'initReport', 'setEntityModelClass', 'setAttributeModel', 'setBackendModel', 'setFrontendModel',
@@ -28,7 +27,6 @@ class ClassesPHPSniff implements Sniff
     public function register(): array
     {
         return [
-            T_OBJECT,
             T_DOUBLE_COLON,
         ];
     }
@@ -44,20 +42,19 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
         $name = $tokens[$methodNameStackPtr]['content'];
-        if (in_array($name, $this->methodsThatReceiveClassNameAsFirstArgument)) {
-            $firstArgumentStackPtr = $phpcsFile->findNext(
-                [T_CONSTANT_ENCAPSED_STRING],
-                $methodNameStackPtr + 1,
+        if (in_array($name, $this->obsoleteStaticMethods)) {
+            $classNameStackPtr = $phpcsFile->findPrevious(
+                [T_STRING],
+                $methodNameStackPtr - 1,
                 null,
                 false,
                 null,
                 true
             );
-            if ($firstArgumentStackPtr === false) {
+            if ($classNameStackPtr === false) {
                 return;
             }
-            $name = $tokens[$firstArgumentStackPtr]['content'];
-            if (!$this->isAValidNonFactoryName($name)) {
+            if ($tokens[$classNameStackPtr]['content'] === 'Mage') {
                 $phpcsFile->addError(
                     self::ERROR_MESSAGE,
                     $methodNameStackPtr + 1,
@@ -66,27 +63,4 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
     }
-
-    /**
-     * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
-     *
-     * @param string $name
-     * @return bool
-     */
-    private function isAValidNonFactoryName(string $name): bool
-    {
-        if (strpos($name, 'Magento') === false) {
-            return true;
-        }
-
-        if (false === strpos($name, '\\')) {
-            return false;
-        }
-
-        if (preg_match('/^([A-Z\\\\][A-Za-z\d\\\\]+)+$/', $name) !== 1) {
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/Magento2/Tests/Legacy/ClassesPHPUnitTest.inc b/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc
similarity index 64%
rename from Magento2/Tests/Legacy/ClassesPHPUnitTest.inc
rename to Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc
index 5482d3fe..91583ae7 100644
--- a/Magento2/Tests/Legacy/ClassesPHPUnitTest.inc
+++ b/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc
@@ -1,10 +1,6 @@
 <?php
 
-namespace Magento;
-
-class foo_baz{};
-
 $model = Mage::getModel('Magento\foo_bar');
-$model = Mage::getModel('baz\FooBar');
+$model = Maga::getModel('baz\FooBar');
 $model = Mage::getModel('Magento\FooBar');
 $model = Mage::getModel('MAGENTO\FooBar');
diff --git a/Magento2/Tests/Legacy/ClassesPHPUnitTest.php b/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php
similarity index 76%
rename from Magento2/Tests/Legacy/ClassesPHPUnitTest.php
rename to Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php
index 1f87534e..124f706c 100644
--- a/Magento2/Tests/Legacy/ClassesPHPUnitTest.php
+++ b/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php
@@ -7,7 +7,7 @@
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class ClassesPHPUnitTest extends AbstractSniffUnitTest
+class ObsoleteMethodsUsageUnitTest extends AbstractSniffUnitTest
 {
     /**
      * @inheritdoc
@@ -15,8 +15,9 @@ class ClassesPHPUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            7 => 1,
-            9 => 1,
+            3 => 1,
+            5 => 1,
+            6 => 1,
         ];
     }
 

From 5b407128bb6de41fb2348c0bcfc55dc163f7e7fa Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 9 Sep 2021 11:51:44 +0200
Subject: [PATCH 193/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php b/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
index 44ae964b..d12c9fa6 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
@@ -14,6 +14,9 @@ class ObsoleteMethodsUsageSniff implements Sniff
     
     private const ERROR_CODE = 'ObsoleteMethodsUsage';
 
+    /**
+     * @var string[]
+     */
     private $obsoleteStaticMethods = [
         'getModel', 'getSingleton', 'getResourceModel', 'getResourceSingleton',
         'addBlock', 'createBlock', 'getBlockSingleton',

From e2c2d07c09f8bc6d9538cc92fa6732d35da88601 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 9 Sep 2021 12:08:35 +0200
Subject: [PATCH 194/630] AC-666: Create phpcs static check for CopyrightTest

---
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php    | 2 +-
 Magento2/Sniffs/Classes/AbstractApiSniff.php                 | 2 +-
 Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php     | 2 +-
 Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php             | 2 +-
 .../Commenting/ClassAndInterfacePHPDocFormattingSniff.php    | 2 +-
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php | 4 ++++
 .../Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php     | 2 +-
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php              | 2 +-
 Magento2/Sniffs/Exceptions/ThrowCatchSniff.php               | 2 +-
 .../Sniffs/Exceptions/TryProcessSystemResourcesSniff.php     | 2 +-
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php       | 2 +-
 Magento2/Sniffs/Functions/StaticFunctionSniff.php            | 2 +-
 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php             | 2 +-
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php           | 2 +-
 Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php              | 2 +-
 Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php              | 2 +-
 Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php      | 2 +-
 Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php               | 2 +-
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php                | 2 +-
 Magento2/Sniffs/Legacy/CopyrightSniff.php                    | 5 ++++-
 Magento2/Sniffs/Legacy/MageEntitySniff.php                   | 2 +-
 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php       | 2 +-
 Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php | 2 +-
 Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php      | 2 +-
 Magento2/Sniffs/PHP/FinalImplementationSniff.php             | 2 +-
 Magento2/Sniffs/PHP/GotoSniff.php                            | 2 +-
 Magento2/Sniffs/PHP/ReturnValueCheckSniff.php                | 2 +-
 Magento2/Sniffs/PHP/VarSniff.php                             | 2 +-
 Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php       | 2 +-
 Magento2/Sniffs/SQL/RawQuerySniff.php                        | 2 +-
 Magento2/Sniffs/Security/IncludeFileSniff.php                | 2 +-
 Magento2/Sniffs/Security/InsecureFunctionSniff.php           | 2 +-
 Magento2/Sniffs/Security/LanguageConstructSniff.php          | 2 +-
 Magento2/Sniffs/Security/SuperglobalSniff.php                | 2 +-
 Magento2/Sniffs/Security/XssTemplateSniff.php                | 2 +-
 Magento2/Sniffs/Strings/ExecutableRegExSniff.php             | 2 +-
 Magento2/Sniffs/Strings/StringConcatSniff.php                | 2 +-
 Magento2/Sniffs/Templates/ThisInTemplateSniff.php            | 2 +-
 Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php       | 2 +-
 Magento2/Tests/Classes/AbstractApiUnitTest.php               | 2 +-
 Magento2/Tests/Classes/DiscouragedDependenciesUnitTest.php   | 2 +-
 Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php           | 2 +-
 .../Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php | 2 +-
 .../Commenting/ClassPropertyPHPDocFormattingUnitTest.php     | 2 +-
 .../Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php   | 2 +-
 Magento2/Tests/Exceptions/DirectThrowUnitTest.php            | 2 +-
 Magento2/Tests/Exceptions/ThrowCatchUnitTest.php             | 2 +-
 .../Tests/Exceptions/TryProcessSystemResourcesUnitTest.php   | 2 +-
 Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php     | 2 +-
 Magento2/Tests/Functions/StaticFunctionUnitTest.php          | 2 +-
 Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php  | 2 +-
 Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php         | 2 +-
 Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php            | 2 +-
 Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php            | 2 +-
 Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php    | 2 +-
 Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php             | 2 +-
 Magento2/Tests/Html/HtmlBindingUnitTest.php                  | 2 +-
 Magento2/Tests/Html/HtmlDirectiveUnitTest.php                | 2 +-
 Magento2/Tests/Legacy/AbstractBlockUnitTest.php              | 2 +-
 Magento2/Tests/Legacy/CopyrightUnitTest.php                  | 2 +-
 Magento2/Tests/Legacy/DiConfigUnitTest.php                   | 2 +-
 Magento2/Tests/Legacy/EmailTemplateUnitTest.php              | 2 +-
 Magento2/Tests/Legacy/MageEntityUnitTest.php                 | 2 +-
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php                  | 2 +-
 Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php        | 2 +-
 Magento2/Tests/Less/AvoidIdUnitTest.php                      | 2 +-
 Magento2/Tests/Less/BracesFormattingUnitTest.php             | 2 +-
 Magento2/Tests/Less/ClassNamingUnitTest.php                  | 2 +-
 Magento2/Tests/Less/ColonSpacingUnitTest.php                 | 2 +-
 Magento2/Tests/Less/ColourDefinitionUnitTest.php             | 2 +-
 Magento2/Tests/Less/CombinatorIndentationUnitTest.php        | 2 +-
 Magento2/Tests/Less/CommentLevelsUnitTest.php                | 2 +-
 Magento2/Tests/Less/ImportantPropertyUnitTest.php            | 2 +-
 Magento2/Tests/Less/IndentationUnitTest.php                  | 2 +-
 Magento2/Tests/Less/PropertiesLineBreakUnitTest.php          | 2 +-
 Magento2/Tests/Less/PropertiesSortingUnitTest.php            | 2 +-
 Magento2/Tests/Less/QuotesUnitTest.php                       | 2 +-
 Magento2/Tests/Less/SelectorDelimiterUnitTest.php            | 2 +-
 Magento2/Tests/Less/SemicolonSpacingUnitTest.php             | 2 +-
 Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php    | 2 +-
 Magento2/Tests/Less/TypeSelectorsUnitTest.php                | 2 +-
 Magento2/Tests/Less/VariablesUnitTest.php                    | 2 +-
 Magento2/Tests/Less/ZeroUnitsUnitTest.php                    | 2 +-
 Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php     | 2 +-
 .../Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php    | 2 +-
 Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php    | 2 +-
 Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php    | 2 +-
 Magento2/Tests/PHP/FinalImplementationUnitTest.php           | 2 +-
 Magento2/Tests/PHP/GotoUnitTest.php                          | 2 +-
 Magento2/Tests/PHP/LiteralNamespacesUnitTest.php             | 2 +-
 Magento2/Tests/PHP/ReturnValueCheckUnitTest.php              | 2 +-
 Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php               | 2 +-
 Magento2/Tests/PHP/VarUnitTest.php                           | 2 +-
 Magento2/Tests/Performance/ForeachArrayMergeUnitTest.php     | 2 +-
 Magento2/Tests/SQL/RawQueryUnitTest.php                      | 2 +-
 Magento2/Tests/Security/IncludeFileUnitTest.php              | 2 +-
 Magento2/Tests/Security/InsecureFunctionUnitTest.php         | 2 +-
 Magento2/Tests/Security/LanguageConstructUnitTest.php        | 2 +-
 Magento2/Tests/Security/SuperglobalUnitTest.php              | 2 +-
 Magento2/Tests/Security/XssTemplateUnitTest.php              | 2 +-
 Magento2/Tests/Strings/ExecutableRegExUnitTest.php           | 2 +-
 Magento2/Tests/Strings/StringConcatUnitTest.php              | 2 +-
 Magento2/Tests/Templates/ThisInTemplateUnitTest.php          | 2 +-
 Magento2/Tests/Translation/ConstantUsageUnitTest.php         | 2 +-
 Magento2/Tests/Whitespace/MultipleEmptyLinesUnitTest.php     | 2 +-
 Magento2/ruleset.xml                                         | 4 ++++
 PHP_CodeSniffer/Tokenizers/GRAPHQL.php                       | 2 +-
 107 files changed, 116 insertions(+), 105 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index fb98db7c..745ec587 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Helpers\Commenting;
diff --git a/Magento2/Sniffs/Classes/AbstractApiSniff.php b/Magento2/Sniffs/Classes/AbstractApiSniff.php
index 13947186..bb8a6571 100644
--- a/Magento2/Sniffs/Classes/AbstractApiSniff.php
+++ b/Magento2/Sniffs/Classes/AbstractApiSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Classes;
diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index 85c1f103..f5e45c63 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Classes;
diff --git a/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
index 9e6ae160..da089029 100644
--- a/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
+++ b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\CodeAnalysis;
diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index 48426a1a..2d715c50 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Commenting;
diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index a402fbd8..8ec509b4 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento2\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
index c56e3c65..5d715af5 100644
--- a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Commenting;
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index bedb9cfa..622644bf 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Exceptions;
diff --git a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
index 7468857d..c2510168 100644
--- a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
+++ b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
index 70fcfabe..0fa28149 100644
--- a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
+++ b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Exceptions;
diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index 55001802..e73e981a 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Functions;
diff --git a/Magento2/Sniffs/Functions/StaticFunctionSniff.php b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
index e4b47975..2ae706d0 100644
--- a/Magento2/Sniffs/Functions/StaticFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Functions;
diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index 2c0448f0..889e7b4a 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\GraphQL;
diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index f127cf17..bb7ad250 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
index 466f2c27..d009b9a0 100644
--- a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
index f638c228..d54f8e0b 100644
--- a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\GraphQL;
diff --git a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
index eacbc10d..f2f872fa 100644
--- a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\GraphQL;
diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
index b80ada40..602225fe 100644
--- a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\GraphQL;
diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index 41a7da00..de9884d2 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types = 1);
diff --git a/Magento2/Sniffs/Legacy/CopyrightSniff.php b/Magento2/Sniffs/Legacy/CopyrightSniff.php
index 7e524b43..e2facc85 100644
--- a/Magento2/Sniffs/Legacy/CopyrightSniff.php
+++ b/Magento2/Sniffs/Legacy/CopyrightSniff.php
@@ -25,11 +25,14 @@ public function register()
         return [T_OPEN_TAG];
     }
     
+    /**
+     * @inheritDoc
+     */
     public function process(File $phpcsFile, $stackPtr)
     {
         $positionOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1);
        
-        if ($positionOpenTag === false){
+        if ($positionOpenTag === false) {
             $positionComment = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $stackPtr);
             $contentFile = $phpcsFile->getTokens()[$positionComment]['content'];
             $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $contentFile);
diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index 637c3b1c..de8b7dbf 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Legacy;
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index df8fba14..f094c353 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Methods;
diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
index 1266c0dc..765631d4 100644
--- a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Namespaces;
diff --git a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
index 461a1705..2ad688ec 100644
--- a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
+++ b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\NamingConvention;
diff --git a/Magento2/Sniffs/PHP/FinalImplementationSniff.php b/Magento2/Sniffs/PHP/FinalImplementationSniff.php
index e2ab7b16..15270a40 100644
--- a/Magento2/Sniffs/PHP/FinalImplementationSniff.php
+++ b/Magento2/Sniffs/PHP/FinalImplementationSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\PHP;
diff --git a/Magento2/Sniffs/PHP/GotoSniff.php b/Magento2/Sniffs/PHP/GotoSniff.php
index 24bfc0a4..4a5f06ca 100644
--- a/Magento2/Sniffs/PHP/GotoSniff.php
+++ b/Magento2/Sniffs/PHP/GotoSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\PHP;
diff --git a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
index 7c5b9e8b..9929d46b 100644
--- a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
+++ b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\PHP;
diff --git a/Magento2/Sniffs/PHP/VarSniff.php b/Magento2/Sniffs/PHP/VarSniff.php
index 5cfd8c6f..fa7b28b7 100644
--- a/Magento2/Sniffs/PHP/VarSniff.php
+++ b/Magento2/Sniffs/PHP/VarSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\PHP;
diff --git a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
index e478638d..9ab6c8cc 100644
--- a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
+++ b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Performance;
diff --git a/Magento2/Sniffs/SQL/RawQuerySniff.php b/Magento2/Sniffs/SQL/RawQuerySniff.php
index c6b105d1..a32d4eb0 100644
--- a/Magento2/Sniffs/SQL/RawQuerySniff.php
+++ b/Magento2/Sniffs/SQL/RawQuerySniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\SQL;
diff --git a/Magento2/Sniffs/Security/IncludeFileSniff.php b/Magento2/Sniffs/Security/IncludeFileSniff.php
index 542e7f69..567f3224 100644
--- a/Magento2/Sniffs/Security/IncludeFileSniff.php
+++ b/Magento2/Sniffs/Security/IncludeFileSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Security;
diff --git a/Magento2/Sniffs/Security/InsecureFunctionSniff.php b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
index a4df7a76..78a3e696 100644
--- a/Magento2/Sniffs/Security/InsecureFunctionSniff.php
+++ b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Security;
diff --git a/Magento2/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php
index acb71481..9b10ae4a 100644
--- a/Magento2/Sniffs/Security/LanguageConstructSniff.php
+++ b/Magento2/Sniffs/Security/LanguageConstructSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Security;
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index c9f58300..136f991f 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Security;
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index e1fa5d56..f35943e5 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Security;
diff --git a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
index 901419c5..09706ed6 100644
--- a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
+++ b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Strings;
diff --git a/Magento2/Sniffs/Strings/StringConcatSniff.php b/Magento2/Sniffs/Strings/StringConcatSniff.php
index 2ba0fbe0..89c8dc9b 100644
--- a/Magento2/Sniffs/Strings/StringConcatSniff.php
+++ b/Magento2/Sniffs/Strings/StringConcatSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Strings;
diff --git a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
index 95279236..9b5e5358 100644
--- a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+++ b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Templates;
diff --git a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index 056a60ab..4d74a29e 100644
--- a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Sniffs\Whitespace;
diff --git a/Magento2/Tests/Classes/AbstractApiUnitTest.php b/Magento2/Tests/Classes/AbstractApiUnitTest.php
index d1c6eebe..c6e1af47 100644
--- a/Magento2/Tests/Classes/AbstractApiUnitTest.php
+++ b/Magento2/Tests/Classes/AbstractApiUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Classes;
diff --git a/Magento2/Tests/Classes/DiscouragedDependenciesUnitTest.php b/Magento2/Tests/Classes/DiscouragedDependenciesUnitTest.php
index db4332ef..4558cd28 100644
--- a/Magento2/Tests/Classes/DiscouragedDependenciesUnitTest.php
+++ b/Magento2/Tests/Classes/DiscouragedDependenciesUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Classes;
diff --git a/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php
index b05c22a2..7959eaa0 100644
--- a/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php
+++ b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\CodeAnalysis;
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
index 959a1d09..9b5b2f85 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Commenting;
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 8817ab3b..5ce3f0d2 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Commenting;
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
index c5056dd7..16cd4d85 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Commenting;
diff --git a/Magento2/Tests/Exceptions/DirectThrowUnitTest.php b/Magento2/Tests/Exceptions/DirectThrowUnitTest.php
index 1730b8e0..dee9d504 100644
--- a/Magento2/Tests/Exceptions/DirectThrowUnitTest.php
+++ b/Magento2/Tests/Exceptions/DirectThrowUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Exceptions;
diff --git a/Magento2/Tests/Exceptions/ThrowCatchUnitTest.php b/Magento2/Tests/Exceptions/ThrowCatchUnitTest.php
index dd351e5e..a1d0b26b 100644
--- a/Magento2/Tests/Exceptions/ThrowCatchUnitTest.php
+++ b/Magento2/Tests/Exceptions/ThrowCatchUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Tests/Exceptions/TryProcessSystemResourcesUnitTest.php b/Magento2/Tests/Exceptions/TryProcessSystemResourcesUnitTest.php
index 3496e00d..a8b2d65e 100644
--- a/Magento2/Tests/Exceptions/TryProcessSystemResourcesUnitTest.php
+++ b/Magento2/Tests/Exceptions/TryProcessSystemResourcesUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Exceptions;
diff --git a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
index e6521ae0..983a87b6 100644
--- a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
+++ b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Functions;
diff --git a/Magento2/Tests/Functions/StaticFunctionUnitTest.php b/Magento2/Tests/Functions/StaticFunctionUnitTest.php
index e323a577..b63bf980 100644
--- a/Magento2/Tests/Functions/StaticFunctionUnitTest.php
+++ b/Magento2/Tests/Functions/StaticFunctionUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Functions;
diff --git a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
index c9451e88..cdedeeee 100644
--- a/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
+++ b/Magento2/Tests/GraphQL/AbstractGraphQLSniffUnitTestCase.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\GraphQL;
diff --git a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
index c0f41e5b..7af22fc2 100644
--- a/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidArgumentNameUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\GraphQL;
diff --git a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
index 57e6ffed..d5ca3726 100644
--- a/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidEnumValueUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\GraphQL;
diff --git a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
index 6e55e399..f758c65f 100644
--- a/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidFieldNameUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\GraphQL;
diff --git a/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
index be37ddd2..f6c5a15d 100644
--- a/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidTopLevelFieldNameUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\GraphQL;
diff --git a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
index 035934e0..b1fd29b9 100644
--- a/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
+++ b/Magento2/Tests/GraphQL/ValidTypeNameUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\GraphQL;
diff --git a/Magento2/Tests/Html/HtmlBindingUnitTest.php b/Magento2/Tests/Html/HtmlBindingUnitTest.php
index fe033afd..f00b68ad 100644
--- a/Magento2/Tests/Html/HtmlBindingUnitTest.php
+++ b/Magento2/Tests/Html/HtmlBindingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Html;
diff --git a/Magento2/Tests/Html/HtmlDirectiveUnitTest.php b/Magento2/Tests/Html/HtmlDirectiveUnitTest.php
index 6d7a0034..1c4d3f6e 100644
--- a/Magento2/Tests/Html/HtmlDirectiveUnitTest.php
+++ b/Magento2/Tests/Html/HtmlDirectiveUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Html;
diff --git a/Magento2/Tests/Legacy/AbstractBlockUnitTest.php b/Magento2/Tests/Legacy/AbstractBlockUnitTest.php
index 62e9517c..a539a5ba 100644
--- a/Magento2/Tests/Legacy/AbstractBlockUnitTest.php
+++ b/Magento2/Tests/Legacy/AbstractBlockUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Legacy;
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.php b/Magento2/Tests/Legacy/CopyrightUnitTest.php
index 887557f6..2d6e8c3f 100644
--- a/Magento2/Tests/Legacy/CopyrightUnitTest.php
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Legacy;
diff --git a/Magento2/Tests/Legacy/DiConfigUnitTest.php b/Magento2/Tests/Legacy/DiConfigUnitTest.php
index d5dad883..8f3c81f7 100644
--- a/Magento2/Tests/Legacy/DiConfigUnitTest.php
+++ b/Magento2/Tests/Legacy/DiConfigUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Legacy;
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
index c0b42189..7732f0aa 100644
--- a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Tests/Legacy/MageEntityUnitTest.php b/Magento2/Tests/Legacy/MageEntityUnitTest.php
index 7e44b074..5a231473 100644
--- a/Magento2/Tests/Legacy/MageEntityUnitTest.php
+++ b/Magento2/Tests/Legacy/MageEntityUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Legacy;
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index eab099a4..c16d1e8b 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Legacy;
diff --git a/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php b/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php
index 71edcbee..d493b585 100644
--- a/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php
+++ b/Magento2/Tests/Less/AbstractLessSniffUnitTestCase.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/AvoidIdUnitTest.php b/Magento2/Tests/Less/AvoidIdUnitTest.php
index 33012879..feafba2e 100644
--- a/Magento2/Tests/Less/AvoidIdUnitTest.php
+++ b/Magento2/Tests/Less/AvoidIdUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/BracesFormattingUnitTest.php b/Magento2/Tests/Less/BracesFormattingUnitTest.php
index ebbea8ee..c47ff12a 100644
--- a/Magento2/Tests/Less/BracesFormattingUnitTest.php
+++ b/Magento2/Tests/Less/BracesFormattingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/ClassNamingUnitTest.php b/Magento2/Tests/Less/ClassNamingUnitTest.php
index c50ff1bf..a6db9477 100644
--- a/Magento2/Tests/Less/ClassNamingUnitTest.php
+++ b/Magento2/Tests/Less/ClassNamingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.php b/Magento2/Tests/Less/ColonSpacingUnitTest.php
index 81b596e5..a5992212 100644
--- a/Magento2/Tests/Less/ColonSpacingUnitTest.php
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/ColourDefinitionUnitTest.php b/Magento2/Tests/Less/ColourDefinitionUnitTest.php
index 890a39ca..f4ceb669 100644
--- a/Magento2/Tests/Less/ColourDefinitionUnitTest.php
+++ b/Magento2/Tests/Less/ColourDefinitionUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/CombinatorIndentationUnitTest.php b/Magento2/Tests/Less/CombinatorIndentationUnitTest.php
index d3e5c882..8794386a 100644
--- a/Magento2/Tests/Less/CombinatorIndentationUnitTest.php
+++ b/Magento2/Tests/Less/CombinatorIndentationUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/CommentLevelsUnitTest.php b/Magento2/Tests/Less/CommentLevelsUnitTest.php
index 9e5315d9..5316faab 100644
--- a/Magento2/Tests/Less/CommentLevelsUnitTest.php
+++ b/Magento2/Tests/Less/CommentLevelsUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/ImportantPropertyUnitTest.php b/Magento2/Tests/Less/ImportantPropertyUnitTest.php
index c3044415..4cd7f543 100644
--- a/Magento2/Tests/Less/ImportantPropertyUnitTest.php
+++ b/Magento2/Tests/Less/ImportantPropertyUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/IndentationUnitTest.php b/Magento2/Tests/Less/IndentationUnitTest.php
index a7bf6502..a8622f08 100644
--- a/Magento2/Tests/Less/IndentationUnitTest.php
+++ b/Magento2/Tests/Less/IndentationUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php b/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php
index 61477f03..8ae57160 100644
--- a/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php
+++ b/Magento2/Tests/Less/PropertiesLineBreakUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/PropertiesSortingUnitTest.php b/Magento2/Tests/Less/PropertiesSortingUnitTest.php
index e32561e5..6200e745 100644
--- a/Magento2/Tests/Less/PropertiesSortingUnitTest.php
+++ b/Magento2/Tests/Less/PropertiesSortingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/QuotesUnitTest.php b/Magento2/Tests/Less/QuotesUnitTest.php
index eb0fa5cb..6113b2e3 100644
--- a/Magento2/Tests/Less/QuotesUnitTest.php
+++ b/Magento2/Tests/Less/QuotesUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/SelectorDelimiterUnitTest.php b/Magento2/Tests/Less/SelectorDelimiterUnitTest.php
index 9fced2eb..e4570f61 100644
--- a/Magento2/Tests/Less/SelectorDelimiterUnitTest.php
+++ b/Magento2/Tests/Less/SelectorDelimiterUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/SemicolonSpacingUnitTest.php b/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
index e25e8d6d..367147da 100644
--- a/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
+++ b/Magento2/Tests/Less/SemicolonSpacingUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php
index 1fbe3227..9001811e 100644
--- a/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php
+++ b/Magento2/Tests/Less/TypeSelectorConcatenationUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/TypeSelectorsUnitTest.php b/Magento2/Tests/Less/TypeSelectorsUnitTest.php
index 1c6ab265..73a0e578 100644
--- a/Magento2/Tests/Less/TypeSelectorsUnitTest.php
+++ b/Magento2/Tests/Less/TypeSelectorsUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/VariablesUnitTest.php b/Magento2/Tests/Less/VariablesUnitTest.php
index c6a49ec7..47fb9e30 100644
--- a/Magento2/Tests/Less/VariablesUnitTest.php
+++ b/Magento2/Tests/Less/VariablesUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Less/ZeroUnitsUnitTest.php b/Magento2/Tests/Less/ZeroUnitsUnitTest.php
index 96c0d028..8393a888 100644
--- a/Magento2/Tests/Less/ZeroUnitsUnitTest.php
+++ b/Magento2/Tests/Less/ZeroUnitsUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Less;
diff --git a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
index 43d88dd3..74218608 100644
--- a/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
+++ b/Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Methods;
diff --git a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
index 8455257c..f15d96ee 100644
--- a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
+++ b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Namespaces;
diff --git a/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php b/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php
index 2b1110f1..e4097e26 100644
--- a/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php
+++ b/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\NamingConvention;
diff --git a/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php b/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php
index e180dd58..91b6f355 100644
--- a/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php
+++ b/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\NamingConvention;
diff --git a/Magento2/Tests/PHP/FinalImplementationUnitTest.php b/Magento2/Tests/PHP/FinalImplementationUnitTest.php
index 61af60f8..9291db51 100644
--- a/Magento2/Tests/PHP/FinalImplementationUnitTest.php
+++ b/Magento2/Tests/PHP/FinalImplementationUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\PHP;
diff --git a/Magento2/Tests/PHP/GotoUnitTest.php b/Magento2/Tests/PHP/GotoUnitTest.php
index 6d7a1c84..ceacca94 100644
--- a/Magento2/Tests/PHP/GotoUnitTest.php
+++ b/Magento2/Tests/PHP/GotoUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\PHP;
diff --git a/Magento2/Tests/PHP/LiteralNamespacesUnitTest.php b/Magento2/Tests/PHP/LiteralNamespacesUnitTest.php
index cd54df28..bebdf4ed 100644
--- a/Magento2/Tests/PHP/LiteralNamespacesUnitTest.php
+++ b/Magento2/Tests/PHP/LiteralNamespacesUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\PHP;
diff --git a/Magento2/Tests/PHP/ReturnValueCheckUnitTest.php b/Magento2/Tests/PHP/ReturnValueCheckUnitTest.php
index 82660b73..a5598898 100644
--- a/Magento2/Tests/PHP/ReturnValueCheckUnitTest.php
+++ b/Magento2/Tests/PHP/ReturnValueCheckUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\PHP;
diff --git a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php
index b2074f0c..159ddedb 100644
--- a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php
+++ b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\PHP;
diff --git a/Magento2/Tests/PHP/VarUnitTest.php b/Magento2/Tests/PHP/VarUnitTest.php
index 359ce0f5..009f95c9 100644
--- a/Magento2/Tests/PHP/VarUnitTest.php
+++ b/Magento2/Tests/PHP/VarUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\PHP;
diff --git a/Magento2/Tests/Performance/ForeachArrayMergeUnitTest.php b/Magento2/Tests/Performance/ForeachArrayMergeUnitTest.php
index 16273883..545e8eca 100644
--- a/Magento2/Tests/Performance/ForeachArrayMergeUnitTest.php
+++ b/Magento2/Tests/Performance/ForeachArrayMergeUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Tests/SQL/RawQueryUnitTest.php b/Magento2/Tests/SQL/RawQueryUnitTest.php
index aa99106d..8ad63c2e 100644
--- a/Magento2/Tests/SQL/RawQueryUnitTest.php
+++ b/Magento2/Tests/SQL/RawQueryUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\SQL;
diff --git a/Magento2/Tests/Security/IncludeFileUnitTest.php b/Magento2/Tests/Security/IncludeFileUnitTest.php
index cb110475..06af1e06 100644
--- a/Magento2/Tests/Security/IncludeFileUnitTest.php
+++ b/Magento2/Tests/Security/IncludeFileUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Security;
diff --git a/Magento2/Tests/Security/InsecureFunctionUnitTest.php b/Magento2/Tests/Security/InsecureFunctionUnitTest.php
index 1bbaf7ad..92b6303d 100644
--- a/Magento2/Tests/Security/InsecureFunctionUnitTest.php
+++ b/Magento2/Tests/Security/InsecureFunctionUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Magento2/Tests/Security/LanguageConstructUnitTest.php b/Magento2/Tests/Security/LanguageConstructUnitTest.php
index 0560ed33..3968621a 100644
--- a/Magento2/Tests/Security/LanguageConstructUnitTest.php
+++ b/Magento2/Tests/Security/LanguageConstructUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Security;
diff --git a/Magento2/Tests/Security/SuperglobalUnitTest.php b/Magento2/Tests/Security/SuperglobalUnitTest.php
index c8cfbf7e..ea0fd590 100644
--- a/Magento2/Tests/Security/SuperglobalUnitTest.php
+++ b/Magento2/Tests/Security/SuperglobalUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Security;
diff --git a/Magento2/Tests/Security/XssTemplateUnitTest.php b/Magento2/Tests/Security/XssTemplateUnitTest.php
index 0eab2af5..a4a4dffa 100644
--- a/Magento2/Tests/Security/XssTemplateUnitTest.php
+++ b/Magento2/Tests/Security/XssTemplateUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Security;
diff --git a/Magento2/Tests/Strings/ExecutableRegExUnitTest.php b/Magento2/Tests/Strings/ExecutableRegExUnitTest.php
index e0deadbf..d1ebe98a 100644
--- a/Magento2/Tests/Strings/ExecutableRegExUnitTest.php
+++ b/Magento2/Tests/Strings/ExecutableRegExUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Strings;
diff --git a/Magento2/Tests/Strings/StringConcatUnitTest.php b/Magento2/Tests/Strings/StringConcatUnitTest.php
index 50775da9..a8265006 100644
--- a/Magento2/Tests/Strings/StringConcatUnitTest.php
+++ b/Magento2/Tests/Strings/StringConcatUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Strings;
diff --git a/Magento2/Tests/Templates/ThisInTemplateUnitTest.php b/Magento2/Tests/Templates/ThisInTemplateUnitTest.php
index 590ae194..96d8661f 100644
--- a/Magento2/Tests/Templates/ThisInTemplateUnitTest.php
+++ b/Magento2/Tests/Templates/ThisInTemplateUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Templates;
diff --git a/Magento2/Tests/Translation/ConstantUsageUnitTest.php b/Magento2/Tests/Translation/ConstantUsageUnitTest.php
index 8d6c883c..ea42902d 100644
--- a/Magento2/Tests/Translation/ConstantUsageUnitTest.php
+++ b/Magento2/Tests/Translation/ConstantUsageUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Translation;
diff --git a/Magento2/Tests/Whitespace/MultipleEmptyLinesUnitTest.php b/Magento2/Tests/Whitespace/MultipleEmptyLinesUnitTest.php
index 7ee1e0c2..f8b70b23 100644
--- a/Magento2/Tests/Whitespace/MultipleEmptyLinesUnitTest.php
+++ b/Magento2/Tests/Whitespace/MultipleEmptyLinesUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento2\Tests\Whitespace;
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1e247a2f..8f33c352 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -629,6 +629,10 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Legacy.Copyright">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
diff --git a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
index 8dd5fcae..05c38d50 100644
--- a/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
+++ b/PHP_CodeSniffer/Tokenizers/GRAPHQL.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

From a25e2cad4e442ed4dbe7ec6eda0393bf110bb5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 13:17:19 +0200
Subject: [PATCH 195/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php | 32 ++++++++---------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index 6bc673b8..b97311b7 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * Test for obsolete nodes/attributes in the module.xml
+ * Test for obsolete nodes/attributes in the widget.xml
  */
 class WidgetXMLSniff implements Sniff
 {
@@ -39,29 +39,19 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
-        if ($xml === false) {
-            $phpcsFile->addError(
-                sprintf(
-                    "Couldn't parse contents of '%s', check that they are in valid XML format",
-                    $phpcsFile->getFilename(),
-                ),
-                1,
-                self::ERROR_CODE_XML
-            );
-        }
 
         $foundElements = $xml->xpath('/widgets/*[@type]');
-
         foreach ($foundElements as $element) {
-            if (property_exists($element->attributes(), 'type')) {
-                $type = $element['type'];
-                if (preg_match('/\//', $type)) {
-                    $phpcsFile->addError(
-                        "Factory name detected: {$type}.",
-                        dom_import_simplexml($element)->getLineNo() - 1,
-                        self::ERROR_CODE_FACTORY
-                    );
-                }
+            if (!property_exists($element->attributes(), 'type')) {
+                continue;
+            }
+            $type = $element['type'];
+            if (preg_match('/\//', $type)) {
+                $phpcsFile->addError(
+                    "Factory name detected: {$type}.",
+                    dom_import_simplexml($element)->getLineNo() - 1,
+                    self::ERROR_CODE_FACTORY
+                );
             }
         }
 

From dc49aaa1a2218afc466ad95b2eac4d68d19e2dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 13:37:36 +0200
Subject: [PATCH 196/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php     | 15 ++++++++++++++-
 Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml | 11 +++++++++++
 Magento2/Tests/Legacy/WidgetXMLUnitTest.php   | 18 +++++++++++++-----
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index b97311b7..f1d85161 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -38,9 +38,22 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        try{
+            $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        } catch (\Exception $e) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                $stackPtr,
+                self::ERROR_CODE_XML
+            );
+            return;
+        }
 
         $foundElements = $xml->xpath('/widgets/*[@type]');
+
         foreach ($foundElements as $element) {
             if (!property_exists($element->attributes(), 'type')) {
                 continue;
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml b/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
new file mode 100644
index 00000000..03066d9f
--- /dev/null
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<widgets>
+    <widget
+</widgets>
+
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.php b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
index 36026b93..0af6f292 100644
--- a/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
@@ -14,11 +14,19 @@ class WidgetXMLUnitTest extends AbstractSniffUnitTest
      */
     public function getErrorList($testFile = '')
     {
-        return [
-            9 => 1,
-            12 => 1,
-            14 => 1,
-        ];
+        if ($testFile === 'WidgetXMLUnitTest.1.xml') {
+            return [
+                9 => 1,
+                12 => 1,
+                14 => 1,
+            ];
+        }
+        if ($testFile === 'WidgetXMLUnitTest.2.xml') {
+            return [
+                1 => 1
+            ];
+        }
+        return [];
     }
 
     /**

From f4b01177d18193b6c5c986567320d6d82c6d5889 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 9 Sep 2021 15:29:37 +0200
Subject: [PATCH 197/630] AC-666: Create phpcs static check for CopyrightTest

---
 Magento2/Sniffs/Legacy/CopyrightSniff.php   |  2 +-
 Magento2/Tests/Legacy/CopyrightUnitTest.php | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/CopyrightSniff.php b/Magento2/Sniffs/Legacy/CopyrightSniff.php
index e2facc85..76cb43ea 100644
--- a/Magento2/Sniffs/Legacy/CopyrightSniff.php
+++ b/Magento2/Sniffs/Legacy/CopyrightSniff.php
@@ -40,7 +40,7 @@ public function process(File $phpcsFile, $stackPtr)
             if (strpos($contentFile, self::COPYRIGHT_MAGENTO_TEXT) === false || $adobeCopyrightFound === false) {
                 $phpcsFile->addWarningOnLine(
                     'Copyright is missing or has wrong format',
-                    null,
+                    $phpcsFile->getTokens()[$positionComment]['line'],
                     self::WARNING_CODE
                 );
             }
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.php b/Magento2/Tests/Legacy/CopyrightUnitTest.php
index 2d6e8c3f..37133e0e 100644
--- a/Magento2/Tests/Legacy/CopyrightUnitTest.php
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.php
@@ -26,8 +26,17 @@ public function getWarningList($testFile = ''): array
             return [];
         }
         
-        return [
-            null => 1,
-        ];
+        if ($testFile === 'CopyrightUnitTest.1.inc') {
+            return [
+                1 => 1,
+            ];
+        }
+        if ($testFile === 'CopyrightUnitTest.2.inc' || 'CopyrightUnitTest.3.inc') {
+            return [
+                3 => 1,
+            ];
+        }
+
+        return [];
     }
 }

From 64512dd75251493940fe2773ed30fc1f84e81bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 16:12:14 +0200
Subject: [PATCH 198/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index f1d85161..f139e37d 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -38,7 +38,7 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        try{
+        try {
             $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         } catch (\Exception $e) {
             $phpcsFile->addError(

From df14044f89bf21a33de2b27a72f67153311af15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 17:10:38 +0200
Subject: [PATCH 199/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php | 29 ++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index f139e37d..e80f221b 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -41,14 +41,11 @@ public function process(File $phpcsFile, $stackPtr)
         try {
             $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         } catch (\Exception $e) {
-            $phpcsFile->addError(
-                sprintf(
-                    "Couldn't parse contents of '%s', check that they are in valid XML format",
-                    $phpcsFile->getFilename(),
-                ),
-                $stackPtr,
-                self::ERROR_CODE_XML
-            );
+            $this->invalidXML($phpcsFile, $stackPtr);
+            return;
+        }
+        if ($xml === false) {
+            $this->invalidXML($phpcsFile, $stackPtr);
             return;
         }
 
@@ -87,6 +84,22 @@ public function process(File $phpcsFile, $stackPtr)
         }
     }
 
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     */
+    protected function invalidXML(File $phpcsFile, int $stackPtr): void
+    {
+        $phpcsFile->addError(
+            sprintf(
+                "Couldn't parse contents of '%s', check that they are in valid XML format",
+                $phpcsFile->getFilename(),
+            ),
+            $stackPtr,
+            self::ERROR_CODE_XML
+        );
+    }
+
     /**
      * Check if the element passed is in the currently sniffed line
      *

From 2f4c72ead7ef5b6994faeb96ebad161f9fdb6afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 9 Sep 2021 17:11:52 +0200
Subject: [PATCH 200/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index e80f221b..064c88c2 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -85,6 +85,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Adds an invalid XML error
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      */

From 7a6f29fe56df07f19af7b16a49529eaa79e3c9cf Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 9 Sep 2021 17:12:41 +0200
Subject: [PATCH 201/630] AC-666: Create phpcs static check for CopyrightTest

---
 Magento2/Sniffs/Legacy/CopyrightSniff.php     | 4 +++-
 Magento2/Tests/Legacy/CopyrightUnitTest.5.inc | 7 +++++++
 Magento2/Tests/Legacy/CopyrightUnitTest.php   | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/CopyrightUnitTest.5.inc

diff --git a/Magento2/Sniffs/Legacy/CopyrightSniff.php b/Magento2/Sniffs/Legacy/CopyrightSniff.php
index 76cb43ea..960819e8 100644
--- a/Magento2/Sniffs/Legacy/CopyrightSniff.php
+++ b/Magento2/Sniffs/Legacy/CopyrightSniff.php
@@ -37,7 +37,9 @@ public function process(File $phpcsFile, $stackPtr)
             $contentFile = $phpcsFile->getTokens()[$positionComment]['content'];
             $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $contentFile);
             
-            if (strpos($contentFile, self::COPYRIGHT_MAGENTO_TEXT) === false || $adobeCopyrightFound === false) {
+            if (strpos($contentFile, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
+                return;
+            } else {
                 $phpcsFile->addWarningOnLine(
                     'Copyright is missing or has wrong format',
                     $phpcsFile->getTokens()[$positionComment]['line'],
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.5.inc b/Magento2/Tests/Legacy/CopyrightUnitTest.5.inc
new file mode 100644
index 00000000..e874c2ca
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.5.inc
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright 2020 Adobe
+ * See COPYING.txt for license details.
+ */
+
+
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.php b/Magento2/Tests/Legacy/CopyrightUnitTest.php
index 37133e0e..1100bc53 100644
--- a/Magento2/Tests/Legacy/CopyrightUnitTest.php
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.php
@@ -22,7 +22,7 @@ public function getErrorList(): array
      */
     public function getWarningList($testFile = ''): array
     {
-        if ($testFile === 'CopyrightUnitTest.4.inc') {
+        if ($testFile === 'CopyrightUnitTest.4.inc' || $testFile === 'CopyrightUnitTest.5.inc') {
             return [];
         }
         
@@ -31,7 +31,7 @@ public function getWarningList($testFile = ''): array
                 1 => 1,
             ];
         }
-        if ($testFile === 'CopyrightUnitTest.2.inc' || 'CopyrightUnitTest.3.inc') {
+        if ($testFile === 'CopyrightUnitTest.2.inc' || $testFile === 'CopyrightUnitTest.3.inc') {
             return [
                 3 => 1,
             ];

From 94acecdc682280709ddef4e367ca495feab31320 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Thu, 9 Sep 2021 16:22:19 -0500
Subject: [PATCH 202/630] AC-1102: Static test to verify self-closing tags for
 non-void html elements

---
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  | 84 +++++++++++++++++++
 Magento2/ruleset.xml                          |  7 ++
 2 files changed, 91 insertions(+)
 create mode 100644 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php

diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
new file mode 100644
index 00000000..cd215313
--- /dev/null
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\Html;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff for self-closing tags
+ */
+class HtmlSelfClosingTagsSniff implements Sniff
+{
+    /**
+     * List of void elements
+     *
+     * https://www.w3.org/TR/html51/syntax.html#writing-html-documents-elements
+     *
+     * @var string[]
+     */
+    private $voidElements = [
+        'area',
+        'base',
+        'br',
+        'col',
+        'embed',
+        'hr',
+        'img',
+        'input',
+        'keygen',
+        'link',
+        'menuitem',
+        'meta',
+        'param',
+        'source',
+        'track',
+        'wbr',
+    ];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Detect use of self-closing tag with non-void html element
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr !== 0) {
+            return;
+        }
+        $html = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+
+        if (empty($html)) {
+            return;
+        }
+
+        if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                if (!in_array($match[1], $this->voidElements)) {
+                    $phpcsFile->addError(
+                        'Avoid using self-closing tag with non-void html element'
+                        . ' - "' . $match[0]  . PHP_EOL,
+                        null,
+                        'HtmlTemplates.Tag.SelfClosing'
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1e247a2f..13bbef09 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -116,6 +116,11 @@
         <type>error</type>
     </rule>
 
+    <rule ref="Magento2.Html.HtmlSelfClosingTags">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">
         <severity>9</severity>
@@ -153,6 +158,7 @@
     <rule ref="Magento2.Html.HtmlBinding">
         <severity>9</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
 
     <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
@@ -246,6 +252,7 @@
     <rule ref="Magento2.Html.HtmlDirective">
         <severity>8</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
 
     <!-- Severity 7 warnings: General code issues. -->

From a2864d222ff6c1afb86ae37b8672a1e5f0d07b4e Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 13 Sep 2021 09:29:07 +0200
Subject: [PATCH 203/630] AC-666: Create phpcs static check for CopyrightTest

---
 Magento2/Sniffs/Legacy/CopyrightSniff.php | 42 ++++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/CopyrightSniff.php b/Magento2/Sniffs/Legacy/CopyrightSniff.php
index 960819e8..f4ccd647 100644
--- a/Magento2/Sniffs/Legacy/CopyrightSniff.php
+++ b/Magento2/Sniffs/Legacy/CopyrightSniff.php
@@ -30,22 +30,32 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $positionOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1);
-       
-        if ($positionOpenTag === false) {
-            $positionComment = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $stackPtr);
-            $contentFile = $phpcsFile->getTokens()[$positionComment]['content'];
-            $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $contentFile);
-            
-            if (strpos($contentFile, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
-                return;
-            } else {
-                $phpcsFile->addWarningOnLine(
-                    'Copyright is missing or has wrong format',
-                    $phpcsFile->getTokens()[$positionComment]['line'],
-                    self::WARNING_CODE
-                );
-            }
+        if ($phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1) !== false) {
+            return;
         }
+
+        $positionComment = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $stackPtr);
+
+        if ($positionComment === false) {
+            $phpcsFile->addWarning(
+                'Copyright is missing',
+                $stackPtr,
+                self::WARNING_CODE
+            );
+            return;
+        }
+
+        $content = $phpcsFile->getTokens()[$positionComment]['content'];
+        $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $content);
+
+        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
+            return;
+        }
+
+        $phpcsFile->addWarningOnLine(
+            'Copyright is missing or has wrong format',
+            $phpcsFile->getTokens()[$positionComment]['line'],
+            self::WARNING_CODE
+        );
     }
 }

From 74c47b2928e260d0071dbc75c55b2a76c5db087d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Mon, 13 Sep 2021 11:55:33 +0200
Subject: [PATCH 204/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php     | 22 ++-----------------
 Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml | 22 +++++++++++++++++++
 Magento2/Tests/Legacy/WidgetXMLUnitTest.3.xml | 22 +++++++++++++++++++
 Magento2/Tests/Legacy/WidgetXMLUnitTest.php   |  4 +++-
 4 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/WidgetXMLUnitTest.3.xml

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index 064c88c2..efd62aee 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -38,12 +38,8 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        try {
-            $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
-        } catch (\Exception $e) {
-            $this->invalidXML($phpcsFile, $stackPtr);
-            return;
-        }
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+
         if ($xml === false) {
             $this->invalidXML($phpcsFile, $stackPtr);
             return;
@@ -102,20 +98,6 @@ protected function invalidXML(File $phpcsFile, int $stackPtr): void
         );
     }
 
-    /**
-     * Check if the element passed is in the currently sniffed line
-     *
-     * @param SimpleXMLElement $element
-     * @param int $stackPtr
-     * @return bool
-     */
-    private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $stackPtr): bool
-    {
-        $node = dom_import_simplexml($element);
-
-        return $node->getLineNo() === $stackPtr + 1;
-    }
-
     /**
      * Format the incoming XML to avoid tags split into several lines.
      *
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml b/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
index 03066d9f..f99ae1ca 100644
--- a/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
@@ -7,5 +7,27 @@
 -->
 <widgets>
     <widget
+            type="/Deprecated"
+    >
+        <label
+                translate="true"
+        >Catalog New Products List
+
+        </label>
+
+
+        <description translate="true">List of Products that are set as New</description>
+
+        <supported_blocks>
+
+
+            Deprecated
+
+
+            <block>
+                <block_name>Deprecated</block_name>
+            </block>
+        </supported_blocks>
+    </widget>
 </widgets>
 
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.3.xml b/Magento2/Tests/Legacy/WidgetXMLUnitTest.3.xml
new file mode 100644
index 00000000..ef90e28b
--- /dev/null
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.3.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<widgets>
+    <widget
+    >
+        <label
+                translate="true"
+        />
+        <description
+                translate="true"
+        >
+            List of Products that are set as New
+        </description>
+
+    </widget>
+</widgets>
+
diff --git a/Magento2/Tests/Legacy/WidgetXMLUnitTest.php b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
index 0af6f292..c52b920b 100644
--- a/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
@@ -23,7 +23,9 @@ public function getErrorList($testFile = '')
         }
         if ($testFile === 'WidgetXMLUnitTest.2.xml') {
             return [
-                1 => 1
+                9 => 1,
+                17 => 1,
+                24 => 1,
             ];
         }
         return [];

From dae1ab386078bb872a143216285b891d27d6c967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Mon, 13 Sep 2021 12:07:11 +0200
Subject: [PATCH 205/630] AC-661: Create phpcs static check for XmlTest

---
 Magento2/ruleset.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1e247a2f..158173f3 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -247,6 +247,11 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.WidgetXML.FoundObsoleteNode">
+        <include-pattern>*\/widget.xml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From d528da6f9861f73ccaff8a9eff578a1fee3337c1 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 13 Sep 2021 12:29:54 +0200
Subject: [PATCH 206/630] AC-666: Static check for CopyrightTest for another
 extensions files

---
 .../CopyrightAnotherExtensionsFilesSniff.php  | 52 +++++++++++++++++++
 .../Legacy/AbstractJsSniffUnitTestCase.php    | 33 ++++++++++++
 ...yrightAnotherExtensionsFilesUnitTest.1.xml | 10 ++++
 ...pyrightAnotherExtensionsFilesUnitTest.2.js | 10 ++++
 ...pyrightAnotherExtensionsFilesUnitTest.4.js | 10 ++++
 ...opyrightAnotherExtensionsFilesUnitTest.php | 41 +++++++++++++++
 ...opyrightAnotherExtensionsFilesUnitTest.xml | 10 ++++
 7 files changed, 166 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
 create mode 100644 Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php
 create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.1.xml
 create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
 create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
 create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml

diff --git a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
new file mode 100644
index 00000000..1455ee58
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class CopyrightAnotherExtensionsFilesSniff implements Sniff
+{
+    private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
+
+    private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
+    private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    
+    /**
+     * @inheritDoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+        
+        $fileText = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+        $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $fileText);
+
+        if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
+            return;
+        }
+
+        $phpcsFile->addWarningOnLine(
+            'Copyright is missing or has wrong format',
+            null,
+            self::WARNING_CODE
+        );
+    }
+}
diff --git a/Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php b/Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php
new file mode 100644
index 00000000..4b891a3c
--- /dev/null
+++ b/Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Implements an abstract base for unit tests that cover less sniffs.
+ */
+abstract class AbstractJsSniffUnitTestCase extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        
+        $config = new Config();
+        $config->extensions = array_merge(
+            $config->extensions,
+            [
+                'js' => 'PHP'
+            ]
+        );
+        
+        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
+    }
+}
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.1.xml b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.1.xml
new file mode 100644
index 00000000..5bbf8807
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights another text to test.
+ * See COPYING.txt for license details.
+ */
+-->
+<tag>
+    
+</tag>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
new file mode 100644
index 00000000..511f7b94
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright Adobe.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function (){
+    
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
new file mode 100644
index 00000000..2eb60f49
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function (){
+    
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
new file mode 100644
index 00000000..8796abb9
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+class CopyrightAnotherExtensionsFilesUnitTest extends AbstractJsSniffUnitTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.1.xml') {
+            return [
+                null => 1,
+            ];
+        }
+        if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.2.js') {
+            return [
+                null => 1,
+            ];
+        }
+        if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.3.xml') {
+            return [];
+        }
+        if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.4.js') {
+            return [];
+        }
+        return [];
+    }
+}
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml
new file mode 100644
index 00000000..d1dcf359
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright 2020 Adobe
+ * See COPYING.txt for license details.
+ */
+-->
+<tag>
+    
+</tag>
\ No newline at end of file

From 6a735c15d4ace82b9ee224fd36174cd05d0da42e Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 13 Sep 2021 12:30:05 +0200
Subject: [PATCH 207/630] AC-666: Static check for CopyrightTest for another
 extensions files

---
 Magento2/ruleset.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1e247a2f..ac130d68 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -3,7 +3,7 @@
     <description>Magento Coding Standard</description>
 
     <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml"/>
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.Functions.CallTimePassByReference">
@@ -629,6 +629,10 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>

From ef00afd073dbed5a43e36674ec9c3de847844687 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 13 Sep 2021 17:07:55 +0200
Subject: [PATCH 208/630] Fixed wrongly returning error for valid descriptions

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 38 +++++++++++--------
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 23 ++++++++++-
 .../ClassPropertyPHPDocFormattingUnitTest.php |  4 +-
 3 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 8ec509b4..18deeeff 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -112,10 +112,11 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             if ($varParts[1]) {
                 return;
             }
-            $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionAfterVar, 'AlreadyHaveMeaningFulNameVar');
+            $error = 'Short description must be before @var tag.';
+            $phpcsFile->addWarning($error, $isShortDescriptionAfterVar, 'ShortDescriptionAfterVar');
             return;
         }
+
         // Check if class has already have meaningful description before @var tag
         $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(
             T_DOC_COMMENT_STRING,
@@ -125,23 +126,28 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             null,
             false
         );
-        if ($this->PHPDocFormattingValidator->providesMeaning(
-            $isShortDescriptionPreviousVar,
-            $commentStart,
-            $tokens
-        ) !== true) {
-            preg_match(
-                '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
-                $tokens[($foundVar + 2)]['content'],
-                $varParts
-            );
-            if ($varParts[1]) {
-                return;
-            }
+
+        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], $tokens[$string]['content']) !== false) {
             $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningFulNameVar');
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
             return;
         }
+        $re = '/
+                # Split camelCase "words". Two global alternatives. Either g1of2:
+                  (?<=[a-z])      # Position is after a lowercase,
+                  (?=[A-Z])       # and before an uppercase letter.
+                | (?<=[A-Z])      # Or g2of2; Position is after uppercase,
+                  (?=[A-Z][a-z])  # and before upper-then-lower case.
+                /x';
+        $varTagParts = preg_split($re, $tokens[$string]['content']);
+
+        foreach ($varTagParts as $part) {
+            if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], $part) === false) {
+                return;
+            }
+        }
+        $error = 'Short description duplicates class property name.';
+        $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
     }
 
     /**
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 6dcccf65..93339460 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -65,11 +65,25 @@ class Bar {
     private $variableName;
 
     /**
-     * Some more invalid description
+     * Some more invalid description with test which is the same name as the variable and is not allowed
      *
      * @var test
      */
     protected $test;
+
+    /**
+     * Formatted Correctly Protected Class Member
+     *
+     * @var correctlyFormattedProtectedClassMember
+     */
+    protected $correctlyFormattedProtectedClassMember;
+
+    /**
+     * anotherCorrectlyFormattedProtectedClassMember
+     *
+     * @var anotherCorrectlyFormattedProtectedClassMember
+     */
+    protected $anotherCorrectlyFormattedProtectedClassMember;
 }
 
 class correctlyFormattedClassMemberDocBlock
@@ -99,4 +113,11 @@ class correctlyFormattedClassMemberDocBlock
      *      \FooObject_TEST_C
      */
     private $testObject;
+
+    /**
+     * Fallback factory
+     *
+     * @var RulePool
+     */
+    protected $rulePool;
 }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 5ce3f0d2..6686607b 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -32,7 +32,9 @@ public function getWarningList()
             49 => 1,
             56 => 1,
             63 => 1,
-            68 => 1
+            68 => 1,
+            75 => 1,
+            82 => 1,
         ];
     }
 }

From 95c56c9de1e426be89a042706f35876d9706e573 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 14 Sep 2021 09:00:25 +0200
Subject: [PATCH 209/630] Update
 Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 18deeeff..08dc5c0a 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -132,7 +132,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
             return;
         }
-        $re = '/
+        $regularExpression = '/
                 # Split camelCase "words". Two global alternatives. Either g1of2:
                   (?<=[a-z])      # Position is after a lowercase,
                   (?=[A-Z])       # and before an uppercase letter.

From 2a57af8e3db57f02518f90880358efe0b42d4dda Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 14 Sep 2021 09:00:30 +0200
Subject: [PATCH 210/630] Update
 Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 08dc5c0a..492a1012 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -141,11 +141,9 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
                 /x';
         $varTagParts = preg_split($re, $tokens[$string]['content']);
 
-        foreach ($varTagParts as $part) {
-            if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], $part) === false) {
+            if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode(' ', $varTagParts)) === false) {
                 return;
             }
-        }
         $error = 'Short description duplicates class property name.';
         $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
     }

From f209db6b754b9aaa6f665f67e6a8ba4e940f06a2 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 09:02:05 +0200
Subject: [PATCH 211/630] Fixed wrongly returning error for valid descriptions

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 492a1012..113da3e6 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -127,6 +127,10 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             false
         );
 
+        if ($isShortDescriptionPreviousVar === false) {
+            return;
+        }
+
         if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], $tokens[$string]['content']) !== false) {
             $error = 'Short description duplicates class property name.';
             $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
@@ -139,7 +143,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
                 | (?<=[A-Z])      # Or g2of2; Position is after uppercase,
                   (?=[A-Z][a-z])  # and before upper-then-lower case.
                 /x';
-        $varTagParts = preg_split($re, $tokens[$string]['content']);
+        $varTagParts = preg_split($regularExpression, $tokens[$string]['content']);
 
             if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode(' ', $varTagParts)) === false) {
                 return;

From 1ed415620f31f914e590a113b3bfe7464e71d38e Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 09:06:46 +0200
Subject: [PATCH 212/630] Fixed wrongly returning error for valid descriptions

---
 .../Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 6686607b..7e8ecc91 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -33,7 +33,6 @@ public function getWarningList()
             56 => 1,
             63 => 1,
             68 => 1,
-            75 => 1,
             82 => 1,
         ];
     }

From efaffacb5ff94f21c12ca529926ee2b81ba06906 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 09:12:01 +0200
Subject: [PATCH 213/630] Fixed wrongly returning error for valid descriptions

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 113da3e6..09d7afa9 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -131,11 +131,6 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         }
 
-        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], $tokens[$string]['content']) !== false) {
-            $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
-            return;
-        }
         $regularExpression = '/
                 # Split camelCase "words". Two global alternatives. Either g1of2:
                   (?<=[a-z])      # Position is after a lowercase,
@@ -145,9 +140,9 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
                 /x';
         $varTagParts = preg_split($regularExpression, $tokens[$string]['content']);
 
-            if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode(' ', $varTagParts)) === false) {
-                return;
-            }
+        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $varTagParts)) === false) {
+            return;
+        }
         $error = 'Short description duplicates class property name.';
         $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
     }

From 62e0fc11dc03994fb290e6986b7724d536f3a4bf Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 09:25:05 +0200
Subject: [PATCH 214/630] Fixed wrongly returning error for valid descriptions

---
 Magento2/Sniffs/Classes/AbstractApiSniff.php                  | 2 +-
 Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php      | 2 +-
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php               | 2 +-
 Magento2/Sniffs/Exceptions/ThrowCatchSniff.php                | 2 +-
 Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php | 2 +-
 Magento2/Sniffs/Functions/StaticFunctionSniff.php             | 2 +-
 Magento2/Sniffs/Legacy/MageEntitySniff.php                    | 2 +-
 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php        | 2 +-
 Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php       | 2 +-
 Magento2/Sniffs/PHP/GotoSniff.php                             | 2 +-
 Magento2/Sniffs/PHP/ReturnValueCheckSniff.php                 | 4 +---
 Magento2/Sniffs/PHP/VarSniff.php                              | 2 +-
 Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php        | 2 +-
 Magento2/Sniffs/SQL/RawQuerySniff.php                         | 2 +-
 Magento2/Sniffs/Security/LanguageConstructSniff.php           | 4 ++--
 Magento2/Sniffs/Security/SuperglobalSniff.php                 | 4 ++--
 Magento2/Sniffs/Security/XssTemplateSniff.php                 | 2 +-
 Magento2/Sniffs/Strings/ExecutableRegExSniff.php              | 2 +-
 Magento2/Sniffs/Strings/StringConcatSniff.php                 | 2 +-
 Magento2/Sniffs/Templates/ThisInTemplateSniff.php             | 4 ++--
 Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php        | 2 +-
 21 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Magento2/Sniffs/Classes/AbstractApiSniff.php b/Magento2/Sniffs/Classes/AbstractApiSniff.php
index bb8a6571..3f709b70 100644
--- a/Magento2/Sniffs/Classes/AbstractApiSniff.php
+++ b/Magento2/Sniffs/Classes/AbstractApiSniff.php
@@ -15,7 +15,7 @@ class AbstractApiSniff implements Sniff
 {
 
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index f5e45c63..8f82ff74 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -18,7 +18,7 @@ class DiscouragedDependenciesSniff implements Sniff
     const CONSTRUCT_METHOD_NAME = '__construct';
 
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 622644bf..60140afb 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -14,7 +14,7 @@
 class DirectThrowSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      * phpcs:disable Generic.Files.LineLength.TooLong
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
index c2510168..6497d47c 100644
--- a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
+++ b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
@@ -16,7 +16,7 @@
 class ThrowCatchSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
index 0fa28149..49ddcf33 100644
--- a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
+++ b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
@@ -15,7 +15,7 @@
 class TryProcessSystemResourcesSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Functions/StaticFunctionSniff.php b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
index 2ae706d0..b74683a9 100644
--- a/Magento2/Sniffs/Functions/StaticFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
@@ -14,7 +14,7 @@
 class StaticFunctionSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index de8b7dbf..ad334cec 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -14,7 +14,7 @@
 class MageEntitySniff implements Sniff
 {
     /**
-     * String representation of error.
+     * Representation of  error.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index f094c353..8e68b35a 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -16,7 +16,7 @@ class DeprecatedModelMethodSniff implements Sniff
     const RESOURCE_METHOD = "getResource";
 
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
index 2ad688ec..b04da011 100644
--- a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
+++ b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
@@ -14,7 +14,7 @@
 class InterfaceNameSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/PHP/GotoSniff.php b/Magento2/Sniffs/PHP/GotoSniff.php
index 4a5f06ca..0b74e855 100644
--- a/Magento2/Sniffs/PHP/GotoSniff.php
+++ b/Magento2/Sniffs/PHP/GotoSniff.php
@@ -14,7 +14,7 @@
 class GotoSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
index 9929d46b..5a6d507f 100644
--- a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
+++ b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
@@ -14,7 +14,7 @@
 class ReturnValueCheckSniff implements Sniff
 {
     /**
-     * String representation of error.
+     * Representation of error.
      *
      * @var string
      */
@@ -46,8 +46,6 @@ class ReturnValueCheckSniff implements Sniff
     protected $tokens = [];
 
     /**
-     * PHP_CodeSniffer file.
-     *
      * @var File
      */
     protected $file;
diff --git a/Magento2/Sniffs/PHP/VarSniff.php b/Magento2/Sniffs/PHP/VarSniff.php
index fa7b28b7..dfa9bdee 100644
--- a/Magento2/Sniffs/PHP/VarSniff.php
+++ b/Magento2/Sniffs/PHP/VarSniff.php
@@ -14,7 +14,7 @@
 class VarSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
index 9ab6c8cc..5e701bd7 100644
--- a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
+++ b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
@@ -14,7 +14,7 @@
 class ForeachArrayMergeSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/SQL/RawQuerySniff.php b/Magento2/Sniffs/SQL/RawQuerySniff.php
index a32d4eb0..966e90ea 100644
--- a/Magento2/Sniffs/SQL/RawQuerySniff.php
+++ b/Magento2/Sniffs/SQL/RawQuerySniff.php
@@ -15,7 +15,7 @@
 class RawQuerySniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php
index 9b10ae4a..f6ea2be2 100644
--- a/Magento2/Sniffs/Security/LanguageConstructSniff.php
+++ b/Magento2/Sniffs/Security/LanguageConstructSniff.php
@@ -14,14 +14,14 @@
 class LanguageConstructSniff implements Sniff
 {
     /**
-     * String representation of error.
+     * Representation of  error.
      *
      * @var string
      */
     protected $errorMessage = 'Use of %s language construct is discouraged.';
 
     /**
-     * String representation of backtick error.
+     * Representation of  backtick error.
      *
      * phpcs:disable Generic.Files.LineLength
      *
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index 136f991f..7a30a3aa 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -14,14 +14,14 @@
 class SuperglobalSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
     protected $warningMessage = 'Direct use of %s Superglobal detected.';
 
     /**
-     * String representation of error.
+     * Representation of  error.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index f35943e5..eabff249 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -14,7 +14,7 @@
 class XssTemplateSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
index 09706ed6..769a176c 100644
--- a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
+++ b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
@@ -15,7 +15,7 @@
 class ExecutableRegExSniff implements Sniff
 {
     /**
-     * String representation of error.
+     * Representation of  error.
      *
      * phpcs:disable Generic.Files.LineLength
      *
diff --git a/Magento2/Sniffs/Strings/StringConcatSniff.php b/Magento2/Sniffs/Strings/StringConcatSniff.php
index 89c8dc9b..f409f421 100644
--- a/Magento2/Sniffs/Strings/StringConcatSniff.php
+++ b/Magento2/Sniffs/Strings/StringConcatSniff.php
@@ -15,7 +15,7 @@
 class StringConcatSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
index 9b5e5358..45b4ebad 100644
--- a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+++ b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
@@ -21,7 +21,7 @@ class ThisInTemplateSniff implements Sniff
     protected $warningCodeFoundHelper = 'FoundHelper';
 
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
@@ -35,7 +35,7 @@ class ThisInTemplateSniff implements Sniff
     protected $warningCodeFoundThis = 'FoundThis';
 
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index 4d74a29e..12bdc263 100644
--- a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -14,7 +14,7 @@
 class MultipleEmptyLinesSniff implements Sniff
 {
     /**
-     * String representation of warning.
+     * Representation of  warning.
      *
      * @var string
      */

From 5b4b543da950ec3c29ac41890c48ee302430cf87 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 09:28:54 +0200
Subject: [PATCH 215/630] Fixed wrongly returning error for valid descriptions

---
 Magento2/Sniffs/Classes/AbstractApiSniff.php                  | 2 +-
 Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php      | 2 +-
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php               | 2 +-
 Magento2/Sniffs/Exceptions/ThrowCatchSniff.php                | 2 +-
 Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php | 2 +-
 Magento2/Sniffs/Functions/StaticFunctionSniff.php             | 2 +-
 Magento2/Sniffs/Legacy/MageEntitySniff.php                    | 2 +-
 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php        | 2 +-
 Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php        | 2 +-
 Magento2/Sniffs/SQL/RawQuerySniff.php                         | 2 +-
 Magento2/Sniffs/Security/LanguageConstructSniff.php           | 4 ++--
 Magento2/Sniffs/Security/SuperglobalSniff.php                 | 4 ++--
 Magento2/Sniffs/Security/XssTemplateSniff.php                 | 4 +---
 Magento2/Sniffs/Strings/ExecutableRegExSniff.php              | 2 +-
 Magento2/Sniffs/Strings/StringConcatSniff.php                 | 2 +-
 Magento2/Sniffs/Templates/ThisInTemplateSniff.php             | 4 ++--
 Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php        | 2 +-
 17 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/Magento2/Sniffs/Classes/AbstractApiSniff.php b/Magento2/Sniffs/Classes/AbstractApiSniff.php
index 3f709b70..a32dc0f5 100644
--- a/Magento2/Sniffs/Classes/AbstractApiSniff.php
+++ b/Magento2/Sniffs/Classes/AbstractApiSniff.php
@@ -15,7 +15,7 @@ class AbstractApiSniff implements Sniff
 {
 
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index 8f82ff74..8996131f 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -18,7 +18,7 @@ class DiscouragedDependenciesSniff implements Sniff
     const CONSTRUCT_METHOD_NAME = '__construct';
 
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 60140afb..1c74f63a 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -14,7 +14,7 @@
 class DirectThrowSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      * phpcs:disable Generic.Files.LineLength.TooLong
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
index 6497d47c..5c2efbcc 100644
--- a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
+++ b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
@@ -16,7 +16,7 @@
 class ThrowCatchSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
index 49ddcf33..6d714dcc 100644
--- a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
+++ b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
@@ -15,7 +15,7 @@
 class TryProcessSystemResourcesSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Functions/StaticFunctionSniff.php b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
index b74683a9..0805e3ce 100644
--- a/Magento2/Sniffs/Functions/StaticFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
@@ -14,7 +14,7 @@
 class StaticFunctionSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index ad334cec..8e305345 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -14,7 +14,7 @@
 class MageEntitySniff implements Sniff
 {
     /**
-     * Representation of  error.
+     * Representation of error.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index 8e68b35a..cf58267f 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -16,7 +16,7 @@ class DeprecatedModelMethodSniff implements Sniff
     const RESOURCE_METHOD = "getResource";
 
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
index 5e701bd7..09bc0bdd 100644
--- a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
+++ b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
@@ -14,7 +14,7 @@
 class ForeachArrayMergeSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/SQL/RawQuerySniff.php b/Magento2/Sniffs/SQL/RawQuerySniff.php
index 966e90ea..cb27c570 100644
--- a/Magento2/Sniffs/SQL/RawQuerySniff.php
+++ b/Magento2/Sniffs/SQL/RawQuerySniff.php
@@ -15,7 +15,7 @@
 class RawQuerySniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php
index f6ea2be2..a8e1c979 100644
--- a/Magento2/Sniffs/Security/LanguageConstructSniff.php
+++ b/Magento2/Sniffs/Security/LanguageConstructSniff.php
@@ -14,14 +14,14 @@
 class LanguageConstructSniff implements Sniff
 {
     /**
-     * Representation of  error.
+     * Representation of error.
      *
      * @var string
      */
     protected $errorMessage = 'Use of %s language construct is discouraged.';
 
     /**
-     * Representation of  backtick error.
+     * Representation of backtick error.
      *
      * phpcs:disable Generic.Files.LineLength
      *
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index 7a30a3aa..4d029dfc 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -14,14 +14,14 @@
 class SuperglobalSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
     protected $warningMessage = 'Direct use of %s Superglobal detected.';
 
     /**
-     * Representation of  error.
+     * Representation of error.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index eabff249..490d5cbd 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -14,7 +14,7 @@
 class XssTemplateSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
@@ -85,8 +85,6 @@ class XssTemplateSniff implements Sniff
     private $statements = [];
 
     /**
-     * PHP_CodeSniffer file.
-     *
      * @var File
      */
     private $file;
diff --git a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
index 769a176c..5e435322 100644
--- a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
+++ b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
@@ -15,7 +15,7 @@
 class ExecutableRegExSniff implements Sniff
 {
     /**
-     * Representation of  error.
+     * Representation of error.
      *
      * phpcs:disable Generic.Files.LineLength
      *
diff --git a/Magento2/Sniffs/Strings/StringConcatSniff.php b/Magento2/Sniffs/Strings/StringConcatSniff.php
index f409f421..06eb6a27 100644
--- a/Magento2/Sniffs/Strings/StringConcatSniff.php
+++ b/Magento2/Sniffs/Strings/StringConcatSniff.php
@@ -15,7 +15,7 @@
 class StringConcatSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
index 45b4ebad..afedc43f 100644
--- a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+++ b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
@@ -21,7 +21,7 @@ class ThisInTemplateSniff implements Sniff
     protected $warningCodeFoundHelper = 'FoundHelper';
 
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
@@ -35,7 +35,7 @@ class ThisInTemplateSniff implements Sniff
     protected $warningCodeFoundThis = 'FoundThis';
 
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index 12bdc263..d5152da3 100644
--- a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -14,7 +14,7 @@
 class MultipleEmptyLinesSniff implements Sniff
 {
     /**
-     * Representation of  warning.
+     * Representation of warning.
      *
      * @var string
      */

From 0c29f5b65a149dff8c991b1e9afebd9826ff1c8b Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 09:32:23 +0200
Subject: [PATCH 216/630] Fixed wrongly returning error for valid descriptions

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 09d7afa9..0c08e5ef 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -140,11 +140,10 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
                 /x';
         $varTagParts = preg_split($regularExpression, $tokens[$string]['content']);
 
-        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $varTagParts)) === false) {
-            return;
+        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $varTagParts)) !== false) {
+            $error = 'Short description duplicates class property name.';
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
         }
-        $error = 'Short description duplicates class property name.';
-        $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
     }
 
     /**

From 3fb9cbae028a770b467fc6d8e2833ccdea81c0ac Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 10:09:36 +0200
Subject: [PATCH 217/630] Fixed wrongly returning error for valid descriptions

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 0c08e5ef..7b418435 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -131,16 +131,21 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $regularExpression = '/
-                # Split camelCase "words". Two global alternatives. Either g1of2:
-                  (?<=[a-z])      # Position is after a lowercase,
-                  (?=[A-Z])       # and before an uppercase letter.
-                | (?<=[A-Z])      # Or g2of2; Position is after uppercase,
-                  (?=[A-Z][a-z])  # and before upper-then-lower case.
-                /x';
-        $varTagParts = preg_split($regularExpression, $tokens[$string]['content']);
-
-        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $varTagParts)) !== false) {
+        $propertyNamePosition = $phpcsFile->findNext(
+            T_VARIABLE,
+            $foundVar,
+            null,
+            false,
+            null,
+            false
+        );
+        if ($propertyNamePosition === false) {
+            return;
+        };
+        $propertyName = trim($tokens[$propertyNamePosition]['content'], '$');
+        $propertyNameParts = array_filter(preg_split('/(?=[A-Z])/', $propertyName));
+
+        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $propertyNameParts)) !== false) {
             $error = 'Short description duplicates class property name.';
             $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
         }

From d238849c5c59bc07c7f37df89018ebe14612b74a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 10:33:48 +0200
Subject: [PATCH 218/630] Fixed wrongly returning error for valid descriptions

---
 .../ClassPropertyPHPDocFormattingSniff.php       |  9 ++++++++-
 .../ClassPropertyPHPDocFormattingUnitTest.inc    | 16 ++++++++--------
 .../ClassPropertyPHPDocFormattingUnitTest.php    |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 7b418435..45f3276c 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -143,9 +143,16 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         };
         $propertyName = trim($tokens[$propertyNamePosition]['content'], '$');
+
+        if (strtolower($tokens[$isShortDescriptionPreviousVar]['content']) === strtolower($propertyName)) {
+            $error = 'Short description duplicates class property name.';
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
+            return;
+        }
+
         $propertyNameParts = array_filter(preg_split('/(?=[A-Z])/', $propertyName));
 
-        if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $propertyNameParts)) !== false) {
+        if (strtolower($tokens[$isShortDescriptionPreviousVar]['content']) === strtolower(implode(' ', $propertyNameParts))) {
             $error = 'Short description duplicates class property name.';
             $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
         }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 93339460..05f9cd13 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -65,14 +65,7 @@ class Bar {
     private $variableName;
 
     /**
-     * Some more invalid description with test which is the same name as the variable and is not allowed
-     *
-     * @var test
-     */
-    protected $test;
-
-    /**
-     * Formatted Correctly Protected Class Member
+     * Correctly Formatted Protected Class Member
      *
      * @var correctlyFormattedProtectedClassMember
      */
@@ -120,4 +113,11 @@ class correctlyFormattedClassMemberDocBlock
      * @var RulePool
      */
     protected $rulePool;
+
+    /**
+     * A description that includes test which is the same name as the variable is allowed
+     *
+     * @var test
+     */
+    protected $test;
 }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 7e8ecc91..6a49be76 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -33,7 +33,7 @@ public function getWarningList()
             56 => 1,
             63 => 1,
             68 => 1,
-            82 => 1,
+            75 => 1,
         ];
     }
 }

From e92e17db5e3eae31dc258cbe2ed0ac8f6a36df19 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 10:39:15 +0200
Subject: [PATCH 219/630] Fixed wrongly returning error for valid descriptions

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 45f3276c..34cb7dd3 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -143,8 +143,9 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         };
         $propertyName = trim($tokens[$propertyNamePosition]['content'], '$');
+        $shortDescription = strtolower($tokens[$isShortDescriptionPreviousVar]['content']);
 
-        if (strtolower($tokens[$isShortDescriptionPreviousVar]['content']) === strtolower($propertyName)) {
+        if ($shortDescription === strtolower($propertyName)) {
             $error = 'Short description duplicates class property name.';
             $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
             return;
@@ -152,7 +153,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
 
         $propertyNameParts = array_filter(preg_split('/(?=[A-Z])/', $propertyName));
 
-        if (strtolower($tokens[$isShortDescriptionPreviousVar]['content']) === strtolower(implode(' ', $propertyNameParts))) {
+        if ($shortDescription === strtolower(implode(' ', $propertyNameParts))) {
             $error = 'Short description duplicates class property name.';
             $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
         }

From 0fb55fcc54a77bc207ed0aaebf7b77b514e870b5 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 10:45:50 +0200
Subject: [PATCH 220/630] Fixed wrongly returning error for valid descriptions

---
 Magento2/Sniffs/Classes/AbstractApiSniff.php                  | 2 +-
 Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php      | 2 +-
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php               | 2 +-
 Magento2/Sniffs/Exceptions/ThrowCatchSniff.php                | 2 +-
 Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php | 2 +-
 Magento2/Sniffs/Functions/StaticFunctionSniff.php             | 2 +-
 Magento2/Sniffs/Legacy/MageEntitySniff.php                    | 2 +-
 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php        | 2 +-
 Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php       | 2 +-
 Magento2/Sniffs/PHP/GotoSniff.php                             | 2 +-
 Magento2/Sniffs/PHP/ReturnValueCheckSniff.php                 | 4 +++-
 Magento2/Sniffs/PHP/VarSniff.php                              | 2 +-
 Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php        | 2 +-
 Magento2/Sniffs/SQL/RawQuerySniff.php                         | 2 +-
 Magento2/Sniffs/Security/LanguageConstructSniff.php           | 4 ++--
 Magento2/Sniffs/Security/SuperglobalSniff.php                 | 4 ++--
 Magento2/Sniffs/Security/XssTemplateSniff.php                 | 4 +++-
 Magento2/Sniffs/Strings/ExecutableRegExSniff.php              | 2 +-
 Magento2/Sniffs/Strings/StringConcatSniff.php                 | 2 +-
 Magento2/Sniffs/Templates/ThisInTemplateSniff.php             | 4 ++--
 Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php        | 2 +-
 21 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Magento2/Sniffs/Classes/AbstractApiSniff.php b/Magento2/Sniffs/Classes/AbstractApiSniff.php
index a32dc0f5..bb8a6571 100644
--- a/Magento2/Sniffs/Classes/AbstractApiSniff.php
+++ b/Magento2/Sniffs/Classes/AbstractApiSniff.php
@@ -15,7 +15,7 @@ class AbstractApiSniff implements Sniff
 {
 
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index 8996131f..f5e45c63 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -18,7 +18,7 @@ class DiscouragedDependenciesSniff implements Sniff
     const CONSTRUCT_METHOD_NAME = '__construct';
 
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 1c74f63a..622644bf 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -14,7 +14,7 @@
 class DirectThrowSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      * phpcs:disable Generic.Files.LineLength.TooLong
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
index 5c2efbcc..c2510168 100644
--- a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
+++ b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
@@ -16,7 +16,7 @@
 class ThrowCatchSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
index 6d714dcc..0fa28149 100644
--- a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
+++ b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
@@ -15,7 +15,7 @@
 class TryProcessSystemResourcesSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Functions/StaticFunctionSniff.php b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
index 0805e3ce..2ae706d0 100644
--- a/Magento2/Sniffs/Functions/StaticFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
@@ -14,7 +14,7 @@
 class StaticFunctionSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index 8e305345..de8b7dbf 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -14,7 +14,7 @@
 class MageEntitySniff implements Sniff
 {
     /**
-     * Representation of error.
+     * String representation of error.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index cf58267f..f094c353 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -16,7 +16,7 @@ class DeprecatedModelMethodSniff implements Sniff
     const RESOURCE_METHOD = "getResource";
 
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
index b04da011..2ad688ec 100644
--- a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
+++ b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
@@ -14,7 +14,7 @@
 class InterfaceNameSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/PHP/GotoSniff.php b/Magento2/Sniffs/PHP/GotoSniff.php
index 0b74e855..4a5f06ca 100644
--- a/Magento2/Sniffs/PHP/GotoSniff.php
+++ b/Magento2/Sniffs/PHP/GotoSniff.php
@@ -14,7 +14,7 @@
 class GotoSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
index 5a6d507f..9929d46b 100644
--- a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
+++ b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
@@ -14,7 +14,7 @@
 class ReturnValueCheckSniff implements Sniff
 {
     /**
-     * Representation of error.
+     * String representation of error.
      *
      * @var string
      */
@@ -46,6 +46,8 @@ class ReturnValueCheckSniff implements Sniff
     protected $tokens = [];
 
     /**
+     * PHP_CodeSniffer file.
+     *
      * @var File
      */
     protected $file;
diff --git a/Magento2/Sniffs/PHP/VarSniff.php b/Magento2/Sniffs/PHP/VarSniff.php
index dfa9bdee..fa7b28b7 100644
--- a/Magento2/Sniffs/PHP/VarSniff.php
+++ b/Magento2/Sniffs/PHP/VarSniff.php
@@ -14,7 +14,7 @@
 class VarSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
index 09bc0bdd..9ab6c8cc 100644
--- a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
+++ b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
@@ -14,7 +14,7 @@
 class ForeachArrayMergeSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/SQL/RawQuerySniff.php b/Magento2/Sniffs/SQL/RawQuerySniff.php
index cb27c570..a32d4eb0 100644
--- a/Magento2/Sniffs/SQL/RawQuerySniff.php
+++ b/Magento2/Sniffs/SQL/RawQuerySniff.php
@@ -15,7 +15,7 @@
 class RawQuerySniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php
index a8e1c979..9b10ae4a 100644
--- a/Magento2/Sniffs/Security/LanguageConstructSniff.php
+++ b/Magento2/Sniffs/Security/LanguageConstructSniff.php
@@ -14,14 +14,14 @@
 class LanguageConstructSniff implements Sniff
 {
     /**
-     * Representation of error.
+     * String representation of error.
      *
      * @var string
      */
     protected $errorMessage = 'Use of %s language construct is discouraged.';
 
     /**
-     * Representation of backtick error.
+     * String representation of backtick error.
      *
      * phpcs:disable Generic.Files.LineLength
      *
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index 4d029dfc..136f991f 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -14,14 +14,14 @@
 class SuperglobalSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
     protected $warningMessage = 'Direct use of %s Superglobal detected.';
 
     /**
-     * Representation of error.
+     * String representation of error.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index 490d5cbd..f35943e5 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -14,7 +14,7 @@
 class XssTemplateSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
@@ -85,6 +85,8 @@ class XssTemplateSniff implements Sniff
     private $statements = [];
 
     /**
+     * PHP_CodeSniffer file.
+     *
      * @var File
      */
     private $file;
diff --git a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
index 5e435322..09706ed6 100644
--- a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
+++ b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
@@ -15,7 +15,7 @@
 class ExecutableRegExSniff implements Sniff
 {
     /**
-     * Representation of error.
+     * String representation of error.
      *
      * phpcs:disable Generic.Files.LineLength
      *
diff --git a/Magento2/Sniffs/Strings/StringConcatSniff.php b/Magento2/Sniffs/Strings/StringConcatSniff.php
index 06eb6a27..89c8dc9b 100644
--- a/Magento2/Sniffs/Strings/StringConcatSniff.php
+++ b/Magento2/Sniffs/Strings/StringConcatSniff.php
@@ -15,7 +15,7 @@
 class StringConcatSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
index afedc43f..9b5e5358 100644
--- a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+++ b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
@@ -21,7 +21,7 @@ class ThisInTemplateSniff implements Sniff
     protected $warningCodeFoundHelper = 'FoundHelper';
 
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
@@ -35,7 +35,7 @@ class ThisInTemplateSniff implements Sniff
     protected $warningCodeFoundThis = 'FoundThis';
 
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index d5152da3..4d74a29e 100644
--- a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -14,7 +14,7 @@
 class MultipleEmptyLinesSniff implements Sniff
 {
     /**
-     * Representation of warning.
+     * String representation of warning.
      *
      * @var string
      */

From 813a761a84e16792dac5d9af5af416e9cbf02d19 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 11:36:59 +0200
Subject: [PATCH 221/630] Increased version to 10

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c06ab6c7..3fd9762b 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "9",
+    "version": "10",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",

From f7df4550adbbdded4f4af2ad42f894fab02773bf Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 14 Sep 2021 11:39:26 +0200
Subject: [PATCH 222/630] Increased version to 10

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 025e27ee..f9b3efca 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9f04a53a3b02845918c714a149ab00b2",
+    "content-hash": "2c33aea65b2ef629308fd92cad58dfad",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From 80e07de67f87f84c6b57251afede86de908f21ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 14 Sep 2021 16:14:26 +0200
Subject: [PATCH 223/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 ...utogeneratedClassNotInConstructorSniff.php | 210 ++++++++++++++++++
 ...tedClassNotInConstructorUnitTest.1.php.inc |  28 +++
 ...tedClassNotInConstructorUnitTest.2.php.inc |  16 ++
 ...generatedClassNotInConstructorUnitTest.php |  33 +++
 4 files changed, 287 insertions(+)
 create mode 100644 Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
 create mode 100644 Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
 create mode 100644 Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
 create mode 100644 Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
new file mode 100644
index 00000000..b7343896
--- /dev/null
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\PHP;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Detects possible usage of 'var' language construction.
+ */
+class AutogeneratedClassNotInConstructorSniff implements Sniff
+{
+    const ERROR_CODE = 'AUTOGENERATED_CLASS_NOT_IN_CONSTRUCTOR';
+    /**
+     * @var mixed
+     */
+    private $constructorScopeOpener;
+    /**
+     * @var mixed
+     */
+    private $constructorScopeCloser;
+
+    /**
+     * @var array
+     */
+    private $constructorParameters = [];
+
+    /**
+     * @var array
+     */
+    private $uses = [];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_FUNCTION, T_DOUBLE_COLON, T_USE];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_USE') {
+            $this->registerUses($phpcsFile, $stackPtr);
+        }
+        if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_FUNCTION') {
+            $this->registerConstructorParameters($phpcsFile, $stackPtr);
+        }
+        if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_DOUBLE_COLON') {
+            if (!$this->isInsideConstruct($stackPtr)) {
+                return;
+            }
+            if (!$this->isObjectManagerGetInstance($phpcsFile, $stackPtr)) {
+                return;
+            }
+
+            $statementStart = $phpcsFile->findStartOfStatement($stackPtr);
+            $statementEnd = $phpcsFile->findEndOfStatement($stackPtr);
+            $equalsPtr = $phpcsFile->findNext(T_EQUAL, $statementStart, $statementEnd);
+
+            if (!$equalsPtr) {
+                return;
+            }
+
+            $variableInParameters = false;
+            if ($variable = $phpcsFile->findNext(T_VARIABLE, $equalsPtr, $statementEnd)) {
+                $variableName = $phpcsFile->getTokens()[$variable]['content'];
+                foreach ($this->constructorParameters as $parameter) {
+                    $parameterName = $parameter['name'];
+                    if ($parameterName === $variableName) {
+                        $variableInParameters = true;
+                    }
+                }
+            }
+
+            if (!$variableInParameters) {
+                $next = $stackPtr;
+                while ($next = $phpcsFile->findNext(T_DOUBLE_COLON, $next + 1, $statementEnd)) {
+                    if ($this->getNext($phpcsFile, $next, $statementEnd, T_STRING)['content'] === 'class') {
+                        $className = $this->getPrevious($phpcsFile, $next, T_STRING)['content'];
+                    }
+                }
+
+                $className = $this->getClassNamespace($className);
+
+                $phpcsFile->addError(
+                    sprintf("Class %s needs to be requested in constructor, " .
+                        "otherwise compiler will not be able to find and generate these classes", $className),
+                    $stackPtr,
+                    self::ERROR_CODE
+                );
+            }
+        }
+    }
+
+    /**
+     * Check if it is a ObjectManager::getInstance
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function isObjectManagerGetInstance(File $phpcsFile, int $stackPtr): bool
+    {
+        $prev = $phpcsFile->findPrevious(T_STRING, $stackPtr - 1);
+        $next = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+        if ($prev &&
+            $next &&
+            $phpcsFile->getTokens()[$prev]['content'] === 'ObjectManager' &&
+            $phpcsFile->getTokens()[$next]['content'] === 'getInstance') {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Checks if the code is inside __construct
+     *
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function isInsideConstruct(int $stackPtr): bool
+    {
+        return $stackPtr > $this->constructorScopeOpener && $stackPtr < $this->constructorScopeCloser;
+    }
+
+    /**
+     * Get the complete class namespace from the use's
+     *
+     * @param string $className
+     * @return string
+     */
+    private function getClassNamespace(string $className): string
+    {
+        foreach ($this->uses as $use) {
+            if (end($use) === $className) {
+                $className = implode('/', $use);
+            }
+        }
+        return $className;
+    }
+
+    /**
+     * Register php uses
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     */
+    private function registerUses(File $phpcsFile, int $stackPtr): void
+    {
+        $useEnd = $phpcsFile->findEndOfStatement($stackPtr);
+        $use = [];
+        $usePosition = $stackPtr;
+        while ($usePosition = $phpcsFile->findNext(T_STRING, $usePosition + 1, $useEnd)) {
+            $use[] = $phpcsFile->getTokens()[$usePosition]['content'];
+        }
+        $this->uses [] = $use;
+    }
+
+    /**
+     * Register php constructor parameters
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     */
+    private function registerConstructorParameters(File $phpcsFile, int $stackPtr): void
+    {
+        $functionName = $phpcsFile->getDeclarationName($stackPtr);
+        if ($functionName == '__construct') {
+            $this->constructorParameters = $phpcsFile->getMethodParameters($stackPtr);
+            $this->constructorScopeOpener = $phpcsFile->getTokens()[$stackPtr]['scope_opener'];
+            $this->constructorScopeCloser = $phpcsFile->getTokens()[$stackPtr]['scope_closer'];
+
+        }
+    }
+
+    /**
+     * Get next token
+     *
+     * @param File $phpcsFile
+     * @param int $nextDoubleColumn
+     * @param int $statementEnd
+     * @param int|string|array $types
+     * @return mixed
+     */
+    private function getNext(File $phpcsFile, int $nextDoubleColumn, int $statementEnd, $types)
+    {
+        return $phpcsFile->getTokens()[$phpcsFile->findNext($types, $nextDoubleColumn + 1, $statementEnd)];
+    }
+
+    /**
+     * Get previous token
+     *
+     * @param File $phpcsFile
+     * @param int $nextDoubleColumn
+     * @param int|string|array $types
+     * @return mixed
+     */
+    private function getPrevious(File $phpcsFile, int $nextDoubleColumn, $types)
+    {
+        return $phpcsFile->getTokens()[$phpcsFile->findPrevious($types, $nextDoubleColumn - 1)];
+    }
+}
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
new file mode 100644
index 00000000..e490e6c0
--- /dev/null
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\PHP;
+
+use Magento2\Model;
+
+class Good
+{
+    public function __construct(
+        Model $model = null
+    )
+    {
+        $this->model = $model ?? ObjectManager::getInstance()->get(Model::class);
+    }
+
+    /**
+     * @return Model
+     */
+    public function otherMethodThatCallsGetInstance(): void
+    {
+        $model = ObjectManager::getInstance()->get(Model::class);
+        $model->something();
+    }
+}
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
new file mode 100644
index 00000000..5b6271ca
--- /dev/null
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\PHP;
+
+class Bad
+{
+    public function __construct()
+    {
+        $this->model = ObjectManager::getInstance()->get(Model::class);
+    }
+}
+
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
new file mode 100644
index 00000000..4ecab492
--- /dev/null
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\PHP;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class AutogeneratedClassNotInConstructorUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($filename = '')
+    {
+        if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.2.php.inc') {
+            return [
+                13 => 1
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From a6d2530c8eb5300ee7d79f2d0bc3f05ac6d7b902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 14 Sep 2021 16:20:45 +0200
Subject: [PATCH 224/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 .../Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php   | 3 ++-
 .../PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc | 3 ++-
 .../PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc | 3 ++-
 .../Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index b7343896..91fdc265 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
 
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
index e490e6c0..6889b13e 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
 
 namespace Magento2\Tests\PHP;
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
index 5b6271ca..a72f5bb0 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
 
 namespace Magento2\Tests\PHP;
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
index 4ecab492..33a67241 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
 
 namespace Magento2\Tests\PHP;
 
@@ -17,7 +18,7 @@ public function getErrorList($filename = '')
     {
         if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.2.php.inc') {
             return [
-                13 => 1
+                14 => 1
             ];
         }
         return [];

From 592dcfc82508ec3196c2aca46b4d14293ef230bf Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Tue, 14 Sep 2021 14:26:10 -0500
Subject: [PATCH 225/630] AC-1102: Static test to verify self-closing tags for
 non-void html elements - add unit test for new sniff

---
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  |  2 +-
 .../Html/HtmlSelfClosingTagsUnitTest.1.inc    | 45 +++++++++++++++++++
 .../Html/HtmlSelfClosingTagsUnitTest.php      | 27 +++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
 create mode 100644 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php

diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index cd215313..ecbdca44 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -75,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr)
                         'Avoid using self-closing tag with non-void html element'
                         . ' - "' . $match[0]  . PHP_EOL,
                         null,
-                        'HtmlTemplates.Tag.SelfClosing'
+                        'HtmlSelfClosingNonVoidTag'
                     );
                 }
             }
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
new file mode 100644
index 00000000..3fadb203
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
@@ -0,0 +1,45 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<html>
+    <head>
+        <base/>
+        <link/>
+    </head>
+    <body>
+        <area alt=""/>
+        <br/>
+        <table>
+            <colgroup>
+                <col/>
+            </colgroup>
+        </table>
+        <embed/>
+        <hr/>
+        <img src="" alt=""/>
+        <input type="text" id="test_input"/>
+        <keygen/>
+        <link/>
+        <meta/>
+        <param name="" value=""/>
+        <video>
+            <source/>
+            <track src=""/>
+        </video>
+        <wbr/>
+
+        <label for="test_input"/>
+        <style type="text/css"/>
+        <div/>
+        <span/>
+        <text/>
+        <render/>
+        <each/>
+        <translate/>
+        <scope/>
+    </body>
+</html>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
new file mode 100644
index 00000000..dd6b0cef
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlSelfClosingTagsUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [1 => 9];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}

From f7b3bcc34c2df3df08efbf5406c5d06dec9e3c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 16 Sep 2021 10:47:32 +0200
Subject: [PATCH 226/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 ...utogeneratedClassNotInConstructorSniff.php | 57 +++++++------------
 ...tedClassNotInConstructorUnitTest.1.php.inc | 11 +++-
 ...generatedClassNotInConstructorUnitTest.php | 11 +++-
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 91fdc265..f2e79a1d 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -15,15 +15,7 @@
  */
 class AutogeneratedClassNotInConstructorSniff implements Sniff
 {
-    const ERROR_CODE = 'AUTOGENERATED_CLASS_NOT_IN_CONSTRUCTOR';
-    /**
-     * @var mixed
-     */
-    private $constructorScopeOpener;
-    /**
-     * @var mixed
-     */
-    private $constructorScopeCloser;
+    private const ERROR_CODE = 'AUTOGENERATED_CLASS_NOT_IN_CONSTRUCTOR';
 
     /**
      * @var array
@@ -55,9 +47,6 @@ public function process(File $phpcsFile, $stackPtr)
             $this->registerConstructorParameters($phpcsFile, $stackPtr);
         }
         if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_DOUBLE_COLON') {
-            if (!$this->isInsideConstruct($stackPtr)) {
-                return;
-            }
             if (!$this->isObjectManagerGetInstance($phpcsFile, $stackPtr)) {
                 return;
             }
@@ -73,9 +62,12 @@ public function process(File $phpcsFile, $stackPtr)
             $variableInParameters = false;
             if ($variable = $phpcsFile->findNext(T_VARIABLE, $equalsPtr, $statementEnd)) {
                 $variableName = $phpcsFile->getTokens()[$variable]['content'];
+                if ($variableName === '$this') {
+                   $variableName = $this->getNext($phpcsFile, $variable, $statementEnd, T_STRING)['content'];
+                }
                 foreach ($this->constructorParameters as $parameter) {
                     $parameterName = $parameter['name'];
-                    if ($parameterName === $variableName) {
+                    if ($this->variableName($parameterName) === $this->variableName($variableName)) {
                         $variableInParameters = true;
                     }
                 }
@@ -91,7 +83,7 @@ public function process(File $phpcsFile, $stackPtr)
 
                 $className = $this->getClassNamespace($className);
 
-                $phpcsFile->addError(
+                $phpcsFile->addWarning(
                     sprintf("Class %s needs to be requested in constructor, " .
                         "otherwise compiler will not be able to find and generate these classes", $className),
                     $stackPtr,
@@ -121,17 +113,6 @@ private function isObjectManagerGetInstance(File $phpcsFile, int $stackPtr): boo
         return false;
     }
 
-    /**
-     * Checks if the code is inside __construct
-     *
-     * @param int $stackPtr
-     * @return bool
-     */
-    private function isInsideConstruct(int $stackPtr): bool
-    {
-        return $stackPtr > $this->constructorScopeOpener && $stackPtr < $this->constructorScopeCloser;
-    }
-
     /**
      * Get the complete class namespace from the use's
      *
@@ -176,9 +157,6 @@ private function registerConstructorParameters(File $phpcsFile, int $stackPtr):
         $functionName = $phpcsFile->getDeclarationName($stackPtr);
         if ($functionName == '__construct') {
             $this->constructorParameters = $phpcsFile->getMethodParameters($stackPtr);
-            $this->constructorScopeOpener = $phpcsFile->getTokens()[$stackPtr]['scope_opener'];
-            $this->constructorScopeCloser = $phpcsFile->getTokens()[$stackPtr]['scope_closer'];
-
         }
     }
 
@@ -186,26 +164,35 @@ private function registerConstructorParameters(File $phpcsFile, int $stackPtr):
      * Get next token
      *
      * @param File $phpcsFile
-     * @param int $nextDoubleColumn
-     * @param int $statementEnd
+     * @param int $from
+     * @param int $to
      * @param int|string|array $types
      * @return mixed
      */
-    private function getNext(File $phpcsFile, int $nextDoubleColumn, int $statementEnd, $types)
+    private function getNext(File $phpcsFile, int $from, int $to, $types)
     {
-        return $phpcsFile->getTokens()[$phpcsFile->findNext($types, $nextDoubleColumn + 1, $statementEnd)];
+        return $phpcsFile->getTokens()[$phpcsFile->findNext($types, $from + 1, $to)];
     }
 
     /**
      * Get previous token
      *
      * @param File $phpcsFile
-     * @param int $nextDoubleColumn
+     * @param int $from
      * @param int|string|array $types
      * @return mixed
      */
-    private function getPrevious(File $phpcsFile, int $nextDoubleColumn, $types)
+    private function getPrevious(File $phpcsFile, int $from, $types)
+    {
+        return $phpcsFile->getTokens()[$phpcsFile->findPrevious($types, $from - 1)];
+    }
+
+    /**
+     * @param $parameterName
+     * @return array|string|string[]
+     */
+    protected function variableName($parameterName)
     {
-        return $phpcsFile->getTokens()[$phpcsFile->findPrevious($types, $nextDoubleColumn - 1)];
+        return str_replace('$', '', $parameterName);
     }
 }
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
index 6889b13e..e16177e8 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
@@ -21,9 +21,18 @@ class Good
     /**
      * @return Model
      */
-    public function otherMethodThatCallsGetInstance(): void
+    public function otherMethodThatCallsGetInstanceBad(): void
     {
         $model = ObjectManager::getInstance()->get(Model::class);
         $model->something();
     }
+
+    /**
+     * @return Model
+     */
+    public function otherMethodThatCallsGetInstanceGood(): void
+    {
+        $model = $this->model ?? ObjectManager::getInstance()->get(Model::class);
+        $model->something();
+    }
 }
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
index 33a67241..5c3a2f70 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
@@ -14,11 +14,16 @@ class AutogeneratedClassNotInConstructorUnitTest extends AbstractSniffUnitTest
     /**
      * @inheritdoc
      */
-    public function getErrorList($filename = '')
+    public function getWarningList($filename = '')
     {
+        if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.1.php.inc') {
+            return [
+                26 => 1,
+            ];
+        }
         if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.2.php.inc') {
             return [
-                14 => 1
+                14 => 1,
             ];
         }
         return [];
@@ -27,7 +32,7 @@ public function getErrorList($filename = '')
     /**
      * @inheritdoc
      */
-    public function getWarningList()
+    public function getErrorList()
     {
         return [];
     }

From c06cbc22be83622d5db80d5f254a89e4e7c19132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 16 Sep 2021 10:51:13 +0200
Subject: [PATCH 227/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 .../PHP/AutogeneratedClassNotInConstructorSniff.php    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index f2e79a1d..5b882dda 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -63,7 +63,7 @@ public function process(File $phpcsFile, $stackPtr)
             if ($variable = $phpcsFile->findNext(T_VARIABLE, $equalsPtr, $statementEnd)) {
                 $variableName = $phpcsFile->getTokens()[$variable]['content'];
                 if ($variableName === '$this') {
-                   $variableName = $this->getNext($phpcsFile, $variable, $statementEnd, T_STRING)['content'];
+                    $variableName = $this->getNext($phpcsFile, $variable, $statementEnd, T_STRING)['content'];
                 }
                 foreach ($this->constructorParameters as $parameter) {
                     $parameterName = $parameter['name'];
@@ -188,10 +188,12 @@ private function getPrevious(File $phpcsFile, int $from, $types)
     }
 
     /**
-     * @param $parameterName
-     * @return array|string|string[]
+     * Get name of the variable without $
+     *
+     * @param string $parameterName
+     * @return string
      */
-    protected function variableName($parameterName)
+    protected function variableName(string $parameterName): string
     {
         return str_replace('$', '', $parameterName);
     }

From 9d542d9f2c04d74e0e45930316c31d30894257b6 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 11:28:03 +0200
Subject: [PATCH 228/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../Legacy/ClassesConfigurationSniff.php      | 214 ++++++++++++++++++
 Magento2/Sniffs/Legacy/ExtendedNode.php       |  25 ++
 .../Legacy/ClassesConfigurationUnitTest.1.xml |  45 ++++
 .../Legacy/ClassesConfigurationUnitTest.2.xml |  52 +++++
 .../Legacy/ClassesConfigurationUnitTest.php   |  38 ++++
 Magento2/ruleset.xml                          |   8 +
 6 files changed, 382 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
 create mode 100644 Magento2/Sniffs/Legacy/ExtendedNode.php
 create mode 100644 Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
 create mode 100644 Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
 create mode 100644 Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
new file mode 100644
index 00000000..67431932
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use SimpleXMLElement;
+
+class ClassesConfigurationSniff implements Sniff
+{
+    private const ERROR_MESSAGE_CONFIG = 'Attribute does not follow expected format';
+    private const ERROR_CODE_CONFIG = 'WrongXML';
+    private const ERROR_MESSAGE_MODULE = 'Attribute does not follow expected format in module';
+    private const ERROR_CODE_MODULE = 'WrongXMLModule';
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_INLINE_HTML,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        // We need to format the incoming XML to avoid tags split into several lines. In that case, PHP's DOMElement
+        // returns the position of the closing /> as the position of the tag, and we need the position of <
+        // instead, as it is the one we compare with $stackPtr later on.
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        if ($xml === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                $stackPtr,
+                self::ERROR_CODE_CONFIG
+            );
+        }
+
+        $classes = $this->collectClassesInConfig($xml);
+        $this->assertNonFactoryName($phpcsFile, $stackPtr, $classes);
+
+        $modules = $this->getXmlAttributeValues($xml, '//@module', 'module');
+        $this->assertNonFactoryNameModule($phpcsFile, $stackPtr, $modules);
+    }
+
+    /**
+     * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param ExtendedNode[] $elements
+     */
+    private function assertNonFactoryName(File $phpcsFile, int $stackPtr, array $elements)
+    {
+        foreach ($elements as $element) {
+            if (stripos($element->value, 'Magento') === false) {
+                continue;
+            }
+            if (preg_match('/^([A-Z][a-z\d\\\\]+)+$/', $element->value) !== 1) {
+                $phpcsFile->addError(
+                    self::ERROR_MESSAGE_CONFIG,
+                    $element->element->getLineNo() - 1,
+                    self::ERROR_CODE_CONFIG,
+                );
+            }
+        }
+    }
+
+    /**
+     * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param ExtendedNode[] $classes
+     */
+    private function assertNonFactoryNameModule(File $phpcsFile, int $stackPtr, array $classes)
+    {
+        foreach ($classes as $element) {
+            if (preg_match('/^([A-Z][A-Za-z\d_]+)+$/', $element->value) !== 1) {
+                $phpcsFile->addError(
+                    self::ERROR_MESSAGE_MODULE,
+                    $element->element->getLineNo() - 1,
+                    self::ERROR_CODE_MODULE,
+                );
+            }
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+
+    /**
+     * @param SimpleXMLElement $xml
+     * @return array
+     */
+    private function collectClassesInConfig(SimpleXMLElement $xml): array
+    {
+        $classes = $this->getXmlNode(
+            $xml,
+            '
+            /config//resource_adapter | /config/*[not(name()="sections")]//class[not(ancestor::observers)]
+                | //model[not(parent::connection)] | //backend_model | //source_model | //price_model
+                | //model_token | //writer_model | //clone_model | //frontend_model | //working_model
+                | //admin_renderer | //renderer | /config/*/di/preferences/*'
+        );
+        $classes = array_merge($classes, $this->getXmlAttributeValues($xml, '//@backend_model', 'backend_model'));
+        $classes = array_merge(
+            $classes,
+            $this->getXmlNodeNames(
+                $xml,
+                '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/* | /config/*/di/preferences/*'
+            )
+        );
+
+        $classes = array_map(
+            function(ExtendedNode $extendedNode) {
+                $extendedNode->value = explode('::', trim($extendedNode->value))[0];
+                return $extendedNode;
+            },
+            $classes
+        );
+        $classes = array_filter(
+            $classes,
+            function ($value) {
+                return !empty($value);
+            }
+        );
+
+        return $classes;
+    }
+
+    /**
+     * Get XML node text values using specified xPath
+     *
+     * The node must contain specified attribute
+     *
+     * @param SimpleXMLElement $xml
+     * @param string $xPath
+     * @return array
+     */
+    private function getXmlNode(SimpleXMLElement $xml, string $xPath): array
+    {
+        $result = [];
+        $nodes = $xml->xpath($xPath) ?: [];
+        foreach ($nodes as $node) {
+            $result[] = new ExtendedNode((string)$node, $node);
+        }
+        return $result;
+    }
+
+    /**
+     * Get XML node names using specified xPath
+     *
+     * @param SimpleXMLElement $xml
+     * @param string $xpath
+     * @return array
+     */
+    private function getXmlNodeNames(SimpleXMLElement $xml, string $xpath): array
+    {
+        $result = [];
+        $nodes = $xml->xpath($xpath) ?: [];
+        foreach ($nodes as $node) {
+            $result[] = new ExtendedNode($node->getName(), $node);
+        }
+        return $result;
+    }
+
+    /**
+     * Get XML node attribute values using specified xPath
+     *
+     * @param SimpleXMLElement $xml
+     * @param string $xPath
+     * @param string $attributeName
+     * @return array
+     */
+    private function getXmlAttributeValues(SimpleXMLElement $xml, string $xPath, string $attributeName): array
+    {
+        $result = [];
+        $nodes = $xml->xpath($xPath) ?: [];
+        foreach ($nodes as $node) {
+            $nodeArray = (array)$node;
+            if (isset($nodeArray['@attributes'][$attributeName])) {
+                $result[] = new ExtendedNode($nodeArray['@attributes'][$attributeName], $node);
+            }
+        }
+        return $result;
+    }
+}
diff --git a/Magento2/Sniffs/Legacy/ExtendedNode.php b/Magento2/Sniffs/Legacy/ExtendedNode.php
new file mode 100644
index 00000000..dbbd8e8d
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ExtendedNode.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMElement;
+use SimpleXMLElement;
+
+class ExtendedNode
+{
+    /**
+     * @var string
+     */
+    public $value;
+
+    /**
+     * @var DOMElement
+     */
+    public $element;
+
+    public function __construct(string $value, SimpleXMLElement $element)
+    {
+        $this->value = $value;
+        $this->element = dom_import_simplexml($element);
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
new file mode 100644
index 00000000..f4a7b5cd
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="payment" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="checkmo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Check / Money Order</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
+            <group id="purchaseorder" translate="label" type="text" sortOrder="32" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Purchase Order</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\CONFIG\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
+            <group id="banktransfer" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Bank Transfer Payment</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="title" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Title</label>
+                </field>
+                <field id="order_status" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>New Order Status</label>
+                    <source_model>Sales\MODEL\Config\Source\Order\Status\NewStatus</source_model>
+                </field>
+                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Payment from Applicable Countries</label>
+                    <source_model>MAGENTO\Payment\Model\Config\Source\Allspecificcountries</source_model>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
new file mode 100644
index 00000000..5ea35a2e
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="payment" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="checkmo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Check / Money Order</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
+            <group id="purchaseorder" translate="label" type="text" sortOrder="32" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Purchase Order</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>
+                        Magento\CONFIG\Model\Config\Source\Yesno
+                    </source_model>
+                </field>
+            </group>
+            <group id="banktransfer" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Bank Transfer Payment</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="title" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Title</label>
+                </field>
+                <field id="order_status" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>New Order Status</label>
+                    <source_model>Sales\MODEL\Config\Source\Order\Status\NewStatus</source_model>
+                </field>
+                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Payment from Applicable Countries</label>
+                    <source_model>
+
+
+                        MAGENTO\Payment\Model\Config\Source\Allspecificcountries
+
+                    </source_model>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
new file mode 100644
index 00000000..20a249b2
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ClassesConfigurationUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        if ($testFile === 'ClassesConfigurationUnitTest.1.xml') {
+            return [
+                22 => 1,
+                40 => 1,
+            ];
+        }
+        if ($testFile === 'ClassesConfigurationUnitTest.2.xml') {
+            return [
+                22 => 1,
+                42 => 1,
+            ];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 212bf246..d1b4cfb0 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -115,6 +115,14 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.Legacy.ClassesConfiguration">
+        <include-pattern>*\/etc/*.xml$</include-pattern>
+        <exclude-pattern>*\/etc/wsdl.xml$</exclude-pattern>
+        <exclude-pattern>*\/etc/wsdl2.xml$</exclude-pattern>
+        <exclude-pattern>*\/etc/wsi.xml$</exclude-pattern>
+        <severity>10</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">

From 2c5c076f64a91351166dfdb4f93417f34dd3b37d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 11:33:26 +0200
Subject: [PATCH 229/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ExtendedNode.php       |  2 +-
 .../Legacy/ObsoleteMethodsUsageSniff.php      | 69 -------------------
 .../Legacy/ClassesConfigurationUnitTest.1.xml |  2 +-
 .../Legacy/ClassesConfigurationUnitTest.2.xml |  2 +-
 .../Legacy/ObsoleteMethodsUsageUnitTest.inc   |  6 --
 .../Legacy/ObsoleteMethodsUsageUnitTest.php   | 31 ---------
 6 files changed, 3 insertions(+), 109 deletions(-)
 delete mode 100644 Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
 delete mode 100644 Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc
 delete mode 100644 Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ExtendedNode.php b/Magento2/Sniffs/Legacy/ExtendedNode.php
index dbbd8e8d..8efb770e 100644
--- a/Magento2/Sniffs/Legacy/ExtendedNode.php
+++ b/Magento2/Sniffs/Legacy/ExtendedNode.php
@@ -22,4 +22,4 @@ public function __construct(string $value, SimpleXMLElement $element)
         $this->value = $value;
         $this->element = dom_import_simplexml($element);
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php b/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
deleted file mode 100644
index d12c9fa6..00000000
--- a/Magento2/Sniffs/Legacy/ObsoleteMethodsUsageSniff.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Sniffs\Legacy;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class ObsoleteMethodsUsageSniff implements Sniff
-{
-    private const ERROR_MESSAGE = 'Obsolete methods usage detected';
-    
-    private const ERROR_CODE = 'ObsoleteMethodsUsage';
-
-    /**
-     * @var string[]
-     */
-    private $obsoleteStaticMethods = [
-        'getModel', 'getSingleton', 'getResourceModel', 'getResourceSingleton',
-        'addBlock', 'createBlock', 'getBlockSingleton',
-        'initReport', 'setEntityModelClass', 'setAttributeModel', 'setBackendModel', 'setFrontendModel',
-        'setSourceModel', 'setModel'
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register(): array
-    {
-        return [
-            T_DOUBLE_COLON,
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $methodNameStackPtr = $phpcsFile->findNext(T_STRING, $stackPtr + 1, null, false, null, true);
-        if ($methodNameStackPtr === false) {
-            return;
-        }
-        $name = $tokens[$methodNameStackPtr]['content'];
-        if (in_array($name, $this->obsoleteStaticMethods)) {
-            $classNameStackPtr = $phpcsFile->findPrevious(
-                [T_STRING],
-                $methodNameStackPtr - 1,
-                null,
-                false,
-                null,
-                true
-            );
-            if ($classNameStackPtr === false) {
-                return;
-            }
-            if ($tokens[$classNameStackPtr]['content'] === 'Mage') {
-                $phpcsFile->addError(
-                    self::ERROR_MESSAGE,
-                    $methodNameStackPtr + 1,
-                    self::ERROR_CODE,
-                );
-            }
-        }
-    }
-}
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
index f4a7b5cd..864a154e 100644
--- a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
@@ -42,4 +42,4 @@
             </group>
         </section>
     </system>
-</config>
\ No newline at end of file
+</config>
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
index 5ea35a2e..2753291f 100644
--- a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
@@ -49,4 +49,4 @@
             </group>
         </section>
     </system>
-</config>
\ No newline at end of file
+</config>
diff --git a/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc b/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc
deleted file mode 100644
index 91583ae7..00000000
--- a/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$model = Mage::getModel('Magento\foo_bar');
-$model = Maga::getModel('baz\FooBar');
-$model = Mage::getModel('Magento\FooBar');
-$model = Mage::getModel('MAGENTO\FooBar');
diff --git a/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php b/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php
deleted file mode 100644
index 124f706c..00000000
--- a/Magento2/Tests/Legacy/ObsoleteMethodsUsageUnitTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Tests\Legacy;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-class ObsoleteMethodsUsageUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    public function getErrorList()
-    {
-        return [
-            3 => 1,
-            5 => 1,
-            6 => 1,
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList()
-    {
-        return [];
-    }
-}

From 3636e9d81ac44ef12a8e4344d09962d21968c552 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 11:34:27 +0200
Subject: [PATCH 230/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ExtendedNode.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/ExtendedNode.php b/Magento2/Sniffs/Legacy/ExtendedNode.php
index 8efb770e..e3c69516 100644
--- a/Magento2/Sniffs/Legacy/ExtendedNode.php
+++ b/Magento2/Sniffs/Legacy/ExtendedNode.php
@@ -17,6 +17,10 @@ class ExtendedNode
      */
     public $element;
 
+    /**
+     * @param string $value
+     * @param SimpleXMLElement $element
+     */
     public function __construct(string $value, SimpleXMLElement $element)
     {
         $this->value = $value;

From 029356085c064db4fd437e7a667268f267898428 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 11:35:40 +0200
Subject: [PATCH 231/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
index 67431932..4502ed27 100644
--- a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
@@ -52,20 +52,19 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $classes = $this->collectClassesInConfig($xml);
-        $this->assertNonFactoryName($phpcsFile, $stackPtr, $classes);
+        $this->assertNonFactoryName($phpcsFile, $classes);
 
         $modules = $this->getXmlAttributeValues($xml, '//@module', 'module');
-        $this->assertNonFactoryNameModule($phpcsFile, $stackPtr, $modules);
+        $this->assertNonFactoryNameModule($phpcsFile, $modules);
     }
 
     /**
      * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
      *
      * @param File $phpcsFile
-     * @param int $stackPtr
      * @param ExtendedNode[] $elements
      */
-    private function assertNonFactoryName(File $phpcsFile, int $stackPtr, array $elements)
+    private function assertNonFactoryName(File $phpcsFile, array $elements)
     {
         foreach ($elements as $element) {
             if (stripos($element->value, 'Magento') === false) {
@@ -85,10 +84,9 @@ private function assertNonFactoryName(File $phpcsFile, int $stackPtr, array $ele
      * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
      *
      * @param File $phpcsFile
-     * @param int $stackPtr
      * @param ExtendedNode[] $classes
      */
-    private function assertNonFactoryNameModule(File $phpcsFile, int $stackPtr, array $classes)
+    private function assertNonFactoryNameModule(File $phpcsFile, array $classes)
     {
         foreach ($classes as $element) {
             if (preg_match('/^([A-Z][A-Za-z\d_]+)+$/', $element->value) !== 1) {

From b91d0d4afdffdc8537cbf1d903ff301a4bfd2674 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 11:45:29 +0200
Subject: [PATCH 232/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php | 7 +++++--
 Magento2/Sniffs/Legacy/ExtendedNode.php              | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
index 4502ed27..46ae7cfe 100644
--- a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento2\Sniffs\Legacy;
 
 use DOMDocument;
@@ -114,6 +115,8 @@ private function getFormattedXML(File $phpcsFile)
     }
 
     /**
+     * Parse an XML for references to PHP class names in selected tags or attributes
+     *
      * @param SimpleXMLElement $xml
      * @return array
      */
@@ -137,7 +140,7 @@ private function collectClassesInConfig(SimpleXMLElement $xml): array
         );
 
         $classes = array_map(
-            function(ExtendedNode $extendedNode) {
+            function (ExtendedNode $extendedNode) {
                 $extendedNode->value = explode('::', trim($extendedNode->value))[0];
                 return $extendedNode;
             },
diff --git a/Magento2/Sniffs/Legacy/ExtendedNode.php b/Magento2/Sniffs/Legacy/ExtendedNode.php
index e3c69516..44c382fa 100644
--- a/Magento2/Sniffs/Legacy/ExtendedNode.php
+++ b/Magento2/Sniffs/Legacy/ExtendedNode.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 namespace Magento2\Sniffs\Legacy;
 

From 717c9983fa908f7918646b90a083fefb9aafa2d1 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 11:55:27 +0200
Subject: [PATCH 233/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../Tests/Legacy/ClassesConfigurationUnitTest.3.xml | 13 +++++++++++++
 .../Tests/Legacy/ClassesConfigurationUnitTest.php   |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 Magento2/Tests/Legacy/ClassesConfigurationUnitTest.3.xml

diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.3.xml b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.3.xml
new file mode 100644
index 00000000..4884a838
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Magento_CatalogRule::promo" title="Promotions" translate="title" module="Magento CatalogRule" parent="Magento_Backend::marketing" sortOrder="10" resource="Magento_CatalogRule::promo"/>
+        <add id="Magento_CatalogRule::promo_catalog" title="Catalog Price Rule" translate="title" sortOrder="10" module="Magento_CatalogRule" parent="Magento_CatalogRule::promo" action="catalog_rule/promo_catalog/" dependsOnModule="Magento_Catalog" resource="Magento_CatalogRule::promo_catalog"/>
+    </menu>
+</config>
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
index 20a249b2..ad788298 100644
--- a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
@@ -26,6 +26,12 @@ public function getErrorList($testFile = '')
                 42 => 1,
             ];
         }
+        if ($testFile === 'ClassesConfigurationUnitTest.3.xml') {
+            return [
+                10 => 1,
+            ];
+        }
+        return [];
     }
 
     /**

From 1d499c26bae36cc1061ee258f02eb4baba0247c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Thu, 16 Sep 2021 12:42:39 +0200
Subject: [PATCH 234/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 .../PHP/AutogeneratedClassNotInConstructorSniff.php      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 5b882dda..30c4620c 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * Detects possible usage of 'var' language construction.
+ * Detects bad usages of ObjectManager in constructor.
  */
 class AutogeneratedClassNotInConstructorSniff implements Sniff
 {
@@ -104,13 +104,10 @@ private function isObjectManagerGetInstance(File $phpcsFile, int $stackPtr): boo
     {
         $prev = $phpcsFile->findPrevious(T_STRING, $stackPtr - 1);
         $next = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-        if ($prev &&
+        return $prev &&
             $next &&
             $phpcsFile->getTokens()[$prev]['content'] === 'ObjectManager' &&
-            $phpcsFile->getTokens()[$next]['content'] === 'getInstance') {
-            return true;
-        }
-        return false;
+            $phpcsFile->getTokens()[$next]['content'] === 'getInstance';
     }
 
     /**

From 5810c6e22bfb6f5575fa0c0c591a2f4855ee7571 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 15:30:23 +0200
Subject: [PATCH 235/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../Legacy/ClassesConfigurationSniff.php      |  5 +--
 .../Legacy/ClassesConfigurationUnitTest.4.xml | 36 +++++++++++++++++++
 .../Legacy/ClassesConfigurationUnitTest.php   |  5 +++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/ClassesConfigurationUnitTest.4.xml

diff --git a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
index 46ae7cfe..794eba9e 100644
--- a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
@@ -128,14 +128,15 @@ private function collectClassesInConfig(SimpleXMLElement $xml): array
             /config//resource_adapter | /config/*[not(name()="sections")]//class[not(ancestor::observers)]
                 | //model[not(parent::connection)] | //backend_model | //source_model | //price_model
                 | //model_token | //writer_model | //clone_model | //frontend_model | //working_model
-                | //admin_renderer | //renderer | /config/*/di/preferences/*'
+                | //admin_renderer | //renderer'
         );
         $classes = array_merge($classes, $this->getXmlAttributeValues($xml, '//@backend_model', 'backend_model'));
+        $classes = array_merge($classes, $this->getXmlAttributeValues($xml, '/config//preference', 'type'));
         $classes = array_merge(
             $classes,
             $this->getXmlNodeNames(
                 $xml,
-                '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/* | /config/*/di/preferences/*'
+                '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/*'
             )
         );
 
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.4.xml b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.4.xml
new file mode 100644
index 00000000..a99f0589
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.4.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="DateTimeInterface" type="DateTime" />
+    <preference for="Psr\Log\LoggerInterface" type="Magento\FRAMEWORK\Logger\LoggerProxy" />
+    <preference for="Magento\Framework\EntityManager\EntityMetadataInterface" type="Magento\Framework\EntityManager\EntityMetadata" />
+    <preference for="Magento\Framework\EntityManager\HydratorInterface" type="Magento\Framework\EntityManager\Hydrator" />
+    <preference for="Magento\Framework\View\Template\Html\MinifierInterface" type="Magento\Framework\View\Template\Html\Minifier" />
+    <preference for="Magento\Framework\Model\Entity\ScopeInterface" type="Magento\Framework\Model\Entity\Scope" />
+    <type name="Magento\Store\Model\Store">
+        <arguments>
+            <argument name="currencyInstalled" xsi:type="string">system/currency/installed</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\Communication\Config\Reader\XmlReader" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Framework\Communication\Config\Reader\XmlReader\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Framework\Communication\Config\Reader\XmlReader\SchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">communication.xml</argument>
+            <argument name="idAttributes" xsi:type="array">
+                <item name="/config/topic" xsi:type="string">name</item>
+                <item name="/config/topic/handler" xsi:type="string">name</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\Logger\Handler\Syslog">
+        <arguments>
+            <argument name="ident" xsi:type="string">Magento</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
index ad788298..8d747e19 100644
--- a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
+++ b/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
@@ -31,6 +31,11 @@ public function getErrorList($testFile = '')
                 10 => 1,
             ];
         }
+        if ($testFile === 'ClassesConfigurationUnitTest.4.xml') {
+            return [
+                10 => 1,
+            ];
+        }
         return [];
     }
 

From 0bc42a6828ceb03bf405909f16d45913ac7d3431 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 16:41:12 +0200
Subject: [PATCH 236/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...hp => ClassReferencesInConfigurationFilesSniff.php} |  2 +-
 ... ClassReferencesInConfigurationFilesUnitTest.1.xml} |  0
 ... ClassReferencesInConfigurationFilesUnitTest.2.xml} |  0
 ... ClassReferencesInConfigurationFilesUnitTest.3.xml} |  0
 ... ClassReferencesInConfigurationFilesUnitTest.4.xml} |  0
 ...=> ClassReferencesInConfigurationFilesUnitTest.php} | 10 +++++-----
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename Magento2/Sniffs/Legacy/{ClassesConfigurationSniff.php => ClassReferencesInConfigurationFilesSniff.php} (99%)
 rename Magento2/Tests/Legacy/{ClassesConfigurationUnitTest.1.xml => ClassReferencesInConfigurationFilesUnitTest.1.xml} (100%)
 rename Magento2/Tests/Legacy/{ClassesConfigurationUnitTest.2.xml => ClassReferencesInConfigurationFilesUnitTest.2.xml} (100%)
 rename Magento2/Tests/Legacy/{ClassesConfigurationUnitTest.3.xml => ClassReferencesInConfigurationFilesUnitTest.3.xml} (100%)
 rename Magento2/Tests/Legacy/{ClassesConfigurationUnitTest.4.xml => ClassReferencesInConfigurationFilesUnitTest.4.xml} (100%)
 rename Magento2/Tests/Legacy/{ClassesConfigurationUnitTest.php => ClassReferencesInConfigurationFilesUnitTest.php} (65%)

diff --git a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
similarity index 99%
rename from Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
rename to Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 794eba9e..55dff999 100644
--- a/Magento2/Sniffs/Legacy/ClassesConfigurationSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Files\File;
 use SimpleXMLElement;
 
-class ClassesConfigurationSniff implements Sniff
+class ClassReferencesInConfigurationFilesSniff implements Sniff
 {
     private const ERROR_MESSAGE_CONFIG = 'Attribute does not follow expected format';
     private const ERROR_CODE_CONFIG = 'WrongXML';
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.1.xml
similarity index 100%
rename from Magento2/Tests/Legacy/ClassesConfigurationUnitTest.1.xml
rename to Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.1.xml
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.2.xml
similarity index 100%
rename from Magento2/Tests/Legacy/ClassesConfigurationUnitTest.2.xml
rename to Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.2.xml
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.3.xml b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.3.xml
similarity index 100%
rename from Magento2/Tests/Legacy/ClassesConfigurationUnitTest.3.xml
rename to Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.3.xml
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.4.xml b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.4.xml
similarity index 100%
rename from Magento2/Tests/Legacy/ClassesConfigurationUnitTest.4.xml
rename to Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.4.xml
diff --git a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.php
similarity index 65%
rename from Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
rename to Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.php
index 8d747e19..83bb6f1d 100644
--- a/Magento2/Tests/Legacy/ClassesConfigurationUnitTest.php
+++ b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.php
@@ -7,31 +7,31 @@
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class ClassesConfigurationUnitTest extends AbstractSniffUnitTest
+class ClassReferencesInConfigurationFilesUnitTest extends AbstractSniffUnitTest
 {
     /**
      * @inheritdoc
      */
     public function getErrorList($testFile = '')
     {
-        if ($testFile === 'ClassesConfigurationUnitTest.1.xml') {
+        if ($testFile === 'ClassReferencesInConfigurationFilesUnitTest.1.xml') {
             return [
                 22 => 1,
                 40 => 1,
             ];
         }
-        if ($testFile === 'ClassesConfigurationUnitTest.2.xml') {
+        if ($testFile === 'ClassReferencesInConfigurationFilesUnitTest.2.xml') {
             return [
                 22 => 1,
                 42 => 1,
             ];
         }
-        if ($testFile === 'ClassesConfigurationUnitTest.3.xml') {
+        if ($testFile === 'ClassReferencesInConfigurationFilesUnitTest.3.xml') {
             return [
                 10 => 1,
             ];
         }
-        if ($testFile === 'ClassesConfigurationUnitTest.4.xml') {
+        if ($testFile === 'ClassReferencesInConfigurationFilesUnitTest.4.xml') {
             return [
                 10 => 1,
             ];

From 19bb57b569245f20d96a0feded57fdb127492565 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 17:19:22 +0200
Subject: [PATCH 237/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 Magento2/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index d1b4cfb0..65d2cb3b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -115,7 +115,7 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
-    <rule ref="Magento2.Legacy.ClassesConfiguration">
+    <rule ref="Magento2.Legacy.ClassReferencesInConfigurationFiles">
         <include-pattern>*\/etc/*.xml$</include-pattern>
         <exclude-pattern>*\/etc/wsdl.xml$</exclude-pattern>
         <exclude-pattern>*\/etc/wsdl2.xml$</exclude-pattern>

From 48a58169ac51178250625b96798be3f69233a0ff Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 16 Sep 2021 17:20:36 +0200
Subject: [PATCH 238/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../Legacy/ClassReferencesInConfigurationFilesSniff.php    | 4 ++--
 Magento2/Sniffs/Legacy/ExtendedNode.php                    | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 55dff999..79f804af 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -74,7 +74,7 @@ private function assertNonFactoryName(File $phpcsFile, array $elements)
             if (preg_match('/^([A-Z][a-z\d\\\\]+)+$/', $element->value) !== 1) {
                 $phpcsFile->addError(
                     self::ERROR_MESSAGE_CONFIG,
-                    $element->element->getLineNo() - 1,
+                    $element->lineNumber - 1,
                     self::ERROR_CODE_CONFIG,
                 );
             }
@@ -93,7 +93,7 @@ private function assertNonFactoryNameModule(File $phpcsFile, array $classes)
             if (preg_match('/^([A-Z][A-Za-z\d_]+)+$/', $element->value) !== 1) {
                 $phpcsFile->addError(
                     self::ERROR_MESSAGE_MODULE,
-                    $element->element->getLineNo() - 1,
+                    $element->lineNumber - 1,
                     self::ERROR_CODE_MODULE,
                 );
             }
diff --git a/Magento2/Sniffs/Legacy/ExtendedNode.php b/Magento2/Sniffs/Legacy/ExtendedNode.php
index 44c382fa..0320e63c 100644
--- a/Magento2/Sniffs/Legacy/ExtendedNode.php
+++ b/Magento2/Sniffs/Legacy/ExtendedNode.php
@@ -6,7 +6,6 @@
 
 namespace Magento2\Sniffs\Legacy;
 
-use DOMElement;
 use SimpleXMLElement;
 
 class ExtendedNode
@@ -17,9 +16,9 @@ class ExtendedNode
     public $value;
 
     /**
-     * @var DOMElement
+     * @var int
      */
-    public $element;
+    public $lineNumber;
 
     /**
      * @param string $value
@@ -28,6 +27,6 @@ class ExtendedNode
     public function __construct(string $value, SimpleXMLElement $element)
     {
         $this->value = $value;
-        $this->element = dom_import_simplexml($element);
+        $this->lineNumber = dom_import_simplexml($element)->getLineNo();
     }
 }

From b10df58d041ee7bf6993d9e76013c5c3e1cb62fb Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 17 Sep 2021 13:58:15 +0200
Subject: [PATCH 239/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...assReferencesInConfigurationFilesSniff.php | 106 ++++++++----------
 1 file changed, 46 insertions(+), 60 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 79f804af..6e4f37f7 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -18,6 +18,10 @@ class ClassReferencesInConfigurationFilesSniff implements Sniff
     private const ERROR_MESSAGE_MODULE = 'Attribute does not follow expected format in module';
     private const ERROR_CODE_MODULE = 'WrongXMLModule';
 
+    private const FROM_CONTENT = 1;
+    private const FROM_NAME = 2;
+    private const FROM_ATTRIBUTE = 3;
+
     /**
      * @inheritdoc
      */
@@ -55,7 +59,7 @@ public function process(File $phpcsFile, $stackPtr)
         $classes = $this->collectClassesInConfig($xml);
         $this->assertNonFactoryName($phpcsFile, $classes);
 
-        $modules = $this->getXmlAttributeValues($xml, '//@module', 'module');
+        $modules = $this->getValuesFromXml($xml, '//@module', self::FROM_ATTRIBUTE, 'module');
         $this->assertNonFactoryNameModule($phpcsFile, $modules);
     }
 
@@ -122,21 +126,39 @@ private function getFormattedXML(File $phpcsFile)
      */
     private function collectClassesInConfig(SimpleXMLElement $xml): array
     {
-        $classes = $this->getXmlNode(
+        $classes = $this->getValuesFromXml(
             $xml,
             '
             /config//resource_adapter | /config/*[not(name()="sections")]//class[not(ancestor::observers)]
                 | //model[not(parent::connection)] | //backend_model | //source_model | //price_model
                 | //model_token | //writer_model | //clone_model | //frontend_model | //working_model
-                | //admin_renderer | //renderer'
+                | //admin_renderer | //renderer',
+            self::FROM_CONTENT
+        );
+        $classes = array_merge(
+            $classes,
+            $this->getValuesFromXml(
+                $xml,
+                '//@backend_model',
+                self::FROM_ATTRIBUTE,
+                'backend_model'
+            )
         );
-        $classes = array_merge($classes, $this->getXmlAttributeValues($xml, '//@backend_model', 'backend_model'));
-        $classes = array_merge($classes, $this->getXmlAttributeValues($xml, '/config//preference', 'type'));
         $classes = array_merge(
             $classes,
-            $this->getXmlNodeNames(
+            $this->getValuesFromXml(
                 $xml,
-                '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/*'
+                '/config//preference',
+                self::FROM_ATTRIBUTE,
+                'type'
+            )
+        );
+        $classes = array_merge(
+            $classes,
+            $this->getValuesFromXml(
+                $xml,
+                '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/*',
+                self::FROM_NAME
             )
         );
 
@@ -147,70 +169,34 @@ function (ExtendedNode $extendedNode) {
             },
             $classes
         );
-        $classes = array_filter(
-            $classes,
-            function ($value) {
-                return !empty($value);
-            }
-        );
 
         return $classes;
     }
 
     /**
-     * Get XML node text values using specified xPath
-     *
-     * The node must contain specified attribute
-     *
+     * Extract value from the specified $extractFrom which exist in the XML path
+     * 
      * @param SimpleXMLElement $xml
      * @param string $xPath
+     * @param int $extractFrom
+     * @param string $attribute
      * @return array
      */
-    private function getXmlNode(SimpleXMLElement $xml, string $xPath): array
+    private function getValuesFromXml(SimpleXMLElement $xml, string $xPath, int $extractFrom, string $attribute = ''): array
     {
-        $result = [];
         $nodes = $xml->xpath($xPath) ?: [];
-        foreach ($nodes as $node) {
-            $result[] = new ExtendedNode((string)$node, $node);
-        }
-        return $result;
-    }
-
-    /**
-     * Get XML node names using specified xPath
-     *
-     * @param SimpleXMLElement $xml
-     * @param string $xpath
-     * @return array
-     */
-    private function getXmlNodeNames(SimpleXMLElement $xml, string $xpath): array
-    {
-        $result = [];
-        $nodes = $xml->xpath($xpath) ?: [];
-        foreach ($nodes as $node) {
-            $result[] = new ExtendedNode($node->getName(), $node);
-        }
-        return $result;
-    }
-
-    /**
-     * Get XML node attribute values using specified xPath
-     *
-     * @param SimpleXMLElement $xml
-     * @param string $xPath
-     * @param string $attributeName
-     * @return array
-     */
-    private function getXmlAttributeValues(SimpleXMLElement $xml, string $xPath, string $attributeName): array
-    {
-        $result = [];
-        $nodes = $xml->xpath($xPath) ?: [];
-        foreach ($nodes as $node) {
-            $nodeArray = (array)$node;
-            if (isset($nodeArray['@attributes'][$attributeName])) {
-                $result[] = new ExtendedNode($nodeArray['@attributes'][$attributeName], $node);
+        return array_map(function($item) use ($extractFrom, $attribute) {
+            switch ($extractFrom) {
+                case self::FROM_CONTENT:
+                    return new ExtendedNode((string)$item, $item);
+                case self::FROM_NAME:
+                    return new ExtendedNode($item->getName(), $item);
+                case self::FROM_ATTRIBUTE:
+                    $nodeArray = (array)$item;
+                    if (isset($nodeArray['@attributes'][$attribute])) {
+                        return new ExtendedNode($nodeArray['@attributes'][$attribute], $item);
+                    }
             }
-        }
-        return $result;
+        }, $nodes);
     }
 }

From 64fa0cc80ec8ea6f4a9b690bd237f153c074b523 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 17 Sep 2021 14:01:10 +0200
Subject: [PATCH 240/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../Legacy/ClassReferencesInConfigurationFilesSniff.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 6e4f37f7..a2348a96 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -64,7 +64,7 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
+     * Check whether specified class names are right according PSR-1 Standard.
      *
      * @param File $phpcsFile
      * @param ExtendedNode[] $elements
@@ -86,7 +86,7 @@ private function assertNonFactoryName(File $phpcsFile, array $elements)
     }
 
     /**
-     * Check whether specified classes or module names correspond to a file according PSR-1 Standard.
+     * Check whether specified class names in modules are right according PSR-1 Standard.
      *
      * @param File $phpcsFile
      * @param ExtendedNode[] $classes

From 5aa57215c506a06e05e7b59fc6cdb27615b1438d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 17 Sep 2021 14:04:19 +0200
Subject: [PATCH 241/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../ClassReferencesInConfigurationFilesSniff.php     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index a2348a96..700bc864 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -175,17 +175,17 @@ function (ExtendedNode $extendedNode) {
 
     /**
      * Extract value from the specified $extractFrom which exist in the XML path
-     * 
+     *
      * @param SimpleXMLElement $xml
      * @param string $xPath
      * @param int $extractFrom
-     * @param string $attribute
+     * @param string $attr
      * @return array
      */
-    private function getValuesFromXml(SimpleXMLElement $xml, string $xPath, int $extractFrom, string $attribute = ''): array
+    private function getValuesFromXml(SimpleXMLElement $xml, string $xPath, int $extractFrom, string $attr = ''): array
     {
         $nodes = $xml->xpath($xPath) ?: [];
-        return array_map(function($item) use ($extractFrom, $attribute) {
+        return array_map(function ($item) use ($extractFrom, $attr) {
             switch ($extractFrom) {
                 case self::FROM_CONTENT:
                     return new ExtendedNode((string)$item, $item);
@@ -193,8 +193,8 @@ private function getValuesFromXml(SimpleXMLElement $xml, string $xPath, int $ext
                     return new ExtendedNode($item->getName(), $item);
                 case self::FROM_ATTRIBUTE:
                     $nodeArray = (array)$item;
-                    if (isset($nodeArray['@attributes'][$attribute])) {
-                        return new ExtendedNode($nodeArray['@attributes'][$attribute], $item);
+                    if (isset($nodeArray['@attributes'][$attr])) {
+                        return new ExtendedNode($nodeArray['@attributes'][$attr], $item);
                     }
             }
         }, $nodes);

From f44af556860d2cabadabf87566bca3844da8530f Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 17 Sep 2021 17:02:03 +0200
Subject: [PATCH 242/630] AC-1156: Move custom eslint tests to
 magento-coding-standard repo

---
 .github/workflows/php.yml                     |    8 +
 .gitignore                                    |    1 +
 .../Tests/Eslint/AbstractEslintTestCase.php   |   34 +
 Magento2/Tests/Eslint/AndSelfTest.js          |    4 +
 Magento2/Tests/Eslint/AndSelfTest.php         |   24 +
 Magento2/Tests/Eslint/BindUnbindTest.js       |    4 +
 Magento2/Tests/Eslint/BindUnbindTest.php      |   24 +
 Magento2/Tests/Eslint/ClickEventShorthand.js  |    4 +
 .../Tests/Eslint/ClickEventShorthandTest.php  |   24 +
 .../Tests/Eslint/DelegateUndelegateTest.js    |    6 +
 .../Tests/Eslint/DelegateUndelegateTest.php   |   24 +
 Magento2/Tests/Eslint/EventShorthandTest.js   |    4 +
 Magento2/Tests/Eslint/EventShorthandTest.php  |   24 +
 Magento2/Tests/Eslint/SizeTest.js             |    4 +
 Magento2/Tests/Eslint/SizeTest.php            |   24 +
 Magento2/Tests/Eslint/TrimTest.js             |    4 +
 Magento2/Tests/Eslint/TrimTest.php            |   24 +
 README.md                                     |   12 +
 eslint/.eslintrc                              |    8 +
 eslint/.eslintrc-jquery                       |   11 +
 eslint/.eslintrc-magento                      |   81 +
 eslint/.eslintrc-misc                         |   87 +
 eslint/.eslintrc-reset                        |  219 ++
 eslint/rules/jquery-no-andSelf.js             |   34 +
 eslint/rules/jquery-no-bind-unbind.js         |   34 +
 .../rules/jquery-no-click-event-shorthand.js  |   41 +
 eslint/rules/jquery-no-delegate-undelegate.js |   34 +
 eslint/rules/jquery-no-event-shorthand.js     |   34 +
 eslint/rules/jquery-no-size.js                |   34 +
 eslint/rules/jquery-no-trim.js                |   32 +
 eslint/rules/utils.js                         |   40 +
 package-lock.json                             | 2162 +++++++++++++++++
 package.json                                  |   14 +
 33 files changed, 3118 insertions(+)
 create mode 100644 Magento2/Tests/Eslint/AbstractEslintTestCase.php
 create mode 100644 Magento2/Tests/Eslint/AndSelfTest.js
 create mode 100644 Magento2/Tests/Eslint/AndSelfTest.php
 create mode 100644 Magento2/Tests/Eslint/BindUnbindTest.js
 create mode 100644 Magento2/Tests/Eslint/BindUnbindTest.php
 create mode 100644 Magento2/Tests/Eslint/ClickEventShorthand.js
 create mode 100644 Magento2/Tests/Eslint/ClickEventShorthandTest.php
 create mode 100644 Magento2/Tests/Eslint/DelegateUndelegateTest.js
 create mode 100644 Magento2/Tests/Eslint/DelegateUndelegateTest.php
 create mode 100644 Magento2/Tests/Eslint/EventShorthandTest.js
 create mode 100644 Magento2/Tests/Eslint/EventShorthandTest.php
 create mode 100644 Magento2/Tests/Eslint/SizeTest.js
 create mode 100644 Magento2/Tests/Eslint/SizeTest.php
 create mode 100644 Magento2/Tests/Eslint/TrimTest.js
 create mode 100644 Magento2/Tests/Eslint/TrimTest.php
 create mode 100644 eslint/.eslintrc
 create mode 100644 eslint/.eslintrc-jquery
 create mode 100644 eslint/.eslintrc-magento
 create mode 100644 eslint/.eslintrc-misc
 create mode 100644 eslint/.eslintrc-reset
 create mode 100644 eslint/rules/jquery-no-andSelf.js
 create mode 100644 eslint/rules/jquery-no-bind-unbind.js
 create mode 100644 eslint/rules/jquery-no-click-event-shorthand.js
 create mode 100644 eslint/rules/jquery-no-delegate-undelegate.js
 create mode 100644 eslint/rules/jquery-no-event-shorthand.js
 create mode 100644 eslint/rules/jquery-no-size.js
 create mode 100644 eslint/rules/jquery-no-trim.js
 create mode 100644 eslint/rules/utils.js
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f59651f5..3bcca807 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -25,6 +25,9 @@ jobs:
     name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:
+    - name: Setup node
+      uses: actions/setup-node@v2
+
     - uses: actions/checkout@v2
 
     - name: Setup PHP
@@ -34,6 +37,11 @@ jobs:
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Install dependencies
+      run: npm install
+    - name: Run ESLint
+      run: npm run eslint -- eslint/rules
+
     - name: Validate composer
       run: composer validate
 
diff --git a/.gitignore b/.gitignore
index 6591b97d..98860b5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /vendor/*
 /bin/*
+/node_modules
 
 # IDE files
 .idea/
diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
new file mode 100644
index 00000000..77bd92ab
--- /dev/null
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Abstract class AbstractEslintTestCase
+ *
+ * Test Eslint Rules (magento-coding-standard/eslint/rules)
+ */
+abstract class AbstractEslintTestCase extends TestCase
+{
+    /**
+     * @param string $testFile
+     * @param array $expectedMessages
+     */
+    protected function assertFileContainsError(string $testFile, array $expectedMessages)
+    {
+        exec(
+            'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
+            $output
+        );
+
+        foreach ($expectedMessages as $message) {
+            $this->assertStringContainsString($message, implode(' ',$output));
+        }
+    }
+}
diff --git a/Magento2/Tests/Eslint/AndSelfTest.js b/Magento2/Tests/Eslint/AndSelfTest.js
new file mode 100644
index 00000000..4cfdb61e
--- /dev/null
+++ b/Magento2/Tests/Eslint/AndSelfTest.js
@@ -0,0 +1,4 @@
+$(document).ready(function() {
+    'use strict';
+    $("div").find("p").andSelf().addClass("border");
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/AndSelfTest.php b/Magento2/Tests/Eslint/AndSelfTest.php
new file mode 100644
index 00000000..2012e80c
--- /dev/null
+++ b/Magento2/Tests/Eslint/AndSelfTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class AndSelfTest
+ *
+ * Test Eslint Rule: jquery-no-andSelf.js
+ */
+class AndSelfTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'AndSelfTest.js',
+            ['jQuery.andSelf() removed, use jQuery.addBack()']
+        );
+    }
+}
diff --git a/Magento2/Tests/Eslint/BindUnbindTest.js b/Magento2/Tests/Eslint/BindUnbindTest.js
new file mode 100644
index 00000000..03ea65f1
--- /dev/null
+++ b/Magento2/Tests/Eslint/BindUnbindTest.js
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+    'use strict';
+    $(".btn1").bind("click");
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/BindUnbindTest.php b/Magento2/Tests/Eslint/BindUnbindTest.php
new file mode 100644
index 00000000..820e9806
--- /dev/null
+++ b/Magento2/Tests/Eslint/BindUnbindTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class BindUnbindTest
+ *
+ * Test Eslint Rule: jquery-no-bind-unbind.js
+ */
+class BindUnbindTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'BindUnbindTest.js',
+            ['jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead']
+        );
+    }
+}
diff --git a/Magento2/Tests/Eslint/ClickEventShorthand.js b/Magento2/Tests/Eslint/ClickEventShorthand.js
new file mode 100644
index 00000000..de8a44e7
--- /dev/null
+++ b/Magento2/Tests/Eslint/ClickEventShorthand.js
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+    'use strict';
+    $("input").blur();
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.php b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
new file mode 100644
index 00000000..342d613e
--- /dev/null
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class ClickEventShorthandTest
+ *
+ * Test Eslint Rule: jquery-no-click-event-shorthand.js
+ */
+class ClickEventShorthandTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'ClickEventShorthand.js',
+            ['Instead of .blur(fn) use .on("blur", fn). Instead of .blur() use .trigger("blur")']
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.js b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
new file mode 100644
index 00000000..1db13079
--- /dev/null
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
@@ -0,0 +1,6 @@
+$(document).ready(function(){
+    'use strict';
+    $( "table" ).delegate( "td", "click", function() {
+        $( this ).toggleClass( "chosen" );
+    });
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.php b/Magento2/Tests/Eslint/DelegateUndelegateTest.php
new file mode 100644
index 00000000..9e573baa
--- /dev/null
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class DelegateUndelegateTest
+ *
+ * Test Eslint Rule: jquery-no-delegate-undelegate.js
+ */
+class DelegateUndelegateTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'DelegateUndelegateTest.js',
+            ['jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead']
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.js b/Magento2/Tests/Eslint/EventShorthandTest.js
new file mode 100644
index 00000000..69ff0a9d
--- /dev/null
+++ b/Magento2/Tests/Eslint/EventShorthandTest.js
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+    'use strict';
+    $( "#result" ).load( "ajax/test.html" );
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.php b/Magento2/Tests/Eslint/EventShorthandTest.php
new file mode 100644
index 00000000..130e51ef
--- /dev/null
+++ b/Magento2/Tests/Eslint/EventShorthandTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class EventShorthandTest
+ *
+ * Test Eslint Rule: jquery-no-event-shorthand.js
+ */
+class EventShorthandTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'EventShorthandTest.js',
+            ['jQuery.load() was removed, use .on("load", fn) instead']
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/SizeTest.js b/Magento2/Tests/Eslint/SizeTest.js
new file mode 100644
index 00000000..279adece
--- /dev/null
+++ b/Magento2/Tests/Eslint/SizeTest.js
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+    'use strict';
+    $("div").size();
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/SizeTest.php b/Magento2/Tests/Eslint/SizeTest.php
new file mode 100644
index 00000000..2ae4fdda
--- /dev/null
+++ b/Magento2/Tests/Eslint/SizeTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class SizeTest
+ *
+ * Test Eslint Rule: jquery-no-size.js
+ */
+class SizeTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'SizeTest.js',
+            ['jQuery.size() removed, use jQuery.length']
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/TrimTest.js b/Magento2/Tests/Eslint/TrimTest.js
new file mode 100644
index 00000000..9943d479
--- /dev/null
+++ b/Magento2/Tests/Eslint/TrimTest.js
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+    'use strict';
+    $.trim("    hello, how are you?    ");
+});
\ No newline at end of file
diff --git a/Magento2/Tests/Eslint/TrimTest.php b/Magento2/Tests/Eslint/TrimTest.php
new file mode 100644
index 00000000..9cb327fe
--- /dev/null
+++ b/Magento2/Tests/Eslint/TrimTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class TrimTest
+ *
+ * Test Eslint Rule: jquery-no-trim.js
+ */
+class TrimTest extends AbstractEslintTestCase
+{
+    public function testExecute()
+    {
+        $this->assertFileContainsError(
+            'TrimTest.js',
+            ['jQuery.trim is deprecated; use String.prototype.trim']
+        );
+    }
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 5150e045..6ab6370d 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,18 @@ Also, verify that the sniffer code itself is written according to the Magento Co
 vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
 ```
 
+### ESLint testing
+Prerequisites: [Node.js](https://nodejs.org/) (`^12.22.0`, `^14.17.0`, or `>=16.0.0`).
+
+You need to run the following command to install all the necessary packages described in the `package.json` file:
+```bash
+npm install
+```
+
+After that, you can just execute the ESLint tests simply running:
+```bash
+npm run eslint -- eslint/rules
+```
 ## License
 
 Each Magento source file included in this distribution is licensed under the OSL-3.0 license.
diff --git a/eslint/.eslintrc b/eslint/.eslintrc
new file mode 100644
index 00000000..8f800d85
--- /dev/null
+++ b/eslint/.eslintrc
@@ -0,0 +1,8 @@
+{
+    "extends": [
+    	"./.eslintrc-reset",
+    	"./.eslintrc-magento",
+    	"./.eslintrc-jquery",
+    	"./.eslintrc-misc"
+    ]
+}
diff --git a/eslint/.eslintrc-jquery b/eslint/.eslintrc-jquery
new file mode 100644
index 00000000..0051d6f0
--- /dev/null
+++ b/eslint/.eslintrc-jquery
@@ -0,0 +1,11 @@
+{
+    "rules": {
+        "jquery-no-andSelf": 2,
+        "jquery-no-bind-unbind": 2,
+        "jquery-no-click-event-shorthand": 2,
+        "jquery-no-delegate-undelegate": 2,
+        "jquery-no-event-shorthand": 2,
+        "jquery-no-size": 2,
+        "jquery-no-trim": 2
+    }
+}
diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
new file mode 100644
index 00000000..3e984418
--- /dev/null
+++ b/eslint/.eslintrc-magento
@@ -0,0 +1,81 @@
+{
+    "env": {
+        "amd": true,
+        "browser": true,
+        "jasmine": true,
+        "jquery": true,
+        "prototypejs": true,
+        "node": true
+    },
+    "rules": {
+        "eqeqeq": [2, "smart"],
+        "guard-for-in": 2,
+        "lines-around-comment": [
+            2,
+            {
+                "beforeBlockComment": true,
+                "allowBlockStart": true,
+                "allowObjectStart": true
+            }
+        ],
+        "max-depth": [2, 2],
+        "max-len": [2, 120, 4],
+        "max-nested-callbacks": [2, 3],
+        "newline-after-var": 2,
+        "no-alert": 2,
+        "no-array-constructor": 2,
+        "no-caller": 2,
+        "no-catch-shadow": 2,
+        "no-cond-assign": 2,
+        "no-constant-condition": 2,
+        "no-debugger": 2,
+        "no-else-return": 2,
+        "no-eval": 2,
+        "no-ex-assign": 2,
+        "no-extend-native": 2,
+        "no-extra-bind": 2,
+        "no-extra-boolean-cast": 2,
+        "no-extra-parens": 2,
+        "no-extra-semi": 2,
+        "no-fallthrough": 2,
+        "no-floating-decimal": 2,
+        "no-func-assign": 2,
+        "no-implied-eval": 2,
+        "no-inner-declarations": 2,
+        "no-invalid-regexp": 2,
+        "no-lone-blocks": 2,
+        "no-lonely-if": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-native-reassign": 2,
+        "no-negated-in-lhs": 2,
+        "no-new-object": 2,
+        "no-proto": 2,
+        "no-redeclare": 2,
+        "no-regex-spaces": 2,
+        "no-return-assign": 2,
+        "no-self-compare": 2,
+        "no-shadow": 2,
+        "no-undef": 2,
+        "no-undef-init": 2,
+        "no-unreachable": 2,
+        "no-unused-vars": [
+            2,
+            {
+                "args": "after-used",
+                "vars": "all",
+                "varsIgnorePattern": "config"
+            }
+        ],
+        "no-use-before-define": 2,
+        "no-with": 2,
+        "operator-assignment": [2, "always"],
+        "radix": 2,
+        "semi": [2, "always"],
+        "semi-spacing": 2,
+        "strict": ["error", "function"],
+        "use-isnan": 2,
+        "valid-typeof": 2,
+        "vars-on-top": 2
+    }
+}
diff --git a/eslint/.eslintrc-misc b/eslint/.eslintrc-misc
new file mode 100644
index 00000000..94fb9ebc
--- /dev/null
+++ b/eslint/.eslintrc-misc
@@ -0,0 +1,87 @@
+{
+    "rules": {
+        'no-restricted-syntax': [
+            'error',
+            {
+                message: "addButton is removed. Update code to be compatible with tinymce5",
+                selector: "CallExpression[callee.object.name='editor'][callee.property.name='addButton']"
+            },
+            {
+                message: "addContextToolbar is removed. Update code to be compatible with tinymce5",
+                selector: "CallExpression[callee.object.name='editor'][callee.property.name='addContextToolbar']"
+            },
+            {
+                message: "addMenuItem is removed. Update code to be compatible with tinymce5",
+                selector: "CallExpression[callee.object.name='editor'][callee.property.name='addMenuItem']"
+            },
+            {
+                message: "addSidebar is removed. Update code to be compatible with tinymce5",
+                selector: "CallExpression[callee.object.name='editor'][callee.property.name='addSidebar']"
+            },
+            {
+                message: "file_browser_callback is removed. Update code to be compatible with tinymce5",
+                selector: "MemberExpression[property.value='file_browser_callback']"
+            },
+            {
+                message: "file_browser_callback is removed. Update code to be compatible with tinymce5",
+                selector: "MemberExpression[property.name='file_browser_callback']"
+            },
+            {
+                message: "file_browser_callback is removed. Update code to be compatible with tinymce5",
+                selector: "ObjectExpression > Property > Identifier[name='file_browser_callback']"
+            },
+            {
+                message: "insert_button_items is removed. Update code to be compatible with tinymce5",
+                selector: "MemberExpression[property.value='insert_button_items']"
+            },
+            {
+                message: "insert_button_items is removed. Update code to be compatible with tinymce5",
+                selector: "MemberExpression[property.name='insert_button_items']"
+            },
+            {
+                message: "insert_button_items is removed. Update code to be compatible with tinymce5",
+                selector: "ObjectExpression > Property > Identifier[name='insert_button_items']"
+            },
+            {
+                message: "'modern' theme is removed. Update code to be compatible with tinymce5",
+                selector: "AssignmentExpression[left.property.value='theme'][right.value='modern']"
+            },
+            {
+                message: "'modern' theme is removed. Update code to be compatible with tinymce5",
+                selector: "AssignmentExpression[left.property.name='theme'][right.value='modern']"
+            },
+            {
+                message: "'modern' theme is removed. Update code to be compatible with tinymce5",
+                selector: "ObjectExpression > Property[key.name='theme'][value.value='modern']"
+            },
+            {
+                message: "'inlite' theme is removed. Update code to be compatible with tinymce5",
+                selector: "AssignmentExpression[left.property.value='theme'][right.value='inlite']"
+            },
+            {
+                message: "'inlite' theme is removed. Update code to be compatible with tinymce5",
+                selector: "AssignmentExpression[left.property.name='theme'][right.value='inlite']"
+            },
+            {
+                message: "'inlite' theme is removed. Update code to be compatible with tinymce5",
+                selector: "ObjectExpression > Property[key.name='theme'][value.value='inlite']"
+            },
+            {
+                message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
+                selector: "AssignmentExpression[left.property.value='theme'][right.value='mobile']"
+            },
+            {
+                message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
+                selector: "AssignmentExpression[left.property.name='theme'][right.value='mobile']"
+            },
+            {
+                message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
+                selector: "ObjectExpression > Property[key.name='theme'][value.value='mobile']"
+            },
+            {
+                message: "This method should not be used to remove built-in (native) properties",
+                selector: "CallExpression[callee.property.name='removeProp'] > :matches([arguments] Literal[value='disabled'], Literal[value='checked'], Literal[value='selected'], Literal[value='required'], Literal[value='value'], Literal[value='readOnly'])"
+            }
+        ]
+    }
+}
diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
new file mode 100644
index 00000000..631a5a98
--- /dev/null
+++ b/eslint/.eslintrc-reset
@@ -0,0 +1,219 @@
+{
+  // http://eslint.org/docs/rules/
+
+  "parserOptions": {
+    "ecmaFeatures": {
+      "binaryLiterals": false,                    // enable binary literals
+      "blockBindings": false,                     // enable let and const (aka block bindings)
+      "defaultParams": false,                     // enable default function parameters
+      "forOf": false,                             // enable for-of loops
+      "generators": false,                        // enable generators
+      "objectLiteralComputedProperties": false,   // enable computed object literal property names
+      "objectLiteralDuplicateProperties": false,  // enable duplicate object literal properties in strict mode
+      "objectLiteralShorthandMethods": false,     // enable object literal shorthand methods
+      "objectLiteralShorthandProperties": false,  // enable object literal shorthand properties
+      "octalLiterals": false,                     // enable octal literals
+      "regexUFlag": false,                        // enable the regular expression u flag
+      "regexYFlag": false,                        // enable the regular expression y flag
+      "templateStrings": false,                   // enable template strings
+      "unicodeCodePointEscapes": false,           // enable code point escapes
+      "jsx": false                                // enable JSX
+    },
+  },
+
+  "env": {
+    "browser": false,     // browser global variables.
+    "node": false,        // Node.js global variables and Node.js-specific rules.
+    "amd": false,         // defines require() and define() as global variables as per the amd spec.
+    "mocha": false,       // adds all of the Mocha testing global variables.
+    "jasmine": false,     // adds all of the Jasmine testing global variables for version 1.3 and 2.0.
+    "phantomjs": false,   // phantomjs global variables.
+    "jquery": false,      // jquery global variables.
+    "prototypejs": false, // prototypejs global variables.
+    "shelljs": false,     // shelljs global variables.
+  },
+
+  "globals": {
+    // e.g. "angular": true
+  },
+
+  "plugins": [
+    // e.g. "react" (must run `npm install eslint-plugin-react` first)
+  ],
+
+  "rules": {
+    ////////// Possible Errors //////////
+
+    "no-comma-dangle": 0,         // disallow trailing commas in object literals
+    "no-cond-assign": 0,          // disallow assignment in conditional expressions
+    "no-console": 0,              // disallow use of console (off by default in the node environment)
+    "no-constant-condition": 0,   // disallow use of constant expressions in conditions
+    "no-control-regex": 0,        // disallow control characters in regular expressions
+    "no-debugger": 0,             // disallow use of debugger
+    "no-dupe-keys": 0,            // disallow duplicate keys when creating object literals
+    "no-empty": 0,                // disallow empty statements
+    "no-empty-class": 0,          // disallow the use of empty character classes in regular expressions
+    "no-ex-assign": 0,            // disallow assigning to the exception in a catch block
+    "no-extra-boolean-cast": 0,   // disallow double-negation boolean casts in a boolean context
+    "no-extra-parens": 0,         // disallow unnecessary parentheses (off by default)
+    "no-extra-semi": 0,           // disallow unnecessary semicolons
+    "no-func-assign": 0,          // disallow overwriting functions written as function declarations
+    "no-inner-declarations": 0,   // disallow function or variable declarations in nested blocks
+    "no-invalid-regexp": 0,       // disallow invalid regular expression strings in the RegExp constructor
+    "no-irregular-whitespace": 0, // disallow irregular whitespace outside of strings and comments
+    "no-negated-in-lhs": 0,       // disallow negation of the left operand of an in expression
+    "no-obj-calls": 0,            // disallow the use of object properties of the global object (Math and JSON) as functions
+    "no-regex-spaces": 0,         // disallow multiple spaces in a regular expression literal
+    "no-reserved-keys": 0,        // disallow reserved words being used as object literal keys (off by default)
+    "no-sparse-arrays": 0,        // disallow sparse arrays
+    "no-unreachable": 0,          // disallow unreachable statements after a return, throw, continue, or break statement
+    "use-isnan": 0,               // disallow comparisons with the value NaN
+    "valid-jsdoc": 0,             // Ensure JSDoc comments are valid (off by default)
+    "valid-typeof": 0,            // Ensure that the results of typeof are compared against a valid string
+
+
+    ////////// Best Practices //////////
+
+    "block-scoped-var": 0,      // treat var statements as if they were block scoped (off by default)
+    "complexity": 0,            // specify the maximum cyclomatic complexity allowed in a program (off by default)
+    "consistent-return": 0,     // require return statements to either always or never specify values
+    "curly": 0,                 // specify curly brace conventions for all control statements
+    "default-case": 0,          // require default case in switch statements (off by default)
+    "dot-notation": 0,          // encourages use of dot notation whenever possible
+    "eqeqeq": 0,                // require the use of === and !==
+    "guard-for-in": 0,          // make sure for-in loops have an if statement (off by default)
+    "no-alert": 0,              // disallow the use of alert, confirm, and prompt
+    "no-caller": 0,             // disallow use of arguments.caller or arguments.callee
+    "no-div-regex": 0,          // disallow division operators explicitly at beginning of regular expression (off by default)
+    "no-else-return": 0,        // disallow else after a return in an if (off by default)
+    "no-empty-label": 0,        // disallow use of labels for anything other then loops and switches
+    "no-eq-null": 0,            // disallow comparisons to null without a type-checking operator (off by default)
+    "no-eval": 0,               // disallow use of eval()
+    "no-extend-native": 0,      // disallow adding to native types
+    "no-extra-bind": 0,         // disallow unnecessary function binding
+    "no-fallthrough": 0,        // disallow fallthrough of case statements
+    "no-floating-decimal": 0,   // disallow the use of leading or trailing decimal points in numeric literals (off by default)
+    "no-implied-eval": 0,       // disallow use of eval()-like methods
+    "no-iterator": 0,           // disallow usage of __iterator__ property
+    "no-labels": 0,             // disallow use of labeled statements
+    "no-lone-blocks": 0,        // disallow unnecessary nested blocks
+    "no-loop-func": 0,          // disallow creation of functions within loops
+    "no-multi-spaces": 0,       // disallow use of multiple spaces
+    "no-multi-str": 0,          // disallow use of multiline strings
+    "no-native-reassign": 0,    // disallow reassignments of native objects
+    "no-new": 0,                // disallow use of new operator when not part of the assignment or comparison
+    "no-new-func": 0,           // disallow use of new operator for Function object
+    "no-new-wrappers": 0,       // disallows creating new instances of String, Number, and Boolean
+    "no-octal": 0,              // disallow use of octal literals
+    "no-octal-escape": 0,       // disallow use of octal escape sequences in string literals, such as var foo = "Copyright \251";
+    "no-process-env": 0,        // disallow use of process.env (off by default)
+    "no-proto": 0,              // disallow usage of __proto__ property
+    "no-redeclare": 0,          // disallow declaring the same variable more then once
+    "no-return-assign": 0,      // disallow use of assignment in return statement
+    "no-script-url": 0,         // disallow use of javascript: urls.
+    "no-self-compare": 0,       // disallow comparisons where both sides are exactly the same (off by default)
+    "no-sequences": 0,          // disallow use of comma operator
+    "no-unused-expressions": 0, // disallow usage of expressions in statement position
+    "no-void": 0,               // disallow use of void operator (off by default)
+    "no-warning-comments": 0,   // disallow usage of configurable warning terms in comments, e.g. TODO or FIXME (off by default)
+    "no-with": 0,               // disallow use of the with statement
+    "radix": 0,                 // require use of the second argument for parseInt() (off by default)
+    "vars-on-top": 0,           // requires to declare all vars on top of their containing scope (off by default)
+    "wrap-iife": 0,             // require immediate function invocation to be wrapped in parentheses (off by default)
+    "yoda": 0,                  // require or disallow Yoda conditions
+
+
+    ////////// Strict Mode //////////
+
+    "global-strict": 0,   // (deprecated) require or disallow the "use strict" pragma in the global scope (off by default in the node environment)
+    "no-extra-strict": 0, // (deprecated) disallow unnecessary use of "use strict"; when already in strict mode
+    "strict": 0,          // controls location of Use Strict Directives
+
+
+    ////////// Variables //////////
+
+    "no-catch-shadow": 0,             // disallow the catch clause parameter name being the same as a variable in the outer scope (off by default in the node environment)
+    "no-delete-var": 0,               // disallow deletion of variables
+    "no-label-var": 0,                // disallow labels that share a name with a variable
+    "no-shadow": 0,                   // disallow declaration of variables already declared in the outer scope
+    "no-shadow-restricted-names": 0,  // disallow shadowing of names such as arguments
+    "no-undef": 0,                    // disallow use of undeclared variables unless mentioned in a /*global */ block
+    "no-undef-init": 0,               // disallow use of undefined when initializing variables
+    "no-undefined": 0,                // disallow use of undefined variable (off by default)
+    "no-unused-vars": 0,              // disallow declaration of variables that are not used in the code
+    "no-use-before-define": 0,        // disallow use of variables before they are defined
+
+
+    ////////// Node.js //////////
+
+    "handle-callback-err": 0,   // enforces error handling in callbacks (off by default) (on by default in the node environment)
+    "no-mixed-requires": 0,     // disallow mixing regular variable and require declarations (off by default) (on by default in the node environment)
+    "no-new-require": 0,        // disallow use of new operator with the require function (off by default) (on by default in the node environment)
+    "no-path-concat": 0,        // disallow string concatenation with __dirname and __filename (off by default) (on by default in the node environment)
+    "no-process-exit": 0,       // disallow process.exit() (on by default in the node environment)
+    "no-restricted-modules": 0, // restrict usage of specified node modules (off by default)
+    "no-sync": 0,               // disallow use of synchronous methods (off by default)
+
+
+    ////////// Stylistic Issues //////////
+
+    "brace-style": 0,               // enforce one true brace style (off by default)
+    "camelcase": 0,                 // require camel case names
+    "comma-spacing": 0,             // enforce spacing before and after comma
+    "comma-style": 0,               // enforce one true comma style (off by default)
+    "consistent-this": 0,           // enforces consistent naming when capturing the current execution context (off by default)
+    "eol-last": 0,                  // enforce newline at the end of file, with no multiple empty lines
+    "func-names": 0,                // require function expressions to have a name (off by default)
+    "func-style": 0,                // enforces use of function declarations or expressions (off by default)
+    "key-spacing": 0,               // enforces spacing between keys and values in object literal properties
+    "max-nested-callbacks": 0,      // specify the maximum depth callbacks can be nested (off by default)
+    "new-cap": 0,                   // require a capital letter for constructors
+    "new-parens": 0,                // disallow the omission of parentheses when invoking a constructor with no arguments
+    "no-array-constructor": 0,      // disallow use of the Array constructor
+    "no-inline-comments": 0,        // disallow comments inline after code (off by default)
+    "no-lonely-if": 0,              // disallow if as the only statement in an else block (off by default)
+    "no-mixed-spaces-and-tabs": 0,  // disallow mixed spaces and tabs for indentation
+    "no-multiple-empty-lines": 0,   // disallow multiple empty lines (off by default)
+    "no-nested-ternary": 0,         // disallow nested ternary expressions (off by default)
+    "no-new-object": 0,             // disallow use of the Object constructor
+    "no-space-before-semi": 0,      // disallow space before semicolon
+    "no-spaced-func": 0,            // disallow space between function identifier and application
+    "no-ternary": 0,                // disallow the use of ternary operators (off by default)
+    "no-trailing-spaces": 0,        // disallow trailing whitespace at the end of lines
+    "no-underscore-dangle": 0,      // disallow dangling underscores in identifiers
+    "no-wrap-func": 0,              // disallow wrapping of non-IIFE statements in parens
+    "one-var": 0,                   // allow just one var statement per function (off by default)
+    "operator-assignment": 0,       // require assignment operator shorthand where possible or prohibit it entirely (off by default)
+    "padded-blocks": 0,             // enforce padding within blocks (off by default)
+    "quote-props": 0,               // require quotes around object literal property names (off by default)
+    "quotes": 0,                    // specify whether double or single quotes should be used
+    "semi": 0,                      // require or disallow use of semicolons instead of ASI
+    "sort-vars": 0,                 // sort variables within the same declaration block (off by default)
+    "space-after-function-name": 0, // require a space after function names (off by default)
+    "space-after-keywords": 0,      // require a space after certain keywords (off by default)
+    "space-before-blocks": 0,       // require or disallow space before blocks (off by default)
+    "space-in-brackets": 0,         // require or disallow spaces inside brackets (off by default)
+    "space-in-parens": 0,           // require or disallow spaces inside parentheses (off by default)
+    "space-infix-ops": 0,           // require spaces around operators
+    "space-return-throw-case": 0,   // require a space after return, throw, and case
+    "space-unary-ops": 0,           // Require or disallow spaces before/after unary operators (words on by default, nonwords off by default)
+    "spaced-line-comment": 0,       // require or disallow a space immediately following the // in a line comment (off by default)
+    "wrap-regex": 0,                // require regex literals to be wrapped in parentheses (off by default)
+
+
+    ////////// ECMAScript 6 //////////
+
+    "no-var": 0,          // require let or const instead of var (off by default)
+    "generator-star": 0,  // enforce the position of the * in generator functions (off by default)
+
+
+    ////////// Legacy //////////
+
+    "max-depth": 0,       // specify the maximum depth that blocks can be nested (off by default)
+    "max-len": 0,         // specify the maximum length of a line in your program (off by default)
+    "max-params": 0,      // limits the number of parameters that can be used in the function declaration. (off by default)
+    "max-statements": 0,  // specify the maximum number of statement allowed in a function (off by default)
+    "no-bitwise": 0,      // disallow use of bitwise operators (off by default)
+    "no-plusplus": 0      // disallow use of unary operators, ++ and -- (off by default)
+  }
+}
diff --git a/eslint/rules/jquery-no-andSelf.js b/eslint/rules/jquery-no-andSelf.js
new file mode 100644
index 00000000..c8c5f72a
--- /dev/null
+++ b/eslint/rules/jquery-no-andSelf.js
@@ -0,0 +1,34 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of the deprecated `andSelf` method',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/andself/'
+    },
+    schema: [],
+    messages: {
+      andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()'
+    }
+  },
+
+  create: function(context) {
+    'use strict';
+    var utils = require('./utils.js');
+
+    return {
+      CallExpression: function(node) {
+        if (node.callee.type !== 'MemberExpression') return;
+        if (node.callee.property.name !== 'andSelf') return;
+
+        if (utils.isjQuery(node)) {
+          context.report({
+            node: node,
+            messageId: 'andSelf'
+          });
+        }
+      }
+    };
+  }
+};
diff --git a/eslint/rules/jquery-no-bind-unbind.js b/eslint/rules/jquery-no-bind-unbind.js
new file mode 100644
index 00000000..14bc75ac
--- /dev/null
+++ b/eslint/rules/jquery-no-bind-unbind.js
@@ -0,0 +1,34 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of the deprecated $.bind and $.unbind',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/bind/'
+    },
+    schema: [],
+    messages: {
+      bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead'
+    }
+  },
+
+  create: function(context) {
+    'use strict';
+    var utils = require('./utils.js');
+
+    return {
+      CallExpression: function(node) {
+        if (node.callee.type !== 'MemberExpression') return;
+        if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
+
+        if (utils.isjQuery(node)) {
+          context.report({
+            node: node,
+            messageId: 'bind'
+          });
+        }
+      }
+    };
+  }
+};
diff --git a/eslint/rules/jquery-no-click-event-shorthand.js b/eslint/rules/jquery-no-click-event-shorthand.js
new file mode 100644
index 00000000..029d1229
--- /dev/null
+++ b/eslint/rules/jquery-no-click-event-shorthand.js
@@ -0,0 +1,41 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of shortcuts to trigger events',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/bind/'
+    },
+    schema: [],
+  },
+
+  create: function(context) {
+    'use strict';
+    var utils = require('./utils.js');
+
+    return {
+      CallExpression: function(node) {
+        var names, name;
+
+        names = [
+          'blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown', 'mouseup', 'mousemove',
+          'mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select', 'submit', 'keydown', 'keypress',
+          'keyup', 'contextmenu', 'click'
+        ];
+
+        if (node.callee.type !== 'MemberExpression') return;
+        if (!names.includes(node.callee.property.name)) return;
+        if (utils.isjQuery(node)) {
+          name = node.callee.property.name;
+          context.report({
+            node: node,
+            message:
+                'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name
+                + '() use .trigger("' + name + '")'
+          });
+        }
+      }
+    };
+  }
+};
diff --git a/eslint/rules/jquery-no-delegate-undelegate.js b/eslint/rules/jquery-no-delegate-undelegate.js
new file mode 100644
index 00000000..2a704272
--- /dev/null
+++ b/eslint/rules/jquery-no-delegate-undelegate.js
@@ -0,0 +1,34 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of the deprecated $.delegate and $.undelegate',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/delegate/'
+    },
+    schema: [],
+    messages: {
+      delegate: 'jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead'
+    }
+  },
+
+  create: function(context) {
+    'use strict';
+    var utils = require('./utils.js');
+
+    return {
+      CallExpression: function(node) {
+        if (node.callee.type !== 'MemberExpression') return;
+        if (!['delegate', 'undelegate'].includes(node.callee.property.name)) return;
+
+        if (utils.isjQuery(node)) {
+          context.report({
+            node: node,
+            messageId: 'delegate'
+          });
+        }
+      }
+    };
+  }
+};
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
new file mode 100644
index 00000000..61dc45af
--- /dev/null
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -0,0 +1,34 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of shorthand methods',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/load/'
+    },
+    schema: []
+  },
+
+  create: function(context) {
+    'use strict';
+    var utils = require('./utils.js');
+
+    return {
+      CallExpression: function(node) {
+        var names = ['load', 'unload', 'error'],
+            name;
+
+        if (node.callee.type !== 'MemberExpression') return;
+        if (!names.includes(node.callee.property.name)) return;
+        if (utils.isjQuery(node)) {
+          name = node.callee.property.name;
+          context.report({
+            node: node,
+            message: 'jQuery.' + name + '() was removed, use .on("' + name + '", fn) instead.'
+          });
+        }
+      }
+    };
+  }
+};
diff --git a/eslint/rules/jquery-no-size.js b/eslint/rules/jquery-no-size.js
new file mode 100644
index 00000000..8c365a19
--- /dev/null
+++ b/eslint/rules/jquery-no-size.js
@@ -0,0 +1,34 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of the deprecated `size` method',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/size/'
+    },
+    schema: [],
+    messages: {
+      size: 'jQuery.size() removed, use jQuery.length'
+    }
+  },
+
+  create: function(context) {
+    'use strict';
+    var utils = require('./utils.js');
+
+    return {
+      CallExpression: function(node) {
+        if (node.callee.type !== 'MemberExpression') return;
+        if (node.callee.property.name !== 'size') return;
+
+        if (utils.isjQuery(node)) {
+          context.report({
+            node: node,
+            messageId: 'size'
+          });
+        }
+      }
+    };
+  }
+};
diff --git a/eslint/rules/jquery-no-trim.js b/eslint/rules/jquery-no-trim.js
new file mode 100644
index 00000000..66e760ab
--- /dev/null
+++ b/eslint/rules/jquery-no-trim.js
@@ -0,0 +1,32 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Disallow the use of the deprecated `trim` function',
+      category: 'jQuery deprecated functions',
+      recommended: true,
+      url: 'https://api.jquery.com/jQuery.trim/'
+    },
+    schema: [],
+    messages: {
+      trim: 'jQuery.trim is deprecated; use String.prototype.trim'
+    }
+  },
+
+  create: function(context) {
+    'use strict';
+
+    return {
+      CallExpression: function(node) {
+        if (node.callee.type !== 'MemberExpression') return;
+        if (node.callee.object.name !== '$') return;
+        if (node.callee.property.name !== 'trim') return;
+
+        context.report({
+          node: node,
+          messageId: 'trim'
+        });
+      }
+    };
+  }
+};
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
new file mode 100644
index 00000000..c88099bb
--- /dev/null
+++ b/eslint/rules/utils.js
@@ -0,0 +1,40 @@
+function traverse(node) {
+  'use strict';
+  while (node) {
+    switch (node.type) {
+      case 'CallExpression':
+        node = node.callee;
+        break;
+      case 'MemberExpression':
+        node = node.object;
+        break;
+      case 'Identifier':
+        return node;
+      default:
+        return null;
+    }
+  }
+}
+
+// Traverses from a node up to its root parent to determine if it
+// originated from a jQuery `$()` function.
+//
+// node - The CallExpression node to start the traversal.
+//
+// Examples
+//
+//   // $('div').find('p').first()
+//   isjQuery(firstNode) // => true
+//
+// Returns true if the function call node is attached to a jQuery element set.
+function isjQuery(node) {
+  'use strict';
+  var id = traverse(node);
+
+  return id && id.name.startsWith('$');
+}
+
+module.exports = {
+  traverse: traverse,
+  isjQuery: isjQuery
+};
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..e0bac264
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,2162 @@
+{
+  "name": "js",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "js",
+      "version": "1.0.0",
+      "license": "ISC",
+      "devDependencies": {
+        "eslint": "^7.32.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    }
+  },
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "table": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.6.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..4aeec6d0
--- /dev/null
+++ b/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "js",
+  "version": "1.0.0",
+  "description": "",
+  "main": "eslint/.eslintrc",
+  "scripts": {
+    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "eslint": "^7.32.0"
+  }
+}

From 71970dab7fafd5987ede1911882112cd0c23b103 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 17 Sep 2021 17:12:51 +0200
Subject: [PATCH 243/630] AC-1156: AC-1156: Move custom eslint tests to
 magento-coding-standard repo - Fix typo in README and add missing 'void' on
 unit tests

---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php  | 2 +-
 Magento2/Tests/Eslint/AndSelfTest.php             | 2 +-
 Magento2/Tests/Eslint/BindUnbindTest.php          | 2 +-
 Magento2/Tests/Eslint/ClickEventShorthandTest.php | 2 +-
 Magento2/Tests/Eslint/DelegateUndelegateTest.php  | 2 +-
 Magento2/Tests/Eslint/EventShorthandTest.php      | 2 +-
 Magento2/Tests/Eslint/SizeTest.php                | 2 +-
 Magento2/Tests/Eslint/TrimTest.php                | 2 +-
 README.md                                         | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index 77bd92ab..dc4b6b86 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -20,7 +20,7 @@ abstract class AbstractEslintTestCase extends TestCase
      * @param string $testFile
      * @param array $expectedMessages
      */
-    protected function assertFileContainsError(string $testFile, array $expectedMessages)
+    protected function assertFileContainsError(string $testFile, array $expectedMessages): void
     {
         exec(
             'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
diff --git a/Magento2/Tests/Eslint/AndSelfTest.php b/Magento2/Tests/Eslint/AndSelfTest.php
index 2012e80c..a5830ac0 100644
--- a/Magento2/Tests/Eslint/AndSelfTest.php
+++ b/Magento2/Tests/Eslint/AndSelfTest.php
@@ -14,7 +14,7 @@
  */
 class AndSelfTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'AndSelfTest.js',
diff --git a/Magento2/Tests/Eslint/BindUnbindTest.php b/Magento2/Tests/Eslint/BindUnbindTest.php
index 820e9806..0cf6404f 100644
--- a/Magento2/Tests/Eslint/BindUnbindTest.php
+++ b/Magento2/Tests/Eslint/BindUnbindTest.php
@@ -14,7 +14,7 @@
  */
 class BindUnbindTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'BindUnbindTest.js',
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.php b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
index 342d613e..32ac2d32 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.php
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
@@ -14,7 +14,7 @@
  */
 class ClickEventShorthandTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'ClickEventShorthand.js',
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.php b/Magento2/Tests/Eslint/DelegateUndelegateTest.php
index 9e573baa..857610bc 100644
--- a/Magento2/Tests/Eslint/DelegateUndelegateTest.php
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.php
@@ -14,7 +14,7 @@
  */
 class DelegateUndelegateTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'DelegateUndelegateTest.js',
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.php b/Magento2/Tests/Eslint/EventShorthandTest.php
index 130e51ef..f79eebd2 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.php
+++ b/Magento2/Tests/Eslint/EventShorthandTest.php
@@ -14,7 +14,7 @@
  */
 class EventShorthandTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'EventShorthandTest.js',
diff --git a/Magento2/Tests/Eslint/SizeTest.php b/Magento2/Tests/Eslint/SizeTest.php
index 2ae4fdda..03f21230 100644
--- a/Magento2/Tests/Eslint/SizeTest.php
+++ b/Magento2/Tests/Eslint/SizeTest.php
@@ -14,7 +14,7 @@
  */
 class SizeTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'SizeTest.js',
diff --git a/Magento2/Tests/Eslint/TrimTest.php b/Magento2/Tests/Eslint/TrimTest.php
index 9cb327fe..754ebc47 100644
--- a/Magento2/Tests/Eslint/TrimTest.php
+++ b/Magento2/Tests/Eslint/TrimTest.php
@@ -14,7 +14,7 @@
  */
 class TrimTest extends AbstractEslintTestCase
 {
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->assertFileContainsError(
             'TrimTest.js',
diff --git a/README.md b/README.md
index 6ab6370d..06ba0d77 100644
--- a/README.md
+++ b/README.md
@@ -107,9 +107,9 @@ You need to run the following command to install all the necessary packages desc
 npm install
 ```
 
-After that, you can just execute the ESLint tests simply running:
+After that, you can just execute ESLint as follows:
 ```bash
-npm run eslint -- eslint/rules
+npm run eslint -- path/to/analyze
 ```
 ## License
 

From 389d7cab75fdc0c3d3273f770f7c13e1e9e35ebb Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Mon, 20 Sep 2021 09:37:06 +0200
Subject: [PATCH 244/630] Update
 Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 700bc864..6cc79da0 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -13,7 +13,7 @@
 
 class ClassReferencesInConfigurationFilesSniff implements Sniff
 {
-    private const ERROR_MESSAGE_CONFIG = 'Attribute does not follow expected format';
+    private const ERROR_MESSAGE_CONFIG = 'Incorrect format of PHP class reference';
     private const ERROR_CODE_CONFIG = 'WrongXML';
     private const ERROR_MESSAGE_MODULE = 'Attribute does not follow expected format in module';
     private const ERROR_CODE_MODULE = 'WrongXMLModule';

From c4801005cb48be77c4047287692cf7bef1d0c979 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Mon, 20 Sep 2021 09:37:12 +0200
Subject: [PATCH 245/630] Update
 Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 6cc79da0..a33c6314 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -14,7 +14,7 @@
 class ClassReferencesInConfigurationFilesSniff implements Sniff
 {
     private const ERROR_MESSAGE_CONFIG = 'Incorrect format of PHP class reference';
-    private const ERROR_CODE_CONFIG = 'WrongXML';
+    private const ERROR_CODE_CONFIG = 'IncorrectClassReference';
     private const ERROR_MESSAGE_MODULE = 'Attribute does not follow expected format in module';
     private const ERROR_CODE_MODULE = 'WrongXMLModule';
 

From c0ead7c6d50fa0899b16bd0496161cde68748ea0 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Mon, 20 Sep 2021 09:37:18 +0200
Subject: [PATCH 246/630] Update
 Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index a33c6314..cbfc7b2b 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -15,7 +15,7 @@ class ClassReferencesInConfigurationFilesSniff implements Sniff
 {
     private const ERROR_MESSAGE_CONFIG = 'Incorrect format of PHP class reference';
     private const ERROR_CODE_CONFIG = 'IncorrectClassReference';
-    private const ERROR_MESSAGE_MODULE = 'Attribute does not follow expected format in module';
+    private const ERROR_MESSAGE_MODULE = 'Incorrect format of module reference';
     private const ERROR_CODE_MODULE = 'WrongXMLModule';
 
     private const FROM_CONTENT = 1;

From 7b389222046074ffc4ac594b41faa26230f7c759 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Mon, 20 Sep 2021 09:37:23 +0200
Subject: [PATCH 247/630] Update
 Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index cbfc7b2b..db6950b3 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -16,7 +16,7 @@ class ClassReferencesInConfigurationFilesSniff implements Sniff
     private const ERROR_MESSAGE_CONFIG = 'Incorrect format of PHP class reference';
     private const ERROR_CODE_CONFIG = 'IncorrectClassReference';
     private const ERROR_MESSAGE_MODULE = 'Incorrect format of module reference';
-    private const ERROR_CODE_MODULE = 'WrongXMLModule';
+    private const ERROR_CODE_MODULE = 'InforrectModuleReference';
 
     private const FROM_CONTENT = 1;
     private const FROM_NAME = 2;

From 9a6963854e2e6ca074e2b64ef9b384885494eeb9 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Mon, 20 Sep 2021 09:37:43 +0200
Subject: [PATCH 248/630] Update Magento2/ruleset.xml

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 65d2cb3b..8e78cb06 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -121,7 +121,7 @@
         <exclude-pattern>*\/etc/wsdl2.xml$</exclude-pattern>
         <exclude-pattern>*\/etc/wsi.xml$</exclude-pattern>
         <severity>10</severity>
-        <type>warning</type>
+        <type>error</type>
     </rule>
 
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->

From 936c28c187c3e336fa72a8b7c2be76cd17f0f03a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 20 Sep 2021 10:11:43 +0200
Subject: [PATCH 249/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...assReferencesInConfigurationFilesSniff.php | 97 ++++++++++++-------
 Magento2/Sniffs/Legacy/ExtendedNode.php       | 32 ------
 2 files changed, 60 insertions(+), 69 deletions(-)
 delete mode 100644 Magento2/Sniffs/Legacy/ExtendedNode.php

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index db6950b3..6255cfa0 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -16,11 +16,7 @@ class ClassReferencesInConfigurationFilesSniff implements Sniff
     private const ERROR_MESSAGE_CONFIG = 'Incorrect format of PHP class reference';
     private const ERROR_CODE_CONFIG = 'IncorrectClassReference';
     private const ERROR_MESSAGE_MODULE = 'Incorrect format of module reference';
-    private const ERROR_CODE_MODULE = 'InforrectModuleReference';
-
-    private const FROM_CONTENT = 1;
-    private const FROM_NAME = 2;
-    private const FROM_ATTRIBUTE = 3;
+    private const ERROR_CODE_MODULE = 'IncorrectModuleReference';
 
     /**
      * @inheritdoc
@@ -59,7 +55,7 @@ public function process(File $phpcsFile, $stackPtr)
         $classes = $this->collectClassesInConfig($xml);
         $this->assertNonFactoryName($phpcsFile, $classes);
 
-        $modules = $this->getValuesFromXml($xml, '//@module', self::FROM_ATTRIBUTE, 'module');
+        $modules = $this->getValuesFromXmlTagAttribute($xml, '//@module', 'module');
         $this->assertNonFactoryNameModule($phpcsFile, $modules);
     }
 
@@ -67,18 +63,18 @@ public function process(File $phpcsFile, $stackPtr)
      * Check whether specified class names are right according PSR-1 Standard.
      *
      * @param File $phpcsFile
-     * @param ExtendedNode[] $elements
+     * @param array $elements
      */
     private function assertNonFactoryName(File $phpcsFile, array $elements)
     {
         foreach ($elements as $element) {
-            if (stripos($element->value, 'Magento') === false) {
+            if (stripos($element['value'], 'Magento') === false) {
                 continue;
             }
-            if (preg_match('/^([A-Z][a-z\d\\\\]+)+$/', $element->value) !== 1) {
+            if (preg_match('/^([A-Z][a-z\d\\\\]+)+$/', $element['value']) !== 1) {
                 $phpcsFile->addError(
                     self::ERROR_MESSAGE_CONFIG,
-                    $element->lineNumber - 1,
+                    $element['lineNumber'],
                     self::ERROR_CODE_CONFIG,
                 );
             }
@@ -89,15 +85,15 @@ private function assertNonFactoryName(File $phpcsFile, array $elements)
      * Check whether specified class names in modules are right according PSR-1 Standard.
      *
      * @param File $phpcsFile
-     * @param ExtendedNode[] $classes
+     * @param array $classes
      */
     private function assertNonFactoryNameModule(File $phpcsFile, array $classes)
     {
         foreach ($classes as $element) {
-            if (preg_match('/^([A-Z][A-Za-z\d_]+)+$/', $element->value) !== 1) {
+            if (preg_match('/^([A-Z][A-Za-z\d_]+)+$/', $element['value']) !== 1) {
                 $phpcsFile->addError(
                     self::ERROR_MESSAGE_MODULE,
-                    $element->lineNumber - 1,
+                    $element['lineNumber'],
                     self::ERROR_CODE_MODULE,
                 );
             }
@@ -126,45 +122,41 @@ private function getFormattedXML(File $phpcsFile)
      */
     private function collectClassesInConfig(SimpleXMLElement $xml): array
     {
-        $classes = $this->getValuesFromXml(
+        $classes = $this->getValuesFromXmlTagContent(
             $xml,
             '
             /config//resource_adapter | /config/*[not(name()="sections")]//class[not(ancestor::observers)]
                 | //model[not(parent::connection)] | //backend_model | //source_model | //price_model
                 | //model_token | //writer_model | //clone_model | //frontend_model | //working_model
                 | //admin_renderer | //renderer',
-            self::FROM_CONTENT
         );
         $classes = array_merge(
             $classes,
-            $this->getValuesFromXml(
+            $this->getValuesFromXmlTagAttribute(
                 $xml,
                 '//@backend_model',
-                self::FROM_ATTRIBUTE,
                 'backend_model'
             )
         );
         $classes = array_merge(
             $classes,
-            $this->getValuesFromXml(
+            $this->getValuesFromXmlTagAttribute(
                 $xml,
                 '/config//preference',
-                self::FROM_ATTRIBUTE,
                 'type'
             )
         );
         $classes = array_merge(
             $classes,
-            $this->getValuesFromXml(
+            $this->getValuesFromXmlTagName(
                 $xml,
                 '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/*',
-                self::FROM_NAME
             )
         );
 
         $classes = array_map(
-            function (ExtendedNode $extendedNode) {
-                $extendedNode->value = explode('::', trim($extendedNode->value))[0];
+            function (array $extendedNode) {
+                $extendedNode['value'] = explode('::', trim($extendedNode['value']))[0];
                 return $extendedNode;
             },
             $classes
@@ -174,28 +166,59 @@ function (ExtendedNode $extendedNode) {
     }
 
     /**
-     * Extract value from the specified $extractFrom which exist in the XML path
+     * Extract value from tag contents which exist in the XML path
+     *
+     * @param SimpleXMLElement $xml
+     * @param string $xPath
+     * @return array
+     */
+    private function getValuesFromXmlTagContent(SimpleXMLElement $xml, string $xPath): array
+    {
+        $nodes = $xml->xpath($xPath) ?: [];
+        return array_map(function ($item) {
+            return [
+                'value' => (string)$item,
+                'lineNumber' => dom_import_simplexml($item)->getLineNo()-1,
+            ];
+        }, $nodes);
+    }
+
+    /**
+     * Extract value from tag names which exist in the XML path
+     *
+     * @param SimpleXMLElement $xml
+     * @param string $xPath
+     * @return array
+     */
+    private function getValuesFromXmlTagName(SimpleXMLElement $xml, string $xPath): array
+    {
+        $nodes = $xml->xpath($xPath) ?: [];
+        return array_map(function ($item) {
+            return [
+                'value' => $item->getName(),
+                'lineNumber' => dom_import_simplexml($item)->getLineNo()-1,
+            ];
+        }, $nodes);
+    }
+
+    /**
+     * Extract value from tag attributes which exist in the XML path
      *
      * @param SimpleXMLElement $xml
      * @param string $xPath
-     * @param int $extractFrom
      * @param string $attr
      * @return array
      */
-    private function getValuesFromXml(SimpleXMLElement $xml, string $xPath, int $extractFrom, string $attr = ''): array
+    private function getValuesFromXmlTagAttribute(SimpleXMLElement $xml, string $xPath, string $attr): array
     {
         $nodes = $xml->xpath($xPath) ?: [];
-        return array_map(function ($item) use ($extractFrom, $attr) {
-            switch ($extractFrom) {
-                case self::FROM_CONTENT:
-                    return new ExtendedNode((string)$item, $item);
-                case self::FROM_NAME:
-                    return new ExtendedNode($item->getName(), $item);
-                case self::FROM_ATTRIBUTE:
-                    $nodeArray = (array)$item;
-                    if (isset($nodeArray['@attributes'][$attr])) {
-                        return new ExtendedNode($nodeArray['@attributes'][$attr], $item);
-                    }
+        return array_map(function ($item) use ($attr) {
+            $nodeArray = (array)$item;
+            if (isset($nodeArray['@attributes'][$attr])) {
+                return [
+                    'value' => $nodeArray['@attributes'][$attr],
+                    'lineNumber' => dom_import_simplexml($item)->getLineNo()-1,
+                ];
             }
         }, $nodes);
     }
diff --git a/Magento2/Sniffs/Legacy/ExtendedNode.php b/Magento2/Sniffs/Legacy/ExtendedNode.php
deleted file mode 100644
index 0320e63c..00000000
--- a/Magento2/Sniffs/Legacy/ExtendedNode.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\Legacy;
-
-use SimpleXMLElement;
-
-class ExtendedNode
-{
-    /**
-     * @var string
-     */
-    public $value;
-
-    /**
-     * @var int
-     */
-    public $lineNumber;
-
-    /**
-     * @param string $value
-     * @param SimpleXMLElement $element
-     */
-    public function __construct(string $value, SimpleXMLElement $element)
-    {
-        $this->value = $value;
-        $this->lineNumber = dom_import_simplexml($element)->getLineNo();
-    }
-}

From fe1e327a422858893263d6f8437931ae750ce3f8 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Mon, 20 Sep 2021 17:51:47 +0200
Subject: [PATCH 250/630] AC-1156: Move custom eslint tests to
 magento-coding-standard repo - Provide node-version on php.yml

---
 .github/workflows/php.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 3bcca807..5d9123b5 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -27,6 +27,8 @@ jobs:
     steps:
     - name: Setup node
       uses: actions/setup-node@v2
+      with:
+        node-version: '14'
 
     - uses: actions/checkout@v2
 

From 122231bb5498314db41cbb7cc69b8150181aeb8c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Mon, 20 Sep 2021 17:55:47 +0200
Subject: [PATCH 251/630] AC-1156: Move custom eslint tests to
 magento-coding-standard repo - Use node 16 in php.yml

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5d9123b5..8392230f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Setup node
       uses: actions/setup-node@v2
       with:
-        node-version: '14'
+        node-version: '16'
 
     - uses: actions/checkout@v2
 

From fbe2c1c05324a3289757c2390245143617b8eb5d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 10:46:12 +0200
Subject: [PATCH 252/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...assReferencesInConfigurationFilesSniff.php |  60 +++++++++
 ...ferencesInConfigurationFilesUnitTest.5.xml | 116 ++++++++++++++++++
 2 files changed, 176 insertions(+)
 create mode 100644 Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 6255cfa0..2a528edb 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -57,6 +57,12 @@ public function process(File $phpcsFile, $stackPtr)
 
         $modules = $this->getValuesFromXmlTagAttribute($xml, '//@module', 'module');
         $this->assertNonFactoryNameModule($phpcsFile, $modules);
+
+        $layouts = $this->collectClassesInLayout($xml);
+        $this->assertNonFactoryName($phpcsFile, $layouts);
+
+        $layoutTabs = $this->collectClassesInLayoutTabs($xml);
+        $this->assertNonFactoryNameTab($phpcsFile, $layoutTabs);
     }
 
     /**
@@ -100,6 +106,25 @@ private function assertNonFactoryNameModule(File $phpcsFile, array $classes)
         }
     }
 
+    /**
+     * Check whether specified class names in layout tabs are right according PSR-1 Standard.
+     *
+     * @param File $phpcsFile
+     * @param array $elements
+     */
+    private function assertNonFactoryNameTab(File $phpcsFile, array $elements)
+    {
+        foreach ($elements as $element) {
+            if (preg_match('/\//', $element['value']) !== false) {
+                $phpcsFile->addError(
+                    self::ERROR_MESSAGE_CONFIG,
+                    $element['lineNumber'],
+                    self::ERROR_CODE_CONFIG,
+                );
+            }
+        }
+    }
+
     /**
      * Format the incoming XML to avoid tags split into several lines.
      *
@@ -165,6 +190,41 @@ function (array $extendedNode) {
         return $classes;
     }
 
+    private function collectClassesInLayout(SimpleXMLElement $xml): array
+    {
+        $classes = $this->getValuesFromXmlTagAttribute(
+            $xml,
+            '/layout//@helper',
+            'helper'
+        );
+        $classes = array_map(
+            function (array $extendedNode) {
+                $extendedNode['value'] = explode('::', trim($extendedNode['value']))[0];
+                return $extendedNode;
+            },
+            $classes
+        );
+        $classes = array_merge(
+            $classes,
+                $this->getValuesFromXmlTagAttribute(
+                $xml,
+                '/layout//@module',
+                'module'
+            )
+        );
+
+        return $classes;
+    }
+
+    private function collectClassesInLayoutTabs(SimpleXMLElement $xml): array
+    {
+        return $this->getValuesFromXmlTagContent(
+            $xml,
+            '/layout//action[@method="addTab"]/block',
+        );
+    }
+
+
     /**
      * Extract value from tag contents which exist in the XML path
      *
diff --git a/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml
new file mode 100644
index 00000000..142ef2d1
--- /dev/null
+++ b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="sales_order_transactions_grid_block"/>
+    <head>
+        <link src="Magento_Sales::js/bootstrap/order-create-index.js"/>
+        <link src="Magento_Sales::js/bootstrap/order-post-action.js"/>
+    </head>
+    <update handle="sales_order_item_price"/>
+    <body>
+        <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" />
+
+        <referenceContainer name="content">
+            <block class="Magento\Sales\Block\Adminhtml\Order\View" name="sales_order_edit"/>
+        </referenceContainer>
+        <referenceContainer name="left">
+            <block class="Magento\Sales\Block\Adminhtml\Order\View\Tabs" name="sales_order_tabs">
+                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="Magento_Sales::order/view/tab/info.phtml">
+                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="Magento_Sales::order/view/info.phtml">
+                        <container name="extra_customer_info"/>
+                    </block>
+                    <container name="order_additional_info"/>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="Magento_Sales::order/view/items.phtml">
+                        <arguments>
+                            <argument name="columns" xsi:type="array">
+                                <item name="product" xsi:type="string" translate="true">Product</item>
+                                <item name="status" xsi:type="string" translate="true">Item Status</item>
+                                <item name="price-original" xsi:type="string" translate="true">Original Price</item>
+                                <item name="price" xsi:type="string" translate="true">Price</item>
+                                <item name="ordered-qty" xsi:type="string" translate="true">Qty</item>
+                                <item name="subtotal" xsi:type="string" translate="true">Subtotal</item>
+                                <item name="tax-amount" xsi:type="string" translate="true">Tax Amount</item>
+                                <item name="tax-percent" xsi:type="string" translate="true">Tax Percent</item>
+                                <item name="discont" xsi:type="string" translate="true">Discount Amount</item>
+                                <item name="total" xsi:type="string" translate="true">Row Total</item>
+                            </argument>
+                        </arguments>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer" as="default" name="default_order_items_renderer" template="Magento_Sales::order/view/items/renderer/default.phtml">
+                            <arguments>
+                                <argument name="columns" xsi:type="array">
+                                    <item name="product" xsi:type="string" translate="false">col-product</item>
+                                    <item name="status" xsi:type="string" translate="false">col-status</item>
+                                    <item name="price-original" xsi:type="string" translate="false">col-price-original</item>
+                                    <item name="price" xsi:type="string" translate="false">col-price</item>
+                                    <item name="qty" xsi:type="string" translate="false">col-ordered-qty</item>
+                                    <item name="subtotal" xsi:type="string" translate="false">col-subtotal</item>
+                                    <item name="tax-amount" xsi:type="string" translate="false">col-tax-amount</item>
+                                    <item name="tax-percent" xsi:type="string" translate="false">col-tax-percent</item>
+                                    <item name="discont" xsi:type="string" translate="false">col-discont</item>
+                                    <item name="total" xsi:type="string" translate="false">col-total</item>
+                                </argument>
+                            </arguments>
+                        </block>
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
+                        <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
+                    </block>
+
+                    <container name="payment_additional_info" htmlTag="div" htmlClass="order-payment-additional" />
+                    <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\View\History" name="order_history" template="Magento_Sales::order/view/history.phtml"/>
+                    <block class="Magento\Backend\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+                        <block class="Magento\Sales\Block\Adminhtml\Order\View\Giftmessage" name="order_giftmessage" template="Magento_Sales::order/view/giftmessage.phtml"/>
+                    </block>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\Totals" name="order_totals" template="Magento_Sales::order/totals.phtml">
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
+                    </block>
+                </block>
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_info</argument>
+                    <argument name="block" xsi:type="string">order_tab_info</argument>
+                </action>
+                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Invoices" name="sales_order_invoice.grid.container"/>
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_invoices</argument>
+                    <argument name="block" xsi:type="string">sales_order_invoice.grid.container</argument>
+                </action>
+                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Creditmemos" name="sales_order_creditmemo.grid.container"/>
+                <action method="addTab">
+                    <block class="Magento\Framework\View\Element\Js\Components" name="sales_page_head_components" template="Magento_Sales::page/js/components.phtml"/>                </action>
+                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Shipments" name="sales_order_shipment.grid.container"/>
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_shipments</argument>
+                    <argument name="block" xsi:type="string">sales_order_shipment.grid.container</argument>
+                </action>
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_history</argument>
+                    <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\History</argument>
+                </action>
+                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions" name="sales_transactions.grid.container"/>
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_transactions</argument>
+                    <argument name="block" xsi:type="string">sales_transactions.grid.container</argument>
+                </action>
+            </block>
+        </referenceContainer>
+        <referenceBlock name="head.components">
+            <block class="Magento\Framework\View\Element\Js\Components" name="sales_page_head_components" template="Magento_Sales::page/js/components.phtml"/>
+        </referenceBlock>
+        <referenceBlock name="sales_order_invoice.grid.container">
+            <uiComponent name="sales_order_view_invoice_grid"/>
+        </referenceBlock>
+        <referenceBlock name="sales_order_creditmemo.grid.container">
+            <uiComponent name="sales_order_view_creditmemo_grid"/>
+        </referenceBlock>
+        <referenceBlock name="sales_order_shipment.grid.container">
+            <uiComponent name="sales_order_view_shipment_grid"/>
+        </referenceBlock>
+    </body>
+</page>

From 34169b2d6af24057c78eb27af0ba97164827c47c Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 10:55:26 +0200
Subject: [PATCH 253/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../ClassReferencesInConfigurationFilesSniff.php  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 2a528edb..9bbd9f07 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -190,6 +190,12 @@ function (array $extendedNode) {
         return $classes;
     }
 
+    /**
+     * Parse an XML for references to PHP class names in selected tags or attributes
+     *
+     * @param SimpleXMLElement $xml
+     * @return array
+     */
     private function collectClassesInLayout(SimpleXMLElement $xml): array
     {
         $classes = $this->getValuesFromXmlTagAttribute(
@@ -206,7 +212,7 @@ function (array $extendedNode) {
         );
         $classes = array_merge(
             $classes,
-                $this->getValuesFromXmlTagAttribute(
+            $this->getValuesFromXmlTagAttribute(
                 $xml,
                 '/layout//@module',
                 'module'
@@ -216,6 +222,12 @@ function (array $extendedNode) {
         return $classes;
     }
 
+    /**
+     * Extract class references from layout tabs
+     *
+     * @param SimpleXMLElement $xml
+     * @return array
+     */
     private function collectClassesInLayoutTabs(SimpleXMLElement $xml): array
     {
         return $this->getValuesFromXmlTagContent(
@@ -224,7 +236,6 @@ private function collectClassesInLayoutTabs(SimpleXMLElement $xml): array
         );
     }
 
-
     /**
      * Extract value from tag contents which exist in the XML path
      *

From 30025539b3edee0fd36bcff3be43ab99f26d47af Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 12:37:23 +0200
Subject: [PATCH 254/630] AC-665: Create phpcs static check for ConfigTest

---
 .../Legacy/ObsoleteConfigNodesSniff.php       |  90 +++++++++++++++
 .../Legacy/_files/obsolete_config_nodes.php   | 106 ++++++++++++++++++
 .../_files/obsolete_config_nodes_ee.php       |  23 ++++
 .../Legacy/ObsoleteConfigNodesUnitTest.1.xml  |  40 +++++++
 .../Legacy/ObsoleteConfigNodesUnitTest.2.xml  |  34 ++++++
 .../Legacy/ObsoleteConfigNodesUnitTest.php    |  33 ++++++
 6 files changed, 326 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
 create mode 100644 Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
 create mode 100644 Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.1.xml
 create mode 100644 Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.2.xml
 create mode 100644 Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
new file mode 100644
index 00000000..2630458e
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class ObsoleteConfigNodesSniff implements Sniff
+{
+    private const ERROR_MESSAGE_CONFIG = "Nodes identified by XPath '%s' are obsolete. %s";
+    private const ERROR_CODE_CONFIG = 'ObsoleteNodeInConfig';
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_INLINE_HTML,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        // We need to format the incoming XML to avoid tags split into several lines. In that case, PHP's DOMElement
+        // returns the position of the closing /> as the position of the tag, and we need the position of <
+        // instead, as it is the one we compare with $stackPtr later on.
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        if ($xml === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                $stackPtr,
+                self::ERROR_CODE_CONFIG
+            );
+        }
+        $obsoleteNodes = [];
+        $obsoleteNodesFiles = glob(__DIR__ . '/_files/obsolete_config_nodes*.php');
+        foreach ($obsoleteNodesFiles as $obsoleteNodesFile) {
+            $obsoleteNodes = array_merge($obsoleteNodes, include $obsoleteNodesFile);
+        }
+        foreach ($obsoleteNodes as $xpath => $suggestion) {
+            $matches = $xml->xpath($xpath);
+            if (empty($matches)) {
+                continue;
+            }
+            foreach ($matches as $match) {
+                $phpcsFile->addError(
+                    sprintf(
+                        self::ERROR_MESSAGE_CONFIG,
+                        $xpath,
+                        $suggestion
+                    ),
+                    dom_import_simplexml($match)->getLineNo()-1,
+                    self::ERROR_CODE_CONFIG
+                );
+            }
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+
+}
\ No newline at end of file
diff --git a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
new file mode 100644
index 00000000..dcde3f7a
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Obsolete configuration nodes
+ *
+ * Format: <class_name> => <replacement>
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreStart
+
+return [
+    '/config/global/fieldsets' => '',
+    '/config/global/cache/betatypes' => '',
+    '/config/admin/fieldsets' => '',
+    '/config/general/locale' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+    '/config/global/can_use_base_url' => 'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
+    '/config/global/locale/allow/codes' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+    '/config/global/locale/allow/currencies' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+    '/config/global/mime/types' => 'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
+    '/config/global/models/*/deprecatedNode' => '',
+    '/config/global/models/*/entities/*/table' => '',
+    '/config/global/models/*/class' => '',
+    '/config/global/helpers/*/class' => '',
+    '/config/global/blocks/*/class' => '',
+    '/config/global/models/*/resourceModel' => '',
+    '/config/global/page/layouts' => 'Moved to page_layouts.xml',
+    '/config/global/cms/layouts' => 'This was never used and is no longer supported',
+    '/config/global/payment/cc/types/*/validator' => 'This configuration was moved to DI configuration of \Magento\Centinel\Model\StateFactory',
+    '/config/global/payment' => 'Move them to payment.xml.',
+    '/config/adminhtml/menu' => 'Move them to adminhtml.xml.',
+    '/config/adminhtml/acl' => 'Move them to adminhtml.xml.',
+    '/config/adminhtml/global_search' => 'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
+    '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'This configuration moved to di.xml file',
+    '/config/*[self::global|self::adminhtml|self::frontend]/events' => 'This configuration moved to events.xml file',
+    '/config/*[self::global|self::adminhtml|self::frontend]/routers' => 'Routes configuration moved to routes.xml file,' .
+    'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
+    '/config/global/importexport' => 'This configuration moved to import.xml and export.xml files',
+    '/config/global/catalog/product/type' => 'This configuration moved to product_types.xml file',
+    '/config/global/catalog/product/options' => 'This configuration moved to product_options.xml file',
+    '/config/global/catalog/product/media/image_types' => 'This configuration moved to Di configuration of ' .
+    '\Magento\Backend\Block\Catalog\Product\Frontend\Product\Watermark',
+    '/config/global/eav_attributes' => 'This configuration moved to eav_attributes.xml file',
+    '/config/global/index' => 'This configuration moved to indexers.xml file',
+    '/config/global/catalogrule' => 'This configuration moved to Di configuration of \Magento\CatalogRule\Model\Rule',
+    '/config/global/salesrule' => 'This configuration moved to Di configuration of \Magento\SalesRule\Helper\Coupon',
+    '/config/global/session' => 'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
+    '/config/global/ignore_user_agents' => 'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
+    '/config/global/request' => 'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
+    '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
+    '/config/global/dev' => 'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
+    '/config/global/webapi' => 'This configuration moved to Di configuration of \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
+    ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
+    '/config/global/cms' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
+    ' and \Magento\Cms\Model\Wysiwyg\Config',
+    '/config/global/widget' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
+    '/config/global/catalog/product/flat/max_index_count' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
+    '/config/global/catalog/product/flat/attribute_groups' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
+    '/config/global/catalog/product/flat/add_filterable_attributes' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+    '/config/global/catalog/product/flat/add_child_data' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+    '/config/global/catalog/content/template_filter' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
+    '/config/frontend/catalog/per_page_values/list' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
+    '/config/frontend/catalog/per_page_values/grid' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
+    '/config/global/catalog/product/design' => 'This configuration moved to Di configuration of' .
+    ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
+    '/config/global/catalog/product/attributes' => 'This configuration moved catalog_attributes.xml',
+    '/config/global/eav_frontendclasses' => 'This configuration was removed. ' .
+    'Please pluginize \Magento\Eav\Helper\Data::getFrontendClasses to extend frontend classes list',
+    '/config/global/resources' => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+    '/config/global/resource' => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+    '/config/*/events/core_block_abstract_to_html_after' => 'Event has been replaced with "core_layout_render_element"',
+    '/config/*/events/catalog_controller_product_delete' => '',
+    '/config//observers/*/args' => 'This was an undocumented and unused feature in event subscribers',
+    '/config/default/design/theme' => 'Relocated to /config/<area>/design/theme',
+    '/config/global/theme' => 'Configuration moved to DI file settings',
+    '/config/default/web/*/base_js_url' => '',
+    '/config/default/web/*/base_skin_url' => '/config/default/web/*/base_static_url',
+    '/config/default/web/*/base_cache_url' => '/config/default/web/*/base_static_url',
+    '/config/global/cache/types/*/tags' => 'use /config/global/cache/types/*/class node instead',
+    '/config/global/disable_local_modules' => '',
+    '/config/global/newsletter/tempate_filter' => 'Use DI configs to setup model for template processing',
+    '/config/*/layout' => 'Use convention for layout files placement instead of configuration',
+    '/config/frontend/product/collection/attributes' => 'Use /config/group[@name="catalog_product"] of catalog_attributes.xml',
+    '/config/frontend/category/collection/attributes' => 'Use /config/group[@name="catalog_category"] of catalog_attributes.xml',
+    '/config/global/sales/quote/item/product_attributes' => 'Use /config/group[@name="quote_item"] of catalog_attributes.xml',
+    '/config/global/wishlist/item/product_attributes' => 'Use /config/group[@name="wishlist_item"] of catalog_attributes.xml',
+    '/config/global/catalog/product/flat/attribute_nodes' => 'Use /config/global/catalog/product/flat/attribute_groups',
+    '/config/global/customer/address/formats' => 'Use /config/format of address_formats.xml',
+    '/config/global/pdf' => 'Use configuration in pdf.xml',
+    '/config/install' => 'Configurations moved to DI file settings',
+    '/config/install/design' => 'Configurations moved to DI file settings',
+    '/config/adminhtml/design' => 'Configurations moved to DI file settings',
+    '/config/frontend/design' => 'Configurations moved to DI file settings',
+    '/config/crontab' => 'All cron configurations moved to crontab.xml',
+    '/config/global/areas' => 'Configurations moved to DI file settings',
+    '/config/vde' => 'Was moved to di',
+    '/config/global/ignoredModules' => 'Was replaced using di',
+    '/config/global/helpers' => 'Was replaced using di',
+    '/config/global/external_cache' => 'Was replaced using di',
+    '/config/global/currency/import/services' => 'Configurations moved to DI file settings',
+    '/config/global/template' => 'Use /config/template of email_templates.xml',
+    '/config/default/general/file/sitemap_generate_valid_paths' => '/config/default/sitemap/file/valid_paths',
+    '/config/dev/css/minify_adapter' => 'Was replaced using di',
+    '/config/dev/js/minify_adapter' => 'Was replaced using di',
+];
diff --git a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
new file mode 100644
index 00000000..b277fc79
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Obsolete configuration nodes, specific for EE
+ *
+ * Format: <class_name> => <replacement>
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    '/config/global/full_page_cache' => '/config/global/cache_advanced/full_page',
+    '/config/adminhtml/enterprise/admingws' => 'This configuration moved to admingws.xml file',
+    '/config/adminhtml/enterprise/websiterestriction' => 'This configuration moved to websiterestrictions.xml file',
+    '/config/global/enterprise_cms' => 'This configuration moved to menu_hierarchy.xml file',
+    '/config/global/enterprise/banner' =>
+        'This configuration moved to Di configuration of \Magento\Banner\Model\Config',
+    '/config/global/enterprise/giftcardaccount' =>
+        'This configuration moved to Di configuration of \Magento\GiftCardAccountModelPool',
+    '/config/global/skip_process_modules_updates' => 'Was replaced using di',
+    '/config/system/page_cache' => 'Module is eliminated. Use PageCache module instead',
+    '/config/system/cms/content/versioning' => 'Functionality is eliminated',
+];
diff --git a/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.1.xml b/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.1.xml
new file mode 100644
index 00000000..9791f65b
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <analytics>
+            <url>
+                <signup>https://advancedreporting.rjmetrics.com/signup</signup>
+                <update>https://advancedreporting.rjmetrics.com/update</update>
+                <bi_essentials>https://dashboard.rjmetrics.com/v2/magento/signup</bi_essentials>
+                <otp>https://advancedreporting.rjmetrics.com/otp</otp>
+                <report>https://advancedreporting.rjmetrics.com/report</report>
+                <notify_data_changed>https://advancedreporting.rjmetrics.com/report</notify_data_changed>
+                <documentation>https://docs.magento.com/user-guide/reports/advanced-reporting.html</documentation>
+            </url>
+            <integration_name>Magento Analytics user</integration_name>
+            <general>
+                <collection_time>02,00,00</collection_time>
+                <token/>
+            </general>
+        </analytics>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <analytics_folder>analytics</analytics_folder>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
+    </default>
+    <global>
+        <fieldsets></fieldsets>
+        <page>
+            <layouts></layouts>
+        </page>
+    </global>
+</config>
diff --git a/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.2.xml b/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.2.xml
new file mode 100644
index 00000000..d3066e18
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <analytics>
+            <url>
+                <signup>https://advancedreporting.rjmetrics.com/signup</signup>
+                <update>https://advancedreporting.rjmetrics.com/update</update>
+                <bi_essentials>https://dashboard.rjmetrics.com/v2/magento/signup</bi_essentials>
+                <otp>https://advancedreporting.rjmetrics.com/otp</otp>
+                <report>https://advancedreporting.rjmetrics.com/report</report>
+                <notify_data_changed>https://advancedreporting.rjmetrics.com/report</notify_data_changed>
+                <documentation>https://docs.magento.com/user-guide/reports/advanced-reporting.html</documentation>
+            </url>
+            <integration_name>Magento Analytics user</integration_name>
+            <general>
+                <collection_time>02,00,00</collection_time>
+                <token/>
+            </general>
+        </analytics>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <analytics_folder>analytics</analytics_folder>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
+    </default>
+</config>
diff --git a/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.php b/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.php
new file mode 100644
index 00000000..379e2b1e
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteConfigNodesUnitTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ObsoleteConfigNodesUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = ''): array
+    {
+        if ($testFile === 'ObsoleteConfigNodesUnitTest.1.xml') {
+            return [
+                35 => 1,
+                37 => 1,
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList(): array
+    {
+        return [];
+    }
+}

From 277c79f3b0474258337810d39784a5b9dee85329 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 12:38:27 +0200
Subject: [PATCH 255/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 2630458e..66bc4c4d 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -87,4 +87,4 @@ private function getFormattedXML(File $phpcsFile)
         return $doc->saveXML();
     }
 
-}
\ No newline at end of file
+}

From d7df4d4d3f6fd58f3277935b6548156a9b71f73d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 12:40:40 +0200
Subject: [PATCH 256/630] AC-665: Create phpcs static check for ConfigTest

---
 .../Legacy/ObsoleteConfigNodesSniff.php       | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 66bc4c4d..c7856ab8 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -49,12 +49,8 @@ public function process(File $phpcsFile, $stackPtr)
                 self::ERROR_CODE_CONFIG
             );
         }
-        $obsoleteNodes = [];
-        $obsoleteNodesFiles = glob(__DIR__ . '/_files/obsolete_config_nodes*.php');
-        foreach ($obsoleteNodesFiles as $obsoleteNodesFile) {
-            $obsoleteNodes = array_merge($obsoleteNodes, include $obsoleteNodesFile);
-        }
-        foreach ($obsoleteNodes as $xpath => $suggestion) {
+
+        foreach ($this->getObsoleteNodes() as $xpath => $suggestion) {
             $matches = $xml->xpath($xpath);
             if (empty($matches)) {
                 continue;
@@ -87,4 +83,19 @@ private function getFormattedXML(File $phpcsFile)
         return $doc->saveXML();
     }
 
+    /**
+     * Get a list of obsolete nodes
+     *
+     * @return array
+     */
+    private function getObsoleteNodes(): array
+    {
+        $obsoleteNodes = [];
+        $obsoleteNodesFiles = glob(__DIR__ . '/_files/obsolete_config_nodes*.php');
+        foreach ($obsoleteNodesFiles as $obsoleteNodesFile) {
+            $obsoleteNodes = array_merge($obsoleteNodes, include $obsoleteNodesFile);
+        }
+        return $obsoleteNodes;
+    }
+
 }

From 602f90790afb3f03a252ab8f7b0783a705c74739 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:12:32 +0200
Subject: [PATCH 257/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/ruleset.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 212bf246..1620de5d 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -115,6 +115,13 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteConfigNodes">
+        <include-pattern>etc/config.xml</include-pattern>
+        <include-pattern>etc/config.*.xml</include-pattern>
+        <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
 
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">
@@ -249,6 +256,7 @@
     </rule>
     <rule ref="Magento2.Legacy.WidgetXML.FoundObsoleteNode">
         <include-pattern>*\/widget.xml$</include-pattern>
+        <exclude-pattern>*\/*.js$</exclude-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>

From f9a88fe631e4b39f5f9fb650dcff7adfc8cd7f9e Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:17:41 +0200
Subject: [PATCH 258/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/ruleset.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1620de5d..124f0494 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -256,7 +256,6 @@
     </rule>
     <rule ref="Magento2.Legacy.WidgetXML.FoundObsoleteNode">
         <include-pattern>*\/widget.xml$</include-pattern>
-        <exclude-pattern>*\/*.js$</exclude-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>

From 091dde37c7d31f4dd5af54a244862d01df7d9df9 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:17:54 +0200
Subject: [PATCH 259/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index c7856ab8..84fc1a8b 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -97,5 +97,4 @@ private function getObsoleteNodes(): array
         }
         return $obsoleteNodes;
     }
-
 }

From 4c2abf65166b196346bcf1a86dd87fcd4b61beda Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:24:54 +0200
Subject: [PATCH 260/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 84fc1a8b..2ab3e3a8 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -90,11 +90,7 @@ private function getFormattedXML(File $phpcsFile)
      */
     private function getObsoleteNodes(): array
     {
-        $obsoleteNodes = [];
-        $obsoleteNodesFiles = glob(__DIR__ . '/_files/obsolete_config_nodes*.php');
-        foreach ($obsoleteNodesFiles as $obsoleteNodesFile) {
-            $obsoleteNodes = array_merge($obsoleteNodes, include $obsoleteNodesFile);
-        }
-        return $obsoleteNodes;
+        $obsoleteNodes = include __DIR__ . '/_files/obsolete_config_nodes.php';
+        return  array_merge($obsoleteNodes, include __DIR__ . '/_files/obsolete_config_nodes_ee.php');
     }
 }

From 061a97d96f2132f21f8462e7c97468390d7a8017 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:25:05 +0200
Subject: [PATCH 261/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 2ab3e3a8..f1a85b03 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -91,6 +91,6 @@ private function getFormattedXML(File $phpcsFile)
     private function getObsoleteNodes(): array
     {
         $obsoleteNodes = include __DIR__ . '/_files/obsolete_config_nodes.php';
-        return  array_merge($obsoleteNodes, include __DIR__ . '/_files/obsolete_config_nodes_ee.php');
+        return array_merge($obsoleteNodes, include __DIR__ . '/_files/obsolete_config_nodes_ee.php');
     }
 }

From a369d3981c3762466a5c37a2056345911cee28ed Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:29:57 +0200
Subject: [PATCH 262/630] AC-665: Create phpcs static check for ConfigTest

---
 .../Sniffs/Legacy/_files/obsolete_config_nodes.php     | 10 ++++++----
 .../Sniffs/Legacy/_files/obsolete_config_nodes_ee.php  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
index dcde3f7a..36af707b 100644
--- a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
+++ b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
@@ -1,15 +1,17 @@
 <?php
+
 /**
- * Obsolete configuration nodes
- *
- * Format: <class_name> => <replacement>
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 // @codingStandardsIgnoreStart
 
+/**
+ * Obsolete configuration nodes
+ *
+ * Format: <class_name> => <replacement>
+ */
 return [
     '/config/global/fieldsets' => '',
     '/config/global/cache/betatypes' => '',
diff --git a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
index b277fc79..24ad7c63 100644
--- a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
+++ b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
@@ -1,13 +1,15 @@
 <?php
+
 /**
- * Obsolete configuration nodes, specific for EE
- *
- * Format: <class_name> => <replacement>
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
+/**
+ * Obsolete configuration nodes
+ *
+ * Format: <class_name> => <replacement>
+ */
 return [
     '/config/global/full_page_cache' => '/config/global/cache_advanced/full_page',
     '/config/adminhtml/enterprise/admingws' => 'This configuration moved to admingws.xml file',

From a1f18593cf4c8441e8bdd023f23c4876ce65c3bd Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 13:55:58 +0200
Subject: [PATCH 263/630] AC-665: Create phpcs static check for ConfigTest

---
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index f1a85b03..4963c59f 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -90,7 +90,7 @@ private function getFormattedXML(File $phpcsFile)
      */
     private function getObsoleteNodes(): array
     {
-        $obsoleteNodes = include __DIR__ . '/_files/obsolete_config_nodes.php';
-        return array_merge($obsoleteNodes, include __DIR__ . '/_files/obsolete_config_nodes_ee.php');
+        $obsoleteNodes = include '_files/obsolete_config_nodes.php';
+        return array_merge($obsoleteNodes, include '_files/obsolete_config_nodes_ee.php');
     }
 }

From e6ad3af4aa8c8cd55d1eed3cc3dcbae7c42a79ce Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 14:02:55 +0200
Subject: [PATCH 264/630] AC-665: Create phpcs static check for ConfigTest

---
 .../Legacy/ObsoleteConfigNodesSniff.php       | 145 +++++++++++++++++-
 1 file changed, 143 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 4963c59f..251f7614 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -90,7 +90,148 @@ private function getFormattedXML(File $phpcsFile)
      */
     private function getObsoleteNodes(): array
     {
-        $obsoleteNodes = include '_files/obsolete_config_nodes.php';
-        return array_merge($obsoleteNodes, include '_files/obsolete_config_nodes_ee.php');
+        return [
+            '/config/global/fieldsets' => '',
+            '/config/global/cache/betatypes' => '',
+            '/config/admin/fieldsets' => '',
+            '/config/general/locale' =>
+                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+            '/config/global/can_use_base_url' =>
+                'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
+            '/config/global/locale/allow/codes' =>
+                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+            '/config/global/locale/allow/currencies' =>
+                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+            '/config/global/mime/types' =>
+                'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
+            '/config/global/models/*/deprecatedNode' => '',
+            '/config/global/models/*/entities/*/table' => '',
+            '/config/global/models/*/class' => '',
+            '/config/global/helpers/*/class' => '',
+            '/config/global/blocks/*/class' => '',
+            '/config/global/models/*/resourceModel' => '',
+            '/config/global/page/layouts' => 'Moved to page_layouts.xml',
+            '/config/global/cms/layouts' => 'This was never used and is no longer supported',
+            '/config/global/payment/cc/types/*/validator' =>
+                'This configuration was moved to DI configuration of \Magento\Centinel\Model\StateFactory',
+            '/config/global/payment' => 'Move them to payment.xml.',
+            '/config/adminhtml/menu' => 'Move them to adminhtml.xml.',
+            '/config/adminhtml/acl' => 'Move them to adminhtml.xml.',
+            '/config/adminhtml/global_search' =>
+                'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
+            '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'This configuration moved to di.xml file',
+            '/config/*[self::global|self::adminhtml|self::frontend]/events' =>
+                'This configuration moved to events.xml file',
+            '/config/*[self::global|self::adminhtml|self::frontend]/routers' =>
+                'Routes configuration moved to routes.xml file,' .
+                'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
+            '/config/global/importexport' => 'This configuration moved to import.xml and export.xml files',
+            '/config/global/catalog/product/type' => 'This configuration moved to product_types.xml file',
+            '/config/global/catalog/product/options' => 'This configuration moved to product_options.xml file',
+            '/config/global/catalog/product/media/image_types' => 'This configuration moved to Di configuration of ' .
+                '\Magento\Backend\Block\Catalog\Product\Frontend\Product\Watermark',
+            '/config/global/eav_attributes' => 'This configuration moved to eav_attributes.xml file',
+            '/config/global/index' => 'This configuration moved to indexers.xml file',
+            '/config/global/catalogrule' =>
+                'This configuration moved to Di configuration of \Magento\CatalogRule\Model\Rule',
+            '/config/global/salesrule' =>
+                'This configuration moved to Di configuration of \Magento\SalesRule\Helper\Coupon',
+            '/config/global/session' =>
+                'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
+            '/config/global/ignore_user_agents' =>
+                'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
+            '/config/global/request' =>
+                'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
+            '/config/global/secure_url' =>
+                'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
+            '/config/global/dev' =>
+                'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
+            '/config/global/webapi' =>
+                'This configuration moved to Di configuration of '.
+                ' \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
+                ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
+            '/config/global/cms' =>
+                'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
+                ' and \Magento\Cms\Model\Wysiwyg\Config',
+            '/config/global/widget' =>
+                'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
+            '/config/global/catalog/product/flat/max_index_count' =>
+                'This configuration moved to Di configuration of '.
+                '\Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
+            '/config/global/catalog/product/flat/attribute_groups' =>
+                'This configuration moved to Di configuration of '.
+                '\Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
+            '/config/global/catalog/product/flat/add_filterable_attributes' =>
+                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+            '/config/global/catalog/product/flat/add_child_data' =>
+                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+            '/config/global/catalog/content/template_filter' =>
+                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
+            '/config/frontend/catalog/per_page_values/list' =>
+                'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
+            '/config/frontend/catalog/per_page_values/grid' =>
+                'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
+            '/config/global/catalog/product/design' => 'This configuration moved to Di configuration of' .
+                ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
+            '/config/global/catalog/product/attributes' => 'This configuration moved catalog_attributes.xml',
+            '/config/global/eav_frontendclasses' => 'This configuration was removed. ' .
+                'Please pluginize \Magento\Eav\Helper\Data::getFrontendClasses to extend frontend classes list',
+            '/config/global/resources' =>
+                'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+            '/config/global/resource' =>
+                'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+            '/config/*/events/core_block_abstract_to_html_after' =>
+                'Event has been replaced with "core_layout_render_element"',
+            '/config/*/events/catalog_controller_product_delete' => '',
+            '/config//observers/*/args' => 'This was an undocumented and unused feature in event subscribers',
+            '/config/default/design/theme' => 'Relocated to /config/<area>/design/theme',
+            '/config/global/theme' => 'Configuration moved to DI file settings',
+            '/config/default/web/*/base_js_url' => '',
+            '/config/default/web/*/base_skin_url' => '/config/default/web/*/base_static_url',
+            '/config/default/web/*/base_cache_url' => '/config/default/web/*/base_static_url',
+            '/config/global/cache/types/*/tags' => 'use /config/global/cache/types/*/class node instead',
+            '/config/global/disable_local_modules' => '',
+            '/config/global/newsletter/tempate_filter' => 'Use DI configs to setup model for template processing',
+            '/config/*/layout' => 'Use convention for layout files placement instead of configuration',
+            '/config/frontend/product/collection/attributes' =>
+                'Use /config/group[@name="catalog_product"] of catalog_attributes.xml',
+            '/config/frontend/category/collection/attributes' =>
+                'Use /config/group[@name="catalog_category"] of catalog_attributes.xml',
+            '/config/global/sales/quote/item/product_attributes' =>
+                'Use /config/group[@name="quote_item"] of catalog_attributes.xml',
+            '/config/global/wishlist/item/product_attributes' =>
+                'Use /config/group[@name="wishlist_item"] of catalog_attributes.xml',
+            '/config/global/catalog/product/flat/attribute_nodes' =>
+                'Use /config/global/catalog/product/flat/attribute_groups',
+            '/config/global/customer/address/formats' => 'Use /config/format of address_formats.xml',
+            '/config/global/pdf' => 'Use configuration in pdf.xml',
+            '/config/install' => 'Configurations moved to DI file settings',
+            '/config/install/design' => 'Configurations moved to DI file settings',
+            '/config/adminhtml/design' => 'Configurations moved to DI file settings',
+            '/config/frontend/design' => 'Configurations moved to DI file settings',
+            '/config/crontab' => 'All cron configurations moved to crontab.xml',
+            '/config/global/areas' => 'Configurations moved to DI file settings',
+            '/config/vde' => 'Was moved to di',
+            '/config/global/ignoredModules' => 'Was replaced using di',
+            '/config/global/helpers' => 'Was replaced using di',
+            '/config/global/external_cache' => 'Was replaced using di',
+            '/config/global/currency/import/services' => 'Configurations moved to DI file settings',
+            '/config/global/template' => 'Use /config/template of email_templates.xml',
+            '/config/default/general/file/sitemap_generate_valid_paths' => '/config/default/sitemap/file/valid_paths',
+            '/config/dev/css/minify_adapter' => 'Was replaced using di',
+            '/config/dev/js/minify_adapter' => 'Was replaced using di',
+            '/config/global/full_page_cache' => '/config/global/cache_advanced/full_page',
+            '/config/adminhtml/enterprise/admingws' => 'This configuration moved to admingws.xml file',
+            '/config/adminhtml/enterprise/websiterestriction' =>
+                'This configuration moved to websiterestrictions.xml file',
+            '/config/global/enterprise_cms' => 'This configuration moved to menu_hierarchy.xml file',
+            '/config/global/enterprise/banner' =>
+                'This configuration moved to Di configuration of \Magento\Banner\Model\Config',
+            '/config/global/enterprise/giftcardaccount' =>
+                'This configuration moved to Di configuration of \Magento\GiftCardAccountModelPool',
+            '/config/global/skip_process_modules_updates' => 'Was replaced using di',
+            '/config/system/page_cache' => 'Module is eliminated. Use PageCache module instead',
+            '/config/system/cms/content/versioning' => 'Functionality is eliminated',
+        ];
     }
 }

From 1d6ac40925cd64874aead694364d441a84703b1b Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Sep 2021 14:06:13 +0200
Subject: [PATCH 265/630] AC-665: Create phpcs static check for ConfigTest

---
 .../Legacy/ObsoleteConfigNodesSniff.php       |   2 +-
 .../Legacy/_files/obsolete_config_nodes.php   | 108 ------------------
 .../_files/obsolete_config_nodes_ee.php       |  25 ----
 3 files changed, 1 insertion(+), 134 deletions(-)
 delete mode 100644 Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
 delete mode 100644 Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 251f7614..efc5fae7 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -84,7 +84,7 @@ private function getFormattedXML(File $phpcsFile)
     }
 
     /**
-     * Get a list of obsolete nodes
+     * Get a list of obsolete nodes in the format <class_name> => <replacement>
      *
      * @return array
      */
diff --git a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
deleted file mode 100644
index 36af707b..00000000
--- a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreStart
-
-/**
- * Obsolete configuration nodes
- *
- * Format: <class_name> => <replacement>
- */
-return [
-    '/config/global/fieldsets' => '',
-    '/config/global/cache/betatypes' => '',
-    '/config/admin/fieldsets' => '',
-    '/config/general/locale' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
-    '/config/global/can_use_base_url' => 'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
-    '/config/global/locale/allow/codes' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
-    '/config/global/locale/allow/currencies' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
-    '/config/global/mime/types' => 'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
-    '/config/global/models/*/deprecatedNode' => '',
-    '/config/global/models/*/entities/*/table' => '',
-    '/config/global/models/*/class' => '',
-    '/config/global/helpers/*/class' => '',
-    '/config/global/blocks/*/class' => '',
-    '/config/global/models/*/resourceModel' => '',
-    '/config/global/page/layouts' => 'Moved to page_layouts.xml',
-    '/config/global/cms/layouts' => 'This was never used and is no longer supported',
-    '/config/global/payment/cc/types/*/validator' => 'This configuration was moved to DI configuration of \Magento\Centinel\Model\StateFactory',
-    '/config/global/payment' => 'Move them to payment.xml.',
-    '/config/adminhtml/menu' => 'Move them to adminhtml.xml.',
-    '/config/adminhtml/acl' => 'Move them to adminhtml.xml.',
-    '/config/adminhtml/global_search' => 'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
-    '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'This configuration moved to di.xml file',
-    '/config/*[self::global|self::adminhtml|self::frontend]/events' => 'This configuration moved to events.xml file',
-    '/config/*[self::global|self::adminhtml|self::frontend]/routers' => 'Routes configuration moved to routes.xml file,' .
-    'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
-    '/config/global/importexport' => 'This configuration moved to import.xml and export.xml files',
-    '/config/global/catalog/product/type' => 'This configuration moved to product_types.xml file',
-    '/config/global/catalog/product/options' => 'This configuration moved to product_options.xml file',
-    '/config/global/catalog/product/media/image_types' => 'This configuration moved to Di configuration of ' .
-    '\Magento\Backend\Block\Catalog\Product\Frontend\Product\Watermark',
-    '/config/global/eav_attributes' => 'This configuration moved to eav_attributes.xml file',
-    '/config/global/index' => 'This configuration moved to indexers.xml file',
-    '/config/global/catalogrule' => 'This configuration moved to Di configuration of \Magento\CatalogRule\Model\Rule',
-    '/config/global/salesrule' => 'This configuration moved to Di configuration of \Magento\SalesRule\Helper\Coupon',
-    '/config/global/session' => 'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
-    '/config/global/ignore_user_agents' => 'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
-    '/config/global/request' => 'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
-    '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
-    '/config/global/dev' => 'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
-    '/config/global/webapi' => 'This configuration moved to Di configuration of \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
-    ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
-    '/config/global/cms' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
-    ' and \Magento\Cms\Model\Wysiwyg\Config',
-    '/config/global/widget' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
-    '/config/global/catalog/product/flat/max_index_count' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
-    '/config/global/catalog/product/flat/attribute_groups' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
-    '/config/global/catalog/product/flat/add_filterable_attributes' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
-    '/config/global/catalog/product/flat/add_child_data' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
-    '/config/global/catalog/content/template_filter' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
-    '/config/frontend/catalog/per_page_values/list' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
-    '/config/frontend/catalog/per_page_values/grid' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
-    '/config/global/catalog/product/design' => 'This configuration moved to Di configuration of' .
-    ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
-    '/config/global/catalog/product/attributes' => 'This configuration moved catalog_attributes.xml',
-    '/config/global/eav_frontendclasses' => 'This configuration was removed. ' .
-    'Please pluginize \Magento\Eav\Helper\Data::getFrontendClasses to extend frontend classes list',
-    '/config/global/resources' => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
-    '/config/global/resource' => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
-    '/config/*/events/core_block_abstract_to_html_after' => 'Event has been replaced with "core_layout_render_element"',
-    '/config/*/events/catalog_controller_product_delete' => '',
-    '/config//observers/*/args' => 'This was an undocumented and unused feature in event subscribers',
-    '/config/default/design/theme' => 'Relocated to /config/<area>/design/theme',
-    '/config/global/theme' => 'Configuration moved to DI file settings',
-    '/config/default/web/*/base_js_url' => '',
-    '/config/default/web/*/base_skin_url' => '/config/default/web/*/base_static_url',
-    '/config/default/web/*/base_cache_url' => '/config/default/web/*/base_static_url',
-    '/config/global/cache/types/*/tags' => 'use /config/global/cache/types/*/class node instead',
-    '/config/global/disable_local_modules' => '',
-    '/config/global/newsletter/tempate_filter' => 'Use DI configs to setup model for template processing',
-    '/config/*/layout' => 'Use convention for layout files placement instead of configuration',
-    '/config/frontend/product/collection/attributes' => 'Use /config/group[@name="catalog_product"] of catalog_attributes.xml',
-    '/config/frontend/category/collection/attributes' => 'Use /config/group[@name="catalog_category"] of catalog_attributes.xml',
-    '/config/global/sales/quote/item/product_attributes' => 'Use /config/group[@name="quote_item"] of catalog_attributes.xml',
-    '/config/global/wishlist/item/product_attributes' => 'Use /config/group[@name="wishlist_item"] of catalog_attributes.xml',
-    '/config/global/catalog/product/flat/attribute_nodes' => 'Use /config/global/catalog/product/flat/attribute_groups',
-    '/config/global/customer/address/formats' => 'Use /config/format of address_formats.xml',
-    '/config/global/pdf' => 'Use configuration in pdf.xml',
-    '/config/install' => 'Configurations moved to DI file settings',
-    '/config/install/design' => 'Configurations moved to DI file settings',
-    '/config/adminhtml/design' => 'Configurations moved to DI file settings',
-    '/config/frontend/design' => 'Configurations moved to DI file settings',
-    '/config/crontab' => 'All cron configurations moved to crontab.xml',
-    '/config/global/areas' => 'Configurations moved to DI file settings',
-    '/config/vde' => 'Was moved to di',
-    '/config/global/ignoredModules' => 'Was replaced using di',
-    '/config/global/helpers' => 'Was replaced using di',
-    '/config/global/external_cache' => 'Was replaced using di',
-    '/config/global/currency/import/services' => 'Configurations moved to DI file settings',
-    '/config/global/template' => 'Use /config/template of email_templates.xml',
-    '/config/default/general/file/sitemap_generate_valid_paths' => '/config/default/sitemap/file/valid_paths',
-    '/config/dev/css/minify_adapter' => 'Was replaced using di',
-    '/config/dev/js/minify_adapter' => 'Was replaced using di',
-];
diff --git a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php b/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
deleted file mode 100644
index 24ad7c63..00000000
--- a/Magento2/Sniffs/Legacy/_files/obsolete_config_nodes_ee.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Obsolete configuration nodes
- *
- * Format: <class_name> => <replacement>
- */
-return [
-    '/config/global/full_page_cache' => '/config/global/cache_advanced/full_page',
-    '/config/adminhtml/enterprise/admingws' => 'This configuration moved to admingws.xml file',
-    '/config/adminhtml/enterprise/websiterestriction' => 'This configuration moved to websiterestrictions.xml file',
-    '/config/global/enterprise_cms' => 'This configuration moved to menu_hierarchy.xml file',
-    '/config/global/enterprise/banner' =>
-        'This configuration moved to Di configuration of \Magento\Banner\Model\Config',
-    '/config/global/enterprise/giftcardaccount' =>
-        'This configuration moved to Di configuration of \Magento\GiftCardAccountModelPool',
-    '/config/global/skip_process_modules_updates' => 'Was replaced using di',
-    '/config/system/page_cache' => 'Module is eliminated. Use PageCache module instead',
-    '/config/system/cms/content/versioning' => 'Functionality is eliminated',
-];

From 504a50bef1d8902ddf0bf0f41017e1656dec4977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 21 Sep 2021 16:11:20 +0200
Subject: [PATCH 266/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 ...utogeneratedClassNotInConstructorSniff.php | 82 ++++++++++++-------
 ...tedClassNotInConstructorUnitTest.1.php.inc |  2 +-
 Magento2/ruleset.xml                          |  3 +-
 3 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 30c4620c..0aca5737 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -41,7 +41,7 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_USE') {
-            $this->registerUses($phpcsFile, $stackPtr);
+            $this->registerUse($phpcsFile, $stackPtr);
         }
         if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_FUNCTION') {
             $this->registerConstructorParameters($phpcsFile, $stackPtr);
@@ -59,29 +59,9 @@ public function process(File $phpcsFile, $stackPtr)
                 return;
             }
 
-            $variableInParameters = false;
-            if ($variable = $phpcsFile->findNext(T_VARIABLE, $equalsPtr, $statementEnd)) {
-                $variableName = $phpcsFile->getTokens()[$variable]['content'];
-                if ($variableName === '$this') {
-                    $variableName = $this->getNext($phpcsFile, $variable, $statementEnd, T_STRING)['content'];
-                }
-                foreach ($this->constructorParameters as $parameter) {
-                    $parameterName = $parameter['name'];
-                    if ($this->variableName($parameterName) === $this->variableName($variableName)) {
-                        $variableInParameters = true;
-                    }
-                }
-            }
-
-            if (!$variableInParameters) {
+            if (!$this->isVariableInConstructorParameters($phpcsFile, $equalsPtr, $statementEnd)) {
                 $next = $stackPtr;
-                while ($next = $phpcsFile->findNext(T_DOUBLE_COLON, $next + 1, $statementEnd)) {
-                    if ($this->getNext($phpcsFile, $next, $statementEnd, T_STRING)['content'] === 'class') {
-                        $className = $this->getPrevious($phpcsFile, $next, T_STRING)['content'];
-                    }
-                }
-
-                $className = $this->getClassNamespace($className);
+                $className = $this->obtainClassToGetOrCreate($phpcsFile, $next, $statementEnd);
 
                 $phpcsFile->addWarning(
                     sprintf("Class %s needs to be requested in constructor, " .
@@ -118,9 +98,9 @@ private function isObjectManagerGetInstance(File $phpcsFile, int $stackPtr): boo
      */
     private function getClassNamespace(string $className): string
     {
-        foreach ($this->uses as $use) {
-            if (end($use) === $className) {
-                $className = implode('/', $use);
+        foreach ($this->uses as $key => $use) {
+            if ($key === $className) {
+                return $use;
             }
         }
         return $className;
@@ -132,7 +112,7 @@ private function getClassNamespace(string $className): string
      * @param File $phpcsFile
      * @param int $stackPtr
      */
-    private function registerUses(File $phpcsFile, int $stackPtr): void
+    private function registerUse(File $phpcsFile, int $stackPtr): void
     {
         $useEnd = $phpcsFile->findEndOfStatement($stackPtr);
         $use = [];
@@ -140,7 +120,13 @@ private function registerUses(File $phpcsFile, int $stackPtr): void
         while ($usePosition = $phpcsFile->findNext(T_STRING, $usePosition + 1, $useEnd)) {
             $use[] = $phpcsFile->getTokens()[$usePosition]['content'];
         }
-        $this->uses [] = $use;
+
+        $key = end($use);
+        if ($phpcsFile->findNext(T_AS, $stackPtr, $useEnd)) {
+            $this->uses[$key] = implode("\\", array_slice($use, 0, count($use) - 1));
+        } else {
+            $this->uses[$key] = implode("\\", $use);
+        }
     }
 
     /**
@@ -194,4 +180,44 @@ protected function variableName(string $parameterName): string
     {
         return str_replace('$', '', $parameterName);
     }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $equalsPtr
+     * @param int $statementEnd
+     * @return bool
+     */
+    private function isVariableInConstructorParameters(File $phpcsFile, int $equalsPtr, int $statementEnd): bool
+    {
+        if ($variable = $phpcsFile->findNext(T_VARIABLE, $equalsPtr, $statementEnd)) {
+            $variableName = $phpcsFile->getTokens()[$variable]['content'];
+            if ($variableName === '$this') {
+                $variableName = $this->getNext($phpcsFile, $variable, $statementEnd, T_STRING)['content'];
+            }
+            foreach ($this->constructorParameters as $parameter) {
+                $parameterName = $parameter['name'];
+                if ($this->variableName($parameterName) === $this->variableName($variableName)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param $next
+     * @param int $statementEnd
+     * @return string
+     */
+    private function obtainClassToGetOrCreate(File $phpcsFile, $next, int $statementEnd): string
+    {
+        while ($next = $phpcsFile->findNext(T_DOUBLE_COLON, $next + 1, $statementEnd)) {
+            if ($this->getNext($phpcsFile, $next, $statementEnd, T_STRING)['content'] === 'class') {
+                $className = $this->getPrevious($phpcsFile, $next, T_STRING)['content'];
+            }
+        }
+
+        return $this->getClassNamespace($className);
+    }
 }
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
index e16177e8..f7a461ed 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
@@ -7,7 +7,7 @@ declare(strict_types = 1);
 
 namespace Magento2\Tests\PHP;
 
-use Magento2\Model;
+use Magento2\OneModel as Model;
 
 class Good
 {
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 212bf246..347aab6e 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -151,6 +151,7 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Html.HtmlBinding">
+        <include-pattern>*\/.phtml$</include-pattern>
         <severity>9</severity>
         <type>warning</type>
     </rule>
@@ -247,7 +248,7 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Legacy.WidgetXML.FoundObsoleteNode">
+    <rule ref="Magento2.Legacy.WidgetXML">
         <include-pattern>*\/widget.xml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>

From 7d317bafa76504117fabbae5561dfefefdd78be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Wed, 22 Sep 2021 11:00:16 +0200
Subject: [PATCH 267/630] AC-662: Create phpcs static check for
 AutogeneratedClassNotInConstructorTest

---
 .../PHP/AutogeneratedClassNotInConstructorSniff.php | 13 ++++++++-----
 .../AutogeneratedClassNotInConstructorUnitTest.php  |  4 ++--
 Magento2/ruleset.xml                                |  5 +++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 0aca5737..f99346af 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -60,10 +60,9 @@ public function process(File $phpcsFile, $stackPtr)
             }
 
             if (!$this->isVariableInConstructorParameters($phpcsFile, $equalsPtr, $statementEnd)) {
-                $next = $stackPtr;
-                $className = $this->obtainClassToGetOrCreate($phpcsFile, $next, $statementEnd);
+                $className = $this->obtainClassToGetOrCreate($phpcsFile, $stackPtr, $statementEnd);
 
-                $phpcsFile->addWarning(
+                $phpcsFile->addError(
                     sprintf("Class %s needs to be requested in constructor, " .
                         "otherwise compiler will not be able to find and generate these classes", $className),
                     $stackPtr,
@@ -182,6 +181,8 @@ protected function variableName(string $parameterName): string
     }
 
     /**
+     * Checks if a variable is present in the constructor parameters
+     *
      * @param File $phpcsFile
      * @param int $equalsPtr
      * @param int $statementEnd
@@ -205,12 +206,14 @@ private function isVariableInConstructorParameters(File $phpcsFile, int $equalsP
     }
 
     /**
+     * Obtain the class inside ObjectManager::getInstance()->get|create()
+     *
      * @param File $phpcsFile
-     * @param $next
+     * @param int $next
      * @param int $statementEnd
      * @return string
      */
-    private function obtainClassToGetOrCreate(File $phpcsFile, $next, int $statementEnd): string
+    private function obtainClassToGetOrCreate(File $phpcsFile, int $next, int $statementEnd): string
     {
         while ($next = $phpcsFile->findNext(T_DOUBLE_COLON, $next + 1, $statementEnd)) {
             if ($this->getNext($phpcsFile, $next, $statementEnd, T_STRING)['content'] === 'class') {
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
index 5c3a2f70..9122213f 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
@@ -14,7 +14,7 @@ class AutogeneratedClassNotInConstructorUnitTest extends AbstractSniffUnitTest
     /**
      * @inheritdoc
      */
-    public function getWarningList($filename = '')
+    public function getErrorList($filename = '')
     {
         if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.1.php.inc') {
             return [
@@ -32,7 +32,7 @@ public function getWarningList($filename = '')
     /**
      * @inheritdoc
      */
-    public function getErrorList()
+    public function getWarningList($filename = '')
     {
         return [];
     }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 347aab6e..b33e8a7f 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -115,6 +115,11 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.PHP.AutogeneratedClassNotInConstructor">
+        <include-pattern>*\.php$</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
 
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">

From 5052feb98fb067dcbeb819bcde1073749b5b1398 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 22 Sep 2021 12:10:12 +0200
Subject: [PATCH 268/630] AC-1307: PHP Syntax errors in xml files

---
 Magento2/ruleset.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index db71693c..f62eafb0 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -14,19 +14,23 @@
         <severity>10</severity>
         <type>error</type>
         <exclude-pattern>*\.phtml$</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.DeprecatedFunctions">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.NoSilencedErrors">
         <severity>10</severity>
         <type>error</type>
         <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.Syntax">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Classes.DiscouragedDependencies">
         <severity>10</severity>
@@ -48,14 +52,17 @@
     <rule ref="Magento2.PHP.FinalImplementation">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.Goto">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.ReturnValueCheck">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.IncludeFile">
         <severity>10</severity>
@@ -104,6 +111,7 @@
     <rule ref="Squiz.PHP.Eval">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Legacy.AbstractBlock">
         <severity>10</severity>
@@ -154,6 +162,7 @@
     <rule ref="Squiz.PHP.NonExecutableCode">
         <severity>9</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Html.HtmlBinding">
         <severity>9</severity>
@@ -225,6 +234,7 @@
     <rule ref="Magento2.PHP.ShortEchoSyntax">
         <severity>8</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Templates.ThisInTemplate">
         <include-pattern>*\.phtml$</include-pattern>
@@ -318,10 +328,12 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.Var">
         <severity>7</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Performance.ForeachArrayMerge">
         <severity>7</severity>
@@ -361,6 +373,7 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.Scope.MemberVarScope">
         <severity>7</severity>
@@ -399,10 +412,12 @@
     <rule ref="Generic.PHP.LowerCaseConstant">
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.LowerCaseKeyword">
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Generic.WhiteSpace.DisallowTabIndent">
         <severity>6</severity>
@@ -633,6 +648,7 @@
         </properties>
         <severity>5</severity>
         <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Annotation">
         <severity>5</severity>
@@ -644,10 +660,14 @@
     <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
         <severity>5</severity>
         <type>warning</type>
+        <exclude-pattern>*\.php$</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Legacy.Copyright">
         <severity>5</severity>
         <type>warning</type>
+        <include-pattern>*\.php$</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
     </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>

From 08c7084bb35c3b8f9e4c5efd43aefd2301a674ba Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 23 Sep 2021 09:29:51 +0200
Subject: [PATCH 269/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 .../Sniffs/Legacy/InstallUpgradeSniff.php     |  125 ++
 .../Tests/Legacy/InstallUpgradeUnitTest.php   |   72 +
 .../InstallUpgradeUnitTest/InstallData.inc    |    1 +
 .../InstallUpgradeUnitTest/InstallSchema.inc  |    1 +
 .../InstallUpgradeUnitTest/UpgradeData.inc    |    1 +
 .../InstallUpgradeUnitTest/UpgradeSchema.inc  |    1 +
 .../InstallUpgradeUnitTest/data-install-.inc  |    1 +
 .../InstallUpgradeUnitTest/data-upgrade-.inc  |    1 +
 .../InstallUpgradeUnitTest/data/file2.inc     |    1 +
 .../InstallUpgradeUnitTest/install-sample.inc |    1 +
 .../InstallUpgradeUnitTest/recurring.inc      |    1 +
 .../InstallUpgradeUnitTest/sql/file.inc       |    1 +
 .../InstallUpgradeUnitTest/upgrade-.inc       |    1 +
 .../InstallUpgradeUnitTest/valid-file.inc     |    1 +
 Magento2/ruleset.xml                          |    2 +
 package-lock.json                             | 1229 +----------------
 16 files changed, 213 insertions(+), 1227 deletions(-)
 create mode 100644 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
 create mode 100644 Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallData.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallSchema.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeData.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeSchema.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-install-.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-upgrade-.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data/file2.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/install-sample.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/recurring.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/sql/file.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/upgrade-.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/valid-file.inc

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
new file mode 100644
index 00000000..74c035d8
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class InstallUpgradeSniff implements Sniff
+{
+    private const ERROR_CODE = 'obsoleteScript';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_OPEN_TAG
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'install-') === 0) {
+            $phpcsFile->addError(
+                'Install scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'InstallSchema') === 0) {
+            $phpcsFile->addError(
+                'InstallSchema scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'InstallData') === 0) {
+            $phpcsFile->addError(
+                'InstallData scripts are obsolete. '
+                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'data-install-') === 0) {
+            $phpcsFile->addError(
+                'Install scripts are obsolete. Please create class InstallData in module\'s Setup folder',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'upgrade-') === 0) {
+            $phpcsFile->addError(
+                'Upgrade scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'UpgradeSchema') === 0) {
+            $phpcsFile->addError(
+                'UpgradeSchema scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'UpgradeData') === 0) {
+            $phpcsFile->addError(
+                'UpgradeSchema scripts are obsolete. '
+                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'data-upgrade-') === 0) {
+            $phpcsFile->addError(
+                'Upgrade scripts are obsolete. '
+                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (strpos(basename($phpcsFile->getFilename()), 'recurring') === 0) {
+            $phpcsFile->addError(
+                'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder',
+                0,
+                self::ERROR_CODE
+            );
+        }
+
+        if (preg_match('/(sql|data)/', dirname($phpcsFile->getFilename())) === 1) {
+            $phpcsFile->addError(
+                $phpcsFile->getFilename()." is in an invalid directory ".dirname($phpcsFile->getFilename()).":\n"
+                . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"
+                . "- Use declarative schema approach in module's etc/db_schema.xml file for schema changes.",
+                0,
+                self::ERROR_CODE
+            );
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php b/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
new file mode 100644
index 00000000..c65ea706
--- /dev/null
+++ b/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use DirectoryIterator;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+class InstallUpgradeUnitTest extends AbstractSniffUnitTest
+{
+    private $wrongFileNames = [
+        'data-install-.inc',
+        'data-upgrade-.inc',
+        'install-sample.inc',
+        'InstallData.inc',
+        'InstallSchema.inc',
+        'recurring.inc',
+        'upgrade-.inc',
+        'UpgradeData.inc',
+        'UpgradeSchema.inc',
+        'file.inc',
+        'file2.inc',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    protected function getTestFiles($testFileBase): array
+    {
+        $testFiles = [];
+
+        $dir = __DIR__.'/_files/InstallUpgradeUnitTest';
+        $di  = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
+
+        foreach ($di as $file) {
+            $path = $file->getPathname();
+            if ($path !== $testFileBase.'php' && substr($path, -5) !== 'fixed' && substr($path, -4) !== '.bak') {
+                $testFiles[] = $path;
+            }
+        }
+
+        // Put them in order.
+        sort($testFiles);
+
+        return $testFiles;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        if (in_array($testFile, $this->wrongFileNames)) {
+            return [
+                1 => 1
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallData.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallData.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallData.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallSchema.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallSchema.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/InstallSchema.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeData.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeData.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeData.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeSchema.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeSchema.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/UpgradeSchema.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-install-.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-install-.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-install-.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-upgrade-.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-upgrade-.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data-upgrade-.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data/file2.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data/file2.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/data/file2.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/install-sample.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/install-sample.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/install-sample.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/recurring.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/recurring.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/recurring.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/sql/file.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/sql/file.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/sql/file.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/upgrade-.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/upgrade-.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/upgrade-.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/valid-file.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/valid-file.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/valid-file.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index e1771984..ad7b5cf2 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -127,6 +127,8 @@
         <include-pattern>etc/config.xml</include-pattern>
         <include-pattern>etc/config.*.xml</include-pattern>
         <include-pattern>etc/*/config.xml</include-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.InstallUpgrade">
         <severity>10</severity>
         <type>error</type>
     </rule>
diff --git a/package-lock.json b/package-lock.json
index e0bac264..b2e5aac9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,1232 +1,8 @@
 {
   "name": "js",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "js",
-      "version": "1.0.0",
-      "license": "ISC",
-      "devDependencies": {
-        "eslint": "^7.32.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    }
-  },
   "dependencies": {
     "@babel/code-frame": {
       "version": "7.12.11",
@@ -1356,8 +132,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ajv": {
       "version": "6.12.6",

From 38cf40834a6a8daa8f216d2f05c108bce12c6e69 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 23 Sep 2021 09:44:12 +0200
Subject: [PATCH 270/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 Magento2/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index ad7b5cf2..e4da852e 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -127,6 +127,8 @@
         <include-pattern>etc/config.xml</include-pattern>
         <include-pattern>etc/config.*.xml</include-pattern>
         <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
     </rule>
     <rule ref="Magento2.Legacy.InstallUpgrade">
         <severity>10</severity>

From b6bff95e92d51a805e1015344a74d0553ca4f7df Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 23 Sep 2021 09:48:04 +0200
Subject: [PATCH 271/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 package-lock.json | 1229 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 1227 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2e5aac9..e0bac264 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,1232 @@
 {
   "name": "js",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "js",
+      "version": "1.0.0",
+      "license": "ISC",
+      "devDependencies": {
+        "eslint": "^7.32.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    }
+  },
   "dependencies": {
     "@babel/code-frame": {
       "version": "7.12.11",
@@ -132,7 +1356,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv": {
       "version": "6.12.6",

From 718975ad87a01cb0d45929bf5b9064a1beb27f7e Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 23 Sep 2021 09:59:06 +0200
Subject: [PATCH 272/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 .../Sniffs/Legacy/InstallUpgradeSniff.php     | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index 74c035d8..066efde5 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -9,6 +9,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use SplFileInfo;
 
 class InstallUpgradeSniff implements Sniff
 {
@@ -32,8 +33,10 @@ public function process(File $phpcsFile, $stackPtr)
         if ($stackPtr > 0) {
             return;
         }
+        
+        $fileInfo = new SplFileInfo($phpcsFile->getFilename());
 
-        if (strpos(basename($phpcsFile->getFilename()), 'install-') === 0) {
+        if (strpos($fileInfo->getFilename(), 'install-') === 0) {
             $phpcsFile->addError(
                 'Install scripts are obsolete. '
                 . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
@@ -42,7 +45,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'InstallSchema') === 0) {
+        if (strpos($fileInfo->getFilename(), 'InstallSchema') === 0) {
             $phpcsFile->addError(
                 'InstallSchema scripts are obsolete. '
                 . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
@@ -51,7 +54,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'InstallData') === 0) {
+        if (strpos($fileInfo->getFilename(), 'InstallData') === 0) {
             $phpcsFile->addError(
                 'InstallData scripts are obsolete. '
                 . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
@@ -60,7 +63,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'data-install-') === 0) {
+        if (strpos($fileInfo->getFilename(), 'data-install-') === 0) {
             $phpcsFile->addError(
                 'Install scripts are obsolete. Please create class InstallData in module\'s Setup folder',
                 0,
@@ -68,7 +71,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'upgrade-') === 0) {
+        if (strpos($fileInfo->getFilename(), 'upgrade-') === 0) {
             $phpcsFile->addError(
                 'Upgrade scripts are obsolete. '
                 . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
@@ -77,7 +80,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'UpgradeSchema') === 0) {
+        if (strpos($fileInfo->getFilename(), 'UpgradeSchema') === 0) {
             $phpcsFile->addError(
                 'UpgradeSchema scripts are obsolete. '
                 . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
@@ -86,7 +89,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'UpgradeData') === 0) {
+        if (strpos($fileInfo->getFilename(), 'UpgradeData') === 0) {
             $phpcsFile->addError(
                 'UpgradeSchema scripts are obsolete. '
                 . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
@@ -95,7 +98,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'data-upgrade-') === 0) {
+        if (strpos($fileInfo->getFilename(), 'data-upgrade-') === 0) {
             $phpcsFile->addError(
                 'Upgrade scripts are obsolete. '
                 . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
@@ -104,7 +107,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strpos(basename($phpcsFile->getFilename()), 'recurring') === 0) {
+        if (strpos($fileInfo->getFilename(), 'recurring') === 0) {
             $phpcsFile->addError(
                 'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder',
                 0,
@@ -112,9 +115,9 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (preg_match('/(sql|data)/', dirname($phpcsFile->getFilename())) === 1) {
+        if (preg_match('/(sql|data)/', $fileInfo->getPath()) === 1) {
             $phpcsFile->addError(
-                $phpcsFile->getFilename()." is in an invalid directory ".dirname($phpcsFile->getFilename()).":\n"
+                $fileInfo->getFilename()." is in an invalid directory ".$fileInfo->getPath().":\n"
                 . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"
                 . "- Use declarative schema approach in module's etc/db_schema.xml file for schema changes.",
                 0,

From 230facd1db85c1abd6872a138d7a820072c3b906 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 23 Sep 2021 12:28:07 +0200
Subject: [PATCH 273/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index dc4b6b86..ad2163da 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -24,7 +24,8 @@ protected function assertFileContainsError(string $testFile, array $expectedMess
     {
         exec(
             'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
-            $output
+            $output,
+            $exitCode
         );
 
         foreach ($expectedMessages as $message) {

From d47a669e85e288ff170cc67c76a8e617142efaa3 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 23 Sep 2021 12:39:11 +0200
Subject: [PATCH 274/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php | 3 +--
 Magento2/Tests/Legacy/InstallUpgradeUnitTest.php | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index ad2163da..dc4b6b86 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -24,8 +24,7 @@ protected function assertFileContainsError(string $testFile, array $expectedMess
     {
         exec(
             'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
-            $output,
-            $exitCode
+            $output
         );
 
         foreach ($expectedMessages as $message) {
diff --git a/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php b/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
index c65ea706..e8ccc2d3 100644
--- a/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
+++ b/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
@@ -36,7 +36,13 @@ protected function getTestFiles($testFileBase): array
         $dir = __DIR__.'/_files/InstallUpgradeUnitTest';
         $di  = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
 
+        /**
+         * @var DirectoryIterator $file
+         */
         foreach ($di as $file) {
+            if ($file->isDir()) {
+                continue;
+            }
             $path = $file->getPathname();
             if ($path !== $testFileBase.'php' && substr($path, -5) !== 'fixed' && substr($path, -4) !== '.bak') {
                 $testFiles[] = $path;

From 97b843c9a2a673551c76014c17dd63bc93cd2e47 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 27 Sep 2021 10:49:11 +0200
Subject: [PATCH 275/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 .../Sniffs/Legacy/InstallUpgradeSniff.php     | 100 ++++--------------
 1 file changed, 23 insertions(+), 77 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index 066efde5..e519fc4b 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -15,6 +15,25 @@ class InstallUpgradeSniff implements Sniff
 {
     private const ERROR_CODE = 'obsoleteScript';
 
+    private $wrongPrefixes = [
+        'install-' => 'Install scripts are obsolete. '
+            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        'InstallSchema' => 'InstallSchema scripts are obsolete. '
+            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        'InstallData' => 'InstallData scripts are obsolete. '
+            . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+        'data-install-' => 'Install scripts are obsolete. Please create class InstallData in module\'s Setup folder',
+        'upgrade-' => 'Upgrade scripts are obsolete. '
+            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        'UpgradeSchema' => 'UpgradeSchema scripts are obsolete. '
+            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        'UpgradeData' => 'UpgradeSchema scripts are obsolete. '
+            . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+        'data-upgrade-' => 'Upgrade scripts are obsolete. '
+            . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+        'recurring' => 'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder',
+    ];
+
     /**
      * @inheritdoc
      */
@@ -36,83 +55,10 @@ public function process(File $phpcsFile, $stackPtr)
         
         $fileInfo = new SplFileInfo($phpcsFile->getFilename());
 
-        if (strpos($fileInfo->getFilename(), 'install-') === 0) {
-            $phpcsFile->addError(
-                'Install scripts are obsolete. '
-                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'InstallSchema') === 0) {
-            $phpcsFile->addError(
-                'InstallSchema scripts are obsolete. '
-                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'InstallData') === 0) {
-            $phpcsFile->addError(
-                'InstallData scripts are obsolete. '
-                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'data-install-') === 0) {
-            $phpcsFile->addError(
-                'Install scripts are obsolete. Please create class InstallData in module\'s Setup folder',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'upgrade-') === 0) {
-            $phpcsFile->addError(
-                'Upgrade scripts are obsolete. '
-                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'UpgradeSchema') === 0) {
-            $phpcsFile->addError(
-                'UpgradeSchema scripts are obsolete. '
-                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'UpgradeData') === 0) {
-            $phpcsFile->addError(
-                'UpgradeSchema scripts are obsolete. '
-                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'data-upgrade-') === 0) {
-            $phpcsFile->addError(
-                'Upgrade scripts are obsolete. '
-                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
-                0,
-                self::ERROR_CODE
-            );
-        }
-
-        if (strpos($fileInfo->getFilename(), 'recurring') === 0) {
-            $phpcsFile->addError(
-                'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder',
-                0,
-                self::ERROR_CODE
-            );
+        foreach ($this->wrongPrefixes as $prefix => $errorMessage) {
+            if (strpos($fileInfo->getFilename(), $prefix) === 0) {
+                $phpcsFile->addError($errorMessage, 0, self::ERROR_CODE);
+            }
         }
 
         if (preg_match('/(sql|data)/', $fileInfo->getPath()) === 1) {

From d9742105983b607e86eea5aebcf570e22a633615 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 27 Sep 2021 10:51:19 +0200
Subject: [PATCH 276/630] AC-669: Create phpcs static check for
 InstallUpgradeTest

---
 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index e519fc4b..fe31088e 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -15,6 +15,9 @@ class InstallUpgradeSniff implements Sniff
 {
     private const ERROR_CODE = 'obsoleteScript';
 
+    /**
+     * @var string[]
+     */
     private $wrongPrefixes = [
         'install-' => 'Install scripts are obsolete. '
             . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',

From 95f699c7ac2b227af55e04e1ea0308aa32011fa2 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 27 Sep 2021 16:08:39 +0200
Subject: [PATCH 277/630] AC-1314: Fix copyright sniff

---
 .../Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
index 1455ee58..31801890 100644
--- a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
@@ -7,6 +7,7 @@
 
 namespace Magento2\Sniffs\Legacy;
 
+use Magento2\Sniffs\Less\TokenizerSymbolsInterface;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -16,6 +17,8 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
     
     /**
      * @inheritDoc
@@ -23,7 +26,8 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
     public function register(): array
     {
         return [
-            T_INLINE_HTML
+            T_INLINE_HTML,
+            T_OPEN_TAG
         ];
     }
 

From 2c54b326cb2982c63fbe0ab31baa4d387179b5da Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 28 Sep 2021 09:40:43 +0200
Subject: [PATCH 278/630] AC-1314: Fix copyright sniff

---
 .../Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
index 31801890..a1d6995b 100644
--- a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
@@ -18,6 +18,11 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
 
+    /**
+     * Defines the tokenizers that this sniff is using.
+     *
+     * @var array
+     */
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
     
     /**

From edd5e2e06c141975f843b9220f0b0ac4cf8ef0e3 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 28 Sep 2021 10:26:09 +0200
Subject: [PATCH 279/630] AC-1335: Exclude the copyright sniff

---
 Magento2/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index cd74c5c8..8ffe4bd1 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -678,12 +678,14 @@
         <type>warning</type>
         <exclude-pattern>*\.php$</exclude-pattern>
         <exclude-pattern>*\.phtml$</exclude-pattern>
+        <exclude name="Magento2.Legacy.CopyrightAnotherExtensionsFiles"/>
     </rule>
     <rule ref="Magento2.Legacy.Copyright">
         <severity>5</severity>
         <type>warning</type>
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
+        <exclude name="Magento2.Legacy.Copyright"/>
     </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>

From d5b2b818cb618d57655a53e2c8c59c9a368a0895 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 28 Sep 2021 11:02:47 +0200
Subject: [PATCH 280/630] AC-1335: Exclude the copyright sniff

---
 Magento2/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 8ffe4bd1..5f8c8cb8 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -678,6 +678,7 @@
         <type>warning</type>
         <exclude-pattern>*\.php$</exclude-pattern>
         <exclude-pattern>*\.phtml$</exclude-pattern>
+        <!-- TODO: AC-1314 -->
         <exclude name="Magento2.Legacy.CopyrightAnotherExtensionsFiles"/>
     </rule>
     <rule ref="Magento2.Legacy.Copyright">
@@ -685,6 +686,7 @@
         <type>warning</type>
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
+        <!-- TODO: AC-1314 -->
         <exclude name="Magento2.Legacy.Copyright"/>
     </rule>
     <rule ref="Internal.NoCodeFound">

From f8cab4a2223bf49acd0686a0016517502b9b78c3 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 28 Sep 2021 11:20:11 +0200
Subject: [PATCH 281/630] AC-1335: Exclude the copyright sniff

---
 Magento2/ruleset.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5f8c8cb8..955801bd 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -678,18 +678,19 @@
         <type>warning</type>
         <exclude-pattern>*\.php$</exclude-pattern>
         <exclude-pattern>*\.phtml$</exclude-pattern>
-        <!-- TODO: AC-1314 -->
-        <exclude name="Magento2.Legacy.CopyrightAnotherExtensionsFiles"/>
     </rule>
     <rule ref="Magento2.Legacy.Copyright">
         <severity>5</severity>
         <type>warning</type>
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
-        <!-- TODO: AC-1314 -->
-        <exclude name="Magento2.Legacy.Copyright"/>
     </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+    <!-- TODO: AC-1314 -->
+    <rule ref="Magento2.Legacy">
+        <exclude name="Magento2.Legacy.Copyright"/>
+        <exclude name="Magento2.Legacy.CopyrightAnotherExtensionsFiles"/>
+    </rule>
 </ruleset>

From 29f3f6f03d813c1520e07c5d45ed4b1cd612b70c Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 11:45:33 +0200
Subject: [PATCH 282/630] Increased version to 11

---
 composer.json | 2 +-
 composer.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 3fd9762b..528cb09c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "10",
+    "version": "11",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index f9b3efca..d5070aa8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2c33aea65b2ef629308fd92cad58dfad",
+    "content-hash": "f25f1bd7b6036461314c750e583e180a",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -1923,7 +1923,6 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {

From 14704dd23ed9e219f2980d50294d7c8f340b5eed Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 12:58:54 +0200
Subject: [PATCH 283/630] AC-1339: Detect comment for typed class properties

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php    | 9 ++++++++-
 .../Commenting/ClassPropertyPHPDocFormattingUnitTest.inc | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 34cb7dd3..30060200 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -57,13 +57,20 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
 
         $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($stackPtr - 1), null, true);
+
+        if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_STRING) {
+            $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($commentEnd - 1), null, true);
+        }
+
         if ($commentEnd === false
             || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-                && $tokens[$commentEnd]['code'] !== T_COMMENT)
+                && $tokens[$commentEnd]['code'] !== T_COMMENT
+                && $tokens[$commentEnd]['code'] !== T_STRING)
         ) {
             $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
             return;
         }
+
         $commentStart = $tokens[$commentEnd]['comment_opener'];
         $foundVar = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 05f9cd13..5f982e8b 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -120,4 +120,10 @@ class correctlyFormattedClassMemberDocBlock
      * @var test
      */
     protected $test;
+
+    /**
+     * @var string
+     */
+    protected string $test;
+
 }

From 6570218e7b96668ac9e6b3d51df818c120094fbb Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 13:02:09 +0200
Subject: [PATCH 284/630] AC-1339: Detect comment for typed class properties

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 30060200..bc8403e0 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -60,12 +60,9 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
 
         if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_STRING) {
             $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($commentEnd - 1), null, true);
-        }
-
-        if ($commentEnd === false
+        } else if ($commentEnd === false
             || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-                && $tokens[$commentEnd]['code'] !== T_COMMENT
-                && $tokens[$commentEnd]['code'] !== T_STRING)
+                && $tokens[$commentEnd]['code'] !== T_COMMENT)
         ) {
             $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
             return;

From 0c5c0f333bb628caae045834f51f19fa2928629a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 13:02:56 +0200
Subject: [PATCH 285/630] AC-1339: Detect comment for typed class properties

---
 .../Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 5f982e8b..b7dee449 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -125,5 +125,4 @@ class correctlyFormattedClassMemberDocBlock
      * @var string
      */
     protected string $test;
-
 }

From 96f00e7e0f0e5801d89ed5984b988f0972852caf Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 13:04:49 +0200
Subject: [PATCH 286/630] AC-1339: Detect comment for typed class properties

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index bc8403e0..035f73ae 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -60,7 +60,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
 
         if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_STRING) {
             $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($commentEnd - 1), null, true);
-        } else if ($commentEnd === false
+        } elseif ($commentEnd === false
             || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
                 && $tokens[$commentEnd]['code'] !== T_COMMENT)
         ) {

From cbe4ffa9a4ea823ce7f628eb09532ed6b553b62b Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 13:20:42 +0200
Subject: [PATCH 287/630] AC-669: Fixed directory name checking too lax

---
 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php                | 4 +++-
 .../InstallUpgradeUnitTest/another-data-folder/file3.inc      | 1 +
 .../InstallUpgradeUnitTest/another-sql-folder/file4.inc       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc
 create mode 100644 Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index fe31088e..c9823242 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -64,7 +64,9 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
-        if (preg_match('/(sql|data)/', $fileInfo->getPath()) === 1) {
+        $folderName = basename($fileInfo->getPath());
+
+        if ($folderName === 'data' || $folderName === 'sql') {
             $phpcsFile->addError(
                 $fileInfo->getFilename()." is in an invalid directory ".$fileInfo->getPath().":\n"
                 . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc
@@ -0,0 +1 @@
+<?php

From e81cea016571bf9a6b862139a5181fbd763b90b4 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 13:27:37 +0200
Subject: [PATCH 288/630] AC-669: Fixed directory name checking too lax

---
 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index c9823242..c7df570c 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -64,7 +64,8 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
-        $folderName = basename($fileInfo->getPath());
+        $folders = array_filter(explode('/', $fileInfo->getPath()));
+        $folderName = array_pop($folders);
 
         if ($folderName === 'data' || $folderName === 'sql') {
             $phpcsFile->addError(

From 6a5d4e62c11f30e2b10e5d804efd648f48c95582 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 28 Sep 2021 14:40:04 +0200
Subject: [PATCH 289/630] Increased version to 12

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 528cb09c..9389c5c4 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "11",
+    "version": "12",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index d5070aa8..6b2f691a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f25f1bd7b6036461314c750e583e180a",
+    "content-hash": "a0dc717c0fb624a2563113591a4459ce",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",

From 327c5bb5231ee110b7582a3261db222bc068015a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 28 Sep 2021 17:11:49 +0200
Subject: [PATCH 290/630] AC-667 Create phpcs static check for
 EmailTemplateTest Fix

---
 Magento2/ruleset.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index cd74c5c8..c64aab71 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -117,9 +117,7 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
-    <rule ref="Magento2.Legacy.EmailTemplate.FoundObsoleteEmailDirective">
-        <include-pattern>view/email/*.html</include-pattern>
-        <include-pattern>view/*/email/*.html</include-pattern>
+    <rule ref="Magento2.Legacy.EmailTemplate">
         <severity>10</severity>
         <type>error</type>
     </rule>

From 1ba56bb139b355477ba323ccd2951f75b449e4db Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 29 Sep 2021 13:10:24 +0200
Subject: [PATCH 291/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php | 446 +++++++++++++++++++++++++
 1 file changed, 446 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/LayoutSniff.php

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
new file mode 100644
index 00000000..7341e87c
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -0,0 +1,446 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use SimpleXMLElement;
+
+/**
+ * Test for obsolete nodes/attributes in layouts
+ */
+class LayoutSniff implements Sniff
+{
+    private const ERROR_CODE_XML = 'WrongXML';
+    private const ERROR_CODE_NOT_ALLOWED = 'NotAllowed';
+    private const ERROR_CODE_OBSOLETE = 'Obsolete';
+    private const ERROR_CODE_OBSOLETE_CLASS = 'ObsoleteClass';
+    private const ERROR_CODE_ATTRIBUTE_NOT_VALID = 'AttributeNotValid';
+    private const ERROR_CODE_METHOD_NOT_ALLOWED = 'MethodNot';
+    private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED = 'CharacterNotAllowedInAttribute';
+    private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED = 'CharacterExpectedInAttribute';
+
+    /**
+     * List of obsolete references per handle
+     *
+     * @var array
+     */
+    private $obsoleteReferences = [
+        'adminhtml_user_edit' => [
+            'adminhtml.permissions.user.edit.tabs',
+            'adminhtml.permission.user.edit.tabs',
+            'adminhtml.permissions.user.edit',
+            'adminhtml.permission.user.edit',
+            'adminhtml.permissions.user.roles.grid.js',
+            'adminhtml.permission.user.roles.grid.js',
+            'adminhtml.permissions.user.edit.tab.roles',
+            'adminhtml.permissions.user.edit.tab.roles.js',
+        ],
+        'adminhtml_user_role_index' => [
+            'adminhtml.permission.role.index',
+            'adminhtml.permissions.role.index',
+            'adminhtml.permissions.role.grid',
+        ],
+        'adminhtml_user_role_rolegrid' => ['adminhtml.permission.role.grid', 'adminhtml.permissions.role.grid'],
+        'adminhtml_user_role_editrole' => [
+            'adminhtml.permissions.editroles',
+            'adminhtml.permissions.tab.rolesedit',
+            'adminhtml.permission.roles.users.grid.js',
+            'adminhtml.permissions.roles.users.grid.js',
+            'adminhtml.permission.role.buttons',
+            'adminhtml.permissions.role.buttons',
+            'adminhtml.permission.role.edit.gws',
+        ],
+        'adminhtml_user_role_editrolegrid' => [
+            'adminhtml.permission.role.grid.user',
+            'adminhtml.permissions.role.grid.user',
+        ],
+        'adminhtml_user_index' => ['adminhtml.permission.user.index', 'adminhtml.permissions.user.index'],
+        'adminhtml_user_rolegrid' => [
+            'adminhtml.permissions.user.rolegrid',
+            'adminhtml.permission.user.rolegrid',
+        ],
+        'adminhtml_user_rolesgrid' => [
+            'adminhtml.permissions.user.rolesgrid',
+            'adminhtml.permission.user.rolesgrid',
+        ],
+    ];
+
+    private $allowedActionNodeMethods = [
+        'addBodyClass',
+        'addButtons',
+        'addColumnCountLayoutDepend',
+        'addCrumb',
+        'addDatabaseBlock',
+        'addInputTypeTemplate',
+        'addNotice',
+        'addReportTypeOption',
+        'addTab',
+        'addTabAfter',
+        'addText',
+        'append',
+        'removeTab',
+        'setActive',
+        'setAddressType',
+        'setAfterCondition',
+        'setAfterTotal',
+        'setAtCall',
+        'setAtCode',
+        'setAtLabel',
+        'setAuthenticationStartMode',
+        'setBeforeCondition',
+        'setBlockId',
+        'setBugreportUrl',
+        'setCanLoadExtJs',
+        'setCanLoadRulesJs',
+        'setCanLoadTinyMce',
+        'setClassName',
+        'setColClass',
+        'setColumnCount',
+        'setColumnsLimit',
+        'setCssClass',
+        'setDefaultFilter',
+        'setDefaultStoreName',
+        'setDestElementId',
+        'setDisplayArea',
+        'setDontDisplayContainer',
+        'setEmptyGridMessage',
+        'setEntityModelClass',
+        'setFieldOption',
+        'setFieldVisibility',
+        'setFormCode',
+        'setFormId',
+        'setFormPrefix',
+        'setGiftRegistryTemplate',
+        'setGiftRegistryUrl',
+        'setGridHtmlClass',
+        'setGridHtmlCss',
+        'setGridHtmlId',
+        'setHeaderTitle',
+        'setHideBalance',
+        'setHideLink',
+        'setHideRequiredNotice',
+        'setHtmlClass',
+        'setId',
+        'setImageType',
+        'setImgAlt',
+        'setImgHeight',
+        'setImgSrc',
+        'setImgWidth',
+        'setInList',
+        'setInfoTemplate',
+        'setIsCollapsed',
+        'setIsDisabled',
+        'setIsEnabled',
+        'setIsGuestNote',
+        'setIsHandle',
+        'setIsLinkMode',
+        'setIsPlaneMode',
+        'setIsTitleHidden',
+        'setIsViewCurrent',
+        'setItemLimit',
+        'setLabel',
+        'setLabelProperties',
+        'setLayoutCode',
+        'setLinkUrl',
+        'setListCollection',
+        'setListModes',
+        'setListOrders',
+        'setMAPTemplate',
+        'setMethodFormTemplate',
+        'setMyClass',
+        'setPageLayout',
+        'setPageTitle',
+        'setParentType',
+        'setControllerPath',
+        'setPosition',
+        'setPositioned',
+        'setRewardMessage',
+        'setRewardQtyLimitationMessage',
+        'setShouldPrepareInfoTabs',
+        'setShowPart',
+        'setSignupLabel',
+        'setSourceField',
+        'setStoreVarName',
+        'setStrong',
+        'setTemplate',
+        'setText',
+        'setThemeName',
+        'setTierPriceTemplate',
+        'setTitle',
+        'setTitleClass',
+        'setTitleId',
+        'setToolbarBlockName',
+        'setType',
+        'setUseConfirm',
+        'setValueProperties',
+        'setViewAction',
+        'setViewColumn',
+        'setViewLabel',
+        'setViewMode',
+        'setWrapperClass',
+        'unsetChild',
+        'unsetChildren',
+        'updateButton',
+        'setIsProductListingContext',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        $layout = simplexml_load_string($this->getFormattedXML($phpcsFile));
+
+        if ($layout === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                $stackPtr,
+                self::ERROR_CODE_XML
+            );
+            return;
+        }
+
+        $this->testObsoleteReferences($layout, $phpcsFile);
+        $this->testObsoleteAttributes($layout, $phpcsFile);
+        $this->testHeadBlocks($layout, $phpcsFile);
+        $this->testOutputAttribute($layout, $phpcsFile);
+        $this->testHelperAttribute($layout, $phpcsFile);
+        $this->testListText($layout, $phpcsFile);
+        $this->testActionNodeMethods($layout, $phpcsFile);
+        //$this->testWithComponentRegistrar($layout, $phpcsFile);
+    }
+
+    /**
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile)
+    {
+        foreach ($layout as $handle) {
+            if (!isset($this->_obsoleteReferences[$handle->getName()])) {
+                continue;
+            }
+            foreach ($handle->xpath('reference') as $reference) {
+                if (strpos((string)$reference['name'], $this->obsoleteReferences[$handle->getName()]) !== false) {
+                    $phpcsFile->addError(
+                        'The block being referenced is removed.',
+                        dom_import_simplexml($reference)->getLineNo(),
+                        self::ERROR_CODE_OBSOLETE
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+
+    /**
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile)
+    {
+        $selectorHeadBlock = '(name()="block" or name()="referenceBlock") and ' .
+            '(@name="head" or @name="convert_root_head" or @name="vde_head")';
+        $elements = $layout->xpath(
+            '//block[@class="Magento\Theme\Block\Html\Head\Css" ' .
+            'or @class="Magento\Theme\Block\Html\Head\Link" ' .
+            'or @class="Magento\Theme\Block\Html\Head\Script"]' .
+            '/parent::*[not(' .
+            $selectorHeadBlock .
+            ')]');
+        if (!empty($elements)) {
+            $phpcsFile->addError(
+                'Blocks \Magento\Theme\Block\Html\Head\{Css,Link,Script} ' .
+                'are allowed within the "head" block only. ' .
+                'Verify integrity of the nodes nesting.',
+                dom_import_simplexml($elements[0])->getLineNo(),
+                self::ERROR_CODE_NOT_ALLOWED
+            );
+        };
+    }
+
+    /**
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testOutputAttribute(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        $elements = $layout->xpath('/layout//*[@output="toHtml"]');
+        if (!empty($elements)) {
+            $phpcsFile->addError(
+                'output="toHtml" is obsolete. Use output="1"',
+                dom_import_simplexml($elements[0])->getLineNo(),
+                self::ERROR_CODE_OBSOLETE
+            );
+        };
+    }
+
+    /**
+     * Tests the attributes of the top-level Layout Node.
+     * Verifies there are no longer attributes of "parent" or "owner"
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testObsoleteAttributes(SimpleXMLElement $layout, File $phpcsFile)
+    {
+        $type = $layout['type'];
+        $parent = $layout['parent'];
+        $owner = $layout['owner'];
+
+        if ((string)$type === 'page') {
+            if ($parent) {
+                $phpcsFile->addError(
+                    'Attribute "parent" is not valid',
+                    dom_import_simplexml($parent)->getLineNo(),
+                    self::ERROR_CODE_ATTRIBUTE_NOT_VALID
+                );
+            }
+        }
+        if ((string)$type === 'fragment') {
+            if ($owner) {
+                $phpcsFile->addError(
+                    'Attribute "owner" is not valid',
+                    dom_import_simplexml($owner)->getLineNo(),
+                    self::ERROR_CODE_ATTRIBUTE_NOT_VALID
+                );
+            }
+        }
+    }
+
+    /**
+     * Returns attribute value by attribute name
+     *
+     * @param string $name
+     * @return string|null
+     */
+    private function getAttribute(SimpleXMLElement $element, string $name): string
+    {
+        $attrs = $element->attributes();
+        return isset($attrs[$name]) ? (string)$attrs[$name] : '';
+    }
+
+    /**
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testHelperAttribute(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        foreach ($layout->xpath('@helper') as $action) {
+            if (strpos($this->getAttribute($action, 'helper'), '/') !== false) {
+                $phpcsFile->addError(
+                    "'helper' attribute contains '/'",
+                    dom_import_simplexml($action)->getLineNo(),
+                    self::ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED
+                );
+            }
+            if (strpos($this->getAttribute($action, 'helper'), '::') === false) {
+                $phpcsFile->addError(
+                    "'helper' attribute does not contain '::'",
+                    dom_import_simplexml($action)->getLineNo(),
+                    self::ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED
+                );
+            }
+        }
+    }
+
+    /**
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testListText(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        $elements = $layout->xpath('/layout//block[@class="Magento\Framework\View\Element\Text\ListText"]');
+        if (!empty($elements)) {
+            $phpcsFile->addError(
+                'The class \Magento\Framework\View\Element\Text\ListText' .
+                ' is not supposed to be used in layout anymore.',
+                dom_import_simplexml($elements[0])->getLineNo(),
+                self::ERROR_CODE_OBSOLETE_CLASS
+            );
+        };
+    }
+
+    /**
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testActionNodeMethods(SimpleXMLElement $layout, File $phpcsFile)
+    {
+        $methodFilter = '@method!="' . implode('" and @method!="', $this->allowedActionNodeMethods) . '"';
+        foreach ($layout->xpath('//action[' . $methodFilter . ']') as $node) {
+            $attributes = $node->attributes();
+            $phpcsFile->addError(
+                sprintf(
+                    'Call of method "%s" via layout instruction <action> is not allowed.',
+                    $attributes['method']
+                ),
+                dom_import_simplexml($node)->getLineNo(),
+                self::ERROR_CODE_METHOD_NOT_ALLOWED
+            );
+        }
+    }
+
+    private function testWithComponentRegistrar(SimpleXMLElement $layout, File $phpcsFile)
+    {
+        /*
+         * $componentRegistrar = new ComponentRegistrar();
+        if (false !== strpos(
+        $layoutFile,
+        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Sales')
+        . '/view/adminhtml/layout/sales_order'
+        ) || false !== strpos(
+        $layoutFile,
+        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Shipping')
+        . '/view/adminhtml/layout/adminhtml_order'
+        )
+        || false !== strpos(
+        $layoutFile,
+        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Catalog')
+        . '/view/adminhtml/layout/catalog_product_grid.xml'
+        )
+        ) {
+        $this->markTestIncomplete(
+        "The file {$layoutFile} has to use \\Magento\\Core\\Block\\Text\\List, \n" .
+        'there is no solution to get rid of it right now.'
+        );
+        }
+         */
+    }
+}

From 247578e3421af59f576cbda5d8266ebe04792c24 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 29 Sep 2021 17:21:53 +0200
Subject: [PATCH 292/630] AC-679: Create phpcs static check for
 ObsoleteSystemConfigurationTest

---
 .../ObsoleteSystemConfigurationSniff.php      | 88 +++++++++++++++++++
 .../ObsoleteSystemConfigurationUnitTest.1.xml | 11 +++
 .../ObsoleteSystemConfigurationUnitTest.2.xml | 15 ++++
 .../ObsoleteSystemConfigurationUnitTest.php   | 36 ++++++++
 Magento2/ruleset.xml                          |  5 ++
 5 files changed, 155 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml
 create mode 100644 Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml
 create mode 100644 Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
new file mode 100644
index 00000000..706e0620
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class ObsoleteSystemConfigurationSniff implements Sniff
+{
+    private const ERROR_CODE_XML = 'WrongXML';
+    private const WARNING_CODE_OBSOLETE = 'FoundObsoleteSystemConfiguration';
+    
+    public function register()
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+
+        if ($xml === false) {
+            $this->invalidXML($phpcsFile, $stackPtr);
+            return;
+        }
+        
+        $foundElements = $xml->xpath('/config/tabs|/config/sections');
+        
+        if ($foundElements === false) {
+            return;
+        }
+        
+        foreach ($foundElements as $element) {
+            $phpcsFile->addWarning(
+                "Obsolete system configuration structure detected in file.",
+                dom_import_simplexml($element)->getLineNo() - 1,
+                self::WARNING_CODE_OBSOLETE
+            );
+        }
+    }
+
+    /**
+     * Adds an invalid XML error
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     */
+    protected function invalidXML(File $phpcsFile, int $stackPtr): void
+    {
+        $phpcsFile->addError(
+            sprintf(
+                "Couldn't parse contents of '%s', check that they are in valid XML format.",
+                $phpcsFile->getFilename(),
+            ),
+            $stackPtr,
+            self::ERROR_CODE_XML
+        );
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml
new file mode 100644
index 00000000..e17a1947
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <sections>test sections</sections>
+    <tabs>test tabs</tabs>    
+</config>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml
new file mode 100644
index 00000000..9492d694
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <sections>test no error</sections>
+        <tabs>test no error</tabs>
+        <section id="admin">
+        </section>
+    </system>
+</config>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.php b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.php
new file mode 100644
index 00000000..513cc8c8
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ObsoleteSystemConfigurationUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        if ($testFile === 'ObsoleteSystemConfigurationUnitTest.1.xml') {
+            return [
+                9 => 1,
+                10 => 1,
+            ];
+        }
+        if ($testFile === 'ObsoleteSystemConfigurationUnitTest.2.xml') {
+            return [];
+        }
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1a19b8a5..232516bb 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -283,6 +283,11 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteSystemConfiguration">
+        <include-pattern>etc/system.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From ffdf5a806f39813029086e36ca5b6b0a17a8547d Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 29 Sep 2021 17:24:36 +0200
Subject: [PATCH 293/630] AC-674: Create phpcs static check for ObsoleteAclTest

---
 Magento2/Sniffs/Legacy/ObsoleteAclSniff.php   | 62 +++++++++++++++++++
 Magento2/Tests/Legacy/ObsoleteAclUnitTest.php | 31 ++++++++++
 Magento2/Tests/Legacy/ObsoleteAclUnitTest.xml | 28 +++++++++
 Magento2/ruleset.xml                          |  7 +++
 4 files changed, 128 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteAclUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteAclUnitTest.xml

diff --git a/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php b/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
new file mode 100644
index 00000000..58f54910
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Test to find obsolete acl declaration
+ */
+class ObsoleteAclSniff implements Sniff
+{
+    private const WARNING_OBSOLETE_ACL_STRUCTURE = 'ObsoleteAclStructure';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        $foundElements = $xml->xpath('/config/acl/*[boolean(./children) or boolean(./title)]');
+        foreach ($foundElements as $element) {
+            $phpcsFile->addWarning(
+                'Obsolete acl structure detected in line ' . dom_import_simplexml($element)->getLineNo(),
+                dom_import_simplexml($element)->getLineNo() - 1,
+                self::WARNING_OBSOLETE_ACL_STRUCTURE
+            );
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteAclUnitTest.php b/Magento2/Tests/Legacy/ObsoleteAclUnitTest.php
new file mode 100644
index 00000000..27f528a0
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteAclUnitTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ObsoleteAclUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList(): array
+    {
+        return [
+            15 => 1,
+            20 => 1,
+            23 => 1
+        ];
+    }
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteAclUnitTest.xml b/Magento2/Tests/Legacy/ObsoleteAclUnitTest.xml
new file mode 100644
index 00000000..df4beb76
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteAclUnitTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <children>
+        <title value="foo"/>
+    </children>
+    <title value="bar"/>
+    <children default_policy="deny"/>
+    <acl>
+        <children>
+            <title value="foo"/>
+        </children>
+        <children default_policy="deny"/>
+        <title value="bar"/>
+        <title>
+            <children default_policy="deny"/>
+        </title>
+        <children>
+            <title
+                    value="foo"/>
+        </children>
+    </acl>
+</config>
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 955801bd..bb1c9b66 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -285,6 +285,13 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteAcl">
+        <include-pattern>etc/config.xml</include-pattern>
+        <include-pattern>etc/config.*.xml</include-pattern>
+        <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From 5148a61664b1d658ab3e31fc48d61b577d845556 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 29 Sep 2021 17:26:26 +0200
Subject: [PATCH 294/630] AC-679: Create phpcs static check for
 ObsoleteSystemConfigurationTest

---
 .../Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php     | 7 +++++--
 .../Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml | 2 +-
 .../Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
index 706e0620..49623e67 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
@@ -15,7 +15,10 @@ class ObsoleteSystemConfigurationSniff implements Sniff
 {
     private const ERROR_CODE_XML = 'WrongXML';
     private const WARNING_CODE_OBSOLETE = 'FoundObsoleteSystemConfiguration';
-    
+
+    /**
+     * @inheritdoc
+     */
     public function register()
     {
         return [
@@ -85,4 +88,4 @@ private function getFormattedXML(File $phpcsFile)
         $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
         return $doc->saveXML();
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml
index e17a1947..acb776af 100644
--- a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml
+++ b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.1.xml
@@ -8,4 +8,4 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <sections>test sections</sections>
     <tabs>test tabs</tabs>    
-</config>
\ No newline at end of file
+</config>
diff --git a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml
index 9492d694..759f386c 100644
--- a/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml
+++ b/Magento2/Tests/Legacy/ObsoleteSystemConfigurationUnitTest.2.xml
@@ -12,4 +12,4 @@
         <section id="admin">
         </section>
     </system>
-</config>
\ No newline at end of file
+</config>

From a91d371bd9ceac7cbfdbd0525eba2aad06bb9f61 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 29 Sep 2021 17:27:02 +0200
Subject: [PATCH 295/630] AC-677: Create phpcs static test for ObsoleteMenuTest

---
 Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php  | 67 +++++++++++++++++++
 .../Tests/Legacy/ObsoleteMenuUnitTest.php     | 38 +++++++++++
 .../Tests/Legacy/ObsoleteMenuUnitTest.xml     | 59 ++++++++++++++++
 Magento2/ruleset.xml                          |  7 ++
 4 files changed, 171 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteMenuUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteMenuUnitTest.xml

diff --git a/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php b/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
new file mode 100644
index 00000000..1955e2e7
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Test to find obsolete acl declaration
+ */
+class ObsoleteMenuSniff implements Sniff
+{
+    private const WARNING_OBSOLETE_MENU_STRUCTURE = 'ObsoleteMenuStructure';
+    
+    /**
+     * @var string
+     */
+    private $xpath = '/config/menu/*[boolean(./children) or boolean(./title) or boolean(./action)]';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
+        $foundElements = $xml->xpath($this->xpath);
+        foreach ($foundElements as $element) {
+            $phpcsFile->addWarning(
+                'Obsolete menu structure detected in line ' . dom_import_simplexml($element)->getLineNo(),
+                dom_import_simplexml($element)->getLineNo() - 1,
+                self::WARNING_OBSOLETE_MENU_STRUCTURE
+            );
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        return $doc->saveXML();
+    }
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteMenuUnitTest.php b/Magento2/Tests/Legacy/ObsoleteMenuUnitTest.php
new file mode 100644
index 00000000..15775291
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteMenuUnitTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ObsoleteMenuUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList(): array
+    {
+        return [
+            17 => 1,
+            20 => 1,
+            23 => 1,
+            28 => 1,
+            31 => 1,
+            34 => 1,
+            39 => 1,
+            42 => 1,
+            45 => 1,
+            49 => 1
+        ];
+    }
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteMenuUnitTest.xml b/Magento2/Tests/Legacy/ObsoleteMenuUnitTest.xml
new file mode 100644
index 00000000..a7475894
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteMenuUnitTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <children>
+        <title value="foo" />
+    </children>
+    <title value="bar" />
+    <children default_policy="deny" />
+    <action method="random" />
+    <menu>
+        <children default_policy="deny" />
+        <children>
+            <title value="foo" />
+        </children>
+        <children>
+            <action method="random" />
+        </children>
+        <children>
+            <title value="foo" />
+            <action method="random" />
+        </children>
+        <title value="bar" />
+        <title>
+            <children default_policy="deny" />
+        </title>
+        <title>
+            <action method="random" />
+        </title>
+        <title>
+            <children default_policy="deny" />
+            <action method="random" />
+        </title>
+        <action method="random" />
+        <action>
+            <title value="bar" />
+        </action>
+        <action>
+            <children default_policy="deny" />
+        </action>
+        <action>
+            <children default_policy="deny" />
+            <title value="foo" />
+        </action>
+        <action
+        >
+            <children
+                    default_policy="deny"/>
+
+            <title
+                    value="foo"
+            />
+        </action>
+    </menu>
+</config>
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 955801bd..71b8e998 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -285,6 +285,13 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteMenu">
+        <include-pattern>etc/config.xml</include-pattern>
+        <include-pattern>etc/config.*.xml</include-pattern>
+        <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From 9f77a7fe37dbad7a4a11fbd39a35aa090293049f Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 30 Sep 2021 13:22:18 +0200
Subject: [PATCH 296/630] AC-1159: Move eslint tests to magento-coding-standard
 - Refactor: Do not take into account Test files on CI - Apply eslint rules JS
 from Tests/Legacy

---
 .github/workflows/php.yml                                       | 2 +-
 .../{ClickEventShorthand.js => ClickEventShorthandTest.js}      | 0
 Magento2/Tests/Eslint/ClickEventShorthandTest.php               | 2 +-
 .../Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js   | 2 +-
 .../Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Magento2/Tests/Eslint/{ClickEventShorthand.js => ClickEventShorthandTest.js} (100%)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8392230f..c49e7ad4 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Install dependencies
       run: npm install
     - name: Run ESLint
-      run: npm run eslint -- eslint/rules
+      run: npm run eslint -- eslint/rules Magento2/ --ignore-pattern 'Magento2/Tests/Eslint/*Test.js'
 
     - name: Validate composer
       run: composer validate
diff --git a/Magento2/Tests/Eslint/ClickEventShorthand.js b/Magento2/Tests/Eslint/ClickEventShorthandTest.js
similarity index 100%
rename from Magento2/Tests/Eslint/ClickEventShorthand.js
rename to Magento2/Tests/Eslint/ClickEventShorthandTest.js
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.php b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
index 32ac2d32..2f5fe0bc 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.php
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
@@ -17,7 +17,7 @@ class ClickEventShorthandTest extends AbstractEslintTestCase
     public function testExecute(): void
     {
         $this->assertFileContainsError(
-            'ClickEventShorthand.js',
+            'ClickEventShorthandTest.js',
             ['Instead of .blur(fn) use .on("blur", fn). Instead of .blur() use .trigger("blur")']
         );
     }
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
index 511f7b94..49cc46fb 100644
--- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
@@ -6,5 +6,5 @@
 define([
     'jquery'
 ], function (){
-    
+    'use strict';
 });
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
index 2eb60f49..9ffb49e5 100644
--- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
@@ -6,5 +6,5 @@
 define([
     'jquery'
 ], function (){
-    
+    'use strict';
 });
\ No newline at end of file

From cc12906668f01b00ddeaab8e22d42b98b919d0fe Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 30 Sep 2021 15:20:34 +0200
Subject: [PATCH 297/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php     |  41 +-----
 Magento2/Tests/Legacy/LayoutUnitTest.1.xml | 157 +++++++++++++++++++++
 Magento2/Tests/Legacy/LayoutUnitTest.2.xml |  29 ++++
 Magento2/Tests/Legacy/LayoutUnitTest.3.xml |  27 ++++
 Magento2/Tests/Legacy/LayoutUnitTest.php   |  31 ++++
 Magento2/ruleset.xml                       |   5 +
 6 files changed, 256 insertions(+), 34 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/LayoutUnitTest.1.xml
 create mode 100644 Magento2/Tests/Legacy/LayoutUnitTest.2.xml
 create mode 100644 Magento2/Tests/Legacy/LayoutUnitTest.3.xml
 create mode 100644 Magento2/Tests/Legacy/LayoutUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 7341e87c..716b8009 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -21,7 +21,7 @@ class LayoutSniff implements Sniff
     private const ERROR_CODE_OBSOLETE = 'Obsolete';
     private const ERROR_CODE_OBSOLETE_CLASS = 'ObsoleteClass';
     private const ERROR_CODE_ATTRIBUTE_NOT_VALID = 'AttributeNotValid';
-    private const ERROR_CODE_METHOD_NOT_ALLOWED = 'MethodNot';
+    private const ERROR_CODE_METHOD_NOT_ALLOWED = 'MethodNotAllowed';
     private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED = 'CharacterNotAllowedInAttribute';
     private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED = 'CharacterExpectedInAttribute';
 
@@ -230,14 +230,13 @@ public function process(File $phpcsFile, $stackPtr)
         $this->testHelperAttribute($layout, $phpcsFile);
         $this->testListText($layout, $phpcsFile);
         $this->testActionNodeMethods($layout, $phpcsFile);
-        //$this->testWithComponentRegistrar($layout, $phpcsFile);
     }
 
     /**
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
-    private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile)
+    private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile): void
     {
         foreach ($layout as $handle) {
             if (!isset($this->_obsoleteReferences[$handle->getName()])) {
@@ -273,7 +272,7 @@ private function getFormattedXML(File $phpcsFile)
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
-    private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile)
+    private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile): void
     {
         $selectorHeadBlock = '(name()="block" or name()="referenceBlock") and ' .
             '(@name="head" or @name="convert_root_head" or @name="vde_head")';
@@ -315,10 +314,11 @@ private function testOutputAttribute(SimpleXMLElement $layout, File $phpcsFile):
      * Tests the attributes of the top-level Layout Node.
      * Verifies there are no longer attributes of "parent" or "owner"
      *
+     * @todo missing test
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
-    private function testObsoleteAttributes(SimpleXMLElement $layout, File $phpcsFile)
+    private function testObsoleteAttributes(SimpleXMLElement $layout, File $phpcsFile): void
     {
         $type = $layout['type'];
         $parent = $layout['parent'];
@@ -362,7 +362,7 @@ private function getAttribute(SimpleXMLElement $element, string $name): string
      */
     private function testHelperAttribute(SimpleXMLElement $layout, File $phpcsFile): void
     {
-        foreach ($layout->xpath('@helper') as $action) {
+        foreach ($layout->xpath('//*[@helper]') as $action) {
             if (strpos($this->getAttribute($action, 'helper'), '/') !== false) {
                 $phpcsFile->addError(
                     "'helper' attribute contains '/'",
@@ -401,7 +401,7 @@ private function testListText(SimpleXMLElement $layout, File $phpcsFile): void
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
-    private function testActionNodeMethods(SimpleXMLElement $layout, File $phpcsFile)
+    private function testActionNodeMethods(SimpleXMLElement $layout, File $phpcsFile): void
     {
         $methodFilter = '@method!="' . implode('" and @method!="', $this->allowedActionNodeMethods) . '"';
         foreach ($layout->xpath('//action[' . $methodFilter . ']') as $node) {
@@ -416,31 +416,4 @@ private function testActionNodeMethods(SimpleXMLElement $layout, File $phpcsFile
             );
         }
     }
-
-    private function testWithComponentRegistrar(SimpleXMLElement $layout, File $phpcsFile)
-    {
-        /*
-         * $componentRegistrar = new ComponentRegistrar();
-        if (false !== strpos(
-        $layoutFile,
-        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Sales')
-        . '/view/adminhtml/layout/sales_order'
-        ) || false !== strpos(
-        $layoutFile,
-        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Shipping')
-        . '/view/adminhtml/layout/adminhtml_order'
-        )
-        || false !== strpos(
-        $layoutFile,
-        $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Catalog')
-        . '/view/adminhtml/layout/catalog_product_grid.xml'
-        )
-        ) {
-        $this->markTestIncomplete(
-        "The file {$layoutFile} has to use \\Magento\\Core\\Block\\Text\\List, \n" .
-        'there is no solution to get rid of it right now.'
-        );
-        }
-         */
-    }
 }
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.1.xml b/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
new file mode 100644
index 00000000..f051284a
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="default_head_blocks"/>
+    <body>
+        <attribute name="id" value="html-body"/>
+        <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::page/js/require_js.phtml" />
+        <referenceContainer name="after.body.start">
+            <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Framework\View\Element\Js\Cookie" name="js_cookies" template="Magento_Theme::js/cookie.phtml">
+                <arguments>
+                    <argument name="session_config" xsi:type="object">Magento\Theme\ViewModel\Block\SessionConfig</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="Magento_Theme::html/notices.phtml"/>
+        </referenceContainer>
+        <referenceBlock name="top.links">
+            <block class="Magento\Theme\Block\Html\Head\Css">
+            </block>
+            <block class="Magento\Theme\Block\Html\Header" name="header" as="header" before="-">
+                <arguments>
+                    <argument name="show_part" xsi:type="string">welcome</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+        <referenceContainer name="main.content">
+            <block class="Magento\Framework\View\Element\Template" name="skip_to_content.target" before="-" template="Magento_Theme::html/skiptarget.phtml">
+                <arguments>
+                    <argument name="target_id" xsi:type="string">contentarea</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+        <referenceContainer name="header.container">
+            <container name="header.panel.wrapper" htmlClass="panel wrapper" htmlTag="div" before="-">
+                <container name="header.panel" label="Page Header Panel" htmlTag="div" htmlClass="panel header">
+                    <block class="Magento\Framework\View\Element\Template" name="skip_to_content" template="Magento_Theme::html/skip.phtml">
+                        <arguments>
+                            <argument name="target" xsi:type="string">contentarea</argument>
+                            <argument name="label" translate="true" xsi:type="string">Skip to Content</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml">
+                        <arguments>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Customer\Block\Account\Navigation" name="top.links">
+                        <arguments>
+                            <argument name="css_class" xsi:type="string">header links</argument>
+                        </arguments>
+                    </block>
+                </container>
+            </container>
+            <container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content">
+                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo">
+                    <arguments>
+                        <argument name="logoPathResolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver</argument>
+                        <argument name="logo_size_resolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoSizeResolver</argument>
+                    </arguments>
+                </block>
+            </container>
+        </referenceContainer>
+        <referenceContainer name="page.top">
+            <block class="Magento\Framework\View\Element\Template" name="navigation.sections" before="-" template="Magento_Theme::html/sections.phtml">
+                <arguments>
+                    <argument name="group_name" xsi:type="string">navigation-sections</argument>
+                    <argument name="group_css" xsi:type="string">nav-sections</argument>
+                </arguments>
+                <block class="Magento\Framework\View\Element\Template" name="store.menu" group="navigation-sections" template="Magento_Theme::html/container.phtml">
+                    <arguments>
+                        <argument name="title" translate="true" xsi:type="string">Menu</argument>
+                    </arguments>
+                    <block class="Magento\Theme\Block\Html\Topmenu" name="catalog.topnav" template="Magento_Theme::html/topmenu.phtml" ttl="3600" before="-"/>
+                </block>
+                <block class="Magento\Framework\View\Element\Text" name="store.links" group="navigation-sections">
+                    <arguments>
+                        <argument name="title" translate="true" xsi:type="string">Account</argument>
+                        <argument name="use_force" xsi:type="boolean">true</argument>
+                        <argument name="text" xsi:type="string"><![CDATA[<!-- Account links -->]]></argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Framework\View\Element\Template" name="store.settings" group="navigation-sections" template="Magento_Theme::html/container.phtml">
+                    <arguments>
+                        <argument name="title" translate="true" xsi:type="string">Settings</argument>
+                    </arguments>
+                    <block class="Magento\Store\Block\Switcher" name="store.settings.language" template="Magento_Store::switch/languages.phtml">
+                        <arguments>
+                            <argument name="id_modifier" xsi:type="string">nav</argument>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Directory\Block\Currency" name="store.settings.currency" template="Magento_Directory::currency.phtml">
+                        <arguments>
+                            <argument name="id_modifier" xsi:type="string">nav</argument>
+                        </arguments>
+                    </block>
+                </block>
+            </block>
+            <container name="top.container" as="topContainer" label="After Page Header Top" htmlTag="div" htmlClass="top-container"/>
+            <block class="Magento\Theme\Block\Html\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
+        </referenceContainer>
+        <referenceContainer name="columns.top">
+            <block class="Magento\Theme\Block\Html\Title" name="page.main.title" template="Magento_Theme::html/title.phtml"/>
+            <container name="page.messages" htmlTag="div" htmlClass="page messages">
+                <block class="Magento\Framework\View\Element\Template" name="ajax.message.placeholder" template="Magento_Theme::html/messages.phtml"/>
+                <block class="Magento\Framework\View\Element\Messages" name="messages" as="messages" template="Magento_Theme::messages.phtml"/>
+            </container>
+        </referenceContainer>
+        <referenceContainer name="main">
+            <container name="content.top" label="Main Content Top">
+                <block name="main_css_preloader" as="main_css_preloader" template="Magento_Theme::html/main_css_preloader.phtml" ifconfig="dev/css/use_css_critical_path"/>
+            </container>
+            <container name="content" label="Main Content Area"/>
+            <container name="content.aside" label="Main Content Aside"/>
+            <container name="content.bottom" label="Main Content Bottom"/>
+        </referenceContainer>
+        <referenceContainer name="page.bottom.container">
+            <container name="page.bottom" label="Before Page Footer" htmlTag="div" htmlClass="content"/>
+        </referenceContainer>
+        <referenceContainer name="footer-container">
+            <container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="footer content">
+                <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" template="Magento_Store::switch/stores.phtml"/>
+                <block class="Magento\Framework\View\Element\Html\Links" name="footer_links">
+                    <arguments>
+                        <argument name="css_class" xsi:type="string">footer links</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="Magento_Theme::html/copyright.phtml"/>
+                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" ifconfig="design/footer/report_bugs"/>
+            </container>
+        </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Theme\Block\Html\Footer" name="absolute_footer" template="Magento_Theme::html/absolute_footer.phtml" />
+        </referenceContainer>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\FormKey" name="formkey"/>
+        </referenceContainer>
+        <referenceContainer name="form.additional.info">
+            <block class="Magento\Captcha\Block\Captcha" name="captcha" cacheable="false">
+                <action method="notAllowedMethod">
+                    <argument name="formId" xsi:type="string">backend_login</argument>
+                </action>
+                <action method="anotherNotallowedMethod">
+                    <argument name="width" xsi:type="string">226</argument>
+                </action>
+                <action method="setImgHeight">
+                    <argument name="width" xsi:type="string">50</argument>
+                </action>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.2.xml b/Magento2/Tests/Legacy/LayoutUnitTest.2.xml
new file mode 100644
index 00000000..04227a27
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
+    <update handle="2columns-left" />
+
+    <container name="columns.top.wrapper" htmlTag="div" htmlClass="page-main" output="toHtml"/>
+    <move element="columns.top" destination="columns.top.wrapper"/>
+    <move element="columns.top.wrapper" destination="page.wrapper" after="page.top"/>
+    <move element="category.view.container" destination="page.wrapper" after="columns.top.wrapper"/>
+
+    <container name="category.image.wrapper" htmlTag="div" htmlClass="page-main"/>
+    <move element="category.image" destination="category.image.wrapper"/>
+    <move element="category.image.wrapper" destination="category.view.container"/>
+
+    <container name="category.description.wrapper" htmlTag="div"/>
+    <move element="category.description" destination="category.description.wrapper"/>
+    <move element="category.description.wrapper" destination="category.view.container" after="category.image.wrapper"/>
+
+    <container name="category.cms.wrapper" htmlTag="div" htmlClass="page-main"/>
+    <move element="category.cms" destination="category.cms.wrapper"/>
+    <move element="category.cms.wrapper" destination="category.view.container" after="category.description.wrapper"/>
+
+    <block name="list" class="Magento\Framework\View\Element\Text\ListText" />
+</layout>
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.3.xml b/Magento2/Tests/Legacy/LayoutUnitTest.3.xml
new file mode 100644
index 00000000..bd34978b
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.3.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="checkout.onepage.review.info.items.after">
+            <block class="Magento\Paypal\Block\Iframe" name="paypal.iframe" cacheable="false"/>
+        </referenceContainer>
+        <referenceBlock name="checkout.onepage.review.button">
+            <action method="setTemplate">
+                <argument name="template" xsi:type="helper" helper="Magento\Paypal\Helper\Hss">
+                    <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+                </argument>
+                <argument name="template" xsi:type="helper" helper="Magento/Paypal/Helper/Hss::getReviewButtonTemplate">
+                    <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+                </argument>
+                <argument name="template" xsi:type="helper" helper="Magento\Paypal\Helper\Hss::getReviewButtonTemplate">
+                    <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+                </argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.php b/Magento2/Tests/Legacy/LayoutUnitTest.php
new file mode 100644
index 00000000..bca0c7c5
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class LayoutUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        if ($testFile === 'LayoutUnitTest.1.xml') {
+            return [
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 955801bd..4d0aa268 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -144,6 +144,11 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Legacy.LayoutSniff">
+        <severity>10</severity>
+        <type>error</type>
+        <include-pattern>*/view/(adminhtml|frontend|base)/*\/.xml</include-pattern>
+    </rule>
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">
         <severity>9</severity>

From 5d04411f841bcf0ecde52414f93aa239d2a6fa3a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 30 Sep 2021 15:25:03 +0200
Subject: [PATCH 298/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Tests/Legacy/LayoutUnitTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.php b/Magento2/Tests/Legacy/LayoutUnitTest.php
index bca0c7c5..c86ddee0 100644
--- a/Magento2/Tests/Legacy/LayoutUnitTest.php
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.php
@@ -16,6 +16,21 @@ public function getErrorList($testFile = '')
     {
         if ($testFile === 'LayoutUnitTest.1.xml') {
             return [
+                23 => 1,
+                146 => 1,
+                149 => 1,
+            ];
+        }
+        if ($testFile === 'LayoutUnitTest.2.xml') {
+            return [
+                12 => 1,
+                29 => 1,
+            ];
+        }
+        if ($testFile === 'LayoutUnitTest.3.xml') {
+            return [
+                16 => 1,
+                19 => 1,
             ];
         }
         return [];

From f16142d83448a2af3286139f9fce9f8c45632b0d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 30 Sep 2021 15:31:10 +0200
Subject: [PATCH 299/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 4d0aa268..c130fa82 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -144,7 +144,7 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Legacy.LayoutSniff">
+    <rule ref="Magento2.Legacy.Layout">
         <severity>10</severity>
         <type>error</type>
         <include-pattern>*/view/(adminhtml|frontend|base)/*\/.xml</include-pattern>

From f7f1a0dbdd62083c0315ca123628d02357085813 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 30 Sep 2021 15:42:22 +0200
Subject: [PATCH 300/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 716b8009..1515cc38 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -71,6 +71,11 @@ class LayoutSniff implements Sniff
         ],
     ];
 
+    /**
+     * List of allowed method names
+     *
+     * @var string[]
+     */
     private $allowedActionNodeMethods = [
         'addBodyClass',
         'addButtons',
@@ -233,6 +238,9 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Check for obsolete block references
+     *
+     * @todo missing test
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
@@ -269,6 +277,8 @@ private function getFormattedXML(File $phpcsFile)
     }
 
     /**
+     * Check that CSS, Link and Script blocks are inside a head block
+     *
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
@@ -295,6 +305,8 @@ private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile): void
     }
 
     /**
+     * Check that the output attribute has the right value
+     *
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
@@ -347,6 +359,7 @@ private function testObsoleteAttributes(SimpleXMLElement $layout, File $phpcsFil
     /**
      * Returns attribute value by attribute name
      *
+     * @param SimpleXMLElement $element
      * @param string $name
      * @return string|null
      */
@@ -357,6 +370,8 @@ private function getAttribute(SimpleXMLElement $element, string $name): string
     }
 
     /**
+     * Check values in helper attributes
+     *
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
@@ -381,6 +396,8 @@ private function testHelperAttribute(SimpleXMLElement $layout, File $phpcsFile):
     }
 
     /**
+     * Check that ListText is not used
+     *
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
@@ -398,6 +415,8 @@ private function testListText(SimpleXMLElement $layout, File $phpcsFile): void
     }
 
     /**
+     * Check that action is calling an allowed method
+     *
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */

From 98cf89383dfff968d8ed558eafcb8dc83db3f5ab Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 30 Sep 2021 15:44:56 +0200
Subject: [PATCH 301/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 1515cc38..d4f3e16f 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -292,7 +292,8 @@ private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile): void
             'or @class="Magento\Theme\Block\Html\Head\Script"]' .
             '/parent::*[not(' .
             $selectorHeadBlock .
-            ')]');
+            ')]'
+        );
         if (!empty($elements)) {
             $phpcsFile->addError(
                 'Blocks \Magento\Theme\Block\Html\Head\{Css,Link,Script} ' .
@@ -323,8 +324,7 @@ private function testOutputAttribute(SimpleXMLElement $layout, File $phpcsFile):
     }
 
     /**
-     * Tests the attributes of the top-level Layout Node.
-     * Verifies there are no longer attributes of "parent" or "owner"
+     * Tests the attributes of the top-level Layout Node. Verifies there are no longer attributes of "parent" or "owner"
      *
      * @todo missing test
      * @param SimpleXMLElement $layout

From 4929b1aeab4885a99e9c894647a1298a6801db4f Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 30 Sep 2021 17:10:48 +0200
Subject: [PATCH 302/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index d4f3e16f..8731c03a 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -247,7 +247,7 @@ public function process(File $phpcsFile, $stackPtr)
     private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile): void
     {
         foreach ($layout as $handle) {
-            if (!isset($this->_obsoleteReferences[$handle->getName()])) {
+            if (!isset($this->obsoleteReferences[$handle->getName()])) {
                 continue;
             }
             foreach ($handle->xpath('reference') as $reference) {

From cd9083c35c760e2f8db54b79e62ce6d1671d23f5 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 1 Oct 2021 12:56:53 +0200
Subject: [PATCH 303/630] AC-682: Create phpcs static check for
 RestrictedCodeTest

---
 .../Sniffs/Legacy/RestrictedCodeSniff.php     | 131 ++++++++++++++++++
 .../Legacy/_files/restricted_classes.php      |  82 +++++++++++
 .../Legacy/_files/restricted_classes_ee.php   |  32 +++++
 .../Tests/Legacy/RestrictedCodeUnitTest.php   |  62 +++++++++
 .../FileWithRestrictedClass.inc               |  12 ++
 .../Model/ResourceModel/Iterator.php          |  34 +++++
 Magento2/ruleset.xml                          |   5 +
 7 files changed, 358 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
 create mode 100644 Magento2/Sniffs/Legacy/_files/restricted_classes.php
 create mode 100644 Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
 create mode 100644 Magento2/Tests/Legacy/RestrictedCodeUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/FileWithRestrictedClass.inc
 create mode 100644 Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php

diff --git a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
new file mode 100644
index 00000000..fb221d92
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Tests to find usage of restricted code
+ */
+class RestrictedCodeSniff implements Sniff
+{
+    private const ERROR_MESSAGE = "Class '%s' is restricted in %s. Suggested replacement: %s";
+    private const ERROR_CODE = "restrictedClass";
+
+    /**
+     * List of fixtures that contain restricted classes and should not be tested
+     *
+     * @var array
+     */
+    private $fixtureFiles = [];
+
+    /**
+     * Restricted classes
+     *
+     * @var array
+     */
+    private $classes = [];
+
+    /**
+     * RestrictedCodeSniff constructor.
+     */
+    public function __construct()
+    {
+        $this->loadData('restricted_classes*.php');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_STRING,
+            T_CONSTANT_ENCAPSED_STRING
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if (array_key_exists(basename($phpcsFile->getFilename()), $this->fixtureFiles)) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $token = $tokens[$stackPtr]['content'];
+        if (array_key_exists($token, $this->classes)) {
+            if ($this->isExcluded($token, $phpcsFile)) {
+                return;
+            }
+            $phpcsFile->addError(
+                sprintf(
+                    self::ERROR_MESSAGE,
+                    $token,
+                    $phpcsFile->getFilename(),
+                    $this->classes[$token]['replacement']
+                ),
+                $stackPtr,
+                self::ERROR_CODE,
+            );
+        }
+    }
+
+    /**
+     * Checks if currently parsed file should be excluded from analysis
+     *
+     * @param string $token
+     * @param File $phpcsFile
+     * @return bool
+     */
+    private function isExcluded(string $token, File $phpcsFile): bool
+    {
+        if (in_array($phpcsFile->getFilename(), $this->fixtureFiles)) {
+            return true;
+        }
+        foreach ($this->classes[$token]['exclude'] as $exclude) {
+            if (strpos($phpcsFile->getFilename(), $exclude) !== false) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Loads and merges data from fixtures
+     *
+     * @param string $filePattern
+     * @return void
+     */
+    private function loadData(string $filePattern)
+    {
+        foreach (glob(__DIR__ . '/_files/' . $filePattern) as $file) {
+            $relativePath = str_replace(
+                '\\',
+                '/',
+                str_replace(__DIR__ . DIRECTORY_SEPARATOR, '', $file)
+            );
+            array_push($this->fixtureFiles, $relativePath);
+            $this->classes = array_merge_recursive($this->classes, $this->readList($file));
+        }
+    }
+
+    /**
+     * Isolate including a file into a method to reduce scope
+     *
+     * @param string $file
+     * @return array
+     */
+    private function readList($file)
+    {
+        return include $file;
+    }
+}
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
new file mode 100644
index 00000000..56a2e510
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Classes that are restricted to use directly.
+ * A <replacement> will be suggested to be used instead.
+ * Use <whitelist> to specify files and directories that are allowed to use restricted classes.
+ *
+ * Format: array(<class_name>, <replacement>[, array(<whitelist>)]])
+ */
+return [
+    'Zend_Db_Select' => [
+        'replacement' => '\Magento\Framework\DB\Select',
+        'exclude' => [
+            'Magento/Framework/DB/Select.php',
+            'Magento/Framework/DB/Adapter/Pdo/Mysql.php',
+            'Magento/Framework/Model/ResourceModel/Iterator.php'
+        ]
+    ],
+    'Zend_Db_Adapter_Pdo_Mysql' => [
+        'replacement' => '\Magento\Framework\DB\Adapter\Pdo\Mysql',
+        'exclude' => [
+            'Magento/Framework/DB/Adapter/Pdo/Mysql.php'
+        ]
+    ],
+    'Magento\Framework\Serialize\Serializer\Serialize' => [
+        'replacement' => 'Magento\Framework\Serialize\SerializerInterface',
+        'exclude' => [
+            'Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php',
+            'Magento/Framework/App/Config/ScopePool.php',
+            'Magento/Framework/App/ObjectManager/ConfigCache.php',
+            'Magento/Framework/App/ObjectManager/ConfigLoader.php',
+            'Magento/Framework/DB/Adapter/Pdo/Mysql.php',
+            'Magento/Framework/DB/DataConverter/SerializedToJson.php',
+            'Magento/Framework/DB/Test/Unit/DataConverter/SerializedToJsonTest.php',
+            'Magento/Framework/ObjectManager/Config/Compiled.php',
+            'Magento/Framework/Interception/Config/Config.php',
+            'Magento/Framework/Interception/PluginList/PluginList.php',
+            'Magento/Framework/App/Router/ActionList.php',
+            'Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php',
+            'src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php',
+            'Magento/Sales/Setup/SerializedDataConverter.php',
+            'Magento/Sales/Test/Unit/Setup/SerializedDataConverterTest.php',
+            'Magento/Sales/Test/Unit/Setup/SalesOrderPaymentDataConverterTest.php',
+            'Magento/Framework/Flag.php',
+            'Magento/Widget/Setup/LayoutUpdateConverter.php',
+            'Magento/Cms/Setup/ContentConverter.php',
+            'Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php'
+        ]
+    ],
+    'ArrayObject' => [
+        'replacement' => 'Custom class, extended from ArrayObject with overwritten serialize/unserialize methods',
+        'exclude' => [
+                'Magento/Theme/Model/Indexer/Design/Config.php',
+                'Magento/Ui/Model/Manager.php',
+                'Magento/Ui/Test/Unit/Model/ManagerTest.php',
+                'Magento/Backend/Model/Menu.php',
+                'Magento/CatalogSearch/Model/Indexer/Fulltext.php',
+                'Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php',
+                'Magento/Catalog/Test/Unit/Model/ProductTest.php',
+                'Magento/CatalogSearch/Model/Indexer/Fulltext.php',
+                'Magento/Framework/Test/Unit/FlagTest.php',
+                'Magento/Framework/Validator/Test/Unit/Constraint/PropertyTest.php',
+                'Magento/Framework/Indexer/Test/Unit/BatchTest.php',
+                'Magento/Framework/View/Element/UiComponent/ArrayObjectFactory.php',
+                'Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php',
+                'Magento/Framework/Indexer/Action/Base.php'
+            ]
+    ],
+    'Magento\Framework\View\Element\UiComponent\ArrayObjectFactory' => [
+        'replacement' => 'Factory that creates custom class, extended from ArrayObject with overwritten '
+            . 'serialize/unserialize methods',
+        'exclude' => [
+                'Magento/Ui/Model/Manager.php',
+                'Magento/Ui/Test/Unit/Model/ManagerTest.php',
+                'Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php',
+            ]
+    ]
+];
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php b/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
new file mode 100644
index 00000000..f57c24b7
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Classes that are restricted to use directly.
+ * A <replacement> will be suggested to be used instead.
+ * Use <whitelist> to specify files and directories that are allowed to use restricted classes.
+ *
+ * Format: array(<class_name>, <replacement>[, array(<whitelist>)]])
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'Zend_Db_Select' => [
+        'exclude' => [
+            'Magento/ResourceConnections/DB/Adapter/Pdo/MysqlProxy.php'
+        ],
+    ],
+    'Magento\Framework\Serialize\Serializer\Serialize' => [
+        'exclude' => [
+            'Magento/Framework/Test/Unit/FlagTest.php',
+            'Magento/Staging/Test/Unit/Model/Update/FlagTest.php',
+            'Magento/Logging/Test/Unit/Setup/ObjectConverterTest.php'
+        ]
+    ],
+    'ArrayObject' => [
+        'exclude' => [
+            'Magento/MultipleWishlist/Test/Unit/Model/Search/Strategy/EmailTest.php',
+            'Magento/Rma/Test/Unit/Model/RmaRepositoryTest.php',
+            'Magento/Rma/Test/Unit/Model/Status/HistoryRepositoryTest.php'
+        ]
+    ]
+];
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/RestrictedCodeUnitTest.php b/Magento2/Tests/Legacy/RestrictedCodeUnitTest.php
new file mode 100644
index 00000000..c602770c
--- /dev/null
+++ b/Magento2/Tests/Legacy/RestrictedCodeUnitTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use DirectoryIterator;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+class RestrictedCodeUnitTest extends AbstractSniffUnitTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    protected function getTestFiles($testFileBase): array
+    {
+        $testFiles = [];
+
+        $dir = __DIR__.'/_files/RestrictedCodeUnitTest';
+        $di  = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
+
+        /**
+         * @var DirectoryIterator $file
+         */
+        foreach ($di as $file) {
+            if ($file->isDir()) {
+                continue;
+            }
+            $testFiles[] = $file->getPathname();
+        }
+
+        // Put them in order.
+        sort($testFiles);
+
+        return $testFiles;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        if ($testFile === 'FileWithRestrictedClass.inc') {
+            return [
+                5 => 1,
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/FileWithRestrictedClass.inc b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/FileWithRestrictedClass.inc
new file mode 100644
index 00000000..a5a19da1
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/FileWithRestrictedClass.inc
@@ -0,0 +1,12 @@
+<?php
+
+function getCheckSql($expression, $true, $false)
+{
+    if ($expression instanceof \Zend_Db_Expr || $expression instanceof \Zend_Db_Select) {
+        $expression = sprintf("IF((%s), %s, %s)", $expression, $true, $false);
+    } else {
+        $expression = sprintf("IF(%s, %s, %s)", $expression, $true, $false);
+    }
+
+    return new \Zend_Db_Expr($expression);
+}
diff --git a/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
new file mode 100644
index 00000000..5a375f56
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
@@ -0,0 +1,34 @@
+<?php
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * This is NOT actually a test, but a file that must be ignored by RestrictedCodeSniff
+ * when doing its analysis, even if it contains restricted classes.
+ * We need this file to have the exact expected path, even with the PHP extension that makes AbstractSniffUnitTest
+ * to recognize this as an actual test file instead of a fixture.
+ */
+class IteratorDummyFile extends AbstractSniffUnitTest
+{
+    protected function shouldSkipTest()
+    {
+        return true;
+    }
+
+    protected function getErrorList() {
+        return [];
+    }
+
+    protected function getWarningList() {
+        return [];
+    }
+
+    private function withProtectedClass() {
+        return new \Zend_Db_Expr();
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 852a70da..341db432 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -142,6 +142,11 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Legacy.RestrictedCode">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">
         <severity>9</severity>

From d775713f2a4cba22d9d8a0fc577ec683363c287a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 1 Oct 2021 13:06:22 +0200
Subject: [PATCH 304/630] AC-682: Create phpcs static check for
 RestrictedCodeTest

---
 Magento2/Sniffs/Legacy/RestrictedCodeSniff.php          | 3 +++
 Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
index fb221d92..a0c0113f 100644
--- a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
+++ b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
@@ -56,6 +56,7 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
+        // phpcs:ignore
         if (array_key_exists(basename($phpcsFile->getFilename()), $this->fixtureFiles)) {
             return;
         }
@@ -107,6 +108,7 @@ private function isExcluded(string $token, File $phpcsFile): bool
      */
     private function loadData(string $filePattern)
     {
+        // phpcs:ignore
         foreach (glob(__DIR__ . '/_files/' . $filePattern) as $file) {
             $relativePath = str_replace(
                 '\\',
@@ -126,6 +128,7 @@ private function loadData(string $filePattern)
      */
     private function readList($file)
     {
+        // phpcs:ignore
         return include $file;
     }
 }
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php b/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
index f57c24b7..0c633bb9 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
@@ -29,4 +29,4 @@
             'Magento/Rma/Test/Unit/Model/Status/HistoryRepositoryTest.php'
         ]
     ]
-];
\ No newline at end of file
+];

From 6cdc855002ea0989ed9ad1841acf09e07efbeeec Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 1 Oct 2021 13:12:51 +0200
Subject: [PATCH 305/630] Run JSCS against eslint/rules/ and Magento2/

---
 Magento2/Tests/Eslint/AndSelfTest.js          |  7 +-
 Magento2/Tests/Eslint/BindUnbindTest.js       |  7 +-
 .../Tests/Eslint/ClickEventShorthandTest.js   |  7 +-
 .../Tests/Eslint/DelegateUndelegateTest.js    |  9 +-
 Magento2/Tests/Eslint/EventShorthandTest.js   |  7 +-
 Magento2/Tests/Eslint/SizeTest.js             |  7 +-
 Magento2/Tests/Eslint/TrimTest.js             |  7 +-
 ...pyrightAnotherExtensionsFilesUnitTest.2.js |  5 +-
 ...pyrightAnotherExtensionsFilesUnitTest.4.js |  5 +-
 eslint/rules/jquery-no-andSelf.js             | 71 +++++++++-------
 eslint/rules/jquery-no-bind-unbind.js         | 71 +++++++++-------
 .../rules/jquery-no-click-event-shorthand.js  | 82 +++++++++++--------
 eslint/rules/jquery-no-delegate-undelegate.js | 71 +++++++++-------
 eslint/rules/jquery-no-event-shorthand.js     | 72 +++++++++-------
 eslint/rules/jquery-no-size.js                | 71 +++++++++-------
 eslint/rules/jquery-no-trim.js                | 67 +++++++++------
 eslint/rules/utils.js                         | 69 +++++++++-------
 17 files changed, 379 insertions(+), 256 deletions(-)

diff --git a/Magento2/Tests/Eslint/AndSelfTest.js b/Magento2/Tests/Eslint/AndSelfTest.js
index 4cfdb61e..036dec01 100644
--- a/Magento2/Tests/Eslint/AndSelfTest.js
+++ b/Magento2/Tests/Eslint/AndSelfTest.js
@@ -1,4 +1,5 @@
-$(document).ready(function() {
+$(document).ready(function () {
     'use strict';
-    $("div").find("p").andSelf().addClass("border");
-});
\ No newline at end of file
+
+    $('div').find('p').andSelf().addClass('border');
+});
diff --git a/Magento2/Tests/Eslint/BindUnbindTest.js b/Magento2/Tests/Eslint/BindUnbindTest.js
index 03ea65f1..befb2b3a 100644
--- a/Magento2/Tests/Eslint/BindUnbindTest.js
+++ b/Magento2/Tests/Eslint/BindUnbindTest.js
@@ -1,4 +1,5 @@
-$(document).ready(function(){
+$(document).ready(function () {
     'use strict';
-    $(".btn1").bind("click");
-});
\ No newline at end of file
+
+    $('.btn1').bind('click');
+});
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.js b/Magento2/Tests/Eslint/ClickEventShorthandTest.js
index de8a44e7..a4ae7529 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.js
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.js
@@ -1,4 +1,5 @@
-$(document).ready(function(){
+$(document).ready(function () {
     'use strict';
-    $("input").blur();
-});
\ No newline at end of file
+
+    $('input').blur();
+});
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.js b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
index 1db13079..a2ed68cc 100644
--- a/Magento2/Tests/Eslint/DelegateUndelegateTest.js
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
@@ -1,6 +1,7 @@
-$(document).ready(function(){
+$(document).ready(function () {
     'use strict';
-    $( "table" ).delegate( "td", "click", function() {
-        $( this ).toggleClass( "chosen" );
+
+    $('table').delegate('td', 'click', function () {
+        $(this).toggleClass('chosen');
     });
-});
\ No newline at end of file
+});
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.js b/Magento2/Tests/Eslint/EventShorthandTest.js
index 69ff0a9d..23762969 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.js
+++ b/Magento2/Tests/Eslint/EventShorthandTest.js
@@ -1,4 +1,5 @@
-$(document).ready(function(){
+$(document).ready(function () {
     'use strict';
-    $( "#result" ).load( "ajax/test.html" );
-});
\ No newline at end of file
+
+    $('#result').load('ajax/test.html');
+});
diff --git a/Magento2/Tests/Eslint/SizeTest.js b/Magento2/Tests/Eslint/SizeTest.js
index 279adece..b6b767ee 100644
--- a/Magento2/Tests/Eslint/SizeTest.js
+++ b/Magento2/Tests/Eslint/SizeTest.js
@@ -1,4 +1,5 @@
-$(document).ready(function(){
+$(document).ready(function () {
     'use strict';
-    $("div").size();
-});
\ No newline at end of file
+
+    $('div').size();
+});
diff --git a/Magento2/Tests/Eslint/TrimTest.js b/Magento2/Tests/Eslint/TrimTest.js
index 9943d479..6f9251ec 100644
--- a/Magento2/Tests/Eslint/TrimTest.js
+++ b/Magento2/Tests/Eslint/TrimTest.js
@@ -1,4 +1,5 @@
-$(document).ready(function(){
+$(document).ready(function () {
     'use strict';
-    $.trim("    hello, how are you?    ");
-});
\ No newline at end of file
+
+    $.trim('    hello, how are you?    ');
+});
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
index 49cc46fb..cc776eef 100644
--- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
@@ -5,6 +5,7 @@
 
 define([
     'jquery'
-], function (){
+], function () {
     'use strict';
-});
\ No newline at end of file
+
+});
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
index 9ffb49e5..b47bf9d5 100644
--- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
@@ -5,6 +5,7 @@
 
 define([
     'jquery'
-], function (){
+], function () {
     'use strict';
-});
\ No newline at end of file
+
+});
diff --git a/eslint/rules/jquery-no-andSelf.js b/eslint/rules/jquery-no-andSelf.js
index c8c5f72a..a72b694b 100644
--- a/eslint/rules/jquery-no-andSelf.js
+++ b/eslint/rules/jquery-no-andSelf.js
@@ -1,34 +1,49 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of the deprecated `andSelf` method',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/andself/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of the deprecated `andSelf` method',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/andself/'
+        },
+        schema: [],
+        messages: {
+            andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()'
+        }
     },
-    schema: [],
-    messages: {
-      andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()'
-    }
-  },
 
-  create: function(context) {
-    'use strict';
-    var utils = require('./utils.js');
+    /**
+     * Executes the function to check if andSelf is used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
 
-    return {
-      CallExpression: function(node) {
-        if (node.callee.type !== 'MemberExpression') return;
-        if (node.callee.property.name !== 'andSelf') return;
+        var utils = require('./utils.js');
 
-        if (utils.isjQuery(node)) {
-          context.report({
-            node: node,
-            messageId: 'andSelf'
-          });
-        }
-      }
-    };
-  }
+        return {
+            /**
+             * Checks if andSelf is used in the node and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
+
+                if (node.callee.property.name !== 'andSelf') return;
+                // jscs:enable requireCurlyBraces
+
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        messageId: 'andSelf'
+                    });
+                }
+            }
+        };
+    }
 };
diff --git a/eslint/rules/jquery-no-bind-unbind.js b/eslint/rules/jquery-no-bind-unbind.js
index 14bc75ac..d64a7c88 100644
--- a/eslint/rules/jquery-no-bind-unbind.js
+++ b/eslint/rules/jquery-no-bind-unbind.js
@@ -1,34 +1,49 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of the deprecated $.bind and $.unbind',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/bind/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of the deprecated $.bind and $.unbind',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/bind/'
+        },
+        schema: [],
+        messages: {
+            bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead'
+        }
     },
-    schema: [],
-    messages: {
-      bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead'
-    }
-  },
 
-  create: function(context) {
-    'use strict';
-    var utils = require('./utils.js');
+    /**
+     * Executes the function to check if bind and unbind are used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
 
-    return {
-      CallExpression: function(node) {
-        if (node.callee.type !== 'MemberExpression') return;
-        if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
+        var utils = require('./utils.js');
 
-        if (utils.isjQuery(node)) {
-          context.report({
-            node: node,
-            messageId: 'bind'
-          });
-        }
-      }
-    };
-  }
+        return {
+            /**
+             * Checks if bind and unbind are used in the node and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
+
+                if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
+                // jscs:enable requireCurlyBraces
+
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        messageId: 'bind'
+                    });
+                }
+            }
+        };
+    }
 };
diff --git a/eslint/rules/jquery-no-click-event-shorthand.js b/eslint/rules/jquery-no-click-event-shorthand.js
index 029d1229..3ae435dd 100644
--- a/eslint/rules/jquery-no-click-event-shorthand.js
+++ b/eslint/rules/jquery-no-click-event-shorthand.js
@@ -1,41 +1,55 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of shortcuts to trigger events',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/bind/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of shortcuts to trigger events',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/bind/'
+        },
+        schema: []
     },
-    schema: [],
-  },
 
-  create: function(context) {
-    'use strict';
-    var utils = require('./utils.js');
+    /**
+     * Executes the function to check if shortcuts are used to trigger events.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
 
-    return {
-      CallExpression: function(node) {
-        var names, name;
+        var utils = require('./utils.js');
 
-        names = [
-          'blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown', 'mouseup', 'mousemove',
-          'mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select', 'submit', 'keydown', 'keypress',
-          'keyup', 'contextmenu', 'click'
-        ];
+        return {
+            /**
+             * Checks if shortcuts are used to trigger events and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                var names, name;
 
-        if (node.callee.type !== 'MemberExpression') return;
-        if (!names.includes(node.callee.property.name)) return;
-        if (utils.isjQuery(node)) {
-          name = node.callee.property.name;
-          context.report({
-            node: node,
-            message:
-                'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name
-                + '() use .trigger("' + name + '")'
-          });
-        }
-      }
-    };
-  }
+                names = ['blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown',
+                    'mouseup', 'mousemove','mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select',
+                    'submit', 'keydown', 'keypress', 'keyup', 'contextmenu', 'click'];
+
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
+
+                if (!names.includes(node.callee.property.name)) return;
+                // jscs:enable requireCurlyBraces
+
+                if (utils.isjQuery(node)) {
+                    name = node.callee.property.name;
+                    context.report({
+                        node: node,
+                        message:
+                            'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
+                            '() use .trigger("' + name + '")'
+                    });
+                }
+            }
+        };
+    }
 };
diff --git a/eslint/rules/jquery-no-delegate-undelegate.js b/eslint/rules/jquery-no-delegate-undelegate.js
index 2a704272..8eb219ee 100644
--- a/eslint/rules/jquery-no-delegate-undelegate.js
+++ b/eslint/rules/jquery-no-delegate-undelegate.js
@@ -1,34 +1,49 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of the deprecated $.delegate and $.undelegate',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/delegate/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of the deprecated $.delegate and $.undelegate',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/delegate/'
+        },
+        schema: [],
+        messages: {
+            delegate: 'jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead'
+        }
     },
-    schema: [],
-    messages: {
-      delegate: 'jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead'
-    }
-  },
 
-  create: function(context) {
-    'use strict';
-    var utils = require('./utils.js');
+    /**
+     * Executes the function to check if delegate and undelegate are used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
 
-    return {
-      CallExpression: function(node) {
-        if (node.callee.type !== 'MemberExpression') return;
-        if (!['delegate', 'undelegate'].includes(node.callee.property.name)) return;
+        var utils = require('./utils.js');
 
-        if (utils.isjQuery(node)) {
-          context.report({
-            node: node,
-            messageId: 'delegate'
-          });
-        }
-      }
-    };
-  }
+        return {
+            /**
+             * Checks if delegate and undelegate are used in the node and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
+
+                if (!['delegate', 'undelegate'].includes(node.callee.property.name)) return;
+                // jscs:enable requireCurlyBraces
+
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        messageId: 'delegate'
+                    });
+                }
+            }
+        };
+    }
 };
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 61dc45af..4715c6b9 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -1,34 +1,50 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of shorthand methods',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/load/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of shorthand methods',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/load/'
+        },
+        schema: []
     },
-    schema: []
-  },
 
-  create: function(context) {
-    'use strict';
-    var utils = require('./utils.js');
+    /**
+     * Executes the function to check if shorthand methods are used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
 
-    return {
-      CallExpression: function(node) {
-        var names = ['load', 'unload', 'error'],
-            name;
+        var utils = require('./utils.js');
 
-        if (node.callee.type !== 'MemberExpression') return;
-        if (!names.includes(node.callee.property.name)) return;
-        if (utils.isjQuery(node)) {
-          name = node.callee.property.name;
-          context.report({
-            node: node,
-            message: 'jQuery.' + name + '() was removed, use .on("' + name + '", fn) instead.'
-          });
-        }
-      }
-    };
-  }
+        return {
+            /**
+             * Checks if shorthand methods are used and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                var names = ['load', 'unload', 'error'],
+                    name;
+
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
+
+                if (!names.includes(node.callee.property.name)) return;
+                // jscs:enable requireCurlyBraces
+
+                if (utils.isjQuery(node)) {
+                    name = node.callee.property.name;
+                    context.report({
+                        node: node,
+                        message: 'jQuery.' + name + '() was removed, use .on("' + name + '", fn) instead.'
+                    });
+                }
+            }
+        };
+    }
 };
diff --git a/eslint/rules/jquery-no-size.js b/eslint/rules/jquery-no-size.js
index 8c365a19..adf58985 100644
--- a/eslint/rules/jquery-no-size.js
+++ b/eslint/rules/jquery-no-size.js
@@ -1,34 +1,49 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of the deprecated `size` method',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/size/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of the deprecated `size` method',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/size/'
+        },
+        schema: [],
+        messages: {
+            size: 'jQuery.size() removed, use jQuery.length'
+        }
     },
-    schema: [],
-    messages: {
-      size: 'jQuery.size() removed, use jQuery.length'
-    }
-  },
 
-  create: function(context) {
-    'use strict';
-    var utils = require('./utils.js');
+    /**
+     * Executes the function to check if size method is used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
 
-    return {
-      CallExpression: function(node) {
-        if (node.callee.type !== 'MemberExpression') return;
-        if (node.callee.property.name !== 'size') return;
+        var utils = require('./utils.js');
 
-        if (utils.isjQuery(node)) {
-          context.report({
-            node: node,
-            messageId: 'size'
-          });
-        }
-      }
-    };
-  }
+        return {
+            /**
+             * Checks if size method is used and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
+
+                if (node.callee.property.name !== 'size') return;
+                // jscs:enable requireCurlyBraces
+
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        messageId: 'size'
+                    });
+                }
+            }
+        };
+    }
 };
diff --git a/eslint/rules/jquery-no-trim.js b/eslint/rules/jquery-no-trim.js
index 66e760ab..ec96ddd5 100644
--- a/eslint/rules/jquery-no-trim.js
+++ b/eslint/rules/jquery-no-trim.js
@@ -1,32 +1,47 @@
 module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Disallow the use of the deprecated `trim` function',
-      category: 'jQuery deprecated functions',
-      recommended: true,
-      url: 'https://api.jquery.com/jQuery.trim/'
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of the deprecated `trim` function',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/jQuery.trim/'
+        },
+        schema: [],
+        messages: {
+            trim: 'jQuery.trim is deprecated; use String.prototype.trim'
+        }
     },
-    schema: [],
-    messages: {
-      trim: 'jQuery.trim is deprecated; use String.prototype.trim'
-    }
-  },
 
-  create: function(context) {
-    'use strict';
+    /**
+     * Executes the function to check if trim method is used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
+
+        return {
+            /**
+             * Checks if trim method is used and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                // jscs:disable requireCurlyBraces
+                if (node.callee.type !== 'MemberExpression') return;
 
-    return {
-      CallExpression: function(node) {
-        if (node.callee.type !== 'MemberExpression') return;
-        if (node.callee.object.name !== '$') return;
-        if (node.callee.property.name !== 'trim') return;
+                if (node.callee.object.name !== '$') return;
 
-        context.report({
-          node: node,
-          messageId: 'trim'
-        });
-      }
-    };
-  }
+                if (node.callee.property.name !== 'trim') return;
+                // jscs:enable requireCurlyBraces
+
+                context.report({
+                    node: node,
+                    messageId: 'trim'
+                });
+            }
+        };
+    }
 };
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index c88099bb..2e3c8eda 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -1,40 +1,49 @@
+/**
+ * Traverses the node to identify its type
+ *
+ * @param {Object} node - The node to check
+ * @returns {Object|Null}
+ */
 function traverse(node) {
-  'use strict';
-  while (node) {
-    switch (node.type) {
-      case 'CallExpression':
-        node = node.callee;
-        break;
-      case 'MemberExpression':
-        node = node.object;
-        break;
-      case 'Identifier':
-        return node;
-      default:
-        return null;
+    'use strict';
+
+    while (node) {
+        switch (node.type) {
+            case 'CallExpression':
+                node = node.callee;
+            break;
+
+            case 'MemberExpression':
+                node = node.object;
+            break;
+
+            case 'Identifier':
+                return node;
+            default:
+                return null;
+        }
     }
-  }
 }
 
-// Traverses from a node up to its root parent to determine if it
-// originated from a jQuery `$()` function.
-//
-// node - The CallExpression node to start the traversal.
-//
-// Examples
-//
-//   // $('div').find('p').first()
-//   isjQuery(firstNode) // => true
-//
-// Returns true if the function call node is attached to a jQuery element set.
+/**
+ * Traverses from a node up to its root parent to determine if it originated from a jQuery `$()` function.
+ * Examples:
+ *   $('div').find('p').first()
+ *   isjQuery(firstNode) // => true
+ *
+ * @param {Object} node - The CallExpression node to start the traversal.
+ * @returns {Boolean} - true if the function call node is attached to a jQuery element set. false, otherwise.
+ */
+
 function isjQuery(node) {
-  'use strict';
-  var id = traverse(node);
+    'use strict';
+
+    var id = traverse(node);
 
-  return id && id.name.startsWith('$');
+    return id && id.name.startsWith('$');
 }
 
 module.exports = {
-  traverse: traverse,
-  isjQuery: isjQuery
+    traverse: traverse,
+    isjQuery: isjQuery
 };

From 605705704716af46fd0eb70ae4ec8e2b44a8e9e1 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 1 Oct 2021 14:23:55 +0200
Subject: [PATCH 306/630] AC-682: Create phpcs static check for
 RestrictedCodeTest

---
 Magento2/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 341db432..699e583b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -146,6 +146,7 @@
         <severity>10</severity>
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
+        <exclude-pattern>*\.js$</exclude-pattern>
     </rule>
     <!-- Severity 9 warnings: Possible security and issues that may cause bugs. -->
     <rule ref="Generic.Files.ByteOrderMark">

From ea85ae00db2c2bd0e4c8e8171ab50033f0eb195b Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 1 Oct 2021 17:05:16 +0200
Subject: [PATCH 307/630] AC-1355: Move JSCS into magento-coding-standards repo

---
 .github/workflows/php.yml |    4 +-
 jscs/.jscsrc              |  119 +
 package-lock.json         | 6116 +++++++++++++++++++++++++++++++++----
 package.json              |    6 +-
 4 files changed, 5714 insertions(+), 531 deletions(-)
 create mode 100644 jscs/.jscsrc

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c49e7ad4..66010067 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -42,7 +42,9 @@ jobs:
     - name: Install dependencies
       run: npm install
     - name: Run ESLint
-      run: npm run eslint -- eslint/rules Magento2/ --ignore-pattern 'Magento2/Tests/Eslint/*Test.js'
+      run: npm run eslint -- eslint/rules Magento2 --ignore-pattern 'Magento2/Tests/Eslint/*Test.js'
+    - name: Run JSCS
+      run: npm run jscs eslint/rules Magento2
 
     - name: Validate composer
       run: composer validate
diff --git a/jscs/.jscsrc b/jscs/.jscsrc
new file mode 100644
index 00000000..a7a0184b
--- /dev/null
+++ b/jscs/.jscsrc
@@ -0,0 +1,119 @@
+{
+    "disallowKeywords": [
+        "with",
+        "continue"
+    ],
+    "disallowKeywordsOnNewLine": [
+        "else"
+    ],
+    "disallowSpaceBeforeBinaryOperators": [
+        ","
+    ],
+    "disallowSpacesInFunctionDeclaration": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowSpacesInNamedFunctionExpression": {
+        "beforeOpeningRoundBrace": true
+    },
+    "requireCurlyBraces": [
+        "if",
+        "else",
+        "for",
+        "while",
+        "do",
+        "try",
+        "catch"
+    ],
+    "requirePaddingNewlinesBeforeKeywords": [
+        "do",
+        "for",
+        "if",
+        "switch",
+        "case",
+        "try",
+        "void",
+        "while",
+        "with",
+        "return"
+    ],
+    "requireSpaceBeforeKeywords": [
+        "else",
+        "while",
+        "catch"
+    ],
+    "requireSpaceAfterKeywords": [
+        "if",
+        "else",
+        "for",
+        "while",
+        "do",
+        "switch",
+        "case",
+        "return",
+        "try",
+        "catch",
+        "function",
+        "typeof"
+    ],
+    "requireSpacesInAnonymousFunctionExpression": {
+        "beforeOpeningCurlyBrace": true,
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowNewlineBeforeBlockStatements": true,
+    "disallowDanglingUnderscores": null,
+    "disallowEmptyBlocks": true,
+    "disallowMixedSpacesAndTabs": true,
+    "disallowMultipleLineBreaks": true,
+    "disallowMultipleLineStrings": true,
+    "disallowSpaceAfterObjectKeys": true,
+    "disallowSpaceAfterPrefixUnaryOperators": true,
+    "disallowSpaceBeforePostfixUnaryOperators": true,
+    "disallowSpacesInCallExpression": true,
+    "disallowSpacesInsideArrayBrackets": "all",
+    "disallowSpacesInsideObjectBrackets": "all",
+    "disallowSpacesInsideParentheses": true,
+    "disallowTrailingComma": true,
+    "disallowTrailingWhitespace": true,
+    "disallowYodaConditions": true,
+    "maxErrors": null,
+    "requireBlocksOnNewline": true,
+    "requireDotNotation": "except_snake_case",
+    "requireCamelCaseOrUpperCaseIdentifiers": true,
+    "requireCapitalizedConstructors": true,
+    "requireCommaBeforeLineBreak": true,
+    "requireLineBreakAfterVariableAssignment": true,
+    "requireLineFeedAtFileEnd": true,
+    "requireMultipleVarDecl": "onevar",
+    "requireOperatorBeforeLineBreak": true,
+    "requirePaddingNewLinesAfterUseStrict": true,
+    "requirePaddingNewLinesInObjects": true,
+    "requireParenthesesAroundIIFE": true,
+    "requireSpaceAfterBinaryOperators": true,
+    "requireSpaceBeforeBinaryOperators": true,
+    "requireSpaceBeforeBlockStatements": true,
+    "requireSpaceBeforeObjectValues": true,
+    "requireSpaceBetweenArguments": true,
+    "requireSpacesInConditionalExpression": true,
+    "requireSpacesInForStatement": true,
+    "validateIndentation": 4,
+    "validateParameterSeparator": ", ",
+    "validateQuoteMarks": "'",
+    "jsDoc": {
+        "checkAnnotations": {
+            "preset": "jsdoc3",
+            "extra": {
+                "override": true,
+                "inheritdoc": true,
+                "api": true
+            }
+        },
+        "checkParamNames": true,
+        "checkRedundantParams": true,
+        "checkRedundantReturns": true,
+        "checkReturnTypes": true,
+        "checkTypes": "capitalizedNativeCase",
+        "enforceExistence": "exceptExports",
+        "requireHyphenBeforeDescription": true,
+        "requireParamTypes": true
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index e0bac264..f635c94d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,8 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "eslint": "^7.32.0"
+        "eslint": "^7.32.0",
+        "jscs": "^2.1.1"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -192,6 +193,38 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/alter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
+      "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=",
+      "dev": true,
+      "dependencies": {
+        "stable": "~0.1.3"
+      }
+    },
+    "node_modules/amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.2"
+      }
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -234,6 +267,21 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/ast-traverse": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz",
+      "integrity": "sha1-ac8rg4bxnc2hux4F1o/jWdiJfeY=",
+      "dev": true
+    },
+    "node_modules/ast-types": {
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz",
+      "integrity": "sha1-oNkOQ1G7iHcWyD/WN+v4GK9K38w=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -243,12 +291,318 @@
         "node": ">=8"
       }
     },
+    "node_modules/async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+      "dev": true
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/babel-core": {
+      "version": "5.8.38",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
+      "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-constant-folding": "^1.0.1",
+        "babel-plugin-dead-code-elimination": "^1.0.2",
+        "babel-plugin-eval": "^1.0.1",
+        "babel-plugin-inline-environment-variables": "^1.0.1",
+        "babel-plugin-jscript": "^1.0.4",
+        "babel-plugin-member-expression-literals": "^1.0.1",
+        "babel-plugin-property-literals": "^1.0.1",
+        "babel-plugin-proto-to-assign": "^1.0.3",
+        "babel-plugin-react-constant-elements": "^1.0.3",
+        "babel-plugin-react-display-name": "^1.0.3",
+        "babel-plugin-remove-console": "^1.0.1",
+        "babel-plugin-remove-debugger": "^1.0.1",
+        "babel-plugin-runtime": "^1.0.7",
+        "babel-plugin-undeclared-variables-check": "^1.0.2",
+        "babel-plugin-undefined-to-void": "^1.1.6",
+        "babylon": "^5.8.38",
+        "bluebird": "^2.9.33",
+        "chalk": "^1.0.0",
+        "convert-source-map": "^1.1.0",
+        "core-js": "^1.0.0",
+        "debug": "^2.1.1",
+        "detect-indent": "^3.0.0",
+        "esutils": "^2.0.0",
+        "fs-readdir-recursive": "^0.1.0",
+        "globals": "^6.4.0",
+        "home-or-tmp": "^1.0.0",
+        "is-integer": "^1.0.4",
+        "js-tokens": "1.0.1",
+        "json5": "^0.4.0",
+        "lodash": "^3.10.0",
+        "minimatch": "^2.0.3",
+        "output-file-sync": "^1.1.0",
+        "path-exists": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "private": "^0.1.6",
+        "regenerator": "0.8.40",
+        "regexpu": "^1.3.0",
+        "repeating": "^1.1.2",
+        "resolve": "^1.1.6",
+        "shebang-regex": "^1.0.0",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.0",
+        "source-map-support": "^0.2.10",
+        "to-fast-properties": "^1.0.0",
+        "trim-right": "^1.0.0",
+        "try-resolve": "^1.0.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/globals": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz",
+      "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/js-tokens": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz",
+      "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=",
+      "dev": true
+    },
+    "node_modules/babel-core/node_modules/minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/babel-core/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/babel-core/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/babel-jscs": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/babel-jscs/-/babel-jscs-2.0.5.tgz",
+      "integrity": "sha1-CjRwRrSBRay8pW6MjtX3NrxU+dA=",
+      "dev": true,
+      "dependencies": {
+        "babel-core": "~5.8.3",
+        "lodash.assign": "^3.2.0"
+      }
+    },
+    "node_modules/babel-plugin-constant-folding": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz",
+      "integrity": "sha1-g2HTZMmORJw2kr26Ue/whEKQqo4=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-dead-code-elimination": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz",
+      "integrity": "sha1-X3xFEnTc18zNv7s+C4XdKBIfD2U=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-eval": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz",
+      "integrity": "sha1-ovrtJc5r5preS/7CY/cBaRlZUNo=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-inline-environment-variables": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz",
+      "integrity": "sha1-H1jOkSB61qgmqL9kX6/mj/X+P/4=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-jscript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz",
+      "integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-member-expression-literals": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz",
+      "integrity": "sha1-zF7bD6qNyScXDnTW0cAkQAIWJNM=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-property-literals": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz",
+      "integrity": "sha1-AlIwGQAZKYCxwRjv6kjOk6q4MzY=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-proto-to-assign": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz",
+      "integrity": "sha1-xJ56/QL1d7xNoF6i3wAiUM980SM=",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^3.9.3"
+      }
+    },
+    "node_modules/babel-plugin-react-constant-elements": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz",
+      "integrity": "sha1-lGc26DeEKcvDSdz/YvUcFDs041o=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-react-display-name": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz",
+      "integrity": "sha1-dU/jiSboQkpOexWrbqYTne4FFPw=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-remove-console": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz",
+      "integrity": "sha1-2PJFVsOgUAXUKqqv0neH9T/wE6c=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-remove-debugger": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz",
+      "integrity": "sha1-/S6jzWGkKK0fO5yJiC/0KT6MFMc=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-runtime": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz",
+      "integrity": "sha1-v3x9lm3Vbs1cF/ocslPJrLflSq8=",
+      "dev": true
+    },
+    "node_modules/babel-plugin-undeclared-variables-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz",
+      "integrity": "sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=",
+      "dev": true,
+      "dependencies": {
+        "leven": "^1.0.2"
+      }
+    },
+    "node_modules/babel-plugin-undefined-to-void": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz",
+      "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=",
+      "dev": true
+    },
+    "node_modules/babylon": {
+      "version": "5.8.38",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz",
+      "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=",
+      "dev": true
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/bluebird": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
+      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
+      "dev": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -259,6 +613,25 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/breakable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
+      "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME=",
+      "dev": true
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -268,6 +641,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "dependencies": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -284,6 +679,29 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/cli-table": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
+      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
+      "dev": true,
+      "dependencies": {
+        "colors": "1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.2.0"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "dependencies": {
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
+        "wordwrap": "0.0.2"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -302,505 +720,1894 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+    "node_modules/colors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "node_modules/commander": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "graceful-readlink": ">= 1.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.6.x"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+    "node_modules/comment-parser": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.2.tgz",
+      "integrity": "sha1-PAPwd2uGo239mgosl8YwfzMggv4=",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "readable-stream": "^2.0.4"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+    "node_modules/comment-parser/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "node_modules/comment-parser/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+    "node_modules/comment-parser/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
     },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+    "node_modules/commoner": {
+      "version": "0.10.8",
+      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
+      "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "commander": "^2.5.0",
+        "detective": "^4.3.1",
+        "glob": "^5.0.15",
+        "graceful-fs": "^4.1.2",
+        "iconv-lite": "^0.4.5",
+        "mkdirp": "^0.5.0",
+        "private": "^0.1.6",
+        "q": "^1.1.2",
+        "recast": "^0.11.17"
+      },
+      "bin": {
+        "commonize": "bin/commonize"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/commoner/node_modules/ast-types": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
+      "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
       "dev": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commoner/node_modules/esprima": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/commoner/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/commoner/node_modules/recast": {
+      "version": "0.11.23",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
+      "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "0.9.6",
+        "esprima": "~3.1.0",
+        "private": "~0.1.5",
+        "source-map": "~0.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
+      "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/deep-equal": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
+      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "es-get-iterator": "^1.1.1",
+        "get-intrinsic": "^1.0.1",
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.2",
+        "is-regex": "^1.1.1",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.4",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.3.0",
+        "side-channel": "^1.0.3",
+        "which-boxed-primitive": "^1.0.1",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/deep-equal/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+      "dev": true
+    },
+    "node_modules/defs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
+      "integrity": "sha1-siYJ8sehG6ej2xFoBcE5scr/qdI=",
+      "dev": true,
+      "dependencies": {
+        "alter": "~0.2.0",
+        "ast-traverse": "~0.1.1",
+        "breakable": "~1.0.0",
+        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
+        "simple-fmt": "~0.1.0",
+        "simple-is": "~0.2.0",
+        "stringmap": "~0.2.2",
+        "stringset": "~0.2.1",
+        "tryor": "~0.1.2",
+        "yargs": "~3.27.0"
+      },
+      "bin": {
+        "defs": "build/es5/defs"
+      }
+    },
+    "node_modules/detect-indent": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
+      "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=",
+      "dev": true,
+      "dependencies": {
+        "get-stdin": "^4.0.1",
+        "minimist": "^1.1.0",
+        "repeating": "^1.1.0"
+      },
+      "bin": {
+        "detect-indent": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detective": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
+      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^5.2.1",
+        "defined": "^1.0.0"
+      }
+    },
+    "node_modules/detective/node_modules/acorn": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/domelementtype": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "node_modules/domhandler": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+      "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+      "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
+      "dev": true
+    },
+    "node_modules/es-abstract": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
+      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-get-iterator": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
+        "has-symbols": "^1.0.1",
+        "is-arguments": "^1.1.0",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.5",
+        "isarray": "^2.0.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-get-iterator/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "node_modules/es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "node_modules/es6-set/node_modules/es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "dependencies": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/escope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima-fb": {
+      "version": "15001.1001.0-dev-harmony-fb",
+      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
+      "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
+      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.5.0"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+      "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
+      "dev": true
+    },
+    "node_modules/eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+      "dev": true,
+      "engines": {
+        "node": "> 0.1.90"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "dev": true
+    },
+    "node_modules/foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "node_modules/fs-readdir-recursive": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz",
+      "integrity": "sha1-MVtPuMHKW4xH3v7zGdBz2tNWgFk=",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "dev": true
+    },
+    "node_modules/graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-color": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
+      "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/home-or-tmp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
+      "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "^1.0.1",
+        "user-home": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+      "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "1",
+        "domhandler": "2.3",
+        "domutils": "1.5",
+        "entities": "1.0",
+        "readable-stream": "1.1"
+      }
+    },
+    "node_modules/i": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
+      "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherit": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.7.tgz",
+      "integrity": "sha512-dxJmC1j0Q32NFAjvbd6g3lXYLZ49HgzotgbSMwMkoiTXGhC9412Oc24g7A7M9cPPkw/vDsF2cSII+2zJwocUtQ==",
+      "dev": true
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
-      "bin": {
-        "eslint": "bin/eslint.js"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
+      "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-scope/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true,
       "engines": {
-        "node": ">=4.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+    "node_modules/is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-integer": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.7.tgz",
+      "integrity": "sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=",
+      "dev": true,
+      "dependencies": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+    "node_modules/is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
       "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+    "node_modules/is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+      "dependencies": {
+        "has-symbols": "^1.0.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+    "node_modules/is-typed-array": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
+      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz",
+      "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jscs": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.11.0.tgz",
+      "integrity": "sha1-bhHvDKqgdzH53MKysn2OzuHdvLY=",
+      "deprecated": "JSCS has merged with ESLint! See - https://medium.com/@markelog/jscs-end-of-the-line-bc9bf0b3fdb2",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "babel-jscs": "^2.0.0",
+        "chalk": "~1.1.0",
+        "cli-table": "~0.3.1",
+        "commander": "~2.9.0",
+        "escope": "^3.2.0",
+        "esprima": "~2.7.0",
+        "estraverse": "^4.1.0",
+        "exit": "~0.1.2",
+        "glob": "^5.0.1",
+        "htmlparser2": "3.8.3",
+        "js-yaml": "~3.4.0",
+        "jscs-jsdoc": "^1.3.1",
+        "jscs-preset-wikimedia": "~1.0.0",
+        "jsonlint": "~1.6.2",
+        "lodash": "~3.10.0",
+        "minimatch": "~3.0.0",
+        "natural-compare": "~1.2.2",
+        "pathval": "~0.1.1",
+        "prompt": "~0.2.14",
+        "reserved-words": "^0.1.1",
+        "resolve": "^1.1.6",
+        "strip-bom": "^2.0.0",
+        "strip-json-comments": "~1.0.2",
+        "to-double-quotes": "^2.0.0",
+        "to-single-quotes": "^2.0.0",
+        "vow": "~0.4.8",
+        "vow-fs": "~0.3.4",
+        "xmlbuilder": "^3.1.0"
+      },
+      "bin": {
+        "jscs": "bin/jscs"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "node_modules/jscs-jsdoc": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-1.3.2.tgz",
+      "integrity": "sha1-HyyCtqtLl1JNqVj0a05WLgMF+ac=",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.2.0"
+        "comment-parser": "^0.3.1",
+        "jsdoctypeparser": "~1.2.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+    "node_modules/jscs-preset-wikimedia": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.1.tgz",
+      "integrity": "sha512-RWqu6IYSUlnYuCRCF0obCOHjJV0vhpLcvKbauwxmLQoZ0PiXDTWBYlfpsEfdhg7pmREAEwrARfDRz5qWD6qknA==",
+      "deprecated": "No longer maintained. We recomment migrating to ESLint with eslint-config-wikimedia.",
+      "dev": true
+    },
+    "node_modules/jscs/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
       "dev": true,
       "engines": {
-        "node": ">=4.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/jscs/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+    "node_modules/jscs/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "node_modules/jscs/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+    "node_modules/jscs/node_modules/esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
+    "node_modules/jscs/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
     },
-    "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+    "node_modules/jscs/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       },
       "engines": {
         "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/jscs/node_modules/js-yaml": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz",
+      "integrity": "sha1-a+GyP2JJ9T0pM3D9TRqqY84bTrA=",
       "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "argparse": "^1.0.2",
+        "esprima": "^2.6.0",
+        "inherit": "^2.2.2"
       },
-      "engines": {
-        "node": ">= 6"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/globals": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+    "node_modules/jscs/node_modules/natural-compare": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.2.2.tgz",
+      "integrity": "sha1-H5bWDjFBysG20FZTzg2urHY69qo=",
+      "dev": true
+    },
+    "node_modules/jscs/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jscs/node_modules/strip-json-comments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+      "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
       "dev": true,
+      "bin": {
+        "strip-json-comments": "cli.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+    "node_modules/jscs/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
       "dev": true,
       "engines": {
-        "node": ">= 4"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "node_modules/jsdoctypeparser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-1.2.0.tgz",
+      "integrity": "sha1-597cFToRhJ/8UUEUSuhqfvDCU5I=",
       "dev": true,
       "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "lodash": "^3.7.0"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+    "node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
       "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
+      "bin": {
+        "jsesc": "bin/jsesc"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+    "node_modules/json5": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
+      "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsonlint": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
       "dev": true,
+      "dependencies": {
+        "JSV": "^4.0.x",
+        "nomnom": "^1.5.x"
+      },
+      "bin": {
+        "jsonlint": "lib/cli.js"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/JSV": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+      "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "*"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+    "node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+    "node_modules/lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "invert-kv": "^1.0.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
+    "node_modules/leven": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz",
+      "integrity": "sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=",
+      "dev": true,
+      "bin": {
+        "leven": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/levn": {
       "version": "0.4.1",
@@ -815,24 +2622,124 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lodash": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+      "dev": true
+    },
+    "node_modules/lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
+      "dev": true
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+      "dev": true,
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "node_modules/lodash.assign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
+      "dev": true,
+      "dependencies": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "dev": true
     },
+    "node_modules/longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -857,18 +2764,164 @@
         "node": "*"
       }
     },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "node_modules/ncp": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
+      "dev": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
+    },
+    "node_modules/next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "node_modules/nomnom": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+      "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
+      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
+      "dev": true,
+      "dependencies": {
+        "chalk": "~0.4.0",
+        "underscore": "~1.6.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/ansi-styles": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+      "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/chalk": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+      "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "~1.0.0",
+        "has-color": "~0.1.0",
+        "strip-ansi": "~0.1.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/strip-ansi": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+      "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
+      "dev": true,
+      "bin": {
+        "strip-ansi": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -895,6 +2948,38 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/output-file-sync": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.4",
+        "mkdirp": "^0.5.1",
+        "object-assign": "^4.1.0"
+      }
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -907,6 +2992,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/path-exists": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
+      "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -925,6 +3019,27 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/pathval": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz",
+      "integrity": "sha1-CPkRzcqczllCiA2ngXvAtyO2bYI=",
+      "dev": true
+    },
+    "node_modules/pkginfo": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
+      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -934,6 +3049,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -943,6 +3073,22 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/prompt": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz",
+      "integrity": "sha1-V3VPZPVD/XsIRXB8gY7OYY8F/9w=",
+      "dev": true,
+      "dependencies": {
+        "pkginfo": "0.x.x",
+        "read": "1.0.x",
+        "revalidator": "0.1.x",
+        "utile": "0.2.x",
+        "winston": "0.8.x"
+      },
+      "engines": {
+        "node": ">= 0.6.6"
+      }
+    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -952,6 +3098,97 @@
         "node": ">=6"
       }
     },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "~0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/recast": {
+      "version": "0.10.33",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz",
+      "integrity": "sha1-lCgI96oBbx+nFCxGHX5XBKqo1pc=",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "0.8.12",
+        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
+        "private": "~0.1.5",
+        "source-map": "~0.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/regenerator": {
+      "version": "0.8.40",
+      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz",
+      "integrity": "sha1-oORXxY69uuV1yfjNdRJ+k3VkNdg=",
+      "dev": true,
+      "dependencies": {
+        "commoner": "~0.10.3",
+        "defs": "~1.1.0",
+        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
+        "private": "~0.1.5",
+        "recast": "0.10.33",
+        "through": "~2.3.8"
+      },
+      "bin": {
+        "regenerator": "bin/regenerator"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
@@ -964,6 +3201,77 @@
         "url": "https://github.com/sponsors/mysticatea"
       }
     },
+    "node_modules/regexpu": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz",
+      "integrity": "sha1-5TTcmRqeWEYFDJjebX3UpVyeoW0=",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^2.6.0",
+        "recast": "^0.10.10",
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      },
+      "bin": {
+        "regexpu": "bin/regexpu"
+      }
+    },
+    "node_modules/regexpu/node_modules/esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/repeating": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
+      "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
+      "dev": true,
+      "dependencies": {
+        "is-finite": "^1.0.0"
+      },
+      "bin": {
+        "repeating": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -973,13 +3281,53 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/reserved-words": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
+      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=4"
+      }
+    },
+    "node_modules/revalidator": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "dependencies": {
+        "align-text": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/rimraf": {
@@ -997,6 +3345,18 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -1033,6 +3393,41 @@
         "node": ">=8"
       }
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/simple-fmt": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
+      "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=",
+      "dev": true
+    },
+    "node_modules/simple-is": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
+      "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -1050,12 +3445,63 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
+      "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
+      "dev": true,
+      "dependencies": {
+        "source-map": "0.1.32"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.1.32",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+      "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
     "node_modules/string-width": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -1070,6 +3516,44 @@
         "node": ">=8"
       }
     },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/stringmap": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
+      "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=",
+      "dev": true
+    },
+    "node_modules/stringset": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
+      "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=",
+      "dev": true
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -1082,6 +3566,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -1100,109 +3596,379 @@
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/to-double-quotes": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-2.0.0.tgz",
+      "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-single-quotes": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz",
+      "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/try-resolve": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz",
+      "integrity": "sha1-z95vq9ctY+V5fPqrhzq76OcA6RI=",
+      "dev": true
+    },
+    "node_modules/tryor": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
+      "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=",
+      "dev": true
+    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+      "dev": true
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true,
+      "bin": {
+        "user-home": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/utile": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+      "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=",
+      "dev": true,
+      "dependencies": {
+        "async": "~0.2.9",
+        "deep-equal": "*",
+        "i": "0.3.x",
+        "mkdirp": "0.x.x",
+        "ncp": "0.4.x",
+        "rimraf": "2.x.x"
+      },
+      "engines": {
+        "node": ">= 0.6.4"
+      }
+    },
+    "node_modules/utile/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/vow": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.20.tgz",
+      "integrity": "sha512-YYoSYXUYABqY08D/WrjcWJxJSErcILRRTQpcPyUc0SFfgIPKSUFzVt7u1HC3TXGJZM/qhsSjCLNQstxqf7asgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/vow-fs": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.6.tgz",
+      "integrity": "sha1-LUxZviLivyYY3fWXq0uqkjvnIA0=",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.0.5",
+        "uuid": "^2.0.2",
+        "vow": "^0.4.7",
+        "vow-queue": "^0.4.1"
+      },
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/vow-queue": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz",
+      "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==",
+      "dev": true,
+      "dependencies": {
+        "vow": "^0.4.17"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 8"
       }
     },
-    "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
       "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       },
-      "engines": {
-        "node": ">=10.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+    "node_modules/which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+    "node_modules/which-typed-array": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
+      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "^1.2.1"
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.7"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/window-size": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "bin": {
+        "window-size": "cli.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+    "node_modules/winston": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz",
+      "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=",
       "dev": true,
       "dependencies": {
-        "punycode": "^2.1.0"
+        "async": "0.2.x",
+        "colors": "0.6.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "pkginfo": "0.3.x",
+        "stack-trace": "0.0.x"
+      },
+      "engines": {
+        "node": ">= 0.6.0"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
+    "node_modules/winston/node_modules/colors": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+    "node_modules/winston/node_modules/pkginfo": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+      "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
       "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4.0"
       }
     },
     "node_modules/word-wrap": {
@@ -1214,17 +3980,58 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
+    "node_modules/xmlbuilder": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
+      "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^3.5.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true
+    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "3.27.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
+      "integrity": "sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^1.2.1",
+        "cliui": "^2.1.0",
+        "decamelize": "^1.0.0",
+        "os-locale": "^1.4.0",
+        "window-size": "^0.1.2",
+        "y18n": "^3.2.0"
+      }
     }
   },
   "dependencies": {
@@ -1352,59 +4159,365 @@
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true
     },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      }
+    },
+    "alter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
+      "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=",
+      "dev": true,
+      "requires": {
+        "stable": "~0.1.3"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "ast-traverse": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz",
+      "integrity": "sha1-ac8rg4bxnc2hux4F1o/jWdiJfeY=",
+      "dev": true
+    },
+    "ast-types": {
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz",
+      "integrity": "sha1-oNkOQ1G7iHcWyD/WN+v4GK9K38w=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+      "dev": true
+    },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true
+    },
+    "babel-core": {
+      "version": "5.8.38",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
+      "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-constant-folding": "^1.0.1",
+        "babel-plugin-dead-code-elimination": "^1.0.2",
+        "babel-plugin-eval": "^1.0.1",
+        "babel-plugin-inline-environment-variables": "^1.0.1",
+        "babel-plugin-jscript": "^1.0.4",
+        "babel-plugin-member-expression-literals": "^1.0.1",
+        "babel-plugin-property-literals": "^1.0.1",
+        "babel-plugin-proto-to-assign": "^1.0.3",
+        "babel-plugin-react-constant-elements": "^1.0.3",
+        "babel-plugin-react-display-name": "^1.0.3",
+        "babel-plugin-remove-console": "^1.0.1",
+        "babel-plugin-remove-debugger": "^1.0.1",
+        "babel-plugin-runtime": "^1.0.7",
+        "babel-plugin-undeclared-variables-check": "^1.0.2",
+        "babel-plugin-undefined-to-void": "^1.1.6",
+        "babylon": "^5.8.38",
+        "bluebird": "^2.9.33",
+        "chalk": "^1.0.0",
+        "convert-source-map": "^1.1.0",
+        "core-js": "^1.0.0",
+        "debug": "^2.1.1",
+        "detect-indent": "^3.0.0",
+        "esutils": "^2.0.0",
+        "fs-readdir-recursive": "^0.1.0",
+        "globals": "^6.4.0",
+        "home-or-tmp": "^1.0.0",
+        "is-integer": "^1.0.4",
+        "js-tokens": "1.0.1",
+        "json5": "^0.4.0",
+        "lodash": "^3.10.0",
+        "minimatch": "^2.0.3",
+        "output-file-sync": "^1.1.0",
+        "path-exists": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "private": "^0.1.6",
+        "regenerator": "0.8.40",
+        "regexpu": "^1.3.0",
+        "repeating": "^1.1.2",
+        "resolve": "^1.1.6",
+        "shebang-regex": "^1.0.0",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.0",
+        "source-map-support": "^0.2.10",
+        "to-fast-properties": "^1.0.0",
+        "trim-right": "^1.0.0",
+        "try-resolve": "^1.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "dev": true
+        },
+        "globals": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz",
+          "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=",
+          "dev": true
+        },
+        "js-tokens": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz",
+          "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-jscs": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/babel-jscs/-/babel-jscs-2.0.5.tgz",
+      "integrity": "sha1-CjRwRrSBRay8pW6MjtX3NrxU+dA=",
+      "dev": true,
+      "requires": {
+        "babel-core": "~5.8.3",
+        "lodash.assign": "^3.2.0"
+      }
+    },
+    "babel-plugin-constant-folding": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz",
+      "integrity": "sha1-g2HTZMmORJw2kr26Ue/whEKQqo4=",
+      "dev": true
+    },
+    "babel-plugin-dead-code-elimination": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz",
+      "integrity": "sha1-X3xFEnTc18zNv7s+C4XdKBIfD2U=",
+      "dev": true
+    },
+    "babel-plugin-eval": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz",
+      "integrity": "sha1-ovrtJc5r5preS/7CY/cBaRlZUNo=",
+      "dev": true
+    },
+    "babel-plugin-inline-environment-variables": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz",
+      "integrity": "sha1-H1jOkSB61qgmqL9kX6/mj/X+P/4=",
+      "dev": true
+    },
+    "babel-plugin-jscript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz",
+      "integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w=",
+      "dev": true
+    },
+    "babel-plugin-member-expression-literals": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz",
+      "integrity": "sha1-zF7bD6qNyScXDnTW0cAkQAIWJNM=",
+      "dev": true
     },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "babel-plugin-property-literals": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz",
+      "integrity": "sha1-AlIwGQAZKYCxwRjv6kjOk6q4MzY=",
+      "dev": true
+    },
+    "babel-plugin-proto-to-assign": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz",
+      "integrity": "sha1-xJ56/QL1d7xNoF6i3wAiUM980SM=",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "lodash": "^3.9.3"
       }
     },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+    "babel-plugin-react-constant-elements": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz",
+      "integrity": "sha1-lGc26DeEKcvDSdz/YvUcFDs041o=",
       "dev": true
     },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "babel-plugin-react-display-name": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz",
+      "integrity": "sha1-dU/jiSboQkpOexWrbqYTne4FFPw=",
       "dev": true
     },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
+    "babel-plugin-remove-console": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz",
+      "integrity": "sha1-2PJFVsOgUAXUKqqv0neH9T/wE6c=",
+      "dev": true
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+    "babel-plugin-remove-debugger": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz",
+      "integrity": "sha1-/S6jzWGkKK0fO5yJiC/0KT6MFMc=",
+      "dev": true
+    },
+    "babel-plugin-runtime": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz",
+      "integrity": "sha1-v3x9lm3Vbs1cF/ocslPJrLflSq8=",
+      "dev": true
+    },
+    "babel-plugin-undeclared-variables-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz",
+      "integrity": "sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "leven": "^1.0.2"
       }
     },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+    "babel-plugin-undefined-to-void": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz",
+      "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=",
+      "dev": true
+    },
+    "babylon": {
+      "version": "5.8.38",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz",
+      "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=",
       "dev": true
     },
     "balanced-match": {
@@ -1413,6 +4526,12 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "bluebird": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
+      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
+      "dev": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1423,12 +4542,44 @@
         "concat-map": "0.0.1"
       }
     },
+    "breakable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
+      "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME=",
+      "dev": true
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "dev": true
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      }
+    },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1439,6 +4590,26 @@
         "supports-color": "^7.1.0"
       }
     },
+    "cli-table": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
+      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
+      "dev": true,
+      "requires": {
+        "colors": "1.0.3"
+      }
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "requires": {
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
+        "wordwrap": "0.0.2"
+      }
+    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1454,12 +4625,145 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "colors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+      "dev": true,
+      "requires": {
+        "graceful-readlink": ">= 1.0.0"
+      }
+    },
+    "comment-parser": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.2.tgz",
+      "integrity": "sha1-PAPwd2uGo239mgosl8YwfzMggv4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.4"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "commoner": {
+      "version": "0.10.8",
+      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
+      "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=",
+      "dev": true,
+      "requires": {
+        "commander": "^2.5.0",
+        "detective": "^4.3.1",
+        "glob": "^5.0.15",
+        "graceful-fs": "^4.1.2",
+        "iconv-lite": "^0.4.5",
+        "mkdirp": "^0.5.0",
+        "private": "^0.1.6",
+        "q": "^1.1.2",
+        "recast": "^0.11.17"
+      },
+      "dependencies": {
+        "ast-types": {
+          "version": "0.9.6",
+          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
+          "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
+          "dev": true
+        },
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "recast": {
+          "version": "0.11.23",
+          "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
+          "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
+          "dev": true,
+          "requires": {
+            "ast-types": "0.9.6",
+            "esprima": "~3.1.0",
+            "private": "~0.1.5",
+            "source-map": "~0.5.0"
+          }
+        }
+      }
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
+    "convert-source-map": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1471,43 +4775,359 @@
         "which": "^2.0.1"
       }
     },
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+      "dev": true
+    },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
     "debug": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
       "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
       "dev": true,
       "requires": {
-        "ms": "2.1.2"
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
+      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "es-get-iterator": "^1.1.1",
+        "get-intrinsic": "^1.0.1",
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.2",
+        "is-regex": "^1.1.1",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.4",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.3.0",
+        "side-channel": "^1.0.3",
+        "which-boxed-primitive": "^1.0.1",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+      "dev": true
+    },
+    "defs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
+      "integrity": "sha1-siYJ8sehG6ej2xFoBcE5scr/qdI=",
+      "dev": true,
+      "requires": {
+        "alter": "~0.2.0",
+        "ast-traverse": "~0.1.1",
+        "breakable": "~1.0.0",
+        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
+        "simple-fmt": "~0.1.0",
+        "simple-is": "~0.2.0",
+        "stringmap": "~0.2.2",
+        "stringset": "~0.2.1",
+        "tryor": "~0.1.2",
+        "yargs": "~3.27.0"
+      }
+    },
+    "detect-indent": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
+      "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1",
+        "minimist": "^1.1.0",
+        "repeating": "^1.1.0"
+      }
+    },
+    "detective": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
+      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.2.1",
+        "defined": "^1.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+          "dev": true
+        }
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+          "dev": true
+        },
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+      "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "entities": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+      "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
+      "dev": true
+    },
+    "es-abstract": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
+      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      }
+    },
+    "es-get-iterator": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
+        "has-symbols": "^1.0.1",
+        "is-arguments": "^1.1.0",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.5",
+        "isarray": "^2.0.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
       }
     },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2"
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "~0.3.5"
+      },
+      "dependencies": {
+        "es6-symbol": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+          "dev": true,
+          "requires": {
+            "d": "1",
+            "es5-ext": "~0.10.14"
+          }
+        }
       }
     },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
     },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+    "es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^4.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
       }
     },
     "escape-string-regexp": {
@@ -1516,6 +5136,26 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true
     },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        }
+      }
+    },
     "eslint": {
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
@@ -1622,6 +5262,12 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
+    "esprima-fb": {
+      "version": "15001.1001.0-dev-harmony-fb",
+      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
+      "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=",
+      "dev": true
+    },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -1652,6 +5298,45 @@
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "ext": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
+      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "dev": true,
+      "requires": {
+        "type": "^2.5.0"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
+          "dev": true
+        }
+      }
+    },
+    "eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+      "dev": true
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1695,18 +5380,63 @@
       "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "fs-readdir-recursive": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz",
+      "integrity": "sha1-MVtPuMHKW4xH3v7zGdBz2tNWgFk=",
+      "dev": true
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "glob": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -1721,95 +5451,408 @@
         "path-is-absolute": "^1.0.0"
       }
     },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true
+    },
+    "has-color": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
+      "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "home-or-tmp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
+      "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "^1.0.1",
+        "user-home": "^1.1.1"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+      "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1",
+        "domhandler": "2.3",
+        "domutils": "1.5",
+        "entities": "1.0",
+        "readable-stream": "1.1"
+      }
+    },
+    "i": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
+      "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherit": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.7.tgz",
+      "integrity": "sha512-dxJmC1j0Q32NFAjvbd6g3lXYLZ49HgzotgbSMwMkoiTXGhC9412Oc24g7A7M9cPPkw/vDsF2cSII+2zJwocUtQ==",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
+      "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-integer": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.7.tgz",
+      "integrity": "sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true
+    },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
       "dev": true,
       "requires": {
-        "is-glob": "^4.0.1"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "globals": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.20.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
       "dev": true
     },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+    "is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
       "dev": true
     },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "has-symbols": "^1.0.2"
       }
     },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+    "is-typed-array": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
+      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
+        "has-tostringtag": "^1.0.0"
+      }
     },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
       "dev": true
     },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+    "is-weakref": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "call-bind": "^1.0.0"
       }
     },
+    "is-weakset": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz",
+      "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1826,6 +5869,169 @@
         "esprima": "^4.0.0"
       }
     },
+    "jscs": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.11.0.tgz",
+      "integrity": "sha1-bhHvDKqgdzH53MKysn2OzuHdvLY=",
+      "dev": true,
+      "requires": {
+        "babel-jscs": "^2.0.0",
+        "chalk": "~1.1.0",
+        "cli-table": "~0.3.1",
+        "commander": "~2.9.0",
+        "escope": "^3.2.0",
+        "esprima": "~2.7.0",
+        "estraverse": "^4.1.0",
+        "exit": "~0.1.2",
+        "glob": "^5.0.1",
+        "htmlparser2": "3.8.3",
+        "js-yaml": "~3.4.0",
+        "jscs-jsdoc": "^1.3.1",
+        "jscs-preset-wikimedia": "~1.0.0",
+        "jsonlint": "~1.6.2",
+        "lodash": "~3.10.0",
+        "minimatch": "~3.0.0",
+        "natural-compare": "~1.2.2",
+        "pathval": "~0.1.1",
+        "prompt": "~0.2.14",
+        "reserved-words": "^0.1.1",
+        "resolve": "^1.1.6",
+        "strip-bom": "^2.0.0",
+        "strip-json-comments": "~1.0.2",
+        "to-double-quotes": "^2.0.0",
+        "to-single-quotes": "^2.0.0",
+        "vow": "~0.4.8",
+        "vow-fs": "~0.3.4",
+        "xmlbuilder": "^3.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "dev": true
+        },
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "js-yaml": {
+          "version": "3.4.6",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz",
+          "integrity": "sha1-a+GyP2JJ9T0pM3D9TRqqY84bTrA=",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.2",
+            "esprima": "^2.6.0",
+            "inherit": "^2.2.2"
+          }
+        },
+        "natural-compare": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.2.2.tgz",
+          "integrity": "sha1-H5bWDjFBysG20FZTzg2urHY69qo=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "jscs-jsdoc": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-1.3.2.tgz",
+      "integrity": "sha1-HyyCtqtLl1JNqVj0a05WLgMF+ac=",
+      "dev": true,
+      "requires": {
+        "comment-parser": "^0.3.1",
+        "jsdoctypeparser": "~1.2.0"
+      }
+    },
+    "jscs-preset-wikimedia": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.1.tgz",
+      "integrity": "sha512-RWqu6IYSUlnYuCRCF0obCOHjJV0vhpLcvKbauwxmLQoZ0PiXDTWBYlfpsEfdhg7pmREAEwrARfDRz5qWD6qknA==",
+      "dev": true
+    },
+    "jsdoctypeparser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-1.2.0.tgz",
+      "integrity": "sha1-597cFToRhJ/8UUEUSuhqfvDCU5I=",
+      "dev": true,
+      "requires": {
+        "lodash": "^3.7.0"
+      }
+    },
+    "jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1838,6 +6044,58 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "json5": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
+      "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
+      "dev": true
+    },
+    "jsonlint": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
+      "dev": true,
+      "requires": {
+        "JSV": "^4.0.x",
+        "nomnom": "^1.5.x"
+      }
+    },
+    "JSV": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+      "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "leven": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz",
+      "integrity": "sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=",
+      "dev": true
+    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1848,24 +6106,121 @@
         "type-check": "~0.4.0"
       }
     },
+    "lodash": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+      "dev": true
+    },
+    "lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
+      "dev": true
+    },
+    "lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+      "dev": true,
+      "requires": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
+      "dev": true,
+      "requires": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "dev": true
     },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -1881,20 +6236,128 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "ncp": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "nomnom": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+      "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
+      "dev": true,
+      "requires": {
+        "chalk": "~0.4.0",
+        "underscore": "~1.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+          "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "~1.0.0",
+            "has-color": "~0.1.0",
+            "strip-ansi": "~0.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+          "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
+          "dev": true
+        }
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "dev": true
+    },
+    "object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      }
     },
     "once": {
       "version": "1.4.0",
@@ -1919,6 +6382,32 @@
         "word-wrap": "^1.2.3"
       }
     },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.4",
+        "mkdirp": "^0.5.1",
+        "object-assign": "^4.1.0"
+      }
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -1928,6 +6417,12 @@
         "callsites": "^3.0.0"
       }
     },
+    "path-exists": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
+      "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
+      "dev": true
+    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1940,42 +6435,236 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "pathval": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz",
+      "integrity": "sha1-CPkRzcqczllCiA2ngXvAtyO2bYI=",
+      "dev": true
+    },
+    "pkginfo": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
+      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=",
+      "dev": true
+    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
+    "prompt": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz",
+      "integrity": "sha1-V3VPZPVD/XsIRXB8gY7OYY8F/9w=",
+      "dev": true,
+      "requires": {
+        "pkginfo": "0.x.x",
+        "read": "1.0.x",
+        "revalidator": "0.1.x",
+        "utile": "0.2.x",
+        "winston": "0.8.x"
+      }
+    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dev": true,
+      "requires": {
+        "mute-stream": "~0.0.4"
+      }
+    },
+    "readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "recast": {
+      "version": "0.10.33",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz",
+      "integrity": "sha1-lCgI96oBbx+nFCxGHX5XBKqo1pc=",
+      "dev": true,
+      "requires": {
+        "ast-types": "0.8.12",
+        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
+        "private": "~0.1.5",
+        "source-map": "~0.5.0"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "regenerator": {
+      "version": "0.8.40",
+      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz",
+      "integrity": "sha1-oORXxY69uuV1yfjNdRJ+k3VkNdg=",
+      "dev": true,
+      "requires": {
+        "commoner": "~0.10.3",
+        "defs": "~1.1.0",
+        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
+        "private": "~0.1.5",
+        "recast": "0.10.33",
+        "through": "~2.3.8"
+      }
+    },
+    "regexp.prototype.flags": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
+    "regexpu": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz",
+      "integrity": "sha1-5TTcmRqeWEYFDJjebX3UpVyeoW0=",
+      "dev": true,
+      "requires": {
+        "esprima": "^2.6.0",
+        "recast": "^0.10.10",
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        }
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      }
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
+      "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
+    "reserved-words": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
+      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      }
+    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "revalidator": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
+      "dev": true
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.1"
+      }
+    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -1985,6 +6674,18 @@
         "glob": "^7.1.3"
       }
     },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -2009,6 +6710,35 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "simple-fmt": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
+      "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=",
+      "dev": true
+    },
+    "simple-is": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
+      "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
     "slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -2020,12 +6750,56 @@
         "is-fullwidth-code-point": "^3.0.0"
       }
     },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
+      "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.1.32"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.1.32",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+          "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
     "string-width": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -2037,6 +6811,38 @@
         "strip-ansi": "^6.0.0"
       }
     },
+    "string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "stringmap": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
+      "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=",
+      "dev": true
+    },
+    "stringset": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
+      "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=",
+      "dev": true
+    },
     "strip-ansi": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -2046,6 +6852,15 @@
         "ansi-regex": "^5.0.0"
       }
     },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -2101,6 +6916,54 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "to-double-quotes": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-2.0.0.tgz",
+      "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-single-quotes": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz",
+      "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "try-resolve": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz",
+      "integrity": "sha1-z95vq9ctY+V5fPqrhzq76OcA6RI=",
+      "dev": true
+    },
+    "tryor": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
+      "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=",
+      "dev": true
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -2116,6 +6979,24 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "underscore": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+      "dev": true
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -2125,12 +7006,82 @@
         "punycode": "^2.1.0"
       }
     },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "utile": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+      "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=",
+      "dev": true,
+      "requires": {
+        "async": "~0.2.9",
+        "deep-equal": "*",
+        "i": "0.3.x",
+        "mkdirp": "0.x.x",
+        "ncp": "0.4.x",
+        "rimraf": "2.x.x"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "uuid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+      "dev": true
+    },
     "v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
+    "vow": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.20.tgz",
+      "integrity": "sha512-YYoSYXUYABqY08D/WrjcWJxJSErcILRRTQpcPyUc0SFfgIPKSUFzVt7u1HC3TXGJZM/qhsSjCLNQstxqf7asgQ==",
+      "dev": true
+    },
+    "vow-fs": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.6.tgz",
+      "integrity": "sha1-LUxZviLivyYY3fWXq0uqkjvnIA0=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5",
+        "uuid": "^2.0.2",
+        "vow": "^0.4.7",
+        "vow-queue": "^0.4.1"
+      }
+    },
+    "vow-queue": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz",
+      "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==",
+      "dev": true,
+      "requires": {
+        "vow": "^0.4.17"
+      }
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2140,23 +7091,132 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "dev": true,
+      "requires": {
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
+      }
+    },
+    "which-typed-array": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
+      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.7"
+      }
+    },
+    "window-size": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
+      "dev": true
+    },
+    "winston": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz",
+      "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=",
+      "dev": true,
+      "requires": {
+        "async": "0.2.x",
+        "colors": "0.6.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "pkginfo": "0.3.x",
+        "stack-trace": "0.0.x"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
+          "dev": true
+        },
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+          "dev": true
+        }
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
+    "wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+      "dev": true
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
+    "xmlbuilder": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
+      "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
+      "dev": true,
+      "requires": {
+        "lodash": "^3.5.0"
+      }
+    },
+    "y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true
+    },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
+    },
+    "yargs": {
+      "version": "3.27.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
+      "integrity": "sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^1.2.1",
+        "cliui": "^2.1.0",
+        "decamelize": "^1.0.0",
+        "os-locale": "^1.4.0",
+        "window-size": "^0.1.2",
+        "y18n": "^3.2.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 4aeec6d0..dba7339e 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,13 @@
   "description": "",
   "main": "eslint/.eslintrc",
   "scripts": {
-    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules"
+    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules",
+    "jscs": "./node_modules/.bin/jscs -c jscs/.jscsrc"
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "^7.32.0"
+    "eslint": "^7.32.0",
+    "jscs": "^2.1.1"
   }
 }

From a6354242bd4421a2ba5103e29aee87d920c8a705 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 1 Oct 2021 17:10:31 +0200
Subject: [PATCH 308/630] Update README file

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 06ba0d77..08a530e9 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Also, verify that the sniffer code itself is written according to the Magento Co
 vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
 ```
 
-### ESLint testing
+### ESLint and JSCS
 Prerequisites: [Node.js](https://nodejs.org/) (`^12.22.0`, `^14.17.0`, or `>=16.0.0`).
 
 You need to run the following command to install all the necessary packages described in the `package.json` file:
@@ -107,10 +107,15 @@ You need to run the following command to install all the necessary packages desc
 npm install
 ```
 
-After that, you can just execute ESLint as follows:
+You can just execute ESLint as follows:
 ```bash
 npm run eslint -- path/to/analyze
 ```
+
+Run the following command to execute JSCS:
+```bash
+npm run jscs path/to/analyze
+```
 ## License
 
 Each Magento source file included in this distribution is licensed under the OSL-3.0 license.

From b9dc92e0409ec1905a7c5c0fbcb93a04f113ca44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Mon, 4 Oct 2021 13:26:55 +0200
Subject: [PATCH 309/630] AC-679: Fix ruleset for
 ObsoleteSystemConfigurationTest

---
 Magento2/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 699e583b..d902a793 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -304,7 +304,7 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Legacy.ObsoleteSystemConfiguration">
-        <include-pattern>etc/system.xml</include-pattern>
+        <include-pattern>etc/adminhtml/system.xml</include-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>

From 9ebe7907aa6d7ce7ba0086c6efbff7b4faa8b25d Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 5 Oct 2021 10:16:06 +0200
Subject: [PATCH 310/630] AC-1355: Move JSCS into magento-coding-standards repo
 - Fix indentation

---
 eslint/rules/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index 2e3c8eda..fee127a2 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -11,11 +11,11 @@ function traverse(node) {
         switch (node.type) {
             case 'CallExpression':
                 node = node.callee;
-            break;
+                break;
 
             case 'MemberExpression':
                 node = node.object;
-            break;
+                break;
 
             case 'Identifier':
                 return node;

From 025a3e3d3a8726df6082932ce79cf77741324cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= <jocual@gmail.com>
Date: Tue, 5 Oct 2021 12:41:15 +0200
Subject: [PATCH 311/630] Increased version to 13

---
 composer.json |  2 +-
 composer.lock | 75 ++++++++++++++++++++++++++-------------------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/composer.json b/composer.json
index 9389c5c4..9b99b887 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "12",
+    "version": "13",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index 6b2f691a..a62a83dc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a0dc717c0fb624a2563113591a4459ce",
+    "content-hash": "5c6ca0b93a60923e59b9ef33f824cea0",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -259,16 +259,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.12.0",
+            "version": "v4.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
+                "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
-                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
+                "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
                 "shasum": ""
             },
             "require": {
@@ -309,9 +309,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
             },
-            "time": "2021-07-21T10:44:31+00:00"
+            "time": "2021-09-20T12:20:58+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -535,16 +535,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
                 "shasum": ""
             },
             "require": {
@@ -552,7 +552,8 @@
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "*"
+                "ext-tokenizer": "*",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -578,39 +579,39 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
             },
-            "time": "2020-09-17T18:55:26+00:00"
+            "time": "2021-10-02T14:08:47+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.13.0",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
+                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.1",
+                "php": "^7.2 || ~8.0, <8.2",
                 "phpdocumentor/reflection-docblock": "^5.2",
                 "sebastian/comparator": "^3.0 || ^4.0",
                 "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^6.0",
+                "phpspec/phpspec": "^6.0 || ^7.0",
                 "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -645,29 +646,29 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
             },
-            "time": "2021-03-17T13:42:18+00:00"
+            "time": "2021-09-10T09:02:12+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.6",
+            "version": "9.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
+                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218",
+                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.10.2",
+                "nikic/php-parser": "^4.12.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -716,7 +717,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7"
             },
             "funding": [
                 {
@@ -724,7 +725,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-28T07:26:59+00:00"
+            "time": "2021-09-17T05:39:03+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -969,16 +970,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.9",
+            "version": "9.5.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b"
+                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
-                "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
+                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
                 "shasum": ""
             },
             "require": {
@@ -994,7 +995,7 @@
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.3",
+                "phpunit/php-code-coverage": "^9.2.7",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
@@ -1056,7 +1057,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10"
             },
             "funding": [
                 {
@@ -1068,7 +1069,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-08-31T06:47:40+00:00"
+            "time": "2021-09-25T07:38:51+00:00"
         },
         {
             "name": "sebastian/cli-parser",

From a7a82f95ed411d2a7ed932654d902746caf5a775 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 5 Oct 2021 15:07:51 +0200
Subject: [PATCH 312/630] AC-681: Create phpcs static check for
 PhtmlTemplateTest

---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 136 ++++++++++++++++++
 .../Tests/Legacy/PhtmlTemplateUnitTest.php    |  82 +++++++++++
 .../templates/PhtmlTemplateUnitTest.3.phtml   |  41 ++++++
 .../templates/PhtmlTemplateUnitTest.1.phtml   |  41 ++++++
 .../templates/PhtmlTemplateUnitTest.2.phtml   |  41 ++++++
 Magento2/ruleset.xml                          |   5 +
 6 files changed, 346 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
 create mode 100644 Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
 create mode 100644 Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml
 create mode 100644 Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml
 create mode 100644 Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
new file mode 100644
index 00000000..d9909c68
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class PhtmlTemplateSniff implements Sniff
+{
+    private const WARNING_CODE = 'PhtmlTemplateObsolete';
+
+    private const OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
+        '/(["\'])jquery\/ui\1/' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ' . 
+            'ui widget instead.',
+        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'Please do not initialize JS component in php. Do ' . 
+            'it in template.',
+        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'Please do not initialize JS component ' . 
+            'in php. Do it in template.',
+    ];
+    
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_OBJECT_OPERATOR,
+            T_INLINE_HTML,
+            T_HEREDOC
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$stackPtr]['code'] === T_OBJECT_OPERATOR) {
+            $this->checkBlockVariable($phpcsFile, $stackPtr, $tokens);
+            $this->checkThisVariable($phpcsFile, $stackPtr, $tokens);
+        }
+        if ($tokens[$stackPtr]['code'] === T_INLINE_HTML || $tokens[$stackPtr]['code'] === T_HEREDOC) {
+            $this->checkHtml($phpcsFile, $stackPtr);
+            
+            $file = $phpcsFile->getFilename();
+
+            if (strpos($file, '/view/frontend/templates/') !== false
+                || strpos($file, '/view/base/templates/') !== false
+            ) {
+                $this->checkHtmlSpecificFiles($phpcsFile, $stackPtr);
+            }
+        }
+    }
+    
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     */
+    private function checkBlockVariable(File $phpcsFile, int $stackPtr, array $tokens): void
+    {
+        $varPos = $phpcsFile->findPrevious(T_VARIABLE, $stackPtr - 1);
+        if ($tokens[$varPos]['content'] !== '$block') {
+            return;
+        }
+        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+        if (strpos($tokens[$stringPos]['content'], '_') === 0) {
+            $phpcsFile->addWarning(
+                'Access to protected and private members of Block class is ' .
+                'obsolete in phtml templates. Use only public members.',
+                $stringPos,
+                self::WARNING_CODE
+            );
+        }
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     */
+    private function checkThisVariable(File $phpcsFile, int $stackPtr, array $tokens): void
+    {
+        $varPos = $phpcsFile->findPrevious(T_VARIABLE, $stackPtr - 1);
+        if ($tokens[$varPos]['content'] !== '$this') {
+            return;
+        }
+        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+        if (strpos($tokens[$stringPos]['content'], 'helper') === false) {
+            $phpcsFile->addWarning(
+                'Access to members and methods of Block class through $this is ' .
+                'obsolete in phtml templates. Use only $block instead of $this.',
+                $stringPos,
+                self::WARNING_CODE
+            );
+        }
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     */
+    private function checkHtml(File $phpcsFile, int $stackPtr): void
+    {
+        $content = $phpcsFile->getTokensAsString($stackPtr, 1);
+        
+        if (preg_match('/type="text\/javascript"/', $content)) {
+            $phpcsFile->addWarning(
+                'Please do not use "text/javascript" type attribute.',
+                $stackPtr,
+                self::WARNING_CODE
+            );
+        }
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     */
+    private function checkHtmlSpecificFiles(File $phpcsFile, int $stackPtr): void
+    {
+        $content = $phpcsFile->getTokensAsString($stackPtr, 1);
+        
+        foreach (self::OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES as $obsoleteRegex => $errorMessage) {
+            if (preg_match($obsoleteRegex, $content)) {
+                $phpcsFile->addWarning(
+                    $errorMessage,
+                    $stackPtr,
+                    self::WARNING_CODE
+                );
+            }
+        }
+    }
+    
+}
diff --git a/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php b/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
new file mode 100644
index 00000000..46417690
--- /dev/null
+++ b/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use DirectoryIterator;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+class PhtmlTemplateUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getTestFiles($testFileBase): array
+    {
+        $testFiles = [];
+
+        $dir = __DIR__.'/_files/PhtmlTemplateUnitTest';
+        $di  = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
+
+        /**
+         * @var DirectoryIterator $file
+         */
+        foreach ($di as $file) {
+            if ($file->isDir()) {
+                continue;
+            }
+            $path = $file->getPathname();
+            if ($path !== $testFileBase.'php' && substr($path, -5) !== 'fixed' && substr($path, -4) !== '.bak') {
+                $testFiles[] = $path;
+            }
+        }
+
+        // Put them in order.
+        sort($testFiles);
+        
+        return $testFiles;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        if ($testFile === 'PhtmlTemplateUnitTest.1.phtml' || $testFile === 'PhtmlTemplateUnitTest.2.phtml') {
+            return [
+                7 => 1,
+                9 => 1,
+                13 => 1,
+                20 => 1,
+                22 => 1,
+                23 => 1,
+                27 => 1,
+                33 => 1,
+                39 => 1
+            ];
+        }
+        if ($testFile === 'PhtmlTemplateUnitTest.3.phtml')
+        {
+            return [
+                9 => 1,
+                20 => 1,
+                22 => 1,
+                23 => 1,
+                27 => 1,
+            ];
+        }
+        return [];
+    }
+}
diff --git a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml
new file mode 100644
index 00000000..c9759f58
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script type="text/x-magento-init">
+</script>
+<script type="text/javascript">
+</script>
+<div id="block-testing"
+     class="block shipping"
+     data-mage-init='{}'
+>
+<?php
+function _testing()
+{
+    return true;
+}
+$_productCollection = $block->_getTestFunction();
+$block->getTestFunction();
+$_something = $this->something();
+$block->_getTest();
+$block = _testing();
+?>
+<?php
+$block->_getTestAnotherFunction();
+?>
+
+<?php $scriptString = <<<script
+    require([
+        "jquery",
+        "jquery/ui",
+    ], function ($, Confirm) {
+    });
+script;
+$this->helper();
+?>
+<script type="jquery/ui">
+</script>
+    
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml
new file mode 100644
index 00000000..c9759f58
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script type="text/x-magento-init">
+</script>
+<script type="text/javascript">
+</script>
+<div id="block-testing"
+     class="block shipping"
+     data-mage-init='{}'
+>
+<?php
+function _testing()
+{
+    return true;
+}
+$_productCollection = $block->_getTestFunction();
+$block->getTestFunction();
+$_something = $this->something();
+$block->_getTest();
+$block = _testing();
+?>
+<?php
+$block->_getTestAnotherFunction();
+?>
+
+<?php $scriptString = <<<script
+    require([
+        "jquery",
+        "jquery/ui",
+    ], function ($, Confirm) {
+    });
+script;
+$this->helper();
+?>
+<script type="jquery/ui">
+</script>
+    
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml
new file mode 100644
index 00000000..c9759f58
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script type="text/x-magento-init">
+</script>
+<script type="text/javascript">
+</script>
+<div id="block-testing"
+     class="block shipping"
+     data-mage-init='{}'
+>
+<?php
+function _testing()
+{
+    return true;
+}
+$_productCollection = $block->_getTestFunction();
+$block->getTestFunction();
+$_something = $this->something();
+$block->_getTest();
+$block = _testing();
+?>
+<?php
+$block->_getTestAnotherFunction();
+?>
+
+<?php $scriptString = <<<script
+    require([
+        "jquery",
+        "jquery/ui",
+    ], function ($, Confirm) {
+    });
+script;
+$this->helper();
+?>
+<script type="jquery/ui">
+</script>
+    
\ No newline at end of file
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 852a70da..d45aa30f 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -302,6 +302,11 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.PhtmlTemplate">
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From a5dff74183a28bc11aeca87a6ea7d3bfe2617284 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 5 Oct 2021 15:17:16 +0200
Subject: [PATCH 313/630] AC-681: Create phpcs static check for
 PhtmlTemplateTest

---
 .../view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml       | 1 -
 .../view/base/templates/PhtmlTemplateUnitTest.1.phtml            | 1 -
 .../view/frontend/templates/PhtmlTemplateUnitTest.2.phtml        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml
index c9759f58..772783c9 100644
--- a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml
+++ b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/adminhtml/templates/PhtmlTemplateUnitTest.3.phtml
@@ -38,4 +38,3 @@ $this->helper();
 ?>
 <script type="jquery/ui">
 </script>
-    
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml
index c9759f58..772783c9 100644
--- a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml
+++ b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/base/templates/PhtmlTemplateUnitTest.1.phtml
@@ -38,4 +38,3 @@ $this->helper();
 ?>
 <script type="jquery/ui">
 </script>
-    
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml
index c9759f58..772783c9 100644
--- a/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml
+++ b/Magento2/Tests/Legacy/_files/PhtmlTemplateUnitTest/view/frontend/templates/PhtmlTemplateUnitTest.2.phtml
@@ -38,4 +38,3 @@ $this->helper();
 ?>
 <script type="jquery/ui">
 </script>
-    
\ No newline at end of file

From 203e8af1e3aa67fe196e3c661911efae30652420 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 5 Oct 2021 15:28:11 +0200
Subject: [PATCH 314/630] AC-681: Create phpcs static check for
 PhtmlTemplateTest

---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index d9909c68..431b6f00 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -10,11 +10,11 @@ class PhtmlTemplateSniff implements Sniff
     private const WARNING_CODE = 'PhtmlTemplateObsolete';
 
     private const OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
-        '/(["\'])jquery\/ui\1/' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ' . 
+        '/(["\'])jquery\/ui\1/' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ' .
             'ui widget instead.',
-        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'Please do not initialize JS component in php. Do ' . 
+        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'Please do not initialize JS component in php. Do ' .
             'it in template.',
-        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'Please do not initialize JS component ' . 
+        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'Please do not initialize JS component ' .
             'in php. Do it in template.',
     ];
     
@@ -54,6 +54,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
     
     /**
+     * Check access to protected and private members of Block
+     * 
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
@@ -76,6 +78,8 @@ private function checkBlockVariable(File $phpcsFile, int $stackPtr, array $token
     }
 
     /**
+     * Check access to members and methods of Block class through $this
+     * 
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
@@ -98,6 +102,8 @@ private function checkThisVariable(File $phpcsFile, int $stackPtr, array $tokens
     }
 
     /**
+     * Check use of "text/javascript" type
+     * 
      * @param File $phpcsFile
      * @param int $stackPtr
      */
@@ -115,6 +121,8 @@ private function checkHtml(File $phpcsFile, int $stackPtr): void
     }
 
     /**
+     * Check of some obsoletes uses in specific files
+     * 
      * @param File $phpcsFile
      * @param int $stackPtr
      */
@@ -132,5 +140,4 @@ private function checkHtmlSpecificFiles(File $phpcsFile, int $stackPtr): void
             }
         }
     }
-    
 }

From a43949d3017309575d67e55dc6ce97d3267490c0 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 5 Oct 2021 15:29:54 +0200
Subject: [PATCH 315/630] AC-681: Create phpcs static check for
 PhtmlTemplateTest

---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index 431b6f00..2b730768 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -55,7 +55,7 @@ public function process(File $phpcsFile, $stackPtr)
     
     /**
      * Check access to protected and private members of Block
-     * 
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
@@ -79,7 +79,7 @@ private function checkBlockVariable(File $phpcsFile, int $stackPtr, array $token
 
     /**
      * Check access to members and methods of Block class through $this
-     * 
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
@@ -103,7 +103,7 @@ private function checkThisVariable(File $phpcsFile, int $stackPtr, array $tokens
 
     /**
      * Check use of "text/javascript" type
-     * 
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      */
@@ -122,7 +122,7 @@ private function checkHtml(File $phpcsFile, int $stackPtr): void
 
     /**
      * Check of some obsoletes uses in specific files
-     * 
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      */

From 70a747c2651115b6d40a0c0995487630c2426dc8 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 5 Oct 2021 17:58:40 +0200
Subject: [PATCH 316/630] AC-681: Create phpcs static check for
 PhtmlTemplateTest

---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index 2b730768..67d74575 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
 
 namespace Magento2\Sniffs\Legacy;
 

From 1b9f3861b06008ee6f7e52e88e77084bb586d747 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 6 Oct 2021 11:20:46 +0200
Subject: [PATCH 317/630] AC-1167: Update DiscouragedFunctionSniff with
 FilesystemDriverInterface functions

---
 .../Functions/DiscouragedFunctionSniff.php     |  9 +++++++++
 .../Functions/DiscouragedFunctionUnitTest.inc  | 18 ++++++++++++++++++
 .../Functions/DiscouragedFunctionUnitTest.php  | 11 ++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index e73e981a..4982f8cc 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -229,5 +229,14 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^strval$' => '(string) construction',
         '^htmlspecialchars$' => '\Magento\Framework\Escaper->escapeHtml',
         '^getimagesize$' => 'getimagesizefromstring',
+        '^file_exists$' => 'Magento\Framework\Filesystem\DriverInterface::isExists()',
+        '^file_get_contents$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetContents()',
+        '^file_put_contents$' => 'Magento\Framework\Filesystem\DriverInterface::filePutContents()',
+        '^fgetcsv$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetCsv()',
+        '^fputcsv$' => 'Magento\Framework\Filesystem\DriverInterface::filePutCsv()',
+        '^ftell$' => 'Magento\Framework\Filesystem\DriverInterface::fileTell()',
+        '^fseek$' => 'Magento\Framework\Filesystem\DriverInterface::fileSeek()',
+        '^feof$' => 'Magento\Framework\Filesystem\DriverInterface::endOfFile()',
+        '^flock$' => 'Magento\Framework\Filesystem\DriverInterface::fileLock()',
     ];
 }
diff --git a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc
index 5abf6dd5..0302ff56 100644
--- a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc
+++ b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc
@@ -464,3 +464,21 @@ $str = chop($text, 'ttt');
 md5($text);
 
 htmlspecialchars('text');
+
+file_exists('./');
+
+file_get_contents('file.txt');
+
+file_put_contents($file, 'test');
+
+fgetcsv($fp,'r');
+
+fputcsv($fp, $fields);
+
+ftell($file);
+
+fseek($file, 0);
+
+feof($fp);
+
+flock($fp, LOCK_EX);
diff --git a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
index 983a87b6..2a30100e 100644
--- a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
+++ b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
@@ -246,7 +246,16 @@ public function getWarningList()
             458 => 1,
             460 => 1,
             462 => 1,
-            466 => 1
+            466 => 1,
+            468 => 1,
+            470 => 1,
+            472 => 1,
+            474 => 1,
+            476 => 1,
+            478 => 1,
+            480 => 1,
+            482 => 1,
+            484 => 1
         ];
     }
 }

From bf6420569a35a1905996e7585159a7cd71e3ce51 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 6 Oct 2021 15:12:23 +0200
Subject: [PATCH 318/630] AC-683: Create phpcs static check for TableTest

---
 Magento2/Sniffs/Legacy/TableNameSniff.php   | 234 ++++++++++++++++++++
 Magento2/Tests/Legacy/TableNameUnitTest.inc |  39 ++++
 Magento2/Tests/Legacy/TableNameUnitTest.php |  32 +++
 3 files changed, 305 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/TableNameSniff.php
 create mode 100644 Magento2/Tests/Legacy/TableNameUnitTest.inc
 create mode 100644 Magento2/Tests/Legacy/TableNameUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/TableNameSniff.php b/Magento2/Sniffs/Legacy/TableNameSniff.php
new file mode 100644
index 00000000..9181909f
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/TableNameSniff.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Coverage of obsolete table names usage
+ */
+class TableNameSniff implements Sniff
+{
+    /**
+     * Methods which receive table names as parameters, with the argument position in which table names are passed
+     *
+     * @var array
+     */
+    private $argPositionInMethods = [
+        'getTableName' => [0],
+        '_setMainTable' => [0],
+        'setMainTable' => [0],
+        'getTable' => [0],
+        'setTable' => [0],
+        'getTableRow' => [0],
+        'deleteTableRow' => [0],
+        'updateTableRow' => [0],
+        'updateTable' => [0],
+        'tableExists' => [0],
+        'joinField' => [1],
+        'joinTable' => [0],
+        'getFkName' => [0, 2],
+        'getIdxName' => [0],
+        'addVirtualGridColumn' => [1],
+    ];
+
+    /**
+     * String representation of error.
+     *
+     * @var string
+     */
+    private const ERROR_MESSAGE = 'Legacy table names with slash must be fixed to direct table names. Found: %s';
+
+    /**
+     * Error violation code.
+     *
+     * @var string
+     */
+    private const ERROR_CODE = 'FoundLegacyTableName';
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_OBJECT_OPERATOR,
+            T_VARIABLE,
+            T_DOUBLE_ARROW
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$stackPtr]['code'] === T_OBJECT_OPERATOR) {
+            $this->checkOccurrencesInMethods($phpcsFile, $stackPtr, $tokens);
+        } elseif ($tokens[$stackPtr]['code'] === T_DOUBLE_ARROW) {
+            $this->checkOccurrencesInArray($phpcsFile, $stackPtr, $tokens);
+        } else {
+            $this->checkOccurrencesInProperty($phpcsFile, $stackPtr, $tokens);
+        }
+    }
+
+    /**
+     * Check if passed file is a resource but not a collection
+     *
+     * @param string $filePath
+     * @return bool
+     */
+    private function isResourceButNotCollection(string $filePath): bool
+    {
+        $filePath = str_replace('\\', '/', $filePath);
+        $parts = explode('/', $filePath);
+        return array_search('Resource', $parts) !== false && array_search('Collection.php', $parts) === false;
+    }
+
+    /**
+     * Check references to table names in methods
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     */
+    private function checkOccurrencesInMethods(File $phpcsFile, int $stackPtr, array $tokens): void
+    {
+        $methodNamePos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+        $methodName = $tokens[$methodNamePos]['content'];
+        if (array_key_exists($methodName, $this->argPositionInMethods) === false) {
+            return;
+        }
+        $firstArgumentPos = $phpcsFile->findNext([T_CONSTANT_ENCAPSED_STRING, T_VARIABLE], $methodNamePos + 1);
+
+        foreach ($this->argPositionInMethods[$methodName] as $argPosition) {
+            $paramPos = $firstArgumentPos;
+            for ($i = 0; $i < $argPosition; $i++) {
+                $paramPos = $phpcsFile->findNext(
+                    [T_CONSTANT_ENCAPSED_STRING, T_VARIABLE],
+                    $paramPos + 1,
+                   $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $paramPos + 1)
+                );
+            }
+            if (strpos($tokens[$paramPos]['content'], '/') !== false) {
+                $phpcsFile->addError(
+                    sprintf(
+                        self::ERROR_MESSAGE,
+                        $tokens[$paramPos]['content'],
+                    ),
+                    $paramPos,
+                    self::ERROR_CODE
+                );
+            }
+        }
+
+        if ($this->isResourceButNotCollection($phpcsFile->getFilename())) {
+            if ($tokens[$stackPtr]['content'] !== '_init') {
+                return;
+            }
+
+            $paramPos = $phpcsFile->findNext(T_PARAM_NAME, $stackPtr + 1);
+            if (strpos($tokens[$paramPos]['content'], '/') !== false) {
+                $phpcsFile->addError(
+                    sprintf(
+                        self::ERROR_MESSAGE,
+                        $tokens[$paramPos]['content'],
+                    ),
+                    $paramPos,
+                    self::ERROR_CODE
+                );
+            }
+        }
+    }
+
+    /**
+     * Check references to table names in the $_aggregationTable property
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     */
+    private function checkOccurrencesInProperty(File $phpcsFile, int $stackPtr, array $tokens): void
+    {
+        if ($methodName = $tokens[$stackPtr]['content'] !== '$_aggregationTable') {
+            return;
+        }
+
+        $tableNamePos = $phpcsFile->findNext(
+            T_CONSTANT_ENCAPSED_STRING,
+            $stackPtr + 1,
+            $phpcsFile->findEndOfStatement($stackPtr + 1)
+        );
+
+        if (strpos($tokens[$tableNamePos]['content'], '/') !== false) {
+            $phpcsFile->addError(
+                sprintf(
+                    self::ERROR_MESSAGE,
+                    $tokens[$tableNamePos]['content'],
+                ),
+                $tableNamePos,
+                self::ERROR_CODE
+            );
+        }
+    }
+
+    /**
+     * Check references to table names in arrays
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @param array $tokens
+     */
+    private function checkOccurrencesInArray(File $phpcsFile, int $stackPtr, array $tokens): void
+    {
+        $aliasPos = $phpcsFile->findPrevious(
+            T_CONSTANT_ENCAPSED_STRING,
+            $stackPtr -1
+        );
+
+        $alias = trim($tokens[$aliasPos]['content'], '\'"');
+
+        if ($this->endsWith($alias, '_table') === false) {
+            return;
+        }
+
+        $tableNamePos = $phpcsFile->findNext(
+            T_CONSTANT_ENCAPSED_STRING,
+            $aliasPos + 1
+        );
+
+        if (strpos($tokens[$tableNamePos]['content'], '/') !== false) {
+            $phpcsFile->addError(
+                sprintf(
+                    self::ERROR_MESSAGE,
+                    $tokens[$tableNamePos]['content'],
+                ),
+                $tableNamePos,
+                self::ERROR_CODE
+            );
+        }
+    }
+
+    /**
+     * Checks if $haystack ends with $needle
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @return bool
+     */
+    private function endsWith(string $haystack, string $needle): bool
+    {
+        $length = strlen($needle);
+        if ($length === 0) {
+            return true;
+        }
+        return substr($haystack, -$length) === $needle;
+    }
+}
diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.inc b/Magento2/Tests/Legacy/TableNameUnitTest.inc
new file mode 100644
index 00000000..a1f2520e
--- /dev/null
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.inc
@@ -0,0 +1,39 @@
+<?php
+
+$productTable = $this->_resource->getTableName('/catalog_category_product');
+
+$collection->joinField(
+    'inventory_in_stock',
+    '/cataloginventory_stock_item',
+    'is_in_stock',
+    'product_id=entity_id',
+    '(' . join(') OR (', $cond) . ')'
+);
+
+$collection->getFkName(
+    'inventory_in_stock',
+    $collection,
+    '/is_in_stock'
+);
+
+$select = $connection->select()->from(
+    ['main_table' => 'magento/sample_table']
+);
+
+$select = $connection->select()->from(
+    ['main_table_name' => 'magento/sample_table']
+);
+
+$select = $connection->select()->from(
+    ['main_table' => 'magento_sample_table']
+);
+
+class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collection
+{
+    /**
+     * Aggregated Data Table
+     *
+     * @var string
+     */
+    protected $_aggregationTable = 'magento/sales_order_aggregated_updated';
+}
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.php b/Magento2/Tests/Legacy/TableNameUnitTest.php
new file mode 100644
index 00000000..94eb10bc
--- /dev/null
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class TableNameUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        return [
+            /*3 => 1,
+            7 => 1,
+            14 => 1,
+            28 => 1,*/
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}

From eb3ad4749a6f9fa56548ade1804dd281d186fdac Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 6 Oct 2021 15:44:19 +0200
Subject: [PATCH 319/630] AC-683: Create phpcs static check for TableTest

---
 Magento2/Tests/Legacy/TableNameUnitTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.php b/Magento2/Tests/Legacy/TableNameUnitTest.php
index 94eb10bc..4cfade20 100644
--- a/Magento2/Tests/Legacy/TableNameUnitTest.php
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.php
@@ -15,10 +15,11 @@ class TableNameUnitTest extends AbstractSniffUnitTest
     public function getErrorList($testFile = '')
     {
         return [
-            /*3 => 1,
+            3 => 1,
             7 => 1,
             14 => 1,
-            28 => 1,*/
+            20 => 1,
+            28 => 1,
         ];
     }
 

From a1c933a4c19c0c4a5f06df818475aa8067f136be Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 6 Oct 2021 15:47:09 +0200
Subject: [PATCH 320/630] AC-683: Create phpcs static check for TableTest

---
 Magento2/Tests/Legacy/TableNameUnitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.php b/Magento2/Tests/Legacy/TableNameUnitTest.php
index 4cfade20..eec07bfe 100644
--- a/Magento2/Tests/Legacy/TableNameUnitTest.php
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.php
@@ -17,9 +17,9 @@ public function getErrorList($testFile = '')
         return [
             3 => 1,
             7 => 1,
-            14 => 1,
+            16 => 1,
             20 => 1,
-            28 => 1,
+            38 => 1,
         ];
     }
 

From 1452ed3dd49f11b2b7743048595e19e02e45f402 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 6 Oct 2021 16:03:05 +0200
Subject: [PATCH 321/630] AC-683: Create phpcs static check for TableTest

---
 Magento2/Sniffs/Legacy/TableNameSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/TableNameSniff.php b/Magento2/Sniffs/Legacy/TableNameSniff.php
index 9181909f..b9a9081f 100644
--- a/Magento2/Sniffs/Legacy/TableNameSniff.php
+++ b/Magento2/Sniffs/Legacy/TableNameSniff.php
@@ -114,7 +114,7 @@ private function checkOccurrencesInMethods(File $phpcsFile, int $stackPtr, array
                 $paramPos = $phpcsFile->findNext(
                     [T_CONSTANT_ENCAPSED_STRING, T_VARIABLE],
                     $paramPos + 1,
-                   $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $paramPos + 1)
+                    $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $paramPos + 1)
                 );
             }
             if (strpos($tokens[$paramPos]['content'], '/') !== false) {

From ceeba5613137c69a0ec0d8f86af56b5948c7a873 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 6 Oct 2021 17:02:31 +0200
Subject: [PATCH 322/630] AC-683: Create phpcs static check for TableTest

---
 Magento2/Tests/Legacy/TableNameUnitTest.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.inc b/Magento2/Tests/Legacy/TableNameUnitTest.inc
index a1f2520e..d3b46079 100644
--- a/Magento2/Tests/Legacy/TableNameUnitTest.inc
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.inc
@@ -36,4 +36,4 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collect
      * @var string
      */
     protected $_aggregationTable = 'magento/sales_order_aggregated_updated';
-}
\ No newline at end of file
+}

From eda77b3d5d1ed780560c295ef280003cff6aa261 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 7 Oct 2021 10:53:49 +0200
Subject: [PATCH 323/630] AC-676: Create phpcs static check for
 ObsoleteConnectionTest

---
 .../Sniffs/Legacy/ObsoleteConnectionSniff.php | 71 +++++++++++++++++++
 .../Legacy/ObsoleteConnectionUnitTest.inc     | 36 ++++++++++
 .../Legacy/ObsoleteConnectionUnitTest.php     | 36 ++++++++++
 3 files changed, 143 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.inc
 create mode 100644 Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
new file mode 100644
index 00000000..ac48af93
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class ObsoleteConnectionSniff implements Sniff
+{
+    private const ERROR_CODE_METHOD = 'FoundObsoleteMethod';
+
+    /**
+     * @var string[] 
+     */
+    private $obsoleteMethods = [
+        '_getReadConnection',
+        '_getWriteConnection',
+        '_getReadAdapter',
+        '_getWriteAdapter',
+        'getReadConnection',
+        'getWriteConnection',
+        'getReadAdapter',
+        'getWriteAdapter',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_OBJECT_OPERATOR,
+            T_FUNCTION
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $this->validateObsoleteMethod($phpcsFile, $stackPtr);
+    }
+
+    /**
+     * Check if obsolete methods are used
+     * 
+     * @param $phpcsFile
+     * @param $stackPtr
+     */
+    private function validateObsoleteMethod($phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+        
+        foreach ($this->obsoleteMethods as $method) {
+            if ($tokens[$stringPos]['content'] === $method) {
+                $phpcsFile->addWarning(
+                    sprintf("Contains obsolete method: %s.", $method),
+                    $stackPtr,
+                    self::ERROR_CODE_METHOD
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.inc b/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.inc
new file mode 100644
index 00000000..70c71642
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.inc
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$this->_getReadConnection();
+
+$connection = new Connection();
+return $connection->_getWriteConnection();
+
+$this->getMethod(
+    function($param){
+        $param->_getWriteAdapter();
+    }
+);
+
+$writeAdapter = $this->getWriteAdapter();
+
+protected function getConnection()
+{
+    return $this->_resource->getReadConnection($this->connection);
+}
+
+return $this->_getReadAdapter();
+
+$this->getReadAdapterMyMehtod();
+
+private function getReadAdapter()
+{
+
+}
+
+$getWriteAdapter = new WriteAdapter();
+
+$getWriteAdapter = $this->getWriteAdapter();
diff --git a/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php b/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php
new file mode 100644
index 00000000..cb0afe53
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ObsoleteConnectionUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [
+            3 => 1,
+            6 => 1,
+            10 => 1,
+            14 => 1,
+            18 => 1,
+            21 => 1,
+            25 => 1,
+            32 => 1
+        ];
+    }
+}

From 5a34fd1e0a4f02094e54d6767a5f46f705b002a9 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 7 Oct 2021 11:00:57 +0200
Subject: [PATCH 324/630] AC-676: Create phpcs static check for
 ObsoleteConnectionTest

---
 Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php | 8 ++++----
 Magento2/ruleset.xml                                 | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php b/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php
index cb0afe53..a451d2cf 100644
--- a/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php
+++ b/Magento2/Tests/Legacy/ObsoleteConnectionUnitTest.php
@@ -23,14 +23,14 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            3 => 1,
-            6 => 1,
+            7 => 1,
             10 => 1,
             14 => 1,
             18 => 1,
-            21 => 1,
+            22 => 1,
             25 => 1,
-            32 => 1
+            29 => 1,
+            36 => 1
         ];
     }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1b1c7f1b..c9d22463 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -313,6 +313,10 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteConnection">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From 0bea0bc0f3017fd0b9b6af3bc8f840b7cb946cbf Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 7 Oct 2021 11:06:29 +0200
Subject: [PATCH 325/630] AC-676: Create phpcs static check for
 ObsoleteConnectionTest

---
 Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
index ac48af93..63949a38 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -15,7 +15,7 @@ class ObsoleteConnectionSniff implements Sniff
     private const ERROR_CODE_METHOD = 'FoundObsoleteMethod';
 
     /**
-     * @var string[] 
+     * @var string[]
      */
     private $obsoleteMethods = [
         '_getReadConnection',
@@ -49,11 +49,11 @@ public function process(File $phpcsFile, $stackPtr)
 
     /**
      * Check if obsolete methods are used
-     * 
-     * @param $phpcsFile
-     * @param $stackPtr
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
      */
-    private function validateObsoleteMethod($phpcsFile, $stackPtr)
+    private function validateObsoleteMethod(File $phpcsFile, int $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);

From 5f08bf5316cd2d048cac6cc20cbb8327f408f2ea Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 11 Oct 2021 15:01:46 +0200
Subject: [PATCH 326/630] AC-678: Create phpcs sniff for ObsoleteResponseTest

---
 .../Sniffs/Legacy/ObsoleteResponseSniff.php   | 62 +++++++++++++++++++
 .../Tests/Legacy/ObsoleteResponseUnitTest.inc | 39 ++++++++++++
 .../Tests/Legacy/ObsoleteResponseUnitTest.php | 40 ++++++++++++
 Magento2/ruleset.xml                          |  4 ++
 4 files changed, 145 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
 create mode 100644 Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
 create mode 100644 Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
new file mode 100644
index 00000000..affb5771
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class ObsoleteResponseSniff implements Sniff
+{
+    private const WARNING_CODE_METHOD = 'FoundObsoleteResponseMethod';
+    
+    /**
+     * @var string[]
+     */
+    private $obsoleteResponseMethods = [
+        'loadLayout',
+        'renderLayout',
+        '_redirect',
+        '_forward',
+        '_setActiveMenu',
+        '_addBreadcrumb',
+        '_addContent',
+        '_addLeft',
+        '_addJs',
+        '_moveBlockToContainer',
+    ];
+    
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_OBJECT_OPERATOR,
+            T_FUNCTION
+        ];
+    }
+    
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
+
+        foreach ($this->obsoleteResponseMethods as $method) {
+            if ($tokens[$stringPos]['content'] === $method) {
+                $phpcsFile->addWarning(
+                    sprintf('Contains obsolete response method: %s.', $method),
+                    $stackPtr,
+                    self::WARNING_CODE_METHOD
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
new file mode 100644
index 00000000..4e33d0f7
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$this->_view->loadLayout(['default', 'test'], true, true, false);
+$this->_view->renderLayout();
+
+protected function _addBreadcrumb($label, $title = null, $link = null)
+{
+    $this->getLayout()->getBlock('test')->addLink($label, $title, $link);
+}
+
+$this->editPost = $objectManagerHelper->getObject(
+    TestClass::class,
+    [
+        '_redirect' => $this->redirect,
+    ]
+);
+
+$this->_redirect('test/path');
+
+$this->_forward('grid');
+
+$this->_initAction()->_setActiveMenu(
+    'Magento_Invitation::report_magento_invitation_order'
+)->_addBreadcrumb(
+    __('Invitation Report by Customers'),
+    __('Invitation Report by Order Conversion Rate')
+)->_addLeft(
+)->_addJs(
+    $this->_view->getLayout()->createBlock(TestBlock::class)->setTemplate('Test::test.phtml')
+);
+
+private function _addContent(AbstractBlock $block)
+{
+    return $this->_moveBlockToContainer($block, 'content');
+}
diff --git a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php
new file mode 100644
index 00000000..b35d43a1
--- /dev/null
+++ b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ObsoleteResponseUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [
+            7 => 1,
+            8 => 1,
+            10 => 1,
+            22 => 1,
+            24 => 1,
+            26 => 1,
+            28 => 1,
+            31 => 1,
+            32 => 1,
+            36 => 1,
+            38 => 1
+        ];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1b1c7f1b..f2be02f2 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -313,6 +313,10 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteResponse">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From 53380c7613790d92b88c1ff5a04961c340df3e33 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 11 Oct 2021 16:18:57 +0200
Subject: [PATCH 327/630] AC-1314: Fix copyright sniff

---
 ...est.xml => CopyrightAnotherExtensionsFilesUnitTest.3.xml} | 0
 .../Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php | 5 +++++
 2 files changed, 5 insertions(+)
 rename Magento2/Tests/Legacy/{CopyrightAnotherExtensionsFilesUnitTest.xml => CopyrightAnotherExtensionsFilesUnitTest.3.xml} (100%)

diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.3.xml
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml
rename to Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.3.xml
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
index 8796abb9..4223e600 100644
--- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
@@ -36,6 +36,11 @@ public function getWarningList($testFile = '')
         if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.4.js') {
             return [];
         }
+        if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.5.less') {
+            return [
+                null => 1,
+            ];
+        }
         return [];
     }
 }

From 9416fc8d6b91d4bf3a034df96fbf58e936e14dba Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 13 Oct 2021 10:50:51 +0200
Subject: [PATCH 328/630] AC-1314: Fix copyright sniff

---
 .../Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less

diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less
new file mode 100644
index 00000000..a86154e6
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less
@@ -0,0 +1,8 @@
+/**
+ * Copyright © Magento, Inc.
+ * See COPYING.txt for license details.
+ */
+
+//@magento_import "magento_import.less";
+@import "dir/import.less";
+

From 9286ff9d0105ceec1074d473db0ffbe0d4ecf674 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 13 Oct 2021 10:57:10 +0200
Subject: [PATCH 329/630] AC-678: Create phpcs sniff for ObsoleteResponseTest

---
 .../Sniffs/Legacy/ObsoleteResponseSniff.php   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
index affb5771..725a8b15 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
@@ -18,16 +18,16 @@ class ObsoleteResponseSniff implements Sniff
      * @var string[]
      */
     private $obsoleteResponseMethods = [
-        'loadLayout',
-        'renderLayout',
-        '_redirect',
-        '_forward',
-        '_setActiveMenu',
-        '_addBreadcrumb',
-        '_addContent',
-        '_addLeft',
-        '_addJs',
-        '_moveBlockToContainer',
+        'loadLayout' => 'Please use \Magento\Framework\View\Layout\Builder::build instead.',
+        'renderLayout' => 'Please use \Magento\Framework\Controller\ResultInterface::renderResult instead.',
+        '_redirect' => 'Please use \Magento\Backend\Model\View\Result\Redirect::render instead.',
+        '_forward' => 'Please use \Magento\Backend\Model\View\Result\Forward::forward instead.',
+        '_setActiveMenu' => 'Please use \Magento\Backend\Model\View\Result\Page::setActiveMenu instead.',
+        '_addBreadcrumb' => 'Please use \Magento\Backend\Model\View\Result\Page::addBreadcrumb instead.',
+        '_addContent' => 'Please use \Magento\Backend\Model\View\Result\Page::addContent instead.',
+        '_addLeft' => 'Please use \Magento\Backend\Model\View\Result\Page::addLeft instead.',
+        '_addJs' => 'Please use \Magento\Backend\Model\View\Result\Page::addJs instead.',
+        '_moveBlockToContainer' => 'Please use \Magento\Backend\Model\View\Result\Page::moveBlockToContainer instead.',
     ];
     
     /**
@@ -49,10 +49,10 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
         $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
 
-        foreach ($this->obsoleteResponseMethods as $method) {
+        foreach ($this->obsoleteResponseMethods as $method => $errorMessage) {
             if ($tokens[$stringPos]['content'] === $method) {
                 $phpcsFile->addWarning(
-                    sprintf('Contains obsolete response method: %s.', $method),
+                    sprintf('%s method is deprecated. %s', $method, $errorMessage),
                     $stackPtr,
                     self::WARNING_CODE_METHOD
                 );

From ec36aef508e2910f8d4866e932fc7cea98ccf8ae Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 13 Oct 2021 11:51:00 +0200
Subject: [PATCH 330/630] AC-676: Create phpcs static check for
 ObsoleteConnectionTest

---
 Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
index 63949a38..a1425cab 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -61,7 +61,7 @@ private function validateObsoleteMethod(File $phpcsFile, int $stackPtr)
         foreach ($this->obsoleteMethods as $method) {
             if ($tokens[$stringPos]['content'] === $method) {
                 $phpcsFile->addWarning(
-                    sprintf("Contains obsolete method: %s.", $method),
+                    sprintf("Contains obsolete method: %s. Please use getConnection method instead.", $method),
                     $stackPtr,
                     self::ERROR_CODE_METHOD
                 );

From e59ca3ff35c0f35afe0ae2e37465f482f1bc454c Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 13 Oct 2021 12:05:43 +0200
Subject: [PATCH 331/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php     | 56 +++++-----------------
 Magento2/Tests/Legacy/LayoutUnitTest.1.xml |  6 +--
 Magento2/Tests/Legacy/LayoutUnitTest.php   | 14 +++---
 3 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 8731c03a..2575e2b5 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
 
 namespace Magento2\Sniffs\Legacy;
 
@@ -20,7 +21,6 @@ class LayoutSniff implements Sniff
     private const ERROR_CODE_NOT_ALLOWED = 'NotAllowed';
     private const ERROR_CODE_OBSOLETE = 'Obsolete';
     private const ERROR_CODE_OBSOLETE_CLASS = 'ObsoleteClass';
-    private const ERROR_CODE_ATTRIBUTE_NOT_VALID = 'AttributeNotValid';
     private const ERROR_CODE_METHOD_NOT_ALLOWED = 'MethodNotAllowed';
     private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED = 'CharacterNotAllowedInAttribute';
     private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED = 'CharacterExpectedInAttribute';
@@ -229,7 +229,6 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $this->testObsoleteReferences($layout, $phpcsFile);
-        $this->testObsoleteAttributes($layout, $phpcsFile);
         $this->testHeadBlocks($layout, $phpcsFile);
         $this->testOutputAttribute($layout, $phpcsFile);
         $this->testHelperAttribute($layout, $phpcsFile);
@@ -240,21 +239,21 @@ public function process(File $phpcsFile, $stackPtr)
     /**
      * Check for obsolete block references
      *
-     * @todo missing test
      * @param SimpleXMLElement $layout
      * @param File $phpcsFile
      */
     private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile): void
     {
         foreach ($layout as $handle) {
-            if (!isset($this->obsoleteReferences[$handle->getName()])) {
+            $attributes = $handle->attributes();
+            if (!isset($this->obsoleteReferences[(string)$attributes->handle])) {
                 continue;
             }
-            foreach ($handle->xpath('reference') as $reference) {
-                if (strpos((string)$reference['name'], $this->obsoleteReferences[$handle->getName()]) !== false) {
+            foreach ($handle->xpath('//reference | //referenceContainer | //referenceBlock') as $reference) {
+                if (in_array((string)$reference['name'], $this->obsoleteReferences[(string)$attributes->handle]) !== false) {
                     $phpcsFile->addError(
                         'The block being referenced is removed.',
-                        dom_import_simplexml($reference)->getLineNo(),
+                        dom_import_simplexml($reference)->getLineNo()-1,
                         self::ERROR_CODE_OBSOLETE
                     );
                 }
@@ -317,45 +316,12 @@ private function testOutputAttribute(SimpleXMLElement $layout, File $phpcsFile):
         if (!empty($elements)) {
             $phpcsFile->addError(
                 'output="toHtml" is obsolete. Use output="1"',
-                dom_import_simplexml($elements[0])->getLineNo(),
+                dom_import_simplexml($elements[0])->getLineNo()-1,
                 self::ERROR_CODE_OBSOLETE
             );
         };
     }
 
-    /**
-     * Tests the attributes of the top-level Layout Node. Verifies there are no longer attributes of "parent" or "owner"
-     *
-     * @todo missing test
-     * @param SimpleXMLElement $layout
-     * @param File $phpcsFile
-     */
-    private function testObsoleteAttributes(SimpleXMLElement $layout, File $phpcsFile): void
-    {
-        $type = $layout['type'];
-        $parent = $layout['parent'];
-        $owner = $layout['owner'];
-
-        if ((string)$type === 'page') {
-            if ($parent) {
-                $phpcsFile->addError(
-                    'Attribute "parent" is not valid',
-                    dom_import_simplexml($parent)->getLineNo(),
-                    self::ERROR_CODE_ATTRIBUTE_NOT_VALID
-                );
-            }
-        }
-        if ((string)$type === 'fragment') {
-            if ($owner) {
-                $phpcsFile->addError(
-                    'Attribute "owner" is not valid',
-                    dom_import_simplexml($owner)->getLineNo(),
-                    self::ERROR_CODE_ATTRIBUTE_NOT_VALID
-                );
-            }
-        }
-    }
-
     /**
      * Returns attribute value by attribute name
      *
@@ -381,14 +347,14 @@ private function testHelperAttribute(SimpleXMLElement $layout, File $phpcsFile):
             if (strpos($this->getAttribute($action, 'helper'), '/') !== false) {
                 $phpcsFile->addError(
                     "'helper' attribute contains '/'",
-                    dom_import_simplexml($action)->getLineNo(),
+                    dom_import_simplexml($action)->getLineNo()-1,
                     self::ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED
                 );
             }
             if (strpos($this->getAttribute($action, 'helper'), '::') === false) {
                 $phpcsFile->addError(
                     "'helper' attribute does not contain '::'",
-                    dom_import_simplexml($action)->getLineNo(),
+                    dom_import_simplexml($action)->getLineNo()-1,
                     self::ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED
                 );
             }
@@ -408,7 +374,7 @@ private function testListText(SimpleXMLElement $layout, File $phpcsFile): void
             $phpcsFile->addError(
                 'The class \Magento\Framework\View\Element\Text\ListText' .
                 ' is not supposed to be used in layout anymore.',
-                dom_import_simplexml($elements[0])->getLineNo(),
+                dom_import_simplexml($elements[0])->getLineNo()-1,
                 self::ERROR_CODE_OBSOLETE_CLASS
             );
         };
@@ -430,7 +396,7 @@ private function testActionNodeMethods(SimpleXMLElement $layout, File $phpcsFile
                     'Call of method "%s" via layout instruction <action> is not allowed.',
                     $attributes['method']
                 ),
-                dom_import_simplexml($node)->getLineNo(),
+                dom_import_simplexml($node)->getLineNo()-1,
                 self::ERROR_CODE_METHOD_NOT_ALLOWED
             );
         }
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.1.xml b/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
index f051284a..591b51ae 100644
--- a/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
@@ -6,11 +6,11 @@
  */
 -->
 <page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="default_head_blocks"/>
+    <update handle="adminhtml_user_edit"/>
     <body>
         <attribute name="id" value="html-body"/>
         <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::page/js/require_js.phtml" />
-        <referenceContainer name="after.body.start">
+        <referenceContainer name="adminhtml.permission.user.edit.tabs">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
             <block class="Magento\Framework\View\Element\Js\Cookie" name="js_cookies" template="Magento_Theme::js/cookie.phtml">
                 <arguments>
@@ -19,7 +19,7 @@
             </block>
             <block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="Magento_Theme::html/notices.phtml"/>
         </referenceContainer>
-        <referenceBlock name="top.links">
+        <referenceBlock name="adminhtml.permission.user.edit">
             <block class="Magento\Theme\Block\Html\Head\Css">
             </block>
             <block class="Magento\Theme\Block\Html\Header" name="header" as="header" before="-">
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.php b/Magento2/Tests/Legacy/LayoutUnitTest.php
index c86ddee0..8e7a6551 100644
--- a/Magento2/Tests/Legacy/LayoutUnitTest.php
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.php
@@ -16,21 +16,23 @@ public function getErrorList($testFile = '')
     {
         if ($testFile === 'LayoutUnitTest.1.xml') {
             return [
+                13 => 1,
+                22 => 1,
                 23 => 1,
-                146 => 1,
-                149 => 1,
+                145 => 1,
+                148 => 1,
             ];
         }
         if ($testFile === 'LayoutUnitTest.2.xml') {
             return [
-                12 => 1,
-                29 => 1,
+                11 => 1,
+                28 => 1,
             ];
         }
         if ($testFile === 'LayoutUnitTest.3.xml') {
             return [
-                16 => 1,
-                19 => 1,
+                15 => 1,
+                18 => 1,
             ];
         }
         return [];

From c30669f41d71e87f9c9d0c3f2b20f3ff84de8e3f Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 13 Oct 2021 12:14:55 +0200
Subject: [PATCH 332/630] AC-670: Create phpcs static check for LayoutTest

---
 Magento2/Sniffs/Legacy/LayoutSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 2575e2b5..72cc6345 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -245,12 +245,12 @@ public function process(File $phpcsFile, $stackPtr)
     private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile): void
     {
         foreach ($layout as $handle) {
-            $attributes = $handle->attributes();
-            if (!isset($this->obsoleteReferences[(string)$attributes->handle])) {
+            $handleAttribute = (string)$handle->attributes()->handle;
+            if (!isset($this->obsoleteReferences[$handleAttribute])) {
                 continue;
             }
             foreach ($handle->xpath('//reference | //referenceContainer | //referenceBlock') as $reference) {
-                if (in_array((string)$reference['name'], $this->obsoleteReferences[(string)$attributes->handle]) !== false) {
+                if (in_array((string)$reference['name'], $this->obsoleteReferences[$handleAttribute]) !== false) {
                     $phpcsFile->addError(
                         'The block being referenced is removed.',
                         dom_import_simplexml($reference)->getLineNo()-1,

From 36776b8f788c629bb73afa88e22b3ddb3d2aa5d7 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 13 Oct 2021 12:46:43 +0200
Subject: [PATCH 333/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...assReferencesInConfigurationFilesSniff.php | 60 ++-----------------
 1 file changed, 4 insertions(+), 56 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index 9bbd9f07..e0187223 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
 
 namespace Magento2\Sniffs\Legacy;
 
@@ -60,9 +61,6 @@ public function process(File $phpcsFile, $stackPtr)
 
         $layouts = $this->collectClassesInLayout($xml);
         $this->assertNonFactoryName($phpcsFile, $layouts);
-
-        $layoutTabs = $this->collectClassesInLayoutTabs($xml);
-        $this->assertNonFactoryNameTab($phpcsFile, $layoutTabs);
     }
 
     /**
@@ -106,25 +104,6 @@ private function assertNonFactoryNameModule(File $phpcsFile, array $classes)
         }
     }
 
-    /**
-     * Check whether specified class names in layout tabs are right according PSR-1 Standard.
-     *
-     * @param File $phpcsFile
-     * @param array $elements
-     */
-    private function assertNonFactoryNameTab(File $phpcsFile, array $elements)
-    {
-        foreach ($elements as $element) {
-            if (preg_match('/\//', $element['value']) !== false) {
-                $phpcsFile->addError(
-                    self::ERROR_MESSAGE_CONFIG,
-                    $element['lineNumber'],
-                    self::ERROR_CODE_CONFIG,
-                );
-            }
-        }
-    }
-
     /**
      * Format the incoming XML to avoid tags split into several lines.
      *
@@ -198,41 +177,10 @@ function (array $extendedNode) {
      */
     private function collectClassesInLayout(SimpleXMLElement $xml): array
     {
-        $classes = $this->getValuesFromXmlTagAttribute(
-            $xml,
-            '/layout//@helper',
-            'helper'
-        );
-        $classes = array_map(
-            function (array $extendedNode) {
-                $extendedNode['value'] = explode('::', trim($extendedNode['value']))[0];
-                return $extendedNode;
-            },
-            $classes
-        );
-        $classes = array_merge(
-            $classes,
-            $this->getValuesFromXmlTagAttribute(
-                $xml,
-                '/layout//@module',
-                'module'
-            )
-        );
-
-        return $classes;
-    }
-
-    /**
-     * Extract class references from layout tabs
-     *
-     * @param SimpleXMLElement $xml
-     * @return array
-     */
-    private function collectClassesInLayoutTabs(SimpleXMLElement $xml): array
-    {
-        return $this->getValuesFromXmlTagContent(
+        return $this->getValuesFromXmlTagAttribute(
             $xml,
-            '/layout//action[@method="addTab"]/block',
+            '/layout//@module',
+            'module'
         );
     }
 

From a78b21dbdff8873078a44cb16859bc3cbaa16ab6 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Wed, 13 Oct 2021 14:58:41 +0200
Subject: [PATCH 334/630] Update Magento2/Sniffs/Legacy/LayoutSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/Sniffs/Legacy/LayoutSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 72cc6345..3a2c2044 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -271,7 +271,7 @@ private function getFormattedXML(File $phpcsFile)
     {
         $doc = new DomDocument('1.0');
         $doc->formatOutput = true;
-        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        $doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
         return $doc->saveXML();
     }
 

From 39267bad4f6ac3349585a0b2b81e94a3ada2f11c Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Wed, 13 Oct 2021 15:03:42 +0200
Subject: [PATCH 335/630] Update
 Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index e0187223..f612c7bc 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -114,7 +114,7 @@ private function getFormattedXML(File $phpcsFile)
     {
         $doc = new DomDocument('1.0');
         $doc->formatOutput = true;
-        $doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
+        $doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
         return $doc->saveXML();
     }
 

From 8402f7d0888c536d186bd5bc2b6548b30db141d9 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 13 Oct 2021 17:16:42 +0200
Subject: [PATCH 336/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...lassReferencesInConfigurationFilesSniff.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index e0187223..1e06d1d8 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -58,9 +58,6 @@ public function process(File $phpcsFile, $stackPtr)
 
         $modules = $this->getValuesFromXmlTagAttribute($xml, '//@module', 'module');
         $this->assertNonFactoryNameModule($phpcsFile, $modules);
-
-        $layouts = $this->collectClassesInLayout($xml);
-        $this->assertNonFactoryName($phpcsFile, $layouts);
     }
 
     /**
@@ -169,21 +166,6 @@ function (array $extendedNode) {
         return $classes;
     }
 
-    /**
-     * Parse an XML for references to PHP class names in selected tags or attributes
-     *
-     * @param SimpleXMLElement $xml
-     * @return array
-     */
-    private function collectClassesInLayout(SimpleXMLElement $xml): array
-    {
-        return $this->getValuesFromXmlTagAttribute(
-            $xml,
-            '/layout//@module',
-            'module'
-        );
-    }
-
     /**
      * Extract value from tag contents which exist in the XML path
      *

From ee4c7d6363ba28191e4089b520b26e88e5886333 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 13 Oct 2021 17:31:47 +0200
Subject: [PATCH 337/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 ...ferencesInConfigurationFilesUnitTest.5.xml | 116 ------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml

diff --git a/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml b/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml
deleted file mode 100644
index 142ef2d1..00000000
--- a/Magento2/Tests/Legacy/ClassReferencesInConfigurationFilesUnitTest.5.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="sales_order_transactions_grid_block"/>
-    <head>
-        <link src="Magento_Sales::js/bootstrap/order-create-index.js"/>
-        <link src="Magento_Sales::js/bootstrap/order-post-action.js"/>
-    </head>
-    <update handle="sales_order_item_price"/>
-    <body>
-        <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" />
-
-        <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Adminhtml\Order\View" name="sales_order_edit"/>
-        </referenceContainer>
-        <referenceContainer name="left">
-            <block class="Magento\Sales\Block\Adminhtml\Order\View\Tabs" name="sales_order_tabs">
-                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="Magento_Sales::order/view/tab/info.phtml">
-                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="Magento_Sales::order/view/info.phtml">
-                        <container name="extra_customer_info"/>
-                    </block>
-                    <container name="order_additional_info"/>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="Magento_Sales::order/view/items.phtml">
-                        <arguments>
-                            <argument name="columns" xsi:type="array">
-                                <item name="product" xsi:type="string" translate="true">Product</item>
-                                <item name="status" xsi:type="string" translate="true">Item Status</item>
-                                <item name="price-original" xsi:type="string" translate="true">Original Price</item>
-                                <item name="price" xsi:type="string" translate="true">Price</item>
-                                <item name="ordered-qty" xsi:type="string" translate="true">Qty</item>
-                                <item name="subtotal" xsi:type="string" translate="true">Subtotal</item>
-                                <item name="tax-amount" xsi:type="string" translate="true">Tax Amount</item>
-                                <item name="tax-percent" xsi:type="string" translate="true">Tax Percent</item>
-                                <item name="discont" xsi:type="string" translate="true">Discount Amount</item>
-                                <item name="total" xsi:type="string" translate="true">Row Total</item>
-                            </argument>
-                        </arguments>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer" as="default" name="default_order_items_renderer" template="Magento_Sales::order/view/items/renderer/default.phtml">
-                            <arguments>
-                                <argument name="columns" xsi:type="array">
-                                    <item name="product" xsi:type="string" translate="false">col-product</item>
-                                    <item name="status" xsi:type="string" translate="false">col-status</item>
-                                    <item name="price-original" xsi:type="string" translate="false">col-price-original</item>
-                                    <item name="price" xsi:type="string" translate="false">col-price</item>
-                                    <item name="qty" xsi:type="string" translate="false">col-ordered-qty</item>
-                                    <item name="subtotal" xsi:type="string" translate="false">col-subtotal</item>
-                                    <item name="tax-amount" xsi:type="string" translate="false">col-tax-amount</item>
-                                    <item name="tax-percent" xsi:type="string" translate="false">col-tax-percent</item>
-                                    <item name="discont" xsi:type="string" translate="false">col-discont</item>
-                                    <item name="total" xsi:type="string" translate="false">col-total</item>
-                                </argument>
-                            </arguments>
-                        </block>
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
-                        <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-                    </block>
-
-                    <container name="payment_additional_info" htmlTag="div" htmlClass="order-payment-additional" />
-                    <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\View\History" name="order_history" template="Magento_Sales::order/view/history.phtml"/>
-                    <block class="Magento\Backend\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
-                        <block class="Magento\Sales\Block\Adminhtml\Order\View\Giftmessage" name="order_giftmessage" template="Magento_Sales::order/view/giftmessage.phtml"/>
-                    </block>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\Totals" name="order_totals" template="Magento_Sales::order/totals.phtml">
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
-                    </block>
-                </block>
-                <action method="addTab">
-                    <argument name="name" xsi:type="string">order_info</argument>
-                    <argument name="block" xsi:type="string">order_tab_info</argument>
-                </action>
-                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Invoices" name="sales_order_invoice.grid.container"/>
-                <action method="addTab">
-                    <argument name="name" xsi:type="string">order_invoices</argument>
-                    <argument name="block" xsi:type="string">sales_order_invoice.grid.container</argument>
-                </action>
-                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Creditmemos" name="sales_order_creditmemo.grid.container"/>
-                <action method="addTab">
-                    <block class="Magento\Framework\View\Element\Js\Components" name="sales_page_head_components" template="Magento_Sales::page/js/components.phtml"/>                </action>
-                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Shipments" name="sales_order_shipment.grid.container"/>
-                <action method="addTab">
-                    <argument name="name" xsi:type="string">order_shipments</argument>
-                    <argument name="block" xsi:type="string">sales_order_shipment.grid.container</argument>
-                </action>
-                <action method="addTab">
-                    <argument name="name" xsi:type="string">order_history</argument>
-                    <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\History</argument>
-                </action>
-                <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions" name="sales_transactions.grid.container"/>
-                <action method="addTab">
-                    <argument name="name" xsi:type="string">order_transactions</argument>
-                    <argument name="block" xsi:type="string">sales_transactions.grid.container</argument>
-                </action>
-            </block>
-        </referenceContainer>
-        <referenceBlock name="head.components">
-            <block class="Magento\Framework\View\Element\Js\Components" name="sales_page_head_components" template="Magento_Sales::page/js/components.phtml"/>
-        </referenceBlock>
-        <referenceBlock name="sales_order_invoice.grid.container">
-            <uiComponent name="sales_order_view_invoice_grid"/>
-        </referenceBlock>
-        <referenceBlock name="sales_order_creditmemo.grid.container">
-            <uiComponent name="sales_order_view_creditmemo_grid"/>
-        </referenceBlock>
-        <referenceBlock name="sales_order_shipment.grid.container">
-            <uiComponent name="sales_order_view_shipment_grid"/>
-        </referenceBlock>
-    </body>
-</page>

From 7fdd6b44b43c44a5a60272b531c39e9ebc8c2835 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 14 Oct 2021 11:17:31 +0200
Subject: [PATCH 338/630] AC-672: Create phpcs static check for LicenseTest

---
 Magento2/Sniffs/Legacy/LicenseSniff.php      | 71 ++++++++++++++++++++
 Magento2/Tests/Legacy/LicenseUnitTest.1.inc  |  5 ++
 Magento2/Tests/Legacy/LicenseUnitTest.2.inc  |  5 ++
 Magento2/Tests/Legacy/LicenseUnitTest.3.xml  | 10 +++
 Magento2/Tests/Legacy/LicenseUnitTest.4.xml  | 10 +++
 Magento2/Tests/Legacy/LicenseUnitTest.5.less |  4 ++
 Magento2/Tests/Legacy/LicenseUnitTest.php    | 49 ++++++++++++++
 Magento2/ruleset.xml                         |  4 ++
 8 files changed, 158 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/LicenseSniff.php
 create mode 100644 Magento2/Tests/Legacy/LicenseUnitTest.1.inc
 create mode 100644 Magento2/Tests/Legacy/LicenseUnitTest.2.inc
 create mode 100644 Magento2/Tests/Legacy/LicenseUnitTest.3.xml
 create mode 100644 Magento2/Tests/Legacy/LicenseUnitTest.4.xml
 create mode 100644 Magento2/Tests/Legacy/LicenseUnitTest.5.less
 create mode 100644 Magento2/Tests/Legacy/LicenseUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/LicenseSniff.php b/Magento2/Sniffs/Legacy/LicenseSniff.php
new file mode 100644
index 00000000..6a59ccc8
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/LicenseSniff.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use Magento2\Sniffs\Less\TokenizerSymbolsInterface;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class LicenseSniff implements Sniff
+{
+    private const WARNING_CODE = 'FoundLegacyTextInCopyright';
+    
+    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
+    
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_DOC_COMMENT_STRING,
+            T_INLINE_HTML
+        ];
+    }
+    
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $content = null;
+        
+        if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_STRING) {
+            $content = $tokens[$stackPtr]['content'];
+        }
+        if ($tokens[$stackPtr]['code'] === T_INLINE_HTML) {
+            $content = $phpcsFile->getTokensAsString($stackPtr, 1);
+        }
+        if ($content != null){
+            $this->checkLicense($content, $stackPtr, $phpcsFile); 
+        }
+    }
+
+    /**
+     * @param string $content
+     * @param int $stackPtr
+     * @param File $phpcsFile
+     */
+    private function checkLicense(string $content, int $stackPtr, File $phpcsFile): void
+    {
+        $commentContent = $content;
+        if (stripos($commentContent, 'copyright') === false) {
+            return;
+        }
+        foreach (['Irubin Consulting Inc', 'DBA Varien', 'Magento Inc'] as $legacyText) {
+            if (stripos($commentContent, $legacyText) !== false) {
+                $phpcsFile->addWarning(
+                    sprintf("The copyright license contains legacy text: %s.", $legacyText),
+                    $stackPtr,
+                    self::WARNING_CODE
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.1.inc b/Magento2/Tests/Legacy/LicenseUnitTest.1.inc
new file mode 100644
index 00000000..75f04eae
--- /dev/null
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.1.inc
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.2.inc b/Magento2/Tests/Legacy/LicenseUnitTest.2.inc
new file mode 100644
index 00000000..7f1c759e
--- /dev/null
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.2.inc
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Copyright © Magento Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.3.xml b/Magento2/Tests/Legacy/LicenseUnitTest.3.xml
new file mode 100644
index 00000000..a60baf13
--- /dev/null
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright My testing text
+ * See COPYING.txt for license details.
+ */
+-->
+<tag>
+
+</tag>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.4.xml b/Magento2/Tests/Legacy/LicenseUnitTest.4.xml
new file mode 100644
index 00000000..73c7558c
--- /dev/null
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @copyright DBA Varien
+ * See COPYING.txt for license details.
+ */
+-->
+<tag>
+
+</tag>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.5.less b/Magento2/Tests/Legacy/LicenseUnitTest.5.less
new file mode 100644
index 00000000..8134b704
--- /dev/null
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.5.less
@@ -0,0 +1,4 @@
+/**
+ * @copyright Copyright Irubin Consulting Inc
+ * See COPYING.txt for license details.
+ */
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.php b/Magento2/Tests/Legacy/LicenseUnitTest.php
new file mode 100644
index 00000000..edcca88e
--- /dev/null
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class LicenseUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = ''): array
+    {
+        if ($testFile === 'LicenseUnitTest.1.inc' || $testFile === 'LicenseUnitTest.3.xml') {
+            return [];
+        }
+        
+        if ($testFile === 'LicenseUnitTest.2.inc') {
+            return [
+                3 => 1,
+            ];
+        }
+
+        if ($testFile === 'LicenseUnitTest.4.xml') {
+            return [
+                4 => 1,
+            ];
+        }
+
+        if ($testFile === 'LicenseUnitTest.5.less') {
+            return [
+                2 => 1,
+            ];
+        }
+
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5966203f..4de85194 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -194,6 +194,10 @@
         <type>warning</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Legacy.License">
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
     <rule ref="Magento2.Classes.AbstractApi">

From e3cdba0476f26aaa1b4945d8dda8b501bb800abb Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 14 Oct 2021 11:19:40 +0200
Subject: [PATCH 339/630] AC-672: Create phpcs static check for LicenseTest

---
 Magento2/Tests/Legacy/LicenseUnitTest.3.xml  | 2 +-
 Magento2/Tests/Legacy/LicenseUnitTest.4.xml  | 2 +-
 Magento2/Tests/Legacy/LicenseUnitTest.5.less | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.3.xml b/Magento2/Tests/Legacy/LicenseUnitTest.3.xml
index a60baf13..cf29cd23 100644
--- a/Magento2/Tests/Legacy/LicenseUnitTest.3.xml
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.3.xml
@@ -7,4 +7,4 @@
 -->
 <tag>
 
-</tag>
\ No newline at end of file
+</tag>
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.4.xml b/Magento2/Tests/Legacy/LicenseUnitTest.4.xml
index 73c7558c..c8e81d11 100644
--- a/Magento2/Tests/Legacy/LicenseUnitTest.4.xml
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.4.xml
@@ -7,4 +7,4 @@
 -->
 <tag>
 
-</tag>
\ No newline at end of file
+</tag>
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.5.less b/Magento2/Tests/Legacy/LicenseUnitTest.5.less
index 8134b704..1b21386f 100644
--- a/Magento2/Tests/Legacy/LicenseUnitTest.5.less
+++ b/Magento2/Tests/Legacy/LicenseUnitTest.5.less
@@ -1,4 +1,4 @@
 /**
  * @copyright Copyright Irubin Consulting Inc
  * See COPYING.txt for license details.
- */
\ No newline at end of file
+ */

From c22fd18265cb1fedbac7125de21bd9671cc01e93 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 14 Oct 2021 11:25:44 +0200
Subject: [PATCH 340/630] AC-672: Create phpcs static check for LicenseTest

---
 Magento2/Sniffs/Legacy/LicenseSniff.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/LicenseSniff.php b/Magento2/Sniffs/Legacy/LicenseSniff.php
index 6a59ccc8..be1eb173 100644
--- a/Magento2/Sniffs/Legacy/LicenseSniff.php
+++ b/Magento2/Sniffs/Legacy/LicenseSniff.php
@@ -13,9 +13,14 @@
 
 class LicenseSniff implements Sniff
 {
-    private const WARNING_CODE = 'FoundLegacyTextInCopyright';
-    
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
+
+    private const WARNING_CODE = 'FoundLegacyTextInCopyright';
     
     /**
      * @inheritdoc
@@ -42,12 +47,14 @@ public function process(File $phpcsFile, $stackPtr)
         if ($tokens[$stackPtr]['code'] === T_INLINE_HTML) {
             $content = $phpcsFile->getTokensAsString($stackPtr, 1);
         }
-        if ($content != null){
-            $this->checkLicense($content, $stackPtr, $phpcsFile); 
+        if ($content != null) {
+            $this->checkLicense($content, $stackPtr, $phpcsFile);
         }
     }
 
     /**
+     * Check that the copyright license does not contain legacy text
+     * 
      * @param string $content
      * @param int $stackPtr
      * @param File $phpcsFile

From 0d1ae00205bdf433dce0959ebbf777485a9912c8 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 14 Oct 2021 11:27:27 +0200
Subject: [PATCH 341/630] AC-672: Create phpcs static check for LicenseTest

---
 Magento2/Sniffs/Legacy/LicenseSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/LicenseSniff.php b/Magento2/Sniffs/Legacy/LicenseSniff.php
index be1eb173..020c0a48 100644
--- a/Magento2/Sniffs/Legacy/LicenseSniff.php
+++ b/Magento2/Sniffs/Legacy/LicenseSniff.php
@@ -54,7 +54,7 @@ public function process(File $phpcsFile, $stackPtr)
 
     /**
      * Check that the copyright license does not contain legacy text
-     * 
+     *
      * @param string $content
      * @param int $stackPtr
      * @param File $phpcsFile

From 08ed34bee413e4dff87c40224be18dc0d1ad323b Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Thu, 14 Oct 2021 12:49:33 +0200
Subject: [PATCH 342/630] Update
 Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jorge Cuerdo Álvarez <jocual@gmail.com>
---
 .../ClassReferencesInConfigurationFilesSniff.php   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index b82228d7..ca1474f3 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -131,24 +131,18 @@ private function collectClassesInConfig(SimpleXMLElement $xml): array
                 | //model_token | //writer_model | //clone_model | //frontend_model | //working_model
                 | //admin_renderer | //renderer',
         );
-        $classes = array_merge(
+$classes = array_merge(
             $classes,
             $this->getValuesFromXmlTagAttribute(
                 $xml,
                 '//@backend_model',
                 'backend_model'
-            )
-        );
-        $classes = array_merge(
-            $classes,
-            $this->getValuesFromXmlTagAttribute(
+            ),
+$this->getValuesFromXmlTagAttribute(
                 $xml,
                 '/config//preference',
                 'type'
-            )
-        );
-        $classes = array_merge(
-            $classes,
+            ),
             $this->getValuesFromXmlTagName(
                 $xml,
                 '/logging/*/expected_models/* | /logging/*/actions/*/expected_models/*',

From c9ca788bbbdeac6598752d23e84e02a3857eebd0 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 14 Oct 2021 12:53:42 +0200
Subject: [PATCH 343/630] AC-663: Create phpcs static check for
 ClassesTest::testPhpCode

---
 .../Legacy/ClassReferencesInConfigurationFilesSniff.php      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index ca1474f3..f2b5b400 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -131,14 +131,15 @@ private function collectClassesInConfig(SimpleXMLElement $xml): array
                 | //model_token | //writer_model | //clone_model | //frontend_model | //working_model
                 | //admin_renderer | //renderer',
         );
-$classes = array_merge(
+
+        $classes = array_merge(
             $classes,
             $this->getValuesFromXmlTagAttribute(
                 $xml,
                 '//@backend_model',
                 'backend_model'
             ),
-$this->getValuesFromXmlTagAttribute(
+            $this->getValuesFromXmlTagAttribute(
                 $xml,
                 '/config//preference',
                 'type'

From 6691ae8ed651a14b2af02a16ce0d385e53af1573 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 14 Oct 2021 14:31:05 +0200
Subject: [PATCH 344/630] AC-672: Create phpcs static check for LicenseTest

---
 Magento2/ruleset.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 0f6c788c..ffe71710 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -202,10 +202,6 @@
         <type>warning</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Legacy.License">
-        <severity>9</severity>
-        <type>warning</type>
-    </rule>
 
     <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
     <rule ref="Magento2.Classes.AbstractApi">
@@ -338,6 +334,10 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.License">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From c38ca663482bb17cae91e66b78f0ac544fe3e65d Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 14 Oct 2021 15:25:33 +0200
Subject: [PATCH 345/630] AC-206: Create UCT phpcs ruleset for customizations
 only

---
 Magento2/customizations-ruleset.xml | 719 ++++++++++++++++++++++++++++
 1 file changed, 719 insertions(+)
 create mode 100644 Magento2/customizations-ruleset.xml

diff --git a/Magento2/customizations-ruleset.xml b/Magento2/customizations-ruleset.xml
new file mode 100644
index 00000000..2c7c695c
--- /dev/null
+++ b/Magento2/customizations-ruleset.xml
@@ -0,0 +1,719 @@
+<?xml version="1.0"?>
+<ruleset name="Magento2">
+    <description>Magento Coding Standard</description>
+
+    <!-- File extensions to be checked. -->
+    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>
+
+    <!-- Severity 10 errors: Critical code issues. -->
+    <rule ref="Generic.Functions.CallTimePassByReference">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Generic.PHP.DeprecatedFunctions">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Generic.PHP.NoSilencedErrors">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Generic.PHP.Syntax">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Classes.DiscouragedDependencies">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.MageEntity">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.NamingConvention.ReservedWords">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.PHP.FinalImplementation">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.PHP.Goto">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.PHP.ReturnValueCheck">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Security.IncludeFile">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Security.InsecureFunction">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.Security.LanguageConstruct">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Security.Superglobal.SuperglobalUsageError">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Strings.ExecutableRegEx">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="PSR1.Classes.ClassDeclaration">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <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>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.AbstractBlock">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.Legacy.EmailTemplate">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.Legacy.ObsoleteConfigNodes">
+        <include-pattern>etc/config.xml</include-pattern>
+        <include-pattern>etc/config.*.xml</include-pattern>
+        <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.Legacy.InstallUpgrade">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.PHP.AutogeneratedClassNotInConstructor">
+        <include-pattern>*\.php$</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
+    <rule ref="Magento2.Html.HtmlSelfClosingTags">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.Layout">
+        <severity>10</severity>
+        <type>error</type>
+        <include-pattern>*/view/(adminhtml|frontend|base)/*\/.xml</include-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.RestrictedCode">
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+        <exclude-pattern>*\.js$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.ClassReferencesInConfigurationFiles">
+        <include-pattern>*\/etc/*.xml$</include-pattern>
+        <exclude-pattern>*\/etc/wsdl.xml$</exclude-pattern>
+        <exclude-pattern>*\/etc/wsdl2.xml$</exclude-pattern>
+        <exclude-pattern>*\/etc/wsi.xml$</exclude-pattern>
+        <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="Magento2.Security.Superglobal.SuperglobalUsageWarning">
+        <severity>9</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Security.XssTemplate">
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>9</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.SQL.RawQuery">
+        <severity>9</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.PHP.NonExecutableCode">
+        <severity>9</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Html.HtmlBinding">
+        <include-pattern>*\/.phtml$</include-pattern>
+        <severity>9</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+
+    <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
+    <rule ref="Magento2.Classes.AbstractApi">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Exceptions.DirectThrow">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Exceptions.ThrowCatch">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Exceptions.TryProcessSystemResources">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Functions.DiscouragedFunction">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Functions.StaticFunction">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Setup/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.NamingConvention.InterfaceName">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.PHP.ShortEchoSyntax">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Templates.ThisInTemplate">
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Translation.ConstantUsage">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Methods.DeprecatedModelMethod">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.ModuleXML">
+        <include-pattern>*\/module.xml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.DiConfig">
+        <include-pattern>*\/di.xml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Html.HtmlDirective">
+        <severity>8</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.WidgetXML">
+        <include-pattern>*\/widget.xml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.ObsoleteAcl">
+        <include-pattern>etc/config.xml</include-pattern>
+        <include-pattern>etc/config.*.xml</include-pattern>
+        <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.ObsoleteMenu">
+        <include-pattern>etc/config.xml</include-pattern>
+        <include-pattern>etc/config.*.xml</include-pattern>
+        <include-pattern>etc/*/config.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.ObsoleteSystemConfiguration">
+        <include-pattern>etc/adminhtml/system.xml</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.PhtmlTemplate">
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <!-- Severity 7 warnings: General code issues. -->
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.Classes.DuplicateClassName">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <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.NestingLevel">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.PHP.DisallowShortOpenTag">
+        <exclude-pattern>*\.xml$</exclude-pattern>
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Magento2.CodeAnalysis.EmptyBlock">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.PHP.LiteralNamespaces">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.PHP.Var">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Performance.ForeachArrayMerge">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Strings.StringConcat">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PEAR.Functions.ValidDefaultValue">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Functions.GlobalFunction">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Operators.IncrementDecrementUsage">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Operators.ValidLogicalOperators">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.PHP.GlobalKeyword">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Scope.MemberVarScope">
+        <severity>7</severity>
+        <type>warning</type>
+    </rule>
+
+    <!-- Severity 6 warnings: Code style issues. -->
+    <rule ref="Generic.ControlStructures.InlineControlStructure">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.Files.LineEndings">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="120"/>
+            <property name="absoluteLineLimit" value="0"/>
+        </properties>
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <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>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Generic.PHP.LowerCaseKeyword">
+        <severity>6</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </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="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>
+    </rule>
+    <rule ref="PEAR.ControlStructures.ControlSignature">
+        <severity>6</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+    </rule>
+    <rule ref="PSR1.Files.SideEffects">
+        <severity>6</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="PSR1.Methods.CamelCapsMethodName">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PSR2.Classes.ClassDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="PSR2.Classes.PropertyDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
+    </rule>
+    <rule ref="PSR2.ControlStructures.ControlStructureSpacing">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <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>
+        <properties>
+            <property name="requiredSpacesBeforeColon" value="0"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+    </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="equalsSpacing" value="1"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Functions.LowercaseFunctionKeywords">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.Scope.MethodScope">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
+        <severity>6</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+    </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.CSS.NamedColours">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Less">
+        <severity>6</severity>
+        <type>warning</type>
+        <include-pattern>*\.less$</include-pattern>
+    </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="Magento2.Commenting.ClassAndInterfacePHPDocFormatting">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Commenting.ClassPropertyPHPDocFormatting">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Commenting.ConstantsPHPDocFormatting">
+        <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="80"/>
+        </properties>
+        <severity>5</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Annotation">
+        <severity>5</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+    </rule>
+    <rule ref="Internal.NoCodeFound">
+        <severity>0</severity>
+    </rule>
+</ruleset>

From 90983fbddf5e28c7c29cde5153dee707ffbca81e Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 14 Oct 2021 15:27:20 +0200
Subject: [PATCH 346/630] AC-206: Create UCT phpcs ruleset for customizations
 only

---
 Magento2/customizations-ruleset.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/customizations-ruleset.xml b/Magento2/customizations-ruleset.xml
index 2c7c695c..e6820cc9 100644
--- a/Magento2/customizations-ruleset.xml
+++ b/Magento2/customizations-ruleset.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="Magento2">
-    <description>Magento Coding Standard</description>
+<ruleset name="customizations">
+    <description>Magento Coding Standard for customizations</description>
 
     <!-- File extensions to be checked. -->
     <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>

From ef49c1b776e4fc4dceb827eaeeeb34908ffc4edb Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 14 Oct 2021 16:20:27 +0200
Subject: [PATCH 347/630] AC-672: Create phpcs static check for LicenseTest

---
 Magento2/Sniffs/Legacy/LicenseSniff.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/LicenseSniff.php b/Magento2/Sniffs/Legacy/LicenseSniff.php
index 020c0a48..c6f8ba8a 100644
--- a/Magento2/Sniffs/Legacy/LicenseSniff.php
+++ b/Magento2/Sniffs/Legacy/LicenseSniff.php
@@ -22,6 +22,8 @@ class LicenseSniff implements Sniff
 
     private const WARNING_CODE = 'FoundLegacyTextInCopyright';
     
+    private const LEGACY_TEXTS = ['Irubin Consulting Inc', 'DBA Varien', 'Magento Inc'];
+    
     /**
      * @inheritdoc
      */
@@ -65,7 +67,7 @@ private function checkLicense(string $content, int $stackPtr, File $phpcsFile):
         if (stripos($commentContent, 'copyright') === false) {
             return;
         }
-        foreach (['Irubin Consulting Inc', 'DBA Varien', 'Magento Inc'] as $legacyText) {
+        foreach (self::LEGACY_TEXTS as $legacyText) {
             if (stripos($commentContent, $legacyText) !== false) {
                 $phpcsFile->addWarning(
                     sprintf("The copyright license contains legacy text: %s.", $legacyText),

From 30a34f2bebe241c5c301b2a2bb6bfed94f4b4e5e Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 19 Oct 2021 12:38:16 +0100
Subject: [PATCH 348/630] AC-206: Updated and renamed the
 extesnions-ruleset.xml

---
 ...customizations-ruleset.xml => extensions-ruleset.xml} | 9 +++++++++
 1 file changed, 9 insertions(+)
 rename Magento2/{customizations-ruleset.xml => extensions-ruleset.xml} (99%)

diff --git a/Magento2/customizations-ruleset.xml b/Magento2/extensions-ruleset.xml
similarity index 99%
rename from Magento2/customizations-ruleset.xml
rename to Magento2/extensions-ruleset.xml
index e6820cc9..c626c5ab 100644
--- a/Magento2/customizations-ruleset.xml
+++ b/Magento2/extensions-ruleset.xml
@@ -326,6 +326,15 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Legacy.ObsoleteConnection">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Legacy.ObsoleteResponse">
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
+
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <severity>7</severity>

From 655960e8144e2dfedf0d58a76e9d3dbd4ecba4c1 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 19 Oct 2021 13:19:32 +0100
Subject: [PATCH 349/630] AC-206: Added Magento only ruleset

---
 Magento2/extensions-ruleset.xml   | 728 ------------------------------
 Magento2/magento-only-ruleset.xml |  16 +
 Magento2/ruleset.xml              |  17 -
 3 files changed, 16 insertions(+), 745 deletions(-)
 delete mode 100644 Magento2/extensions-ruleset.xml
 create mode 100644 Magento2/magento-only-ruleset.xml

diff --git a/Magento2/extensions-ruleset.xml b/Magento2/extensions-ruleset.xml
deleted file mode 100644
index c626c5ab..00000000
--- a/Magento2/extensions-ruleset.xml
+++ /dev/null
@@ -1,728 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="customizations">
-    <description>Magento Coding Standard for customizations</description>
-
-    <!-- File extensions to be checked. -->
-    <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>
-
-    <!-- Severity 10 errors: Critical code issues. -->
-    <rule ref="Generic.Functions.CallTimePassByReference">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Generic.PHP.DeprecatedFunctions">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Generic.PHP.NoSilencedErrors">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Generic.PHP.Syntax">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Classes.DiscouragedDependencies">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.MageEntity">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.NamingConvention.ReservedWords">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.PHP.FinalImplementation">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.PHP.Goto">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.PHP.ReturnValueCheck">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Security.IncludeFile">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Security.InsecureFunction">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.Security.LanguageConstruct">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Security.Superglobal.SuperglobalUsageError">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Strings.ExecutableRegEx">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="PSR1.Classes.ClassDeclaration">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <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>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.AbstractBlock">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.Legacy.EmailTemplate">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ObsoleteConfigNodes">
-        <include-pattern>etc/config.xml</include-pattern>
-        <include-pattern>etc/config.*.xml</include-pattern>
-        <include-pattern>etc/*/config.xml</include-pattern>
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.Legacy.InstallUpgrade">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.PHP.AutogeneratedClassNotInConstructor">
-        <include-pattern>*\.php$</include-pattern>
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
-    <rule ref="Magento2.Html.HtmlSelfClosingTags">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.Layout">
-        <severity>10</severity>
-        <type>error</type>
-        <include-pattern>*/view/(adminhtml|frontend|base)/*\/.xml</include-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.RestrictedCode">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-        <exclude-pattern>*\.js$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.ClassReferencesInConfigurationFiles">
-        <include-pattern>*\/etc/*.xml$</include-pattern>
-        <exclude-pattern>*\/etc/wsdl.xml$</exclude-pattern>
-        <exclude-pattern>*\/etc/wsdl2.xml$</exclude-pattern>
-        <exclude-pattern>*\/etc/wsi.xml$</exclude-pattern>
-        <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="Magento2.Security.Superglobal.SuperglobalUsageWarning">
-        <severity>9</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Security.XssTemplate">
-        <include-pattern>*\.phtml$</include-pattern>
-        <severity>9</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.SQL.RawQuery">
-        <severity>9</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.PHP.NonExecutableCode">
-        <severity>9</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Html.HtmlBinding">
-        <include-pattern>*\/.phtml$</include-pattern>
-        <severity>9</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-
-    <!-- Severity 8 warnings: Magento specific code issues and design violations. -->
-    <rule ref="Magento2.Classes.AbstractApi">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Exceptions.DirectThrow">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Exceptions.ThrowCatch">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Exceptions.TryProcessSystemResources">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Functions.DiscouragedFunction">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Functions.StaticFunction">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Setup/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.NamingConvention.InterfaceName">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.PHP.ShortEchoSyntax">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Templates.ThisInTemplate">
-        <include-pattern>*\.phtml$</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Translation.ConstantUsage">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Methods.DeprecatedModelMethod">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ModuleXML">
-        <include-pattern>*\/module.xml$</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.DiConfig">
-        <include-pattern>*\/di.xml$</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Html.HtmlDirective">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.WidgetXML">
-        <include-pattern>*\/widget.xml$</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ObsoleteAcl">
-        <include-pattern>etc/config.xml</include-pattern>
-        <include-pattern>etc/config.*.xml</include-pattern>
-        <include-pattern>etc/*/config.xml</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ObsoleteMenu">
-        <include-pattern>etc/config.xml</include-pattern>
-        <include-pattern>etc/config.*.xml</include-pattern>
-        <include-pattern>etc/*/config.xml</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ObsoleteSystemConfiguration">
-        <include-pattern>etc/adminhtml/system.xml</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.PhtmlTemplate">
-        <include-pattern>*\.phtml$</include-pattern>
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ObsoleteConnection">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Legacy.ObsoleteResponse">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-
-    <!-- Severity 7 warnings: General code issues. -->
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.Classes.DuplicateClassName">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <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.NestingLevel">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.PHP.DisallowShortOpenTag">
-        <exclude-pattern>*\.xml$</exclude-pattern>
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
-        <severity>0</severity>
-    </rule>
-    <rule ref="Magento2.CodeAnalysis.EmptyBlock">
-        <severity>7</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.PHP.LiteralNamespaces">
-        <severity>7</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.PHP.Var">
-        <severity>7</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Performance.ForeachArrayMerge">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Strings.StringConcat">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="PEAR.Functions.ValidDefaultValue">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Squiz.Functions.GlobalFunction">
-        <severity>7</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.Operators.IncrementDecrementUsage">
-        <severity>7</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.Operators.ValidLogicalOperators">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Squiz.PHP.GlobalKeyword">
-        <severity>7</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.Scope.MemberVarScope">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
-
-    <!-- Severity 6 warnings: Code style issues. -->
-    <rule ref="Generic.ControlStructures.InlineControlStructure">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.Files.LineEndings">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Generic.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="120"/>
-            <property name="absoluteLineLimit" value="0"/>
-        </properties>
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <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>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Generic.PHP.LowerCaseKeyword">
-        <severity>6</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </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="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>
-    </rule>
-    <rule ref="PEAR.ControlStructures.ControlSignature">
-        <severity>6</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-    </rule>
-    <rule ref="PSR1.Files.SideEffects">
-        <severity>6</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Fixtures/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-    <rule ref="PSR1.Methods.CamelCapsMethodName">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="PSR2.Classes.ClassDeclaration">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="PSR2.Classes.PropertyDeclaration">
-        <severity>6</severity>
-        <type>warning</type>
-        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
-    </rule>
-    <rule ref="PSR2.ControlStructures.ControlStructureSpacing">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <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>
-        <properties>
-            <property name="requiredSpacesBeforeColon" value="0"/>
-        </properties>
-    </rule>
-    <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-    </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="equalsSpacing" value="1"/>
-        </properties>
-    </rule>
-    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
-        <severity>0</severity>
-    </rule>
-    <rule ref="Squiz.Functions.LowercaseFunctionKeywords">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Squiz.Scope.MethodScope">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
-        <severity>6</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-    </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.CSS.NamedColours">
-        <severity>6</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Less">
-        <severity>6</severity>
-        <type>warning</type>
-        <include-pattern>*\.less$</include-pattern>
-    </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="Magento2.Commenting.ClassAndInterfacePHPDocFormatting">
-        <severity>5</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Commenting.ClassPropertyPHPDocFormatting">
-        <severity>5</severity>
-        <type>warning</type>
-    </rule>
-    <rule ref="Magento2.Commenting.ConstantsPHPDocFormatting">
-        <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="80"/>
-        </properties>
-        <severity>5</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Annotation">
-        <severity>5</severity>
-        <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-    </rule>
-    <rule ref="Internal.NoCodeFound">
-        <severity>0</severity>
-    </rule>
-</ruleset>
diff --git a/Magento2/magento-only-ruleset.xml b/Magento2/magento-only-ruleset.xml
new file mode 100644
index 00000000..6a81cd26
--- /dev/null
+++ b/Magento2/magento-only-ruleset.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="Magento2 Only">
+    <description>Magento Coding Standard sniffs applicable for Magento Open Source development only</description>
+    <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
+        <severity>5</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.php$</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
+    </rule>
+    <rule ref="Magento2.Legacy.Copyright">
+        <severity>5</severity>
+        <type>warning</type>
+        <include-pattern>*\.php$</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
+    </rule>
+</ruleset>
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index ffe71710..1b55a9ad 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -726,24 +726,7 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
-        <severity>5</severity>
-        <type>warning</type>
-        <exclude-pattern>*\.php$</exclude-pattern>
-        <exclude-pattern>*\.phtml$</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Legacy.Copyright">
-        <severity>5</severity>
-        <type>warning</type>
-        <include-pattern>*\.php$</include-pattern>
-        <include-pattern>*\.phtml$</include-pattern>
-    </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
-    <!-- TODO: AC-1314 -->
-    <rule ref="Magento2.Legacy">
-        <exclude name="Magento2.Legacy.Copyright"/>
-        <exclude name="Magento2.Legacy.CopyrightAnotherExtensionsFiles"/>
-    </rule>
 </ruleset>

From c0d26b8dc249ba5b8e7820e8c77743e6bff4f32f Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 19 Oct 2021 13:25:04 +0100
Subject: [PATCH 350/630] AC-206: Moved License sniff to magento-only-ruleset

---
 Magento2/magento-only-ruleset.xml | 8 ++++++--
 Magento2/ruleset.xml              | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Magento2/magento-only-ruleset.xml b/Magento2/magento-only-ruleset.xml
index 6a81cd26..fbbe1ba5 100644
--- a/Magento2/magento-only-ruleset.xml
+++ b/Magento2/magento-only-ruleset.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <ruleset name="Magento2 Only">
     <description>Magento Coding Standard sniffs applicable for Magento Open Source development only</description>
-    <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
+    <rule ref="Magento2.Header.License">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
+    <rule ref="Magento2.Header.CopyrightAnotherExtensionsFiles">
         <severity>5</severity>
         <type>warning</type>
         <exclude-pattern>*\.php$</exclude-pattern>
         <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Legacy.Copyright">
+    <rule ref="Magento2.Header.Copyright">
         <severity>5</severity>
         <type>warning</type>
         <include-pattern>*\.php$</include-pattern>
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1b55a9ad..442d9867 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -334,10 +334,6 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Legacy.License">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
 
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">

From c7250a26de1b7a54bc7880338c08564146e96d36 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 19 Oct 2021 13:36:17 +0100
Subject: [PATCH 351/630] AC-206: Corrected rules names in magento-only-ruleset

---
 Magento2/magento-only-ruleset.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/magento-only-ruleset.xml b/Magento2/magento-only-ruleset.xml
index fbbe1ba5..bace947f 100644
--- a/Magento2/magento-only-ruleset.xml
+++ b/Magento2/magento-only-ruleset.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <ruleset name="Magento2 Only">
     <description>Magento Coding Standard sniffs applicable for Magento Open Source development only</description>
-    <rule ref="Magento2.Header.License">
+    <rule ref="Magento2.Legacy.License">
         <severity>5</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Header.CopyrightAnotherExtensionsFiles">
+    <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
         <severity>5</severity>
         <type>warning</type>
         <exclude-pattern>*\.php$</exclude-pattern>
         <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Header.Copyright">
+    <rule ref="Magento2.Legacy.Copyright">
         <severity>5</severity>
         <type>warning</type>
         <include-pattern>*\.php$</include-pattern>

From 88d9f59ec7844e4b2ef57bb65219228b891bb53b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 19 Oct 2021 14:25:17 +0100
Subject: [PATCH 352/630] AC-206: Extracted Fframework only sniffs to a
 separate namespace

---
 .github/workflows/php.yml                     |  5 ++-
 .../Sniffs/Legacy/RestrictedCodeSniff.php     | 37 ++-----------------
 .../Legacy/_files/restricted_classes.php      | 13 +++++--
 .../Legacy/_files/restricted_classes_ee.php   | 32 ----------------
 .../Legacy/AbstractJsSniffUnitTestCase.php    | 33 -----------------
 .../CopyrightAnotherExtensionsFilesSniff.php  |  6 +--
 .../Sniffs/Header}/CopyrightSniff.php         |  8 ++--
 .../Sniffs/Header}/LicenseSniff.php           | 10 ++---
 ...yrightAnotherExtensionsFilesUnitTest.1.xml |  0
 ...pyrightAnotherExtensionsFilesUnitTest.2.js |  0
 ...yrightAnotherExtensionsFilesUnitTest.3.xml |  0
 ...pyrightAnotherExtensionsFilesUnitTest.4.js |  0
 ...rightAnotherExtensionsFilesUnitTest.5.less |  0
 ...opyrightAnotherExtensionsFilesUnitTest.php | 25 ++++++++++++-
 .../Tests/Header}/CopyrightUnitTest.1.inc     |  0
 .../Tests/Header}/CopyrightUnitTest.2.inc     |  0
 .../Tests/Header}/CopyrightUnitTest.3.inc     |  0
 .../Tests/Header}/CopyrightUnitTest.4.inc     |  0
 .../Tests/Header}/CopyrightUnitTest.5.inc     |  0
 .../Tests/Header}/CopyrightUnitTest.php       |  4 +-
 .../Tests/Header}/LicenseUnitTest.1.inc       |  0
 .../Tests/Header}/LicenseUnitTest.2.inc       |  0
 .../Tests/Header}/LicenseUnitTest.3.xml       |  0
 .../Tests/Header}/LicenseUnitTest.4.xml       |  0
 .../Tests/Header}/LicenseUnitTest.5.less      |  0
 .../Tests/Header}/LicenseUnitTest.php         |  4 +-
 .../ruleset.xml                               | 10 ++---
 composer.json                                 |  3 +-
 composer.lock                                 | 11 +++---
 29 files changed, 69 insertions(+), 132 deletions(-)
 delete mode 100644 Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
 delete mode 100644 Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php
 rename {Magento2/Sniffs/Legacy => Magento2Framework/Sniffs/Header}/CopyrightAnotherExtensionsFilesSniff.php (96%)
 rename {Magento2/Sniffs/Legacy => Magento2Framework/Sniffs/Header}/CopyrightSniff.php (96%)
 rename {Magento2/Sniffs/Legacy => Magento2Framework/Sniffs/Header}/LicenseSniff.php (97%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightAnotherExtensionsFilesUnitTest.1.xml (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightAnotherExtensionsFilesUnitTest.2.js (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightAnotherExtensionsFilesUnitTest.3.xml (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightAnotherExtensionsFilesUnitTest.4.js (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightAnotherExtensionsFilesUnitTest.5.less (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightAnotherExtensionsFilesUnitTest.php (64%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightUnitTest.1.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightUnitTest.2.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightUnitTest.3.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightUnitTest.4.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightUnitTest.5.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/CopyrightUnitTest.php (95%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/LicenseUnitTest.1.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/LicenseUnitTest.2.inc (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/LicenseUnitTest.3.xml (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/LicenseUnitTest.4.xml (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/LicenseUnitTest.5.less (100%)
 rename {Magento2/Tests/Legacy => Magento2Framework/Tests/Header}/LicenseUnitTest.php (95%)
 rename Magento2/magento-only-ruleset.xml => Magento2Framework/ruleset.xml (59%)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 66010067..7e64fe7a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -59,4 +59,7 @@ jobs:
       run: vendor/bin/phpunit
 
     - name: Run code style suite
-      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers/ Magento2/Sniffs
+      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+
+    - name: Run framework suite
+      run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
diff --git a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
index a0c0113f..62ee2d4e 100644
--- a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
+++ b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
@@ -37,7 +37,8 @@ class RestrictedCodeSniff implements Sniff
      */
     public function __construct()
     {
-        $this->loadData('restricted_classes*.php');
+        // phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
+        $this->classes = include __DIR__ . '/_files/restricted_classes.php';
     }
 
     /**
@@ -56,7 +57,7 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        // phpcs:ignore
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (array_key_exists(basename($phpcsFile->getFilename()), $this->fixtureFiles)) {
             return;
         }
@@ -99,36 +100,4 @@ private function isExcluded(string $token, File $phpcsFile): bool
         }
         return false;
     }
-
-    /**
-     * Loads and merges data from fixtures
-     *
-     * @param string $filePattern
-     * @return void
-     */
-    private function loadData(string $filePattern)
-    {
-        // phpcs:ignore
-        foreach (glob(__DIR__ . '/_files/' . $filePattern) as $file) {
-            $relativePath = str_replace(
-                '\\',
-                '/',
-                str_replace(__DIR__ . DIRECTORY_SEPARATOR, '', $file)
-            );
-            array_push($this->fixtureFiles, $relativePath);
-            $this->classes = array_merge_recursive($this->classes, $this->readList($file));
-        }
-    }
-
-    /**
-     * Isolate including a file into a method to reduce scope
-     *
-     * @param string $file
-     * @return array
-     */
-    private function readList($file)
-    {
-        // phpcs:ignore
-        return include $file;
-    }
 }
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index 56a2e510..1052b994 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -17,7 +17,8 @@
         'exclude' => [
             'Magento/Framework/DB/Select.php',
             'Magento/Framework/DB/Adapter/Pdo/Mysql.php',
-            'Magento/Framework/Model/ResourceModel/Iterator.php'
+            'Magento/Framework/Model/ResourceModel/Iterator.php',
+            'Magento/ResourceConnections/DB/Adapter/Pdo/MysqlProxy.php'
         ]
     ],
     'Zend_Db_Adapter_Pdo_Mysql' => [
@@ -48,7 +49,10 @@
             'Magento/Framework/Flag.php',
             'Magento/Widget/Setup/LayoutUpdateConverter.php',
             'Magento/Cms/Setup/ContentConverter.php',
-            'Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php'
+            'Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php',
+            'Magento/Framework/Test/Unit/FlagTest.php',
+            'Magento/Staging/Test/Unit/Model/Update/FlagTest.php',
+            'Magento/Logging/Test/Unit/Setup/ObjectConverterTest.php'
         ]
     ],
     'ArrayObject' => [
@@ -67,7 +71,10 @@
                 'Magento/Framework/Indexer/Test/Unit/BatchTest.php',
                 'Magento/Framework/View/Element/UiComponent/ArrayObjectFactory.php',
                 'Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php',
-                'Magento/Framework/Indexer/Action/Base.php'
+                'Magento/Framework/Indexer/Action/Base.php',
+                'Magento/MultipleWishlist/Test/Unit/Model/Search/Strategy/EmailTest.php',
+                'Magento/Rma/Test/Unit/Model/RmaRepositoryTest.php',
+                'Magento/Rma/Test/Unit/Model/Status/HistoryRepositoryTest.php'
             ]
     ],
     'Magento\Framework\View\Element\UiComponent\ArrayObjectFactory' => [
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php b/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
deleted file mode 100644
index 0c633bb9..00000000
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes_ee.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Classes that are restricted to use directly.
- * A <replacement> will be suggested to be used instead.
- * Use <whitelist> to specify files and directories that are allowed to use restricted classes.
- *
- * Format: array(<class_name>, <replacement>[, array(<whitelist>)]])
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'Zend_Db_Select' => [
-        'exclude' => [
-            'Magento/ResourceConnections/DB/Adapter/Pdo/MysqlProxy.php'
-        ],
-    ],
-    'Magento\Framework\Serialize\Serializer\Serialize' => [
-        'exclude' => [
-            'Magento/Framework/Test/Unit/FlagTest.php',
-            'Magento/Staging/Test/Unit/Model/Update/FlagTest.php',
-            'Magento/Logging/Test/Unit/Setup/ObjectConverterTest.php'
-        ]
-    ],
-    'ArrayObject' => [
-        'exclude' => [
-            'Magento/MultipleWishlist/Test/Unit/Model/Search/Strategy/EmailTest.php',
-            'Magento/Rma/Test/Unit/Model/RmaRepositoryTest.php',
-            'Magento/Rma/Test/Unit/Model/Status/HistoryRepositoryTest.php'
-        ]
-    ]
-];
diff --git a/Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php b/Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php
deleted file mode 100644
index 4b891a3c..00000000
--- a/Magento2/Tests/Legacy/AbstractJsSniffUnitTestCase.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Tests\Legacy;
-
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Implements an abstract base for unit tests that cover less sniffs.
- */
-abstract class AbstractJsSniffUnitTestCase extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritDoc
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-        
-        $config = new Config();
-        $config->extensions = array_merge(
-            $config->extensions,
-            [
-                'js' => 'PHP'
-            ]
-        );
-        
-        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
-    }
-}
diff --git a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
similarity index 96%
rename from Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
rename to Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
index a1d6995b..bfc36afe 100644
--- a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types = 1);
 
-namespace Magento2\Sniffs\Legacy;
+namespace Magento2Framework\Sniffs\Header;
 
 use Magento2\Sniffs\Less\TokenizerSymbolsInterface;
 use PHP_CodeSniffer\Files\File;
@@ -24,7 +24,7 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
      * @var array
      */
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
-    
+
     /**
      * @inheritDoc
      */
@@ -44,7 +44,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($stackPtr > 0) {
             return;
         }
-        
+
         $fileText = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
         $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $fileText);
 
diff --git a/Magento2/Sniffs/Legacy/CopyrightSniff.php b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
similarity index 96%
rename from Magento2/Sniffs/Legacy/CopyrightSniff.php
rename to Magento2Framework/Sniffs/Header/CopyrightSniff.php
index f4ccd647..81442207 100644
--- a/Magento2/Sniffs/Legacy/CopyrightSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types = 1);
 
-namespace Magento2\Sniffs\Legacy;
+namespace Magento2Framework\Sniffs\Header;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -13,10 +13,10 @@
 class CopyrightSniff implements Sniff
 {
     private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
-    
+
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
-    
+
     /**
      * @inheritdoc
      */
@@ -24,7 +24,7 @@ public function register()
     {
         return [T_OPEN_TAG];
     }
-    
+
     /**
      * @inheritDoc
      */
diff --git a/Magento2/Sniffs/Legacy/LicenseSniff.php b/Magento2Framework/Sniffs/Header/LicenseSniff.php
similarity index 97%
rename from Magento2/Sniffs/Legacy/LicenseSniff.php
rename to Magento2Framework/Sniffs/Header/LicenseSniff.php
index c6f8ba8a..667b3b2b 100644
--- a/Magento2/Sniffs/Legacy/LicenseSniff.php
+++ b/Magento2Framework/Sniffs/Header/LicenseSniff.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types = 1);
 
-namespace Magento2\Sniffs\Legacy;
+namespace Magento2Framework\Sniffs\Header;
 
 use Magento2\Sniffs\Less\TokenizerSymbolsInterface;
 use PHP_CodeSniffer\Files\File;
@@ -21,9 +21,9 @@ class LicenseSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
 
     private const WARNING_CODE = 'FoundLegacyTextInCopyright';
-    
+
     private const LEGACY_TEXTS = ['Irubin Consulting Inc', 'DBA Varien', 'Magento Inc'];
-    
+
     /**
      * @inheritdoc
      */
@@ -34,7 +34,7 @@ public function register()
             T_INLINE_HTML
         ];
     }
-    
+
     /**
      * @inheritDoc
      */
@@ -42,7 +42,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $content = null;
-        
+
         if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_STRING) {
             $content = $tokens[$stackPtr]['content'];
         }
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.1.xml b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.1.xml
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.1.xml
rename to Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.1.xml
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.2.js
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js
rename to Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.2.js
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.3.xml b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.3.xml
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.3.xml
rename to Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.3.xml
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.4.js
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js
rename to Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.4.js
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.5.less
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less
rename to Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.5.less
diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.php
similarity index 64%
rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
rename to Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.php
index 4223e600..c1b06f52 100644
--- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.php
@@ -3,10 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento2\Tests\Legacy;
+namespace Magento2Framework\Tests\Header;
 
-class CopyrightAnotherExtensionsFilesUnitTest extends AbstractJsSniffUnitTestCase
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class CopyrightAnotherExtensionsFilesUnitTest extends AbstractSniffUnitTest
 {
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $config = new Config();
+        $config->extensions = array_merge(
+            $config->extensions,
+            [
+                'js' => 'PHP'
+            ]
+        );
+
+        $GLOBALS['PHP_CODESNIFFER_CONFIG'] = $config;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.1.inc b/Magento2Framework/Tests/Header/CopyrightUnitTest.1.inc
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightUnitTest.1.inc
rename to Magento2Framework/Tests/Header/CopyrightUnitTest.1.inc
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.2.inc b/Magento2Framework/Tests/Header/CopyrightUnitTest.2.inc
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightUnitTest.2.inc
rename to Magento2Framework/Tests/Header/CopyrightUnitTest.2.inc
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.3.inc b/Magento2Framework/Tests/Header/CopyrightUnitTest.3.inc
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightUnitTest.3.inc
rename to Magento2Framework/Tests/Header/CopyrightUnitTest.3.inc
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.4.inc b/Magento2Framework/Tests/Header/CopyrightUnitTest.4.inc
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightUnitTest.4.inc
rename to Magento2Framework/Tests/Header/CopyrightUnitTest.4.inc
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.5.inc b/Magento2Framework/Tests/Header/CopyrightUnitTest.5.inc
similarity index 100%
rename from Magento2/Tests/Legacy/CopyrightUnitTest.5.inc
rename to Magento2Framework/Tests/Header/CopyrightUnitTest.5.inc
diff --git a/Magento2/Tests/Legacy/CopyrightUnitTest.php b/Magento2Framework/Tests/Header/CopyrightUnitTest.php
similarity index 95%
rename from Magento2/Tests/Legacy/CopyrightUnitTest.php
rename to Magento2Framework/Tests/Header/CopyrightUnitTest.php
index 1100bc53..065f6460 100644
--- a/Magento2/Tests/Legacy/CopyrightUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightUnitTest.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento2\Tests\Legacy;
+namespace Magento2Framework\Tests\Header;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -25,7 +25,7 @@ public function getWarningList($testFile = ''): array
         if ($testFile === 'CopyrightUnitTest.4.inc' || $testFile === 'CopyrightUnitTest.5.inc') {
             return [];
         }
-        
+
         if ($testFile === 'CopyrightUnitTest.1.inc') {
             return [
                 1 => 1,
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.1.inc b/Magento2Framework/Tests/Header/LicenseUnitTest.1.inc
similarity index 100%
rename from Magento2/Tests/Legacy/LicenseUnitTest.1.inc
rename to Magento2Framework/Tests/Header/LicenseUnitTest.1.inc
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.2.inc b/Magento2Framework/Tests/Header/LicenseUnitTest.2.inc
similarity index 100%
rename from Magento2/Tests/Legacy/LicenseUnitTest.2.inc
rename to Magento2Framework/Tests/Header/LicenseUnitTest.2.inc
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.3.xml b/Magento2Framework/Tests/Header/LicenseUnitTest.3.xml
similarity index 100%
rename from Magento2/Tests/Legacy/LicenseUnitTest.3.xml
rename to Magento2Framework/Tests/Header/LicenseUnitTest.3.xml
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.4.xml b/Magento2Framework/Tests/Header/LicenseUnitTest.4.xml
similarity index 100%
rename from Magento2/Tests/Legacy/LicenseUnitTest.4.xml
rename to Magento2Framework/Tests/Header/LicenseUnitTest.4.xml
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.5.less b/Magento2Framework/Tests/Header/LicenseUnitTest.5.less
similarity index 100%
rename from Magento2/Tests/Legacy/LicenseUnitTest.5.less
rename to Magento2Framework/Tests/Header/LicenseUnitTest.5.less
diff --git a/Magento2/Tests/Legacy/LicenseUnitTest.php b/Magento2Framework/Tests/Header/LicenseUnitTest.php
similarity index 95%
rename from Magento2/Tests/Legacy/LicenseUnitTest.php
rename to Magento2Framework/Tests/Header/LicenseUnitTest.php
index edcca88e..df32d8df 100644
--- a/Magento2/Tests/Legacy/LicenseUnitTest.php
+++ b/Magento2Framework/Tests/Header/LicenseUnitTest.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento2\Tests\Legacy;
+namespace Magento2Framework\Tests\Header;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -25,7 +25,7 @@ public function getWarningList($testFile = ''): array
         if ($testFile === 'LicenseUnitTest.1.inc' || $testFile === 'LicenseUnitTest.3.xml') {
             return [];
         }
-        
+
         if ($testFile === 'LicenseUnitTest.2.inc') {
             return [
                 3 => 1,
diff --git a/Magento2/magento-only-ruleset.xml b/Magento2Framework/ruleset.xml
similarity index 59%
rename from Magento2/magento-only-ruleset.xml
rename to Magento2Framework/ruleset.xml
index bace947f..434d10cc 100644
--- a/Magento2/magento-only-ruleset.xml
+++ b/Magento2Framework/ruleset.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
-<ruleset name="Magento2 Only">
-    <description>Magento Coding Standard sniffs applicable for Magento Open Source development only</description>
-    <rule ref="Magento2.Legacy.License">
+<ruleset name="Magento2Framework">
+    <description>Magento Coding Standard sniffs applicable for the framework testing only</description>
+    <rule ref="Magento2Framework.Header.License">
         <severity>5</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Legacy.CopyrightAnotherExtensionsFiles">
+    <rule ref="Magento2Framework.Header.CopyrightAnotherExtensionsFiles">
         <severity>5</severity>
         <type>warning</type>
         <exclude-pattern>*\.php$</exclude-pattern>
         <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Legacy.Copyright">
+    <rule ref="Magento2Framework.Header.Copyright">
         <severity>5</severity>
         <type>warning</type>
         <include-pattern>*\.php$</include-pattern>
diff --git a/composer.json b/composer.json
index 9b99b887..ede320cf 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
             "PHP_CodeSniffer/Tokenizers/"
         ],
         "psr-4": {
-            "Magento2\\": "Magento2/"
+            "Magento2\\": "Magento2/",
+            "Magento2Framework\\": "Magento2Framework/"
         }
     },
     "scripts": {
diff --git a/composer.lock b/composer.lock
index a62a83dc..0e7a89fc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.0",
+            "version": "3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
+                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
-                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e",
+                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e",
                 "shasum": ""
             },
             "require": {
@@ -60,7 +60,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-04-09T00:54:41+00:00"
+            "time": "2021-10-11T04:00:11+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -1924,6 +1924,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {

From dd1e3f6d78e6c28e5ba564fd784f0cc2ee718b3d Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 19 Oct 2021 14:33:58 +0100
Subject: [PATCH 353/630] AC-206: Optimized eslint test command

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 7e64fe7a..1af77466 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Install dependencies
       run: npm install
     - name: Run ESLint
-      run: npm run eslint -- eslint/rules Magento2 --ignore-pattern 'Magento2/Tests/Eslint/*Test.js'
+      run: npm run eslint -- eslint/rules
     - name: Run JSCS
       run: npm run jscs eslint/rules Magento2
 

From 1bd89ac238d6a718744daec62d8a546a02eb2b19 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 26 Oct 2021 10:56:28 +0200
Subject: [PATCH 354/630] AC-1549: Create codes for each type of returned error
 / warning

---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php |  12 +-
 Magento2/Sniffs/Legacy/DiConfigSniff.php      |  10 +-
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php |   7 +-
 .../Sniffs/Legacy/InstallUpgradeSniff.php     |  21 ++-
 Magento2/Sniffs/Legacy/LayoutSniff.php        |   7 +-
 .../Legacy/ObsoleteConfigNodesSniff.php       | 177 ++++++++++++++----
 .../Sniffs/Legacy/ObsoleteConnectionSniff.php |  20 +-
 .../Sniffs/Legacy/ObsoleteResponseSniff.php   |  20 +-
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php |  17 +-
 .../Sniffs/Legacy/RestrictedCodeSniff.php     |   3 +-
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php     |   7 +-
 .../Legacy/_files/restricted_classes.php      |   5 +
 .../NamingConvention/ReservedWordsSniff.php   |  42 ++++-
 13 files changed, 267 insertions(+), 81 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index de9884d2..705db1b0 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -15,12 +15,8 @@ class AbstractBlockSniff implements Sniff
     private const CHILD_HTML_METHOD = 'getChildHtml';
     private const CHILD_CHILD_HTML_METHOD = 'getChildChildHtml';
 
-    /**
-     * Error violation code.
-     *
-     * @var string
-     */
-    protected $errorCode = 'FoundCountOfParametersIncorrect';
+    private const ERROR_CODE_THIRD_PARAMETER = 'ThirdParameterNotNeeded';
+    private const ERROR_CODE_FOURTH_PARAMETER = 'FourthParameterNotNeeded';
 
     /**
      * @inheritdoc
@@ -52,14 +48,14 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->addError(
                 '3rd parameter is not needed anymore for getChildHtml()',
                 $stackPtr,
-                $this->errorCode
+                self::ERROR_CODE_THIRD_PARAMETER
             );
         }
         if ($content === self::CHILD_CHILD_HTML_METHOD && $paramsCount >= 4) {
             $phpcsFile->addError(
                 '4th parameter is not needed anymore for getChildChildHtml()',
                 $stackPtr,
-                $this->errorCode
+                self::ERROR_CODE_FOURTH_PARAMETER
             );
         }
     }
diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 954c32e0..89c0025d 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -11,7 +11,13 @@
 
 class DiConfigSniff implements Sniff
 {
-    private const WARNING_CODE = 'FoundObsoleteAttribute';
+    private $obsoleteDiNodesWarningCodes = [
+        '<param' => 'FoundObsoleteParamNode',
+        '<instance' => 'FoundObsoleteInstanceNode',
+        '<array' => 'FoundObsoleteArrayNode',
+        '<item key=' => 'FoundObsoleteItemNode',
+        '<value' => 'FoundObsoleteValueNode',
+    ];
 
     /**
      * @var string[] Associative array containing the obsolete nodes and the message to display when they are found.
@@ -46,7 +52,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $phpcsFile->addWarning(
                     $message,
                     $stackPtr,
-                    self::WARNING_CODE
+                    $this->obsoleteDiNodesWarningCodes[$element]
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
index 17ebbf08..1cff51fe 100644
--- a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -19,7 +19,10 @@ class EmailTemplateSniff implements Sniff
         '/\{\{escapehtml.*?\}\}/i' => 'Directive {{escapehtml}} is obsolete. Use {{var}} instead.',
     ];
 
-    private const ERROR_CODE = 'FoundObsoleteEmailDirective';
+    private $errorCodes = [
+        '/\{\{htmlescape.*?\}\}/i' => 'FoundObsoleteHtmlescapeDirective',
+        '/\{\{escapehtml.*?\}\}/i' => 'FoundObsoleteEscapehtmlDirective'
+    ];
 
     /**
      * @inheritdoc
@@ -42,7 +45,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $phpcsFile->addError(
                     $errorMessage,
                     $stackPtr,
-                    self::ERROR_CODE
+                    $this->errorCodes[$directiveRegex]
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index c7df570c..aad0e56b 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -13,7 +13,7 @@
 
 class InstallUpgradeSniff implements Sniff
 {
-    private const ERROR_CODE = 'obsoleteScript';
+    private const ERROR_CODE = 'invalidDirectory';
 
     /**
      * @var string[]
@@ -30,13 +30,28 @@ class InstallUpgradeSniff implements Sniff
             . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
         'UpgradeSchema' => 'UpgradeSchema scripts are obsolete. '
             . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-        'UpgradeData' => 'UpgradeSchema scripts are obsolete. '
+        'UpgradeData' => 'UpgradeData scripts are obsolete. '
             . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
         'data-upgrade-' => 'Upgrade scripts are obsolete. '
             . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
         'recurring' => 'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder',
     ];
 
+    /**
+     * @var string[]
+     */
+    private $wrongPrefixesErrorCodes = [
+        'install-' => 'obsoleteInstallScript',
+        'InstallSchema' => 'obsoleteInstallSchemaScript',
+        'InstallData' => 'obsoleteInstallDataScript',
+        'data-install-' => 'obsoleteDataInstallScript',
+        'upgrade-' => 'obsoleteUpgradeScript',
+        'UpgradeSchema' => 'obsoleteUpgradeSchemaScript',
+        'UpgradeData' => 'obsoleteUpgradeDataScript',
+        'data-upgrade-' => 'obsoleteDataUpgradeScript',
+        'recurring' => 'obsoleteRecurringScript',
+    ];
+
     /**
      * @inheritdoc
      */
@@ -60,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         foreach ($this->wrongPrefixes as $prefix => $errorMessage) {
             if (strpos($fileInfo->getFilename(), $prefix) === 0) {
-                $phpcsFile->addError($errorMessage, 0, self::ERROR_CODE);
+                $phpcsFile->addError($errorMessage, 0, $this->wrongPrefixesErrorCodes[$prefix]);
             }
         }
 
diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 3a2c2044..78b67b21 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -19,8 +19,9 @@ class LayoutSniff implements Sniff
 {
     private const ERROR_CODE_XML = 'WrongXML';
     private const ERROR_CODE_NOT_ALLOWED = 'NotAllowed';
-    private const ERROR_CODE_OBSOLETE = 'Obsolete';
+    private const ERROR_CODE_OBSOLETE_BLOCK = 'ObsoleteBlock';
     private const ERROR_CODE_OBSOLETE_CLASS = 'ObsoleteClass';
+    private const ERROR_CODE_OBSOLETE_TOHTML_ATTRIBUTE = 'ObsoleteToHtmlAttribute';
     private const ERROR_CODE_METHOD_NOT_ALLOWED = 'MethodNotAllowed';
     private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED = 'CharacterNotAllowedInAttribute';
     private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED = 'CharacterExpectedInAttribute';
@@ -254,7 +255,7 @@ private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFil
                     $phpcsFile->addError(
                         'The block being referenced is removed.',
                         dom_import_simplexml($reference)->getLineNo()-1,
-                        self::ERROR_CODE_OBSOLETE
+                        self::ERROR_CODE_OBSOLETE_BLOCK
                     );
                 }
             }
@@ -317,7 +318,7 @@ private function testOutputAttribute(SimpleXMLElement $layout, File $phpcsFile):
             $phpcsFile->addError(
                 'output="toHtml" is obsolete. Use output="1"',
                 dom_import_simplexml($elements[0])->getLineNo()-1,
-                self::ERROR_CODE_OBSOLETE
+                self::ERROR_CODE_OBSOLETE_TOHTML_ATTRIBUTE
             );
         };
     }
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index efc5fae7..9738d080 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -14,7 +14,104 @@
 class ObsoleteConfigNodesSniff implements Sniff
 {
     private const ERROR_MESSAGE_CONFIG = "Nodes identified by XPath '%s' are obsolete. %s";
-    private const ERROR_CODE_CONFIG = 'ObsoleteNodeInConfig';
+    private const ERROR_CODE_CONFIG = 'WrongXML';
+    private $obsoleteNodesErrorCodes = [
+        '/config/global/fieldsets' => 'obsoleteNodeGlobalFieldsets',
+        '/config/global/cache/betatypes' => 'obsoleteNodeBetatypes',
+        '/config/admin/fieldsets' => 'obsoleteNodeAdminFieldsets',
+        '/config/general/locale' => 'obsoleteNodeGeneralLocale',
+        '/config/global/can_use_base_url' => 'obsoleteNodeGlobalCanUseBaseURL',
+        '/config/global/locale/allow/codes' => 'obsoleteNodeAllowCodes',
+        '/config/global/locale/allow/currencies' => 'obsoleteNodeAllowCurrencies',
+        '/config/global/mime/types' => 'obsoleteNodeMimeTypes',
+        '/config/global/models/*/deprecatedNode' => 'obsoleteNodeDeprecatedNode',
+        '/config/global/models/*/entities/*/table' => 'obsoleteNodeEntitiesTable',
+        '/config/global/models/*/class' => 'obsoleteNodeModelsClass',
+        '/config/global/helpers/*/class' => 'obsoleteNodeHelpersClass',
+        '/config/global/blocks/*/class' => 'obsoleteNodeBlocksClass',
+        '/config/global/models/*/resourceModel' => 'obsoleteNodeResourceModel',
+        '/config/global/page/layouts' => 'obsoleteNodePageLayouts',
+        '/config/global/cms/layouts' => 'obsoleteNodeCmsLayouts',
+        '/config/global/payment/cc/types/*/validator' => 'obsoleteNodeTypesValidator',
+        '/config/global/payment' => 'obsoleteNodeGlobalPayment',
+        '/config/adminhtml/menu' => 'obsoleteNodeAdminhtmlMenu',
+        '/config/adminhtml/acl' => 'obsoleteNodeAdminhtmlAcl',
+        '/config/adminhtml/global_search' => 'obsoleteNodeAdminhtmlGlobalSearch',
+        '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'obsoleteNodeDi',
+        '/config/*[self::global|self::adminhtml|self::frontend]/events' => 'obsoleteNodeEvents',
+        '/config/*[self::global|self::adminhtml|self::frontend]/routers' => 'obsoleteNodeRouters',
+        '/config/global/importexport' => 'obsoleteNodeGlobalImportExport',
+        '/config/global/catalog/product/type' => 'obsoleteNodeProductType',
+        '/config/global/catalog/product/options' => 'obsoleteNodeProductOptions',
+        '/config/global/catalog/product/media/image_types' => 'obsoleteNodeMediaImageTypes',
+        '/config/global/eav_attributes' => 'obsoleteNodeEavAttributes',
+        '/config/global/index' => 'obsoleteNodeGlobalIndex',
+        '/config/global/catalogrule' => 'obsoleteNodeGlobalCatalogRule',
+        '/config/global/salesrule' => 'obsoleteNodeGlobalSalesRule',
+        '/config/global/session' => 'obsoleteNodeGlobalSession',
+        '/config/global/ignore_user_agents' => 'obsoleteNodeGlobalIgnoreUserAgents',
+        '/config/global/request' => 'obsoleteNodeGlobalRequest',
+        '/config/global/secure_url' => 'obsoleteNodeGlobalSecureUrl',
+        '/config/global/dev' => 'obsoleteNodeGlobalDev',
+        '/config/global/webapi' => 'obsoleteNodeGlobalWebapi',
+        '/config/global/cms' => 'obsoleteNodeGlobalCms',
+        '/config/global/widget' => 'obsoleteNodeGlobalWidget',
+        '/config/global/catalog/product/flat/max_index_count' => 'obsoleteNodeFlatMaxIndexCount',
+        '/config/global/catalog/product/flat/attribute_groups' => 'obsoleteNodeFlatAttributeGroups',
+        '/config/global/catalog/product/flat/add_filterable_attributes' => 'obsoleteNodeFlatAddIterableAttributes',
+        '/config/global/catalog/product/flat/add_child_data' => 'obsoleteNodeFlatAddChildData',
+        '/config/global/catalog/content/template_filter' => 'obsoleteNodeContentTemplateFilter',
+        '/config/frontend/catalog/per_page_values/list' => 'obsoleteNodePerPageValuesList',
+        '/config/frontend/catalog/per_page_values/grid' => 'obsoleteNodePerPageValuesGrid',
+        '/config/global/catalog/product/design' => 'obsoleteNodeProductDesign',
+        '/config/global/catalog/product/attributes' => 'obsoleteNodeProductAttributes',
+        '/config/global/eav_frontendclasses' => 'obsoleteNodeGlobalEavFrontendClasses',
+        '/config/global/resources' => 'obsoleteNodeGlobalResources',
+        '/config/global/resource' => 'obsoleteNodeGlobalResource',
+        '/config/*/events/core_block_abstract_to_html_after' => 'obsoleteNodeEventsCoreBlockAbstract',
+        '/config/*/events/catalog_controller_product_delete' => 'obsoleteNodeEventsCatalogController',
+        '/config//observers/*/args' => 'obsoleteNodeObserversArgs',
+        '/config/default/design/theme' => 'obsoleteNodeDesignTheme',
+        '/config/global/theme' => 'obsoleteNodeGlobalTheme',
+        '/config/default/web/*/base_js_url' => 'obsoleteNodeWebBaseJsUrl',
+        '/config/default/web/*/base_skin_url' => 'obsoleteNodeWebBaseSkinUrl',
+        '/config/default/web/*/base_cache_url' => 'obsoleteNodeWebBaseCacheUrl',
+        '/config/global/cache/types/*/tags' => 'obsoleteNodeTypesTags',
+        '/config/global/disable_local_modules' => 'obsoleteNodeGlobalDisableLocalModules',
+        '/config/global/newsletter/template_filter' => 'obsoleteNodeNewsletterTemplateFilter',
+        '/config/*/layout' => 'obsoleteNodeConfigLayout',
+        '/config/frontend/product/collection/attributes' => 'obsoleteNodeProductCollectionAttributes',
+        '/config/frontend/category/collection/attributes' => 'obsoleteNodeCategoryCollectionAttributes',
+        '/config/global/sales/quote/item/product_attributes' => 'obsoleteNodeQuoteItemProductAttributes',
+        '/config/global/wishlist/item/product_attributes' => 'obsoleteNodeWishlistItemProductAttributes',
+        '/config/global/catalog/product/flat/attribute_nodes' => 'obsoleteNodeFlatAttributeNodes',
+        '/config/global/customer/address/formats' => 'obsoleteNodeCustomerAddressFormats',
+        '/config/global/pdf' => 'obsoleteNodeGlobalPdf',
+        '/config/install' => 'obsoleteNodeConfigInstall',
+        '/config/install/design' => 'obsoleteNodeConfigInstallDesign',
+        '/config/adminhtml/design' => 'obsoleteNodeConfigAdminhtmlDesign',
+        '/config/frontend/design' => 'obsoleteNodeConfigFrontendDesign',
+        '/config/crontab' => 'obsoleteNodeConfigCrontab',
+        '/config/global/areas' => 'obsoleteNodeGlobalAreas',
+        '/config/vde' => 'obsoleteNodeConfigVde',
+        '/config/global/ignoredModules' => 'obsoleteNodeGlobalIgnoredModules',
+        '/config/global/helpers' => 'obsoleteNodeGlobalHelpers',
+        '/config/global/external_cache' => 'obsoleteNodeGlobalExternalCache',
+        '/config/global/currency/import/services' => 'obsoleteNodeCurrencyImportServices',
+        '/config/global/template' => 'obsoleteNodeGlobalTemplate',
+        '/config/default/general/file/sitemap_generate_valid_paths' => 'obsoleteNodeFileSitemap',
+        '/config/dev/css/minify_adapter' => 'obsoleteNodeCssMinify',
+        '/config/dev/js/minify_adapter' => 'obsoleteNodeJsMinify',
+        '/config/global/full_page_cache' => 'obsoleteNodeGlobalFullPageCache',
+        '/config/adminhtml/enterprise/admingws' => 'obsoleteNodeEnterpriseAdmingws',
+        '/config/adminhtml/enterprise/websiterestriction' => 'obsoleteNodeEnterpriseWebsiteRestriction',
+        '/config/global/enterprise_cms' => 'obsoleteNodeGlobalEnterpriseCms',
+        '/config/global/enterprise/banner' => 'obsoleteNodeGlobalEnterpriseBanner',
+        '/config/global/enterprise/giftcardaccount' => 'obsoleteNodeGlobalEnterpriseGiftCardAccount',
+        '/config/global/skip_process_modules_updates' => 'obsoleteNodeGlobalSkipProcess',
+        '/config/system/page_cache' => 'obsoleteNodeSystemPageCache',
+        '/config/system/cms/content/versioning' => 'obsoleteNodeContentVersioning',
+    ];
 
     /**
      * @inheritdoc
@@ -63,7 +160,7 @@ public function process(File $phpcsFile, $stackPtr)
                         $suggestion
                     ),
                     dom_import_simplexml($match)->getLineNo()-1,
-                    self::ERROR_CODE_CONFIG
+                    $this->obsoleteNodesErrorCodes[$xpath]
                 );
             }
         }
@@ -95,15 +192,15 @@ private function getObsoleteNodes(): array
             '/config/global/cache/betatypes' => '',
             '/config/admin/fieldsets' => '',
             '/config/general/locale' =>
-                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+                'This configuration moved to DI configuration of \Magento\Framework\Locale\ConfigInterface',
             '/config/global/can_use_base_url' =>
-                'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
+                'This configuration moved to DI configuration of \Magento\Backend\App\Action\Context class',
             '/config/global/locale/allow/codes' =>
-                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+                'This configuration moved to DI configuration of \Magento\Framework\Locale\ConfigInterface',
             '/config/global/locale/allow/currencies' =>
-                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+                'This configuration moved to DI configuration of \Magento\Framework\Locale\ConfigInterface',
             '/config/global/mime/types' =>
-                'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
+                'This configuration moved to DI configuration for \Magento\Downloadable\Helper\File class',
             '/config/global/models/*/deprecatedNode' => '',
             '/config/global/models/*/entities/*/table' => '',
             '/config/global/models/*/class' => '',
@@ -118,68 +215,68 @@ private function getObsoleteNodes(): array
             '/config/adminhtml/menu' => 'Move them to adminhtml.xml.',
             '/config/adminhtml/acl' => 'Move them to adminhtml.xml.',
             '/config/adminhtml/global_search' =>
-                'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
+                'This configuration moved to DI configuration of \Magento\Backend\Controller\Index',
             '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'This configuration moved to di.xml file',
             '/config/*[self::global|self::adminhtml|self::frontend]/events' =>
                 'This configuration moved to events.xml file',
             '/config/*[self::global|self::adminhtml|self::frontend]/routers' =>
                 'Routes configuration moved to routes.xml file,' .
-                'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
+                'routers list can be set through DI configuration of \Magento\Framework\App\RouterList model',
             '/config/global/importexport' => 'This configuration moved to import.xml and export.xml files',
             '/config/global/catalog/product/type' => 'This configuration moved to product_types.xml file',
             '/config/global/catalog/product/options' => 'This configuration moved to product_options.xml file',
-            '/config/global/catalog/product/media/image_types' => 'This configuration moved to Di configuration of ' .
+            '/config/global/catalog/product/media/image_types' => 'This configuration moved to DI configuration of ' .
                 '\Magento\Backend\Block\Catalog\Product\Frontend\Product\Watermark',
             '/config/global/eav_attributes' => 'This configuration moved to eav_attributes.xml file',
             '/config/global/index' => 'This configuration moved to indexers.xml file',
             '/config/global/catalogrule' =>
-                'This configuration moved to Di configuration of \Magento\CatalogRule\Model\Rule',
+                'This configuration moved to DI configuration of \Magento\CatalogRule\Model\Rule',
             '/config/global/salesrule' =>
-                'This configuration moved to Di configuration of \Magento\SalesRule\Helper\Coupon',
+                'This configuration moved to DI configuration of \Magento\SalesRule\Helper\Coupon',
             '/config/global/session' =>
-                'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
+                'This configuration moved to DI configuration of \Magento\Framework\Session\Validator',
             '/config/global/ignore_user_agents' =>
-                'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
+                'This configuration moved to DI configuration of \Magento\Log\Model\Visitor',
             '/config/global/request' =>
-                'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
+                'This configuration moved to DI configuration of \Magento\Framework\App\RequestInterface',
             '/config/global/secure_url' =>
-                'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
+                'This configuration moved to DI configuration of \Magento\Framework\Url\SecurityInfo',
             '/config/global/dev' =>
-                'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
+                'This configuration moved to DI configuration of \Magento\Framework\App\Action\Context',
             '/config/global/webapi' =>
-                'This configuration moved to Di configuration of '.
+                'This configuration moved to DI configuration of '.
                 ' \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
                 ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
             '/config/global/cms' =>
-                'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
+                'This configuration moved to DI configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
                 ' and \Magento\Cms\Model\Wysiwyg\Config',
             '/config/global/widget' =>
-                'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
+                'This configuration moved to DI configuration of \Magento\Cms\Model\Template\FilterProvider',
             '/config/global/catalog/product/flat/max_index_count' =>
-                'This configuration moved to Di configuration of '.
+                'This configuration moved to DI configuration of '.
                 '\Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
             '/config/global/catalog/product/flat/attribute_groups' =>
-                'This configuration moved to Di configuration of '.
+                'This configuration moved to DI configuration of '.
                 '\Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
             '/config/global/catalog/product/flat/add_filterable_attributes' =>
-                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+                'This configuration moved to DI configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
             '/config/global/catalog/product/flat/add_child_data' =>
-                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+                'This configuration moved to DI configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
             '/config/global/catalog/content/template_filter' =>
-                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
+                'This configuration moved to DI configuration of \Magento\Catalog\Helper\Data',
             '/config/frontend/catalog/per_page_values/list' =>
-                'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
+                'This configuration moved to DI configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
             '/config/frontend/catalog/per_page_values/grid' =>
-                'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
-            '/config/global/catalog/product/design' => 'This configuration moved to Di configuration of' .
+                'This configuration moved to DI configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
+            '/config/global/catalog/product/design' => 'This configuration moved to DI configuration of' .
                 ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
             '/config/global/catalog/product/attributes' => 'This configuration moved catalog_attributes.xml',
             '/config/global/eav_frontendclasses' => 'This configuration was removed. ' .
                 'Please pluginize \Magento\Eav\Helper\Data::getFrontendClasses to extend frontend classes list',
             '/config/global/resources' =>
-                'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+                'This configuration moved to DI configuration of \Magento\Framework\App\ResourceConnection',
             '/config/global/resource' =>
-                'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+                'This configuration moved to DI configuration of \Magento\Framework\App\ResourceConnection',
             '/config/*/events/core_block_abstract_to_html_after' =>
                 'Event has been replaced with "core_layout_render_element"',
             '/config/*/events/catalog_controller_product_delete' => '',
@@ -211,27 +308,29 @@ private function getObsoleteNodes(): array
             '/config/frontend/design' => 'Configurations moved to DI file settings',
             '/config/crontab' => 'All cron configurations moved to crontab.xml',
             '/config/global/areas' => 'Configurations moved to DI file settings',
-            '/config/vde' => 'Was moved to di',
-            '/config/global/ignoredModules' => 'Was replaced using di',
-            '/config/global/helpers' => 'Was replaced using di',
-            '/config/global/external_cache' => 'Was replaced using di',
+            '/config/vde' => 'Was moved to DI',
+            '/config/global/ignoredModules' => 'Was replaced using DI',
+            '/config/global/helpers' => 'Was replaced using DI',
+            '/config/global/external_cache' => 'Was replaced using DI',
             '/config/global/currency/import/services' => 'Configurations moved to DI file settings',
             '/config/global/template' => 'Use /config/template of email_templates.xml',
             '/config/default/general/file/sitemap_generate_valid_paths' => '/config/default/sitemap/file/valid_paths',
-            '/config/dev/css/minify_adapter' => 'Was replaced using di',
-            '/config/dev/js/minify_adapter' => 'Was replaced using di',
+            '/config/dev/css/minify_adapter' => 'Was replaced using DI',
+            '/config/dev/js/minify_adapter' => 'Was replaced using DI',
             '/config/global/full_page_cache' => '/config/global/cache_advanced/full_page',
             '/config/adminhtml/enterprise/admingws' => 'This configuration moved to admingws.xml file',
             '/config/adminhtml/enterprise/websiterestriction' =>
                 'This configuration moved to websiterestrictions.xml file',
             '/config/global/enterprise_cms' => 'This configuration moved to menu_hierarchy.xml file',
             '/config/global/enterprise/banner' =>
-                'This configuration moved to Di configuration of \Magento\Banner\Model\Config',
+                'This configuration moved to DI configuration of \Magento\Banner\Model\Config',
             '/config/global/enterprise/giftcardaccount' =>
-                'This configuration moved to Di configuration of \Magento\GiftCardAccountModelPool',
-            '/config/global/skip_process_modules_updates' => 'Was replaced using di',
+                'This configuration moved to DI configuration of \Magento\GiftCardAccountModelPool',
+            '/config/global/skip_process_modules_updates' => 'Was replaced using DI',
             '/config/system/page_cache' => 'Module is eliminated. Use PageCache module instead',
             '/config/system/cms/content/versioning' => 'Functionality is eliminated',
         ];
     }
+
+
 }
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
index a1425cab..a3372ff3 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -18,14 +18,14 @@ class ObsoleteConnectionSniff implements Sniff
      * @var string[]
      */
     private $obsoleteMethods = [
-        '_getReadConnection',
-        '_getWriteConnection',
-        '_getReadAdapter',
-        '_getWriteAdapter',
-        'getReadConnection',
-        'getWriteConnection',
-        'getReadAdapter',
-        'getWriteAdapter',
+        '_getReadConnection' => 'FoundObsoleteMethod_getReadConnection',
+        '_getWriteConnection' => 'FoundObsoleteMethod_getWriteConnection',
+        '_getReadAdapter' => 'FoundObsoleteMethod_getReadAdapter',
+        '_getWriteAdapter' => 'FoundObsoleteMethod_getWriteAdapter',
+        'getReadConnection' => 'FoundObsoleteMethodGetReadConnection',
+        'getWriteConnection' => 'FoundObsoleteMethodGetWriteConnection',
+        'getReadAdapter' => 'FoundObsoleteMethodGetReadAdapter',
+        'getWriteAdapter' => 'FoundObsoleteMethodGetWriteAdapter',
     ];
 
     /**
@@ -58,12 +58,12 @@ private function validateObsoleteMethod(File $phpcsFile, int $stackPtr)
         $tokens = $phpcsFile->getTokens();
         $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
         
-        foreach ($this->obsoleteMethods as $method) {
+        foreach ($this->obsoleteMethods as $method => $errorCode) {
             if ($tokens[$stringPos]['content'] === $method) {
                 $phpcsFile->addWarning(
                     sprintf("Contains obsolete method: %s. Please use getConnection method instead.", $method),
                     $stackPtr,
-                    self::ERROR_CODE_METHOD
+                    $errorCode
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
index 725a8b15..9dadee00 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
@@ -12,8 +12,6 @@
 
 class ObsoleteResponseSniff implements Sniff
 {
-    private const WARNING_CODE_METHOD = 'FoundObsoleteResponseMethod';
-    
     /**
      * @var string[]
      */
@@ -29,6 +27,22 @@ class ObsoleteResponseSniff implements Sniff
         '_addJs' => 'Please use \Magento\Backend\Model\View\Result\Page::addJs instead.',
         '_moveBlockToContainer' => 'Please use \Magento\Backend\Model\View\Result\Page::moveBlockToContainer instead.',
     ];
+
+    /**
+     * @var string[]
+     */
+    private $obsoleteResponseWarningCodes = [
+        'loadLayout' => 'loadLayoutResponseMethodFound',
+        'renderLayout' => 'renderLayoutResponseMethodFound',
+        '_redirect' => 'redirectResponseMethodFound',
+        '_forward' => 'forwardResponseMethodFound',
+        '_setActiveMenu' => 'setActiveMenuResponseMethodFound',
+        '_addBreadcrumb' => 'addBreadcrumbResponseMethodFound',
+        '_addContent' => 'addContentResponseMethodFound',
+        '_addLeft' => 'addLeftResponseMethodFound',
+        '_addJs' => 'addJsResponseMethodFound',
+        '_moveBlockToContainer' => 'moveBlockToContainerResponseMethodFound',
+    ];
     
     /**
      * @inheritdoc
@@ -54,7 +68,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $phpcsFile->addWarning(
                     sprintf('%s method is deprecated. %s', $method, $errorMessage),
                     $stackPtr,
-                    self::WARNING_CODE_METHOD
+                    $this->obsoleteResponseWarningCodes[$method]
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index 67d74575..cd9ef45e 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -13,6 +13,15 @@
 class PhtmlTemplateSniff implements Sniff
 {
     private const WARNING_CODE = 'PhtmlTemplateObsolete';
+    private const WARNING_CODE_TEXT_JAVASCRIPT = 'TextJavascriptTypeFound';
+    private const WARNING_CODE_THIS_USAGE = 'ThisUsageObsolete';
+    private const WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS = 'ProtectedPrivateBlockAccess';
+
+    private const WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
+        '/(["\'])jquery\/ui\1/' => 'JQueryUILibraryFound',
+        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'JSComponentInitInPHPFound',
+        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'JSComponentInitInPHPFound',
+    ];
 
     private const OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
         '/(["\'])jquery\/ui\1/' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ' .
@@ -77,7 +86,7 @@ private function checkBlockVariable(File $phpcsFile, int $stackPtr, array $token
                 'Access to protected and private members of Block class is ' .
                 'obsolete in phtml templates. Use only public members.',
                 $stringPos,
-                self::WARNING_CODE
+                self::WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS
             );
         }
     }
@@ -101,7 +110,7 @@ private function checkThisVariable(File $phpcsFile, int $stackPtr, array $tokens
                 'Access to members and methods of Block class through $this is ' .
                 'obsolete in phtml templates. Use only $block instead of $this.',
                 $stringPos,
-                self::WARNING_CODE
+                self::WARNING_CODE_THIS_USAGE
             );
         }
     }
@@ -120,7 +129,7 @@ private function checkHtml(File $phpcsFile, int $stackPtr): void
             $phpcsFile->addWarning(
                 'Please do not use "text/javascript" type attribute.',
                 $stackPtr,
-                self::WARNING_CODE
+                self::WARNING_CODE_TEXT_JAVASCRIPT
             );
         }
     }
@@ -140,7 +149,7 @@ private function checkHtmlSpecificFiles(File $phpcsFile, int $stackPtr): void
                 $phpcsFile->addWarning(
                     $errorMessage,
                     $stackPtr,
-                    self::WARNING_CODE
+                    self::WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES[$obsoleteRegex]
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
index 62ee2d4e..5b6c860c 100644
--- a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
+++ b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
@@ -16,7 +16,6 @@
 class RestrictedCodeSniff implements Sniff
 {
     private const ERROR_MESSAGE = "Class '%s' is restricted in %s. Suggested replacement: %s";
-    private const ERROR_CODE = "restrictedClass";
 
     /**
      * List of fixtures that contain restricted classes and should not be tested
@@ -76,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr)
                     $this->classes[$token]['replacement']
                 ),
                 $stackPtr,
-                self::ERROR_CODE,
+                $this->classes[$token]['warning_code'],
             );
         }
     }
diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index efd62aee..aee84dc8 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -15,7 +15,8 @@
  */
 class WidgetXMLSniff implements Sniff
 {
-    private const ERROR_CODE_OBSOLETE = 'FoundObsoleteNode';
+    private const ERROR_CODE_OBSOLETE_SUPPORTED_BLOCKS = 'FoundObsoleteNodeSupportedBlocks';
+    private const ERROR_CODE_OBSOLETE_BLOCK_NAME = 'FoundObsoleteNodeBlockName';
     private const ERROR_CODE_FACTORY = 'FoundFactory';
     private const ERROR_CODE_XML = 'WrongXML';
 
@@ -66,7 +67,7 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->addError(
                 "Obsolete node: <supported_blocks>. To be replaced with <supported_containers>",
                 dom_import_simplexml($element)->getLineNo() - 1,
-                self::ERROR_CODE_OBSOLETE
+                self::ERROR_CODE_OBSOLETE_SUPPORTED_BLOCKS
             );
         }
 
@@ -75,7 +76,7 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->addError(
                 "Obsolete node: <block_name>. To be replaced with <container_name>",
                 dom_import_simplexml($element)->getLineNo() - 1,
-                self::ERROR_CODE_OBSOLETE
+                self::ERROR_CODE_OBSOLETE_BLOCK_NAME
             );
         }
     }
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index 1052b994..41d4c698 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -13,6 +13,7 @@
  */
 return [
     'Zend_Db_Select' => [
+        'warning_code' => 'ZendDbSelectIsRestricted',
         'replacement' => '\Magento\Framework\DB\Select',
         'exclude' => [
             'Magento/Framework/DB/Select.php',
@@ -22,12 +23,14 @@
         ]
     ],
     'Zend_Db_Adapter_Pdo_Mysql' => [
+        'warning_code' => 'ZendDbAdapterPdoMysqlIsRestricted',
         'replacement' => '\Magento\Framework\DB\Adapter\Pdo\Mysql',
         'exclude' => [
             'Magento/Framework/DB/Adapter/Pdo/Mysql.php'
         ]
     ],
     'Magento\Framework\Serialize\Serializer\Serialize' => [
+        'warning_code' => 'SerializerSerializeIsRestricted',
         'replacement' => 'Magento\Framework\Serialize\SerializerInterface',
         'exclude' => [
             'Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php',
@@ -56,6 +59,7 @@
         ]
     ],
     'ArrayObject' => [
+        'warning_code' => 'ArrayObjectIsRestricted',
         'replacement' => 'Custom class, extended from ArrayObject with overwritten serialize/unserialize methods',
         'exclude' => [
                 'Magento/Theme/Model/Indexer/Design/Config.php',
@@ -78,6 +82,7 @@
             ]
     ],
     'Magento\Framework\View\Element\UiComponent\ArrayObjectFactory' => [
+        'warning_code' => 'ArrayObjectFactoryIsRestricted',
         'replacement' => 'Factory that creates custom class, extended from ArrayObject with overwritten '
             . 'serialize/unserialize methods',
         'exclude' => [
diff --git a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
index 23724a7c..19b80e41 100644
--- a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
+++ b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
@@ -36,6 +36,44 @@ class ReservedWordsSniff implements Sniff
         'numeric' => '7',
     ];
 
+    /**
+     * @var string[]
+     */
+    private $classErrorCodes = [
+        'int' => 'IntForbiddenAsClassName',
+        'float' => 'FloatForbiddenAsClassName',
+        'bool' => 'boolForbiddenAsClassName',
+        'string' => 'stringForbiddenAsClassName',
+        'true' => 'trueForbiddenAsClassName',
+        'false' => 'falseForbiddenAsClassName',
+        'null' => 'nullForbiddenAsClassName',
+        'void' => 'voidForbiddenAsClassName',
+        'iterable' => 'iterableForbiddenAsClassName',
+        'resource' => 'resourceForbiddenAsClassName',
+        'object' => 'objectForbiddenAsClassName',
+        'mixed' => 'mixedForbiddenAsClassName',
+        'numeric' => 'numericForbiddenAsClassName',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $namespaceErrorCodes = [
+        'int' => 'IntForbiddenAsNameSpace',
+        'float' => 'FloatForbiddenAsNameSpace',
+        'bool' => 'boolForbiddenAsNameSpace',
+        'string' => 'stringForbiddenAsNameSpace',
+        'true' => 'trueForbiddenAsNameSpace',
+        'false' => 'falseForbiddenAsNameSpace',
+        'null' => 'nullForbiddenAsNameSpace',
+        'void' => 'voidForbiddenAsNameSpace',
+        'iterable' => 'iterableForbiddenAsNameSpace',
+        'resource' => 'resourceForbiddenAsNameSpace',
+        'object' => 'objectForbiddenAsNameSpace',
+        'mixed' => 'mixedForbiddenAsNameSpace',
+        'numeric' => 'numericForbiddenAsNameSpace',
+    ];
+
     /**
      * @inheritdoc
      */
@@ -65,7 +103,7 @@ protected function validateNamespace(File $sourceFile, $stackPtr)
                 $sourceFile->addError(
                     'Cannot use "%s" in namespace as it is reserved since PHP %s',
                     $stackPtr,
-                    'Namespace',
+                    $this->namespaceErrorCodes[strtolower($namespacePart)],
                     [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
                 );
             }
@@ -89,7 +127,7 @@ protected function validateClass(File $sourceFile, $stackPtr)
             $sourceFile->addError(
                 'Cannot use "%s" as class name as it is reserved since PHP %s',
                 $stackPtr,
-                'Class',
+                $this->classErrorCodes[strtolower($className)],
                 [$className, $this->reservedWords[$className]]
             );
         }

From c147628c9524bd8f8e20c993aec62b61eb032962 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 26 Oct 2021 11:46:03 +0200
Subject: [PATCH 355/630] AC-1549: Fixed static tests

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php            | 3 +++
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php       | 3 +++
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php | 6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 89c0025d..164a084c 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -11,6 +11,9 @@
 
 class DiConfigSniff implements Sniff
 {
+    /**
+     * @var string[]
+     */
     private $obsoleteDiNodesWarningCodes = [
         '<param' => 'FoundObsoleteParamNode',
         '<instance' => 'FoundObsoleteInstanceNode',
diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
index 1cff51fe..69cbc751 100644
--- a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -19,6 +19,9 @@ class EmailTemplateSniff implements Sniff
         '/\{\{escapehtml.*?\}\}/i' => 'Directive {{escapehtml}} is obsolete. Use {{var}} instead.',
     ];
 
+    /**
+     * @var string[]
+     */
     private $errorCodes = [
         '/\{\{htmlescape.*?\}\}/i' => 'FoundObsoleteHtmlescapeDirective',
         '/\{\{escapehtml.*?\}\}/i' => 'FoundObsoleteEscapehtmlDirective'
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index 9738d080..effaf123 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -15,6 +15,10 @@ class ObsoleteConfigNodesSniff implements Sniff
 {
     private const ERROR_MESSAGE_CONFIG = "Nodes identified by XPath '%s' are obsolete. %s";
     private const ERROR_CODE_CONFIG = 'WrongXML';
+
+    /**
+     * @var string[]
+     */
     private $obsoleteNodesErrorCodes = [
         '/config/global/fieldsets' => 'obsoleteNodeGlobalFieldsets',
         '/config/global/cache/betatypes' => 'obsoleteNodeBetatypes',
@@ -331,6 +335,4 @@ private function getObsoleteNodes(): array
             '/config/system/cms/content/versioning' => 'Functionality is eliminated',
         ];
     }
-
-
 }

From 94a395a84265063ef3348f5d9fee124d114b3eb4 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 26 Oct 2021 13:04:55 +0200
Subject: [PATCH 356/630] AC-1549: Added more codes and cleaned up unused
 messages

---
 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php     | 12 +++++++++---
 Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php |  2 --
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php      |  1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index aad0e56b..e6c22cc4 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -13,8 +13,6 @@
 
 class InstallUpgradeSniff implements Sniff
 {
-    private const ERROR_CODE = 'invalidDirectory';
-
     /**
      * @var string[]
      */
@@ -52,6 +50,14 @@ class InstallUpgradeSniff implements Sniff
         'recurring' => 'obsoleteRecurringScript',
     ];
 
+    /**
+     * @var string[]
+     */
+    private $invalidDirectoriesErrorCodes = [
+        'data' => 'dataInvalidDirectory',
+        'sql' => 'sqlInvalidDirectory'
+    ];
+
     /**
      * @inheritdoc
      */
@@ -88,7 +94,7 @@ public function process(File $phpcsFile, $stackPtr)
                 . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"
                 . "- Use declarative schema approach in module's etc/db_schema.xml file for schema changes.",
                 0,
-                self::ERROR_CODE
+                $this->invalidDirectoriesErrorCodes[$folderName]
             );
         }
     }
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
index a3372ff3..c79844a5 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -12,8 +12,6 @@
 
 class ObsoleteConnectionSniff implements Sniff
 {
-    private const ERROR_CODE_METHOD = 'FoundObsoleteMethod';
-
     /**
      * @var string[]
      */
diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index cd9ef45e..e086adc5 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -12,7 +12,6 @@
 
 class PhtmlTemplateSniff implements Sniff
 {
-    private const WARNING_CODE = 'PhtmlTemplateObsolete';
     private const WARNING_CODE_TEXT_JAVASCRIPT = 'TextJavascriptTypeFound';
     private const WARNING_CODE_THIS_USAGE = 'ThisUsageObsolete';
     private const WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS = 'ProtectedPrivateBlockAccess';

From f76f48f7d1750ff4b405b2ed8f0a8a3a20b9c5e9 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 26 Oct 2021 14:54:46 +0200
Subject: [PATCH 357/630] Update Magento2/Sniffs/Legacy/InstallUpgradeSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index e6c22cc4..d1e0c787 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -39,7 +39,7 @@ class InstallUpgradeSniff implements Sniff
      * @var string[]
      */
     private $wrongPrefixesErrorCodes = [
-        'install-' => 'obsoleteInstallScript',
+        'install-' => 'ObsoleteInstallScript',
         'InstallSchema' => 'obsoleteInstallSchemaScript',
         'InstallData' => 'obsoleteInstallDataScript',
         'data-install-' => 'obsoleteDataInstallScript',

From 395320787697e254fb376a2b6207a92c2c113613 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 26 Oct 2021 14:54:53 +0200
Subject: [PATCH 358/630] Update Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index e086adc5..91de4672 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -18,7 +18,7 @@ class PhtmlTemplateSniff implements Sniff
 
     private const WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
         '/(["\'])jquery\/ui\1/' => 'JQueryUILibraryFound',
-        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'JSComponentInitInPHPFound',
+        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'FoundDataMageInit',
         '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'JSComponentInitInPHPFound',
     ];
 

From 28ce4efb524cbb9bfe35bd330f723d7692533cd5 Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 26 Oct 2021 14:54:58 +0200
Subject: [PATCH 359/630] Update Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index 91de4672..bb58f641 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -19,7 +19,7 @@ class PhtmlTemplateSniff implements Sniff
     private const WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
         '/(["\'])jquery\/ui\1/' => 'JQueryUILibraryFound',
         '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'FoundDataMageInit',
-        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'JSComponentInitInPHPFound',
+        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'FoundXMagentoInit',
     ];
 
     private const OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [

From d7c4374b4158c9f914b7f8685fa5e9d0bcd9c28d Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 26 Oct 2021 14:55:03 +0200
Subject: [PATCH 360/630] Update Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index bb58f641..dd4d06d1 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -17,7 +17,7 @@ class PhtmlTemplateSniff implements Sniff
     private const WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS = 'ProtectedPrivateBlockAccess';
 
     private const WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
-        '/(["\'])jquery\/ui\1/' => 'JQueryUILibraryFound',
+        '/(["\'])jquery\/ui\1/' => 'FoundJQueryUI',
         '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'FoundDataMageInit',
         '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'FoundXMagentoInit',
     ];

From ee515c3e8acaf3b126f2afec57785e0ac973a96d Mon Sep 17 00:00:00 2001
From: Sergio Vera <sergio.vera@gmail.com>
Date: Tue, 26 Oct 2021 14:55:09 +0200
Subject: [PATCH 361/630] Update
 Magento2/Sniffs/Legacy/_files/restricted_classes.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 Magento2/Sniffs/Legacy/_files/restricted_classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index 41d4c698..ed6d2540 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -13,7 +13,7 @@
  */
 return [
     'Zend_Db_Select' => [
-        'warning_code' => 'ZendDbSelectIsRestricted',
+        'warning_code' => 'ZendDbSelect',
         'replacement' => '\Magento\Framework\DB\Select',
         'exclude' => [
             'Magento/Framework/DB/Select.php',

From 2391b0db6d2940289752ce060d7d1f633df32d99 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 26 Oct 2021 16:51:59 +0200
Subject: [PATCH 362/630] AC-1549: Made suggestions

---
 Magento2/Sniffs/Legacy/DiConfigSniff.php      |  49 ++---
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php |  26 ++-
 .../Sniffs/Legacy/InstallUpgradeSniff.php     |  93 +++++----
 .../Legacy/ObsoleteConfigNodesSniff.php       | 179 ++++--------------
 .../Sniffs/Legacy/ObsoleteResponseSniff.php   |  20 +-
 .../NamingConvention/InterfaceNameSniff.php   |   6 +-
 .../NamingConvention/ReservedWordsSniff.php   |  55 +-----
 ...utogeneratedClassNotInConstructorSniff.php |   2 +-
 .../Sniffs/PHP/LiteralNamespacesSniff.php     |  10 +-
 9 files changed, 156 insertions(+), 284 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 164a084c..7495dd44 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -11,26 +11,27 @@
 
 class DiConfigSniff implements Sniff
 {
-    /**
-     * @var string[]
-     */
-    private $obsoleteDiNodesWarningCodes = [
-        '<param' => 'FoundObsoleteParamNode',
-        '<instance' => 'FoundObsoleteInstanceNode',
-        '<array' => 'FoundObsoleteArrayNode',
-        '<item key=' => 'FoundObsoleteItemNode',
-        '<value' => 'FoundObsoleteValueNode',
-    ];
-
-    /**
-     * @var string[] Associative array containing the obsolete nodes and the message to display when they are found.
-     */
-    private $obsoleteDiNodes = [
-        '<param' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">',
-        '<instance' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">',
-        '<array' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">',
-        '<item key=' => 'The <item key="..."> node is obsolete. Instead, use the <item name="..." xsi:type="...">',
-        '<value' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal.'
+    private const OBSOLETE_NODES = [
+        'FoundObsoleteParamNode' => [
+            'pattern' => '<param',
+            'message' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">'
+        ],
+        'FoundObsoleteInstanceNode' => [
+            'pattern' => '<instance',
+            'message' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">>'
+        ],
+        'FoundObsoleteArrayNode' => [
+            'pattern' => '<array',
+            'message' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">'
+        ],
+        'FoundObsoleteItemNode' => [
+            'pattern' => '<item key=',
+            'message' => 'The <item key="..."> node is obsolete. Instead, use the <item name="..." xsi:type="...">'
+        ],
+        'FoundObsoleteValueNode' => [
+            'pattern' => '<value',
+            'message' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal'
+        ],
     ];
 
     /**
@@ -50,12 +51,12 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $lineContent = $phpcsFile->getTokensAsString($stackPtr, 1);
 
-        foreach ($this->obsoleteDiNodes as $element => $message) {
-            if (strpos($lineContent, $element) !== false) {
+        foreach (self::OBSOLETE_NODES as $code => $data) {
+            if (strpos($lineContent, $data['pattern']) !== false) {
                 $phpcsFile->addWarning(
-                    $message,
+                    $data['message'],
                     $stackPtr,
-                    $this->obsoleteDiNodesWarningCodes[$element]
+                    $code
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
index 69cbc751..85d6b9a0 100644
--- a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -15,16 +15,14 @@
 class EmailTemplateSniff implements Sniff
 {
     private const OBSOLETE_EMAIL_DIRECTIVES = [
-        '/\{\{htmlescape.*?\}\}/i' => 'Directive {{htmlescape}} is obsolete. Use {{var}} instead.',
-        '/\{\{escapehtml.*?\}\}/i' => 'Directive {{escapehtml}} is obsolete. Use {{var}} instead.',
-    ];
-
-    /**
-     * @var string[]
-     */
-    private $errorCodes = [
-        '/\{\{htmlescape.*?\}\}/i' => 'FoundObsoleteHtmlescapeDirective',
-        '/\{\{escapehtml.*?\}\}/i' => 'FoundObsoleteEscapehtmlDirective'
+        'FoundObsoleteHtmlescapeDirective' => [
+            'pattern' => '/\{\{htmlescape.*?\}\}/i',
+            'message' => 'Directive {{htmlescape}} is obsolete. Use {{var}} instead.',
+        ],
+        'FoundObsoleteEscapehtmlDirective' => [
+            'pattern' => '/\{\{escapehtml.*?\}\}/i',
+            'message' => 'Directive {{escapehtml}} is obsolete. Use {{var}} instead.',
+        ],
     ];
 
     /**
@@ -43,12 +41,12 @@ public function register(): array
     public function process(File $phpcsFile, $stackPtr)
     {
         $content = $phpcsFile->getTokens()[$stackPtr]['content'];
-        foreach (self::OBSOLETE_EMAIL_DIRECTIVES as $directiveRegex => $errorMessage) {
-            if (preg_match($directiveRegex, $content)) {
+        foreach (self::OBSOLETE_EMAIL_DIRECTIVES as $code => $data) {
+            if (preg_match($data['pattern'], $content)) {
                 $phpcsFile->addError(
-                    $errorMessage,
+                    $data['message'],
                     $stackPtr,
-                    $this->errorCodes[$directiveRegex]
+                    $code
                 );
             }
         }
diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index d1e0c787..09dbedfb 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -13,49 +13,58 @@
 
 class InstallUpgradeSniff implements Sniff
 {
-    /**
-     * @var string[]
-     */
-    private $wrongPrefixes = [
-        'install-' => 'Install scripts are obsolete. '
-            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-        'InstallSchema' => 'InstallSchema scripts are obsolete. '
-            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-        'InstallData' => 'InstallData scripts are obsolete. '
-            . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
-        'data-install-' => 'Install scripts are obsolete. Please create class InstallData in module\'s Setup folder',
-        'upgrade-' => 'Upgrade scripts are obsolete. '
-            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-        'UpgradeSchema' => 'UpgradeSchema scripts are obsolete. '
-            . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
-        'UpgradeData' => 'UpgradeData scripts are obsolete. '
-            . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
-        'data-upgrade-' => 'Upgrade scripts are obsolete. '
-            . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
-        'recurring' => 'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder',
-    ];
-
-    /**
-     * @var string[]
-     */
-    private $wrongPrefixesErrorCodes = [
-        'install-' => 'ObsoleteInstallScript',
-        'InstallSchema' => 'obsoleteInstallSchemaScript',
-        'InstallData' => 'obsoleteInstallDataScript',
-        'data-install-' => 'obsoleteDataInstallScript',
-        'upgrade-' => 'obsoleteUpgradeScript',
-        'UpgradeSchema' => 'obsoleteUpgradeSchemaScript',
-        'UpgradeData' => 'obsoleteUpgradeDataScript',
-        'data-upgrade-' => 'obsoleteDataUpgradeScript',
-        'recurring' => 'obsoleteRecurringScript',
+    private const WRONG_PREFIXES = [
+        'ObsoleteInstallScript' => [
+            'pattern' => 'install-',
+            'message' => 'Install scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        ],
+        'ObsoleteInstallSchemaScript' => [
+            'pattern' => 'InstallSchema',
+            'message' => 'InstallSchema scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        ],
+        'ObsoleteInstallDataScript' => [
+            'pattern' => 'InstallData',
+            'message' => 'InstallData scripts are obsolete. '
+                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+        ],
+        'ObsoleteDataInstallScript' => [
+            'pattern' => 'data-install-',
+            'message' => 'Install scripts are obsolete. Please create class InstallData in module\'s Setup folder',
+        ],
+        'ObsoleteUpgradeScript' => [
+            'pattern' => 'upgrade-',
+            'message' => 'Upgrade scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        ],
+        'ObsoleteUpgradeSchemaScript' => [
+            'pattern' => 'UpgradeSchema',
+            'message' => 'UpgradeSchema scripts are obsolete. '
+                . 'Please use declarative schema approach in module\'s etc/db_schema.xml file',
+        ],
+        'ObsoleteUpgradeDataScript' => [
+            'pattern' => 'UpgradeData',
+            'message' => 'UpgradeData scripts are obsolete. '
+                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+        ],
+        'ObsoleteDataUpgradeScript' => [
+            'pattern' => 'data-upgrade',
+            'message' => 'Upgrade scripts are obsolete. '
+                . 'Please use data patches approach in module\'s Setup/Patch/Data dir',
+        ],
+        'ObsoleteRecurringScript' => [
+            'pattern' => 'recurring',
+            'message' => 'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder'
+        ]
     ];
 
     /**
      * @var string[]
      */
-    private $invalidDirectoriesErrorCodes = [
-        'data' => 'dataInvalidDirectory',
-        'sql' => 'sqlInvalidDirectory'
+    private const INVALID_DIRECTORIES_ERROR_CODES = [
+        'data' => 'DataInvalidDirectory',
+        'sql' => 'SqlInvalidDirectory'
     ];
 
     /**
@@ -79,9 +88,9 @@ public function process(File $phpcsFile, $stackPtr)
         
         $fileInfo = new SplFileInfo($phpcsFile->getFilename());
 
-        foreach ($this->wrongPrefixes as $prefix => $errorMessage) {
-            if (strpos($fileInfo->getFilename(), $prefix) === 0) {
-                $phpcsFile->addError($errorMessage, 0, $this->wrongPrefixesErrorCodes[$prefix]);
+        foreach (self::WRONG_PREFIXES as $code => $data) {
+            if (strpos($fileInfo->getFilename(), $data['pattern']) === 0) {
+                $phpcsFile->addError($data['message'], 0, $code);
             }
         }
 
@@ -94,7 +103,7 @@ public function process(File $phpcsFile, $stackPtr)
                 . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"
                 . "- Use declarative schema approach in module's etc/db_schema.xml file for schema changes.",
                 0,
-                $this->invalidDirectoriesErrorCodes[$folderName]
+                self::INVALID_DIRECTORIES_ERROR_CODES[$folderName]
             );
         }
     }
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index effaf123..efc5fae7 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -14,108 +14,7 @@
 class ObsoleteConfigNodesSniff implements Sniff
 {
     private const ERROR_MESSAGE_CONFIG = "Nodes identified by XPath '%s' are obsolete. %s";
-    private const ERROR_CODE_CONFIG = 'WrongXML';
-
-    /**
-     * @var string[]
-     */
-    private $obsoleteNodesErrorCodes = [
-        '/config/global/fieldsets' => 'obsoleteNodeGlobalFieldsets',
-        '/config/global/cache/betatypes' => 'obsoleteNodeBetatypes',
-        '/config/admin/fieldsets' => 'obsoleteNodeAdminFieldsets',
-        '/config/general/locale' => 'obsoleteNodeGeneralLocale',
-        '/config/global/can_use_base_url' => 'obsoleteNodeGlobalCanUseBaseURL',
-        '/config/global/locale/allow/codes' => 'obsoleteNodeAllowCodes',
-        '/config/global/locale/allow/currencies' => 'obsoleteNodeAllowCurrencies',
-        '/config/global/mime/types' => 'obsoleteNodeMimeTypes',
-        '/config/global/models/*/deprecatedNode' => 'obsoleteNodeDeprecatedNode',
-        '/config/global/models/*/entities/*/table' => 'obsoleteNodeEntitiesTable',
-        '/config/global/models/*/class' => 'obsoleteNodeModelsClass',
-        '/config/global/helpers/*/class' => 'obsoleteNodeHelpersClass',
-        '/config/global/blocks/*/class' => 'obsoleteNodeBlocksClass',
-        '/config/global/models/*/resourceModel' => 'obsoleteNodeResourceModel',
-        '/config/global/page/layouts' => 'obsoleteNodePageLayouts',
-        '/config/global/cms/layouts' => 'obsoleteNodeCmsLayouts',
-        '/config/global/payment/cc/types/*/validator' => 'obsoleteNodeTypesValidator',
-        '/config/global/payment' => 'obsoleteNodeGlobalPayment',
-        '/config/adminhtml/menu' => 'obsoleteNodeAdminhtmlMenu',
-        '/config/adminhtml/acl' => 'obsoleteNodeAdminhtmlAcl',
-        '/config/adminhtml/global_search' => 'obsoleteNodeAdminhtmlGlobalSearch',
-        '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'obsoleteNodeDi',
-        '/config/*[self::global|self::adminhtml|self::frontend]/events' => 'obsoleteNodeEvents',
-        '/config/*[self::global|self::adminhtml|self::frontend]/routers' => 'obsoleteNodeRouters',
-        '/config/global/importexport' => 'obsoleteNodeGlobalImportExport',
-        '/config/global/catalog/product/type' => 'obsoleteNodeProductType',
-        '/config/global/catalog/product/options' => 'obsoleteNodeProductOptions',
-        '/config/global/catalog/product/media/image_types' => 'obsoleteNodeMediaImageTypes',
-        '/config/global/eav_attributes' => 'obsoleteNodeEavAttributes',
-        '/config/global/index' => 'obsoleteNodeGlobalIndex',
-        '/config/global/catalogrule' => 'obsoleteNodeGlobalCatalogRule',
-        '/config/global/salesrule' => 'obsoleteNodeGlobalSalesRule',
-        '/config/global/session' => 'obsoleteNodeGlobalSession',
-        '/config/global/ignore_user_agents' => 'obsoleteNodeGlobalIgnoreUserAgents',
-        '/config/global/request' => 'obsoleteNodeGlobalRequest',
-        '/config/global/secure_url' => 'obsoleteNodeGlobalSecureUrl',
-        '/config/global/dev' => 'obsoleteNodeGlobalDev',
-        '/config/global/webapi' => 'obsoleteNodeGlobalWebapi',
-        '/config/global/cms' => 'obsoleteNodeGlobalCms',
-        '/config/global/widget' => 'obsoleteNodeGlobalWidget',
-        '/config/global/catalog/product/flat/max_index_count' => 'obsoleteNodeFlatMaxIndexCount',
-        '/config/global/catalog/product/flat/attribute_groups' => 'obsoleteNodeFlatAttributeGroups',
-        '/config/global/catalog/product/flat/add_filterable_attributes' => 'obsoleteNodeFlatAddIterableAttributes',
-        '/config/global/catalog/product/flat/add_child_data' => 'obsoleteNodeFlatAddChildData',
-        '/config/global/catalog/content/template_filter' => 'obsoleteNodeContentTemplateFilter',
-        '/config/frontend/catalog/per_page_values/list' => 'obsoleteNodePerPageValuesList',
-        '/config/frontend/catalog/per_page_values/grid' => 'obsoleteNodePerPageValuesGrid',
-        '/config/global/catalog/product/design' => 'obsoleteNodeProductDesign',
-        '/config/global/catalog/product/attributes' => 'obsoleteNodeProductAttributes',
-        '/config/global/eav_frontendclasses' => 'obsoleteNodeGlobalEavFrontendClasses',
-        '/config/global/resources' => 'obsoleteNodeGlobalResources',
-        '/config/global/resource' => 'obsoleteNodeGlobalResource',
-        '/config/*/events/core_block_abstract_to_html_after' => 'obsoleteNodeEventsCoreBlockAbstract',
-        '/config/*/events/catalog_controller_product_delete' => 'obsoleteNodeEventsCatalogController',
-        '/config//observers/*/args' => 'obsoleteNodeObserversArgs',
-        '/config/default/design/theme' => 'obsoleteNodeDesignTheme',
-        '/config/global/theme' => 'obsoleteNodeGlobalTheme',
-        '/config/default/web/*/base_js_url' => 'obsoleteNodeWebBaseJsUrl',
-        '/config/default/web/*/base_skin_url' => 'obsoleteNodeWebBaseSkinUrl',
-        '/config/default/web/*/base_cache_url' => 'obsoleteNodeWebBaseCacheUrl',
-        '/config/global/cache/types/*/tags' => 'obsoleteNodeTypesTags',
-        '/config/global/disable_local_modules' => 'obsoleteNodeGlobalDisableLocalModules',
-        '/config/global/newsletter/template_filter' => 'obsoleteNodeNewsletterTemplateFilter',
-        '/config/*/layout' => 'obsoleteNodeConfigLayout',
-        '/config/frontend/product/collection/attributes' => 'obsoleteNodeProductCollectionAttributes',
-        '/config/frontend/category/collection/attributes' => 'obsoleteNodeCategoryCollectionAttributes',
-        '/config/global/sales/quote/item/product_attributes' => 'obsoleteNodeQuoteItemProductAttributes',
-        '/config/global/wishlist/item/product_attributes' => 'obsoleteNodeWishlistItemProductAttributes',
-        '/config/global/catalog/product/flat/attribute_nodes' => 'obsoleteNodeFlatAttributeNodes',
-        '/config/global/customer/address/formats' => 'obsoleteNodeCustomerAddressFormats',
-        '/config/global/pdf' => 'obsoleteNodeGlobalPdf',
-        '/config/install' => 'obsoleteNodeConfigInstall',
-        '/config/install/design' => 'obsoleteNodeConfigInstallDesign',
-        '/config/adminhtml/design' => 'obsoleteNodeConfigAdminhtmlDesign',
-        '/config/frontend/design' => 'obsoleteNodeConfigFrontendDesign',
-        '/config/crontab' => 'obsoleteNodeConfigCrontab',
-        '/config/global/areas' => 'obsoleteNodeGlobalAreas',
-        '/config/vde' => 'obsoleteNodeConfigVde',
-        '/config/global/ignoredModules' => 'obsoleteNodeGlobalIgnoredModules',
-        '/config/global/helpers' => 'obsoleteNodeGlobalHelpers',
-        '/config/global/external_cache' => 'obsoleteNodeGlobalExternalCache',
-        '/config/global/currency/import/services' => 'obsoleteNodeCurrencyImportServices',
-        '/config/global/template' => 'obsoleteNodeGlobalTemplate',
-        '/config/default/general/file/sitemap_generate_valid_paths' => 'obsoleteNodeFileSitemap',
-        '/config/dev/css/minify_adapter' => 'obsoleteNodeCssMinify',
-        '/config/dev/js/minify_adapter' => 'obsoleteNodeJsMinify',
-        '/config/global/full_page_cache' => 'obsoleteNodeGlobalFullPageCache',
-        '/config/adminhtml/enterprise/admingws' => 'obsoleteNodeEnterpriseAdmingws',
-        '/config/adminhtml/enterprise/websiterestriction' => 'obsoleteNodeEnterpriseWebsiteRestriction',
-        '/config/global/enterprise_cms' => 'obsoleteNodeGlobalEnterpriseCms',
-        '/config/global/enterprise/banner' => 'obsoleteNodeGlobalEnterpriseBanner',
-        '/config/global/enterprise/giftcardaccount' => 'obsoleteNodeGlobalEnterpriseGiftCardAccount',
-        '/config/global/skip_process_modules_updates' => 'obsoleteNodeGlobalSkipProcess',
-        '/config/system/page_cache' => 'obsoleteNodeSystemPageCache',
-        '/config/system/cms/content/versioning' => 'obsoleteNodeContentVersioning',
-    ];
+    private const ERROR_CODE_CONFIG = 'ObsoleteNodeInConfig';
 
     /**
      * @inheritdoc
@@ -164,7 +63,7 @@ public function process(File $phpcsFile, $stackPtr)
                         $suggestion
                     ),
                     dom_import_simplexml($match)->getLineNo()-1,
-                    $this->obsoleteNodesErrorCodes[$xpath]
+                    self::ERROR_CODE_CONFIG
                 );
             }
         }
@@ -196,15 +95,15 @@ private function getObsoleteNodes(): array
             '/config/global/cache/betatypes' => '',
             '/config/admin/fieldsets' => '',
             '/config/general/locale' =>
-                'This configuration moved to DI configuration of \Magento\Framework\Locale\ConfigInterface',
+                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
             '/config/global/can_use_base_url' =>
-                'This configuration moved to DI configuration of \Magento\Backend\App\Action\Context class',
+                'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
             '/config/global/locale/allow/codes' =>
-                'This configuration moved to DI configuration of \Magento\Framework\Locale\ConfigInterface',
+                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
             '/config/global/locale/allow/currencies' =>
-                'This configuration moved to DI configuration of \Magento\Framework\Locale\ConfigInterface',
+                'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
             '/config/global/mime/types' =>
-                'This configuration moved to DI configuration for \Magento\Downloadable\Helper\File class',
+                'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
             '/config/global/models/*/deprecatedNode' => '',
             '/config/global/models/*/entities/*/table' => '',
             '/config/global/models/*/class' => '',
@@ -219,68 +118,68 @@ private function getObsoleteNodes(): array
             '/config/adminhtml/menu' => 'Move them to adminhtml.xml.',
             '/config/adminhtml/acl' => 'Move them to adminhtml.xml.',
             '/config/adminhtml/global_search' =>
-                'This configuration moved to DI configuration of \Magento\Backend\Controller\Index',
+                'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
             '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'This configuration moved to di.xml file',
             '/config/*[self::global|self::adminhtml|self::frontend]/events' =>
                 'This configuration moved to events.xml file',
             '/config/*[self::global|self::adminhtml|self::frontend]/routers' =>
                 'Routes configuration moved to routes.xml file,' .
-                'routers list can be set through DI configuration of \Magento\Framework\App\RouterList model',
+                'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
             '/config/global/importexport' => 'This configuration moved to import.xml and export.xml files',
             '/config/global/catalog/product/type' => 'This configuration moved to product_types.xml file',
             '/config/global/catalog/product/options' => 'This configuration moved to product_options.xml file',
-            '/config/global/catalog/product/media/image_types' => 'This configuration moved to DI configuration of ' .
+            '/config/global/catalog/product/media/image_types' => 'This configuration moved to Di configuration of ' .
                 '\Magento\Backend\Block\Catalog\Product\Frontend\Product\Watermark',
             '/config/global/eav_attributes' => 'This configuration moved to eav_attributes.xml file',
             '/config/global/index' => 'This configuration moved to indexers.xml file',
             '/config/global/catalogrule' =>
-                'This configuration moved to DI configuration of \Magento\CatalogRule\Model\Rule',
+                'This configuration moved to Di configuration of \Magento\CatalogRule\Model\Rule',
             '/config/global/salesrule' =>
-                'This configuration moved to DI configuration of \Magento\SalesRule\Helper\Coupon',
+                'This configuration moved to Di configuration of \Magento\SalesRule\Helper\Coupon',
             '/config/global/session' =>
-                'This configuration moved to DI configuration of \Magento\Framework\Session\Validator',
+                'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
             '/config/global/ignore_user_agents' =>
-                'This configuration moved to DI configuration of \Magento\Log\Model\Visitor',
+                'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
             '/config/global/request' =>
-                'This configuration moved to DI configuration of \Magento\Framework\App\RequestInterface',
+                'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
             '/config/global/secure_url' =>
-                'This configuration moved to DI configuration of \Magento\Framework\Url\SecurityInfo',
+                'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
             '/config/global/dev' =>
-                'This configuration moved to DI configuration of \Magento\Framework\App\Action\Context',
+                'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
             '/config/global/webapi' =>
-                'This configuration moved to DI configuration of '.
+                'This configuration moved to Di configuration of '.
                 ' \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
                 ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
             '/config/global/cms' =>
-                'This configuration moved to DI configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
+                'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
                 ' and \Magento\Cms\Model\Wysiwyg\Config',
             '/config/global/widget' =>
-                'This configuration moved to DI configuration of \Magento\Cms\Model\Template\FilterProvider',
+                'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
             '/config/global/catalog/product/flat/max_index_count' =>
-                'This configuration moved to DI configuration of '.
+                'This configuration moved to Di configuration of '.
                 '\Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
             '/config/global/catalog/product/flat/attribute_groups' =>
-                'This configuration moved to DI configuration of '.
+                'This configuration moved to Di configuration of '.
                 '\Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
             '/config/global/catalog/product/flat/add_filterable_attributes' =>
-                'This configuration moved to DI configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
             '/config/global/catalog/product/flat/add_child_data' =>
-                'This configuration moved to DI configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
             '/config/global/catalog/content/template_filter' =>
-                'This configuration moved to DI configuration of \Magento\Catalog\Helper\Data',
+                'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
             '/config/frontend/catalog/per_page_values/list' =>
-                'This configuration moved to DI configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
+                'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
             '/config/frontend/catalog/per_page_values/grid' =>
-                'This configuration moved to DI configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
-            '/config/global/catalog/product/design' => 'This configuration moved to DI configuration of' .
+                'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
+            '/config/global/catalog/product/design' => 'This configuration moved to Di configuration of' .
                 ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
             '/config/global/catalog/product/attributes' => 'This configuration moved catalog_attributes.xml',
             '/config/global/eav_frontendclasses' => 'This configuration was removed. ' .
                 'Please pluginize \Magento\Eav\Helper\Data::getFrontendClasses to extend frontend classes list',
             '/config/global/resources' =>
-                'This configuration moved to DI configuration of \Magento\Framework\App\ResourceConnection',
+                'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
             '/config/global/resource' =>
-                'This configuration moved to DI configuration of \Magento\Framework\App\ResourceConnection',
+                'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
             '/config/*/events/core_block_abstract_to_html_after' =>
                 'Event has been replaced with "core_layout_render_element"',
             '/config/*/events/catalog_controller_product_delete' => '',
@@ -312,25 +211,25 @@ private function getObsoleteNodes(): array
             '/config/frontend/design' => 'Configurations moved to DI file settings',
             '/config/crontab' => 'All cron configurations moved to crontab.xml',
             '/config/global/areas' => 'Configurations moved to DI file settings',
-            '/config/vde' => 'Was moved to DI',
-            '/config/global/ignoredModules' => 'Was replaced using DI',
-            '/config/global/helpers' => 'Was replaced using DI',
-            '/config/global/external_cache' => 'Was replaced using DI',
+            '/config/vde' => 'Was moved to di',
+            '/config/global/ignoredModules' => 'Was replaced using di',
+            '/config/global/helpers' => 'Was replaced using di',
+            '/config/global/external_cache' => 'Was replaced using di',
             '/config/global/currency/import/services' => 'Configurations moved to DI file settings',
             '/config/global/template' => 'Use /config/template of email_templates.xml',
             '/config/default/general/file/sitemap_generate_valid_paths' => '/config/default/sitemap/file/valid_paths',
-            '/config/dev/css/minify_adapter' => 'Was replaced using DI',
-            '/config/dev/js/minify_adapter' => 'Was replaced using DI',
+            '/config/dev/css/minify_adapter' => 'Was replaced using di',
+            '/config/dev/js/minify_adapter' => 'Was replaced using di',
             '/config/global/full_page_cache' => '/config/global/cache_advanced/full_page',
             '/config/adminhtml/enterprise/admingws' => 'This configuration moved to admingws.xml file',
             '/config/adminhtml/enterprise/websiterestriction' =>
                 'This configuration moved to websiterestrictions.xml file',
             '/config/global/enterprise_cms' => 'This configuration moved to menu_hierarchy.xml file',
             '/config/global/enterprise/banner' =>
-                'This configuration moved to DI configuration of \Magento\Banner\Model\Config',
+                'This configuration moved to Di configuration of \Magento\Banner\Model\Config',
             '/config/global/enterprise/giftcardaccount' =>
-                'This configuration moved to DI configuration of \Magento\GiftCardAccountModelPool',
-            '/config/global/skip_process_modules_updates' => 'Was replaced using DI',
+                'This configuration moved to Di configuration of \Magento\GiftCardAccountModelPool',
+            '/config/global/skip_process_modules_updates' => 'Was replaced using di',
             '/config/system/page_cache' => 'Module is eliminated. Use PageCache module instead',
             '/config/system/cms/content/versioning' => 'Functionality is eliminated',
         ];
diff --git a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
index 9dadee00..765ae5f1 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
@@ -32,16 +32,16 @@ class ObsoleteResponseSniff implements Sniff
      * @var string[]
      */
     private $obsoleteResponseWarningCodes = [
-        'loadLayout' => 'loadLayoutResponseMethodFound',
-        'renderLayout' => 'renderLayoutResponseMethodFound',
-        '_redirect' => 'redirectResponseMethodFound',
-        '_forward' => 'forwardResponseMethodFound',
-        '_setActiveMenu' => 'setActiveMenuResponseMethodFound',
-        '_addBreadcrumb' => 'addBreadcrumbResponseMethodFound',
-        '_addContent' => 'addContentResponseMethodFound',
-        '_addLeft' => 'addLeftResponseMethodFound',
-        '_addJs' => 'addJsResponseMethodFound',
-        '_moveBlockToContainer' => 'moveBlockToContainerResponseMethodFound',
+        'loadLayout' => 'LoadLayoutResponseMethodFound',
+        'renderLayout' => 'RenderLayoutResponseMethodFound',
+        '_redirect' => 'RedirectResponseMethodFound',
+        '_forward' => 'ForwardResponseMethodFound',
+        '_setActiveMenu' => 'SetActiveMenuResponseMethodFound',
+        '_addBreadcrumb' => 'AddBreadcrumbResponseMethodFound',
+        '_addContent' => 'AddContentResponseMethodFound',
+        '_addLeft' => 'AddLeftResponseMethodFound',
+        '_addJs' => 'AddJsResponseMethodFound',
+        '_moveBlockToContainer' => 'MoveBlockToContainerResponseMethodFound',
     ];
     
     /**
diff --git a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
index 2ad688ec..8daf5226 100644
--- a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
+++ b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
@@ -45,16 +45,16 @@ public function register()
     /**
      * @inheritdoc
      */
-    public function process(File $sourceFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens = $sourceFile->getTokens();
+        $tokens = $phpcsFile->getTokens();
         $declarationLine = $tokens[$stackPtr]['line'];
         $suffixLength = strlen($this->interfaceSuffix);
         // Find first T_STRING after 'interface' keyword in the line and verify it
         while ($tokens[$stackPtr]['line'] === $declarationLine) {
             if ($tokens[$stackPtr]['type'] === 'T_STRING') {
                 if (substr($tokens[$stackPtr]['content'], 0 - $suffixLength) !== $this->interfaceSuffix) {
-                    $sourceFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
+                    $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
                 }
                 break;
             }
diff --git a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
index 19b80e41..13109c58 100644
--- a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
+++ b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
@@ -36,43 +36,8 @@ class ReservedWordsSniff implements Sniff
         'numeric' => '7',
     ];
 
-    /**
-     * @var string[]
-     */
-    private $classErrorCodes = [
-        'int' => 'IntForbiddenAsClassName',
-        'float' => 'FloatForbiddenAsClassName',
-        'bool' => 'boolForbiddenAsClassName',
-        'string' => 'stringForbiddenAsClassName',
-        'true' => 'trueForbiddenAsClassName',
-        'false' => 'falseForbiddenAsClassName',
-        'null' => 'nullForbiddenAsClassName',
-        'void' => 'voidForbiddenAsClassName',
-        'iterable' => 'iterableForbiddenAsClassName',
-        'resource' => 'resourceForbiddenAsClassName',
-        'object' => 'objectForbiddenAsClassName',
-        'mixed' => 'mixedForbiddenAsClassName',
-        'numeric' => 'numericForbiddenAsClassName',
-    ];
-
-    /**
-     * @var string[]
-     */
-    private $namespaceErrorCodes = [
-        'int' => 'IntForbiddenAsNameSpace',
-        'float' => 'FloatForbiddenAsNameSpace',
-        'bool' => 'boolForbiddenAsNameSpace',
-        'string' => 'stringForbiddenAsNameSpace',
-        'true' => 'trueForbiddenAsNameSpace',
-        'false' => 'falseForbiddenAsNameSpace',
-        'null' => 'nullForbiddenAsNameSpace',
-        'void' => 'voidForbiddenAsNameSpace',
-        'iterable' => 'iterableForbiddenAsNameSpace',
-        'resource' => 'resourceForbiddenAsNameSpace',
-        'object' => 'objectForbiddenAsNameSpace',
-        'mixed' => 'mixedForbiddenAsNameSpace',
-        'numeric' => 'numericForbiddenAsNameSpace',
-    ];
+    private const CLASS_ERROR_CODE = 'ForbiddenAsClassName';
+    private const NAMESPACE_ERROR_CODE = 'ForbiddenAsNameSpace';
 
     /**
      * @inheritdoc
@@ -89,7 +54,7 @@ public function register()
      * @param int $stackPtr
      * @return void
      */
-    protected function validateNamespace(File $sourceFile, $stackPtr)
+    protected function validateNamespace(File $sourceFile, int $stackPtr)
     {
         $stackPtr += 2;
         $tokens = $sourceFile->getTokens();
@@ -103,7 +68,7 @@ protected function validateNamespace(File $sourceFile, $stackPtr)
                 $sourceFile->addError(
                     'Cannot use "%s" in namespace as it is reserved since PHP %s',
                     $stackPtr,
-                    $this->namespaceErrorCodes[strtolower($namespacePart)],
+                    self::NAMESPACE_ERROR_CODE,
                     [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
                 );
             }
@@ -118,7 +83,7 @@ protected function validateNamespace(File $sourceFile, $stackPtr)
      * @param int $stackPtr
      * @return void
      */
-    protected function validateClass(File $sourceFile, $stackPtr)
+    protected function validateClass(File $sourceFile, int $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
         $stackPtr += 2; //skip "class" and whitespace
@@ -127,7 +92,7 @@ protected function validateClass(File $sourceFile, $stackPtr)
             $sourceFile->addError(
                 'Cannot use "%s" as class name as it is reserved since PHP %s',
                 $stackPtr,
-                $this->classErrorCodes[strtolower($className)],
+                self::CLASS_ERROR_CODE,
                 [$className, $this->reservedWords[$className]]
             );
         }
@@ -136,17 +101,17 @@ protected function validateClass(File $sourceFile, $stackPtr)
     /**
      * @inheritdoc
      */
-    public function process(File $sourceFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens = $sourceFile->getTokens();
+        $tokens = $phpcsFile->getTokens();
         switch ($tokens[$stackPtr]['code']) {
             case T_CLASS:
             case T_INTERFACE:
             case T_TRAIT:
-                $this->validateClass($sourceFile, $stackPtr);
+                $this->validateClass($phpcsFile, $stackPtr);
                 break;
             case T_NAMESPACE:
-                $this->validateNamespace($sourceFile, $stackPtr);
+                $this->validateNamespace($phpcsFile, $stackPtr);
                 break;
         }
     }
diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index f99346af..6c56d07e 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -15,7 +15,7 @@
  */
 class AutogeneratedClassNotInConstructorSniff implements Sniff
 {
-    private const ERROR_CODE = 'AUTOGENERATED_CLASS_NOT_IN_CONSTRUCTOR';
+    private const ERROR_CODE = 'AutogeneratedClassNotInConstructor';
 
     /**
      * @var array
diff --git a/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php b/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php
index 705e154b..d76dae3e 100644
--- a/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php
+++ b/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php
@@ -37,11 +37,11 @@ public function register()
     /**
      * @inheritdoc
      */
-    public function process(File $sourceFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens = $sourceFile->getTokens();
-        if ($sourceFile->findPrevious(T_STRING_CONCAT, $stackPtr, $stackPtr - 3) ||
-            $sourceFile->findNext(T_STRING_CONCAT, $stackPtr, $stackPtr + 3)
+        $tokens = $phpcsFile->getTokens();
+        if ($phpcsFile->findPrevious(T_STRING_CONCAT, $stackPtr, $stackPtr - 3) ||
+            $phpcsFile->findNext(T_STRING_CONCAT, $stackPtr, $stackPtr + 3)
         ) {
             return;
         }
@@ -53,7 +53,7 @@ public function process(File $sourceFile, $stackPtr)
         }
 
         if (preg_match($this->literalNamespacePattern, $content) === 1) {
-            $sourceFile->addWarning(
+            $phpcsFile->addWarning(
                 "Use ::class notation instead.",
                 $stackPtr,
                 'LiteralClassUsage'

From 852a479d8a4ba28fe21d718672dee5934119ec2b Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 26 Oct 2021 17:11:00 +0200
Subject: [PATCH 363/630] AC-1549: Made suggestions

---
 .../Sniffs/Legacy/ObsoleteConnectionSniff.php | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
index c79844a5..74a74394 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -16,16 +16,18 @@ class ObsoleteConnectionSniff implements Sniff
      * @var string[]
      */
     private $obsoleteMethods = [
-        '_getReadConnection' => 'FoundObsoleteMethod_getReadConnection',
-        '_getWriteConnection' => 'FoundObsoleteMethod_getWriteConnection',
-        '_getReadAdapter' => 'FoundObsoleteMethod_getReadAdapter',
-        '_getWriteAdapter' => 'FoundObsoleteMethod_getWriteAdapter',
-        'getReadConnection' => 'FoundObsoleteMethodGetReadConnection',
-        'getWriteConnection' => 'FoundObsoleteMethodGetWriteConnection',
-        'getReadAdapter' => 'FoundObsoleteMethodGetReadAdapter',
-        'getWriteAdapter' => 'FoundObsoleteMethodGetWriteAdapter',
+        '_getReadConnection',
+        '_getWriteConnection',
+        '_getReadAdapter',
+        '_getWriteAdapter',
+        'getReadConnection',
+        'getWriteConnection',
+        'getReadAdapter',
+        'getWriteAdapter',
     ];
 
+    private const OBSOLETE_METHOD_ERROR_CODE = 'ObsoleteMethodFound';
+
     /**
      * @inheritdoc
      */
@@ -56,12 +58,12 @@ private function validateObsoleteMethod(File $phpcsFile, int $stackPtr)
         $tokens = $phpcsFile->getTokens();
         $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
         
-        foreach ($this->obsoleteMethods as $method => $errorCode) {
+        foreach ($this->obsoleteMethods as $method) {
             if ($tokens[$stringPos]['content'] === $method) {
                 $phpcsFile->addWarning(
                     sprintf("Contains obsolete method: %s. Please use getConnection method instead.", $method),
                     $stackPtr,
-                    $errorCode
+                    self::OBSOLETE_METHOD_ERROR_CODE
                 );
             }
         }

From 3d3dc9e54ba206b7272acecb73883a1fdea52da5 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 26 Oct 2021 17:17:22 +0200
Subject: [PATCH 364/630] AC-1549: Made suggestions

---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index dd4d06d1..4217ecda 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -16,19 +16,19 @@ class PhtmlTemplateSniff implements Sniff
     private const WARNING_CODE_THIS_USAGE = 'ThisUsageObsolete';
     private const WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS = 'ProtectedPrivateBlockAccess';
 
-    private const WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
-        '/(["\'])jquery\/ui\1/' => 'FoundJQueryUI',
-        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'FoundDataMageInit',
-        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'FoundXMagentoInit',
-    ];
-
-    private const OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES = [
-        '/(["\'])jquery\/ui\1/' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ' .
-            'ui widget instead.',
-        '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/' => 'Please do not initialize JS component in php. Do ' .
-            'it in template.',
-        '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i' => 'Please do not initialize JS component ' .
-            'in php. Do it in template.',
+    private const OBSOLETE_REGEX = [
+        'FoundJQueryUI' => [
+            'pattern' => '/(["\'])jquery\/ui\1/',
+            'message' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ui widget instead'
+        ],
+        'FoundDataMageInit' => [
+            'pattern' => '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/',
+            'message' => 'Please do not initialize JS component in php. Do it in template'
+        ],
+        'FoundXMagentoInit' => [
+            'pattern' => '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i',
+            'message' => 'Please do not initialize JS component in php. Do it in template'
+        ],
     ];
     
     /**
@@ -143,12 +143,12 @@ private function checkHtmlSpecificFiles(File $phpcsFile, int $stackPtr): void
     {
         $content = $phpcsFile->getTokensAsString($stackPtr, 1);
         
-        foreach (self::OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES as $obsoleteRegex => $errorMessage) {
-            if (preg_match($obsoleteRegex, $content)) {
+        foreach (self::OBSOLETE_REGEX as $code => $data) {
+            if (preg_match($data['pattern'], $content)) {
                 $phpcsFile->addWarning(
-                    $errorMessage,
+                    $data['message'],
                     $stackPtr,
-                    self::WARNING_CODES_OBSOLETE_REGEX_IN_SPECIFIC_PHTML_TEMPLATES[$obsoleteRegex]
+                    $code
                 );
             }
         }

From fe327128bae4048a6d4bd54d7c45fc2c10034dc0 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 27 Oct 2021 14:12:28 +0100
Subject: [PATCH 365/630] magento/magento-coding-standard#315: Fixed undefined
 index in Magento2.Commenting.ClassPropertyPHPDocFormatting

---
 .../ClassPropertyPHPDocFormattingSniff.php    | 155 +++++++++++-------
 .../ClassPropertyPHPDocFormattingUnitTest.inc |  10 ++
 .../ClassPropertyPHPDocFormattingUnitTest.php |   1 +
 3 files changed, 105 insertions(+), 61 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 035f73ae..ea13aca5 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento2\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
-use PHP_CodeSniffer\Util\Tokens;
 use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
 
 /**
@@ -15,17 +16,19 @@
  */
 class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
 {
-
     /**
      * @var array
      */
-    private $ignoreTokens = [
+    private const TOKENS_ALLOWED_BETWEEN_PHPDOC_AND_PROPERTY_NAME = [
         T_PUBLIC,
         T_PRIVATE,
         T_PROTECTED,
         T_VAR,
         T_STATIC,
         T_WHITESPACE,
+        T_NS_SEPARATOR,
+        T_STRING,
+        T_COMMENT
     ];
 
     /**
@@ -38,15 +41,9 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
      */
     public function __construct()
     {
-        $scopes = Tokens::$ooScopeTokens;
         $this->PHPDocFormattingValidator = new PHPDocFormattingValidator();
-        $listen = [
-            T_VARIABLE,
-            T_DOUBLE_QUOTED_STRING,
-            T_HEREDOC,
-        ];
 
-        parent::__construct($scopes, $listen, true);
+        parent::__construct();
     }
 
     /**
@@ -56,111 +53,147 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($stackPtr - 1), null, true);
+        $commentEnd = $phpcsFile->findPrevious(
+            self::TOKENS_ALLOWED_BETWEEN_PHPDOC_AND_PROPERTY_NAME,
+            $stackPtr - 1,
+            null,
+            true
+        );
 
-        if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_STRING) {
-            $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($commentEnd - 1), null, true);
-        } elseif ($commentEnd === false
-            || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-                && $tokens[$commentEnd]['code'] !== T_COMMENT)
-        ) {
+        if ($commentEnd === false || $tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG) {
             $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
             return;
         }
 
         $commentStart = $tokens[$commentEnd]['comment_opener'];
-        $foundVar = null;
+        $varAnnotationPosition = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
             if ($tokens[$tag]['content'] === '@var') {
-                if ($foundVar !== null) {
-                    $error = 'Only one @var tag is allowed for class property declaration.';
-                    $phpcsFile->addWarning($error, $tag, 'DuplicateVar');
+                if ($varAnnotationPosition !== null) {
+                    $phpcsFile->addWarning(
+                        'Only one @var tag is allowed for class property declaration.',
+                        $tag,
+                        'DuplicateVar'
+                    );
                 } else {
-                    $foundVar = $tag;
+                    $varAnnotationPosition = $tag;
                 }
             }
         }
 
-        if ($foundVar === null) {
-            $error = 'Class properties must have type declaration using @var tag.';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingVar');
+        if ($varAnnotationPosition === null) {
+            $phpcsFile->addWarning(
+                'Class properties must have type declaration using @var tag.',
+                $stackPtr,
+                'MissingVar'
+            );
             return;
         }
 
-        $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar, $commentEnd);
-        if ($string === false || $tokens[$string]['line'] !== $tokens[$foundVar]['line']) {
-            $error = 'Content missing for @var tag in class property declaration.';
-            $phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
+        $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $varAnnotationPosition, $commentEnd);
+        if ($string === false || $tokens[$string]['line'] !== $tokens[$varAnnotationPosition]['line']) {
+            $phpcsFile->addWarning(
+                'Content missing for @var tag in class property declaration.',
+                $varAnnotationPosition,
+                'EmptyVar'
+            );
             return;
         }
 
         // Check if class has already have meaningful description after @var tag
-        $isShortDescriptionAfterVar = $phpcsFile->findNext(
+        $shortDescriptionAfterVarPosition = $phpcsFile->findNext(
             T_DOC_COMMENT_STRING,
-            $foundVar + 4,
+            $varAnnotationPosition + 4,
             $commentEnd,
             false,
             null,
             false
         );
+
         if ($this->PHPDocFormattingValidator->providesMeaning(
-            $isShortDescriptionAfterVar,
+            $shortDescriptionAfterVarPosition,
             $commentStart,
             $tokens
         ) !== true) {
             preg_match(
                 '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
-                $tokens[($foundVar + 2)]['content'],
+                $tokens[($varAnnotationPosition + 2)]['content'],
                 $varParts
             );
             if ($varParts[1]) {
                 return;
             }
-            $error = 'Short description must be before @var tag.';
-            $phpcsFile->addWarning($error, $isShortDescriptionAfterVar, 'ShortDescriptionAfterVar');
-            return;
+            $phpcsFile->addWarning(
+                'Short description must be before @var tag.',
+                $shortDescriptionAfterVarPosition,
+                'ShortDescriptionAfterVar'
+            );
         }
 
-        // Check if class has already have meaningful description before @var tag
-        $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(
+        $this->processPropertyShortDescription($phpcsFile, $stackPtr, $varAnnotationPosition, $commentStart);
+    }
+
+    /**
+     * Check if class has already have meaningful description before var tag
+     *
+     * @param File $phpcsFile
+     * @param int $propertyNamePosition
+     * @param int $varAnnotationPosition
+     * @param int $commentStart
+     */
+    private function processPropertyShortDescription(
+        File $phpcsFile,
+        int $propertyNamePosition,
+        int $varAnnotationPosition,
+        int $commentStart
+    ) {
+        $propertyShortDescriptionPosition = $phpcsFile->findPrevious(
             T_DOC_COMMENT_STRING,
-            $foundVar,
+            $varAnnotationPosition,
             $commentStart,
             false,
             null,
             false
         );
 
-        if ($isShortDescriptionPreviousVar === false) {
+        if ($propertyShortDescriptionPosition === false) {
             return;
         }
 
-        $propertyNamePosition = $phpcsFile->findNext(
-            T_VARIABLE,
-            $foundVar,
-            null,
-            false,
-            null,
-            false
-        );
-        if ($propertyNamePosition === false) {
-            return;
-        };
+        $tokens = $phpcsFile->getTokens();
         $propertyName = trim($tokens[$propertyNamePosition]['content'], '$');
-        $shortDescription = strtolower($tokens[$isShortDescriptionPreviousVar]['content']);
+        $shortDescription = strtolower($tokens[$propertyShortDescriptionPosition]['content']);
 
-        if ($shortDescription === strtolower($propertyName)) {
-            $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
-            return;
+        if ($this->isDuplicate($propertyName, $shortDescription)) {
+            $phpcsFile->addWarning(
+                'Short description duplicates class property name.',
+                $propertyShortDescriptionPosition,
+                'AlreadyHaveMeaningfulNameVar'
+            );
         }
+    }
 
-        $propertyNameParts = array_filter(preg_split('/(?=[A-Z])/', $propertyName));
+    /**
+     * Does short description duplicate the property name
+     *
+     * @param string $propertyName
+     * @param string $shortDescription
+     * @return bool
+     */
+    private function isDuplicate(string $propertyName, string $shortDescription): bool
+    {
+        return $this->clean($propertyName) === $this->clean($shortDescription);
+    }
 
-        if ($shortDescription === strtolower(implode(' ', $propertyNameParts))) {
-            $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
-        }
+    /**
+     * Return only A-Za-z characters converted to lowercase from the string
+     *
+     * @param string $string
+     * @return string
+     */
+    private function clean(string $string): string
+    {
+        return strtolower(preg_replace('/[^A-Za-z]/', '', $string));
     }
 
     /**
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index b7dee449..e001393d 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -114,6 +114,16 @@ class correctlyFormattedClassMemberDocBlock
      */
     protected $rulePool;
 
+    /**
+     * @var \Magento\Store\Model\StoreManager
+     */
+    private \Magento\Store\Model\StoreManager $decoratedStoreManager;
+
+    /*
+     * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
+     */
+    private $attributeSetFactory;
+
     /**
      * A description that includes test which is the same name as the variable is allowed
      *
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 6a49be76..1d6ad272 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -34,6 +34,7 @@ public function getWarningList()
             63 => 1,
             68 => 1,
             75 => 1,
+            125 => 1
         ];
     }
 }

From b5eab5ad44b956b529d99f9842fc1a75220bc471 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 27 Oct 2021 14:26:09 +0100
Subject: [PATCH 366/630] magento/magento-coding-standard#317: Updated phpdocs
 duplicating property names

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php    | 2 +-
 Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php         | 2 --
 Magento2/Sniffs/Security/XssTemplateSniff.php                   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index ea13aca5..b1404e32 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -146,7 +146,7 @@ private function processPropertyShortDescription(
         int $propertyNamePosition,
         int $varAnnotationPosition,
         int $commentStart
-    ) {
+    ): void {
         $propertyShortDescriptionPosition = $phpcsFile->findPrevious(
             T_DOC_COMMENT_STRING,
             $varAnnotationPosition,
diff --git a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
index 2ad688ec..e15e41ad 100644
--- a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
+++ b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
@@ -28,8 +28,6 @@ class InterfaceNameSniff implements Sniff
     protected $warningCode = 'WrongInterfaceName';
 
     /**
-     * Interface suffix.
-     *
      * @var string
      */
     private $interfaceSuffix = 'Interface';
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index f35943e5..3b4385e8 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -62,7 +62,7 @@ class XssTemplateSniff implements Sniff
     protected $allowedFunctions = ['count'];
 
     /**
-     * Allowed annotations.
+     * Annotations preventing from static analysis (skipping this sniff)
      *
      * @var array
      */

From 9ffb1a53dc00ddd42e6ca3847fae365c9be2193b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 27 Oct 2021 18:09:56 +0100
Subject: [PATCH 367/630] Extracted js tests to a separate build

---
 .github/workflows/php.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1af77466..119d380e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -7,8 +7,7 @@ on:
     branches: [ master, develop ]
 
 jobs:
-  build:
-
+  php:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -41,10 +40,6 @@ jobs:
 
     - name: Install dependencies
       run: npm install
-    - name: Run ESLint
-      run: npm run eslint -- eslint/rules
-    - name: Run JSCS
-      run: npm run jscs eslint/rules Magento2
 
     - name: Validate composer
       run: composer validate
@@ -63,3 +58,23 @@ jobs:
 
     - name: Run framework suite
       run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+  js:
+    runs-on: ubuntu-latest
+    name: Javascript tests
+
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run ESLint
+        run: npm run eslint -- eslint/rules
+
+      - name: Run JSCS
+        run: npm run jscs eslint/rules Magento2

From c4e2ecae195495c253d461bdb7b925267657c403 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 28 Oct 2021 13:18:59 +0100
Subject: [PATCH 368/630] magento/magento-coding-standard#314: Fixed
 AutogeneratedClassNotInConstructorSniff

---
 ...utogeneratedClassNotInConstructorSniff.php | 235 ++++++++----------
 ...tedClassNotInConstructorUnitTest.1.php.inc |  22 +-
 ...tedClassNotInConstructorUnitTest.2.php.inc |  22 +-
 ...generatedClassNotInConstructorUnitTest.php |   5 +-
 4 files changed, 153 insertions(+), 131 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 6c56d07e..33c0bdf4 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -17,22 +17,16 @@ class AutogeneratedClassNotInConstructorSniff implements Sniff
 {
     private const ERROR_CODE = 'AutogeneratedClassNotInConstructor';
 
-    /**
-     * @var array
-     */
-    private $constructorParameters = [];
-
-    /**
-     * @var array
-     */
-    private $uses = [];
+    private const AUTOGENERATED_CLASS_SUFFIXES = [
+        'Factory'
+    ];
 
     /**
      * @inheritdoc
      */
     public function register()
     {
-        return [T_FUNCTION, T_DOUBLE_COLON, T_USE];
+        return [T_DOUBLE_COLON];
     }
 
     /**
@@ -40,187 +34,178 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_USE') {
-            $this->registerUse($phpcsFile, $stackPtr);
+        if (!$this->isClass($phpcsFile)) {
+            return;
         }
-        if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_FUNCTION') {
-            $this->registerConstructorParameters($phpcsFile, $stackPtr);
+
+        $tokens = $phpcsFile->getTokens();
+
+        if ($tokens[$stackPtr - 1]['content'] !== 'ObjectManager'
+            && $tokens[$stackPtr + 1]['content'] !== 'getInstance'
+        ) {
+            return;
         }
-        if ($phpcsFile->getTokens()[$stackPtr]['type'] === 'T_DOUBLE_COLON') {
-            if (!$this->isObjectManagerGetInstance($phpcsFile, $stackPtr)) {
-                return;
-            }
 
-            $statementStart = $phpcsFile->findStartOfStatement($stackPtr);
-            $statementEnd = $phpcsFile->findEndOfStatement($stackPtr);
-            $equalsPtr = $phpcsFile->findNext(T_EQUAL, $statementStart, $statementEnd);
+        if (!isset($tokens[$stackPtr + 4]) || $tokens[$stackPtr + 4]['code'] !== T_SEMICOLON) {
+            $this->validateRequestedClass(
+                $phpcsFile,
+                $phpcsFile->findNext(T_OBJECT_OPERATOR, $stackPtr)
+            );
+            return;
+        }
 
-            if (!$equalsPtr) {
-                return;
-            }
+        $objectManagerVariableName = $this->getObjectManagerVariableName($phpcsFile, $stackPtr);
 
-            if (!$this->isVariableInConstructorParameters($phpcsFile, $equalsPtr, $statementEnd)) {
-                $className = $this->obtainClassToGetOrCreate($phpcsFile, $stackPtr, $statementEnd);
+        if (!$objectManagerVariableName) {
+            return;
+        }
 
-                $phpcsFile->addError(
-                    sprintf("Class %s needs to be requested in constructor, " .
-                        "otherwise compiler will not be able to find and generate these classes", $className),
-                    $stackPtr,
-                    self::ERROR_CODE
-                );
-            }
+        $variablePosition = $phpcsFile->findNext(T_VARIABLE, $stackPtr, null, false, $objectManagerVariableName);
+        if ($variablePosition) {
+            $this->validateRequestedClass($phpcsFile, $phpcsFile->findNext(T_OBJECT_OPERATOR, $variablePosition));
         }
     }
 
     /**
-     * Check if it is a ObjectManager::getInstance
+     * Check if the class is instantiated via get/create method, it is autogenerated and present in constructor
      *
      * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return bool
+     * @param int $arrowPosition
      */
-    private function isObjectManagerGetInstance(File $phpcsFile, int $stackPtr): bool
+    private function validateRequestedClass(File $phpcsFile, int $arrowPosition): void
     {
-        $prev = $phpcsFile->findPrevious(T_STRING, $stackPtr - 1);
-        $next = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-        return $prev &&
-            $next &&
-            $phpcsFile->getTokens()[$prev]['content'] === 'ObjectManager' &&
-            $phpcsFile->getTokens()[$next]['content'] === 'getInstance';
+        $requestedClass = $this->getRequestedClass($phpcsFile, $arrowPosition);
+
+        if (!$requestedClass
+            || !$this->isClassAutogenerated($requestedClass)
+            || $this->isConstructorParameter($phpcsFile, $requestedClass)
+        ) {
+            return;
+        }
+
+        $phpcsFile->addError(
+            sprintf(
+                'Class %s needs to be requested in constructor, ' .
+                'otherwise compiler will not be able to find and generate this classes',
+                $requestedClass
+            ),
+            $arrowPosition,
+            self::ERROR_CODE
+        );
     }
 
     /**
-     * Get the complete class namespace from the use's
+     * Does the class have the suffix common for autogenerated classes e.g. Factory
      *
      * @param string $className
-     * @return string
+     * @return bool
      */
-    private function getClassNamespace(string $className): string
+    private function isClassAutogenerated(string $className): bool
     {
-        foreach ($this->uses as $key => $use) {
-            if ($key === $className) {
-                return $use;
+        foreach (self::AUTOGENERATED_CLASS_SUFFIXES as $suffix) {
+            if (substr($className, -strlen($suffix)) === $suffix) {
+                return true;
             }
         }
-        return $className;
+        return false;
     }
 
     /**
-     * Register php uses
+     * Get the variable name to which the ObjectManager::getInstance() result is assigned
      *
      * @param File $phpcsFile
      * @param int $stackPtr
+     * @return string|null
      */
-    private function registerUse(File $phpcsFile, int $stackPtr): void
+    private function getObjectManagerVariableName(File $phpcsFile, int $stackPtr): ?string
     {
-        $useEnd = $phpcsFile->findEndOfStatement($stackPtr);
-        $use = [];
-        $usePosition = $stackPtr;
-        while ($usePosition = $phpcsFile->findNext(T_STRING, $usePosition + 1, $useEnd)) {
-            $use[] = $phpcsFile->getTokens()[$usePosition]['content'];
+        $matches = [];
+        $found = preg_match(
+            '/(\$[A-Za-z]+) ?= ?ObjectManager::getInstance\(\);/',
+            $phpcsFile->getTokensAsString($stackPtr - 5, 10),
+            $matches
+        );
+
+        if (!$found || !isset($matches[1])) {
+            return null;
         }
 
-        $key = end($use);
-        if ($phpcsFile->findNext(T_AS, $stackPtr, $useEnd)) {
-            $this->uses[$key] = implode("\\", array_slice($use, 0, count($use) - 1));
-        } else {
-            $this->uses[$key] = implode("\\", $use);
-        }
+        return $matches[1];
     }
 
     /**
-     * Register php constructor parameters
+     * Get class name requested from ObjectManager
      *
      * @param File $phpcsFile
-     * @param int $stackPtr
+     * @param int $callerPosition
+     * @return string|null
      */
-    private function registerConstructorParameters(File $phpcsFile, int $stackPtr): void
+    private function getRequestedClass(File $phpcsFile, int $callerPosition): ?string
     {
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($functionName == '__construct') {
-            $this->constructorParameters = $phpcsFile->getMethodParameters($stackPtr);
+        if (!isset($phpcsFile->getTokens()[$callerPosition + 10])) {
+            return null;
         }
-    }
 
-    /**
-     * Get next token
-     *
-     * @param File $phpcsFile
-     * @param int $from
-     * @param int $to
-     * @param int|string|array $types
-     * @return mixed
-     */
-    private function getNext(File $phpcsFile, int $from, int $to, $types)
-    {
-        return $phpcsFile->getTokens()[$phpcsFile->findNext($types, $from + 1, $to)];
-    }
+        $matches = [];
+        $found = preg_match(
+            '/->(get|create)\(([A-Za-z]+)::class/',
+            $phpcsFile->getTokensAsString($callerPosition, 7),
+            $matches
+        );
 
-    /**
-     * Get previous token
-     *
-     * @param File $phpcsFile
-     * @param int $from
-     * @param int|string|array $types
-     * @return mixed
-     */
-    private function getPrevious(File $phpcsFile, int $from, $types)
-    {
-        return $phpcsFile->getTokens()[$phpcsFile->findPrevious($types, $from - 1)];
+        if (!$found || !isset($matches[2])) {
+            return null;
+        }
+
+        return $matches[2];
     }
 
     /**
-     * Get name of the variable without $
+     * Does the file contain class declaration
      *
-     * @param string $parameterName
-     * @return string
+     * @param File $phpcsFile
+     * @return bool
      */
-    protected function variableName(string $parameterName): string
+    private function isClass(File $phpcsFile): bool
     {
-        return str_replace('$', '', $parameterName);
+        foreach ($phpcsFile->getTokens() as $token) {
+            if ($token['code'] === T_CLASS) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
-     * Checks if a variable is present in the constructor parameters
+     * Get an array of constructor parameters
      *
      * @param File $phpcsFile
-     * @param int $equalsPtr
-     * @param int $statementEnd
-     * @return bool
+     * @return array
      */
-    private function isVariableInConstructorParameters(File $phpcsFile, int $equalsPtr, int $statementEnd): bool
+    private function getConstructorParameters(File $phpcsFile): array
     {
-        if ($variable = $phpcsFile->findNext(T_VARIABLE, $equalsPtr, $statementEnd)) {
-            $variableName = $phpcsFile->getTokens()[$variable]['content'];
-            if ($variableName === '$this') {
-                $variableName = $this->getNext($phpcsFile, $variable, $statementEnd, T_STRING)['content'];
-            }
-            foreach ($this->constructorParameters as $parameter) {
-                $parameterName = $parameter['name'];
-                if ($this->variableName($parameterName) === $this->variableName($variableName)) {
-                    return true;
-                }
+        foreach ($phpcsFile->getTokens() as $stackPtr => $token) {
+            if ($token['code'] === T_FUNCTION && $phpcsFile->getDeclarationName($stackPtr) === '__construct') {
+                return $phpcsFile->getMethodParameters($stackPtr);
             }
         }
-        return false;
+        return [];
     }
 
     /**
-     * Obtain the class inside ObjectManager::getInstance()->get|create()
+     * Is the class name present between constructor parameters
      *
      * @param File $phpcsFile
-     * @param int $next
-     * @param int $statementEnd
-     * @return string
+     * @param string $className
+     * @return bool
      */
-    private function obtainClassToGetOrCreate(File $phpcsFile, int $next, int $statementEnd): string
+    private function isConstructorParameter(File $phpcsFile, string $className): bool
     {
-        while ($next = $phpcsFile->findNext(T_DOUBLE_COLON, $next + 1, $statementEnd)) {
-            if ($this->getNext($phpcsFile, $next, $statementEnd, T_STRING)['content'] === 'class') {
-                $className = $this->getPrevious($phpcsFile, $next, T_STRING)['content'];
+        foreach ($this->getConstructorParameters($phpcsFile) as $parameter) {
+            if (strpos($parameter['content'], $className) !== false) {
+                return true;
             }
         }
-
-        return $this->getClassNamespace($className);
+        return false;
     }
 }
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
index f7a461ed..c5833baf 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.1.php.inc
@@ -12,10 +12,10 @@ use Magento2\OneModel as Model;
 class Good
 {
     public function __construct(
-        Model $model = null
+        ModelFactory $model = null
     )
     {
-        $this->model = $model ?? ObjectManager::getInstance()->get(Model::class);
+        $this->model = $model ?? ObjectManager::getInstance()->get(ModelFactory::class);
     }
 
     /**
@@ -23,8 +23,8 @@ class Good
      */
     public function otherMethodThatCallsGetInstanceBad(): void
     {
-        $model = ObjectManager::getInstance()->get(Model::class);
-        $model->something();
+        $modelFactory = ObjectManager::getInstance()->get(OtherFactory::class);
+        $modelFactory->create();
     }
 
     /**
@@ -35,4 +35,18 @@ class Good
         $model = $this->model ?? ObjectManager::getInstance()->get(Model::class);
         $model->something();
     }
+
+    public function variablePositive(): void
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->_entityFactory = $objectManager->get(EntityFactoryInterface::class);
+    }
+
+    public function variableNegative(): void
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->_entityFactory = $objectManager->get(EntityFactory::class);
+    }
 }
+
+
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
index a72f5bb0..e495ef6c 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
@@ -7,11 +7,31 @@ declare(strict_types = 1);
 
 namespace Magento2\Tests\PHP;
 
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Setup\AddOptionToAttribute;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
 class Bad
 {
     public function __construct()
     {
-        $this->model = ObjectManager::getInstance()->get(Model::class);
+        $this->model = ObjectManager::getInstance()->get(ModelFactory::class);
+    }
+
+    protected function setUp(): void
+    {
+        ObjectManager::getInstance()
+            ->get(EavSetupFactory::class);
+        $objectManager = ObjectManager::getInstance();
+
+        /** @var EavSetup $eavSetup */
+        $this->eavSetup = $objectManager
+            ->get(EavSetupFactory::class)
+            ->create(['setup' => $this->setup]);
     }
 }
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
index 9122213f..84ebaaf2 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
@@ -19,11 +19,14 @@ public function getErrorList($filename = '')
         if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.1.php.inc') {
             return [
                 26 => 1,
+                48 => 1
             ];
         }
         if ($filename === 'AutogeneratedClassNotInConstructorUnitTest.2.php.inc') {
             return [
-                14 => 1,
+                22 => 1,
+                28 => 1,
+                33 => 1
             ];
         }
         return [];

From de99e8b6bcc671d3350abd6cf83d070c372eda9c Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 28 Oct 2021 13:44:10 +0100
Subject: [PATCH 369/630] magento/magento-coding-standard#319: Corrected regex

---
 .../PHP/AutogeneratedClassNotInConstructorSniff.php       | 8 ++------
 .../AutogeneratedClassNotInConstructorUnitTest.2.php.inc  | 3 +++
 .../PHP/AutogeneratedClassNotInConstructorUnitTest.php    | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 33c0bdf4..b63c0e96 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -142,14 +142,10 @@ private function getObjectManagerVariableName(File $phpcsFile, int $stackPtr): ?
      */
     private function getRequestedClass(File $phpcsFile, int $callerPosition): ?string
     {
-        if (!isset($phpcsFile->getTokens()[$callerPosition + 10])) {
-            return null;
-        }
-
         $matches = [];
         $found = preg_match(
-            '/->(get|create)\(([A-Za-z]+)::class/',
-            $phpcsFile->getTokensAsString($callerPosition, 7),
+            '/->(get|create)\(([A-Za-z\\\]+)::class/',
+            $phpcsFile->getTokensAsString($callerPosition, $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $callerPosition)),
             $matches
         );
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
index e495ef6c..0e474247 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
@@ -32,6 +32,9 @@ class Bad
         $this->eavSetup = $objectManager
             ->get(EavSetupFactory::class)
             ->create(['setup' => $this->setup]);
+
+        ObjectManager::getInstance()
+            ->get(\Full\Class\NameFactory::class);
     }
 }
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
index 84ebaaf2..0424ac06 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.php
@@ -26,7 +26,8 @@ public function getErrorList($filename = '')
             return [
                 22 => 1,
                 28 => 1,
-                33 => 1
+                33 => 1,
+                37 => 1
             ];
         }
         return [];

From d903f9c5ce9e96d2c878e86174e56d3afc707e95 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 28 Oct 2021 13:56:12 +0100
Subject: [PATCH 370/630] magento/magento-coding-standard#319: Corrected
 message

---
 Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index b63c0e96..0b397523 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -86,7 +86,7 @@ private function validateRequestedClass(File $phpcsFile, int $arrowPosition): vo
         $phpcsFile->addError(
             sprintf(
                 'Class %s needs to be requested in constructor, ' .
-                'otherwise compiler will not be able to find and generate this classes',
+                'otherwise compiler will not be able to find and generate this class',
                 $requestedClass
             ),
             $arrowPosition,

From 6f94d87e2b7222e402877eb0c6cb8b1cc4e06f9e Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 29 Oct 2021 19:12:36 +0100
Subject: [PATCH 371/630] AC-1314: Added copyright verification for graphqls
 files

---
 .../CopyrightAnotherExtensionsFilesSniff.php  |  8 +--
 .../Sniffs/Header/CopyrightGraphQLSniff.php   | 57 +++++++++++++++++++
 .../Sniffs/Header/LicenseSniff.php            |  5 +-
 .../CopyrightGraphQLUnitTest.1.graphqls       | 34 +++++++++++
 .../CopyrightGraphQLUnitTest.2.graphqls       | 34 +++++++++++
 .../CopyrightGraphQLUnitTest.3.graphqls       | 34 +++++++++++
 .../CopyrightGraphQLUnitTest.4.graphqls       | 31 ++++++++++
 .../Tests/Header/CopyrightGraphQLUnitTest.php | 37 ++++++++++++
 Magento2Framework/ruleset.xml                 | 12 ++++
 9 files changed, 245 insertions(+), 7 deletions(-)
 create mode 100644 Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
 create mode 100644 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls
 create mode 100644 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls
 create mode 100644 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.3.graphqls
 create mode 100644 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.4.graphqls
 create mode 100644 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php

diff --git a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
index bfc36afe..3bafbb1f 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
@@ -7,7 +7,6 @@
 
 namespace Magento2Framework\Sniffs\Header;
 
-use Magento2\Sniffs\Less\TokenizerSymbolsInterface;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -23,7 +22,7 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
      *
      * @var array
      */
-    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
+    public $supportedTokenizers = ['CSS', 'PHP', 'JS'];
 
     /**
      * @inheritDoc
@@ -46,9 +45,10 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $fileText = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
-        $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $fileText);
 
-        if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
+        if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false
+            || preg_match(self::COPYRIGHT_ADOBE, $fileText)
+        ) {
             return;
         }
 
diff --git a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
new file mode 100644
index 00000000..1e488e69
--- /dev/null
+++ b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2Framework\Sniffs\Header;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class CopyrightGraphQLSniff implements Sniff
+{
+    private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
+
+    private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
+    private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+
+    private const FILE_EXTENSION = 'graphqls';
+
+    /**
+     * @var string[]
+     */
+    public $supportedTokenizers = ['GRAPHQL'];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_OPEN_TAG];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1) !== false) {
+            return;
+        }
+
+        // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
+        $content = file_get_contents($phpcsFile->getFilename());
+
+        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || preg_match(self::COPYRIGHT_ADOBE, $content)) {
+            return;
+        }
+
+        $phpcsFile->addWarningOnLine(
+            'Copyright is missing or has wrong format',
+            null,
+            self::WARNING_CODE
+        );
+    }
+}
diff --git a/Magento2Framework/Sniffs/Header/LicenseSniff.php b/Magento2Framework/Sniffs/Header/LicenseSniff.php
index 667b3b2b..cf7a5479 100644
--- a/Magento2Framework/Sniffs/Header/LicenseSniff.php
+++ b/Magento2Framework/Sniffs/Header/LicenseSniff.php
@@ -7,7 +7,6 @@
 
 namespace Magento2Framework\Sniffs\Header;
 
-use Magento2\Sniffs\Less\TokenizerSymbolsInterface;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -18,7 +17,7 @@ class LicenseSniff implements Sniff
      *
      * @var array
      */
-    public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP'];
+    public $supportedTokenizers = ['CSS', 'PHP'];
 
     private const WARNING_CODE = 'FoundLegacyTextInCopyright';
 
@@ -49,7 +48,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($tokens[$stackPtr]['code'] === T_INLINE_HTML) {
             $content = $phpcsFile->getTokensAsString($stackPtr, 1);
         }
-        if ($content != null) {
+        if ($content !== null) {
             $this->checkLicense($content, $stackPtr, $phpcsFile);
         }
     }
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls
new file mode 100644
index 00000000..6d212f25
--- /dev/null
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls
@@ -0,0 +1,34 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+enum PriceAdjustmentCodesEnum {
+    WEEE @deprecated(reason: "WEEE code is deprecated, use fixed_product_taxes.label")
+    WEEE_TAX @deprecated(reason: "Use fixed_product_taxes. PriceAdjustmentCodesEnum is deprecated. Tax is included or excluded in price. Tax is not shown separtely in Catalog")
+}
+
+type ProductPrice {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "The multiple FPTs that can be applied to a product price.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\FixedProductTax")
+}
+
+type CartItemPrices {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "Applied FPT to the cart item.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\Quote\\FixedProductTax")
+}
+
+type FixedProductTax @doc(description: "A single FPT that can be applied to a product price.") {
+    amount: Money @doc(description: "Amount of the FPT as a money object.")
+    label: String @doc(description: "The label assigned to the FPT to be displayed on the frontend.")
+}
+
+type StoreConfig {
+    product_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices On Product View Page' field. It indicates how FPT information is displayed on product pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    category_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Product Lists' field. It indicates how FPT information is displayed on category pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    sales_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Sales Modules' field. It indicates how FPT information is displayed on cart, checkout, and order pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+}
+
+enum FixedProductTaxDisplaySettings @doc(description: "This enumeration display settings for the fixed product tax") {
+    INCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price includes the FPT amount without displaying the ProductPrice.fixed_product_taxes values. This value corresponds to 'Including FPT only'")
+    INCLUDE_FPT_WITH_DETAILS @doc(description: "The displayed price includes the FPT amount while displaying the values of ProductPrice.fixed_product_taxes separately. This value corresponds to 'Including FPT and FPT description'")
+    EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values of ProductPrice.fixed_product_taxes and the price including the FPT are displayed separately. This value corresponds to 'Excluding FPT, Including FPT description and final price'")
+    EXCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values from ProductPrice.fixed_product_taxes are not displayed. This value corresponds to 'Excluding FPT'")
+    FPT_DISABLED @doc(description: "The FPT feature is not enabled. You can omit  ProductPrice.fixed_product_taxes from your query")
+}
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls
new file mode 100644
index 00000000..786f22ca
--- /dev/null
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls
@@ -0,0 +1,34 @@
+# Copyright 2020 Adobe
+# See COPYING.txt for license details.
+
+enum PriceAdjustmentCodesEnum {
+    WEEE @deprecated(reason: "WEEE code is deprecated, use fixed_product_taxes.label")
+    WEEE_TAX @deprecated(reason: "Use fixed_product_taxes. PriceAdjustmentCodesEnum is deprecated. Tax is included or excluded in price. Tax is not shown separtely in Catalog")
+}
+
+type ProductPrice {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "The multiple FPTs that can be applied to a product price.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\FixedProductTax")
+}
+
+type CartItemPrices {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "Applied FPT to the cart item.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\Quote\\FixedProductTax")
+}
+
+type FixedProductTax @doc(description: "A single FPT that can be applied to a product price.") {
+    amount: Money @doc(description: "Amount of the FPT as a money object.")
+    label: String @doc(description: "The label assigned to the FPT to be displayed on the frontend.")
+}
+
+type StoreConfig {
+    product_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices On Product View Page' field. It indicates how FPT information is displayed on product pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    category_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Product Lists' field. It indicates how FPT information is displayed on category pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    sales_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Sales Modules' field. It indicates how FPT information is displayed on cart, checkout, and order pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+}
+
+enum FixedProductTaxDisplaySettings @doc(description: "This enumeration display settings for the fixed product tax") {
+    INCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price includes the FPT amount without displaying the ProductPrice.fixed_product_taxes values. This value corresponds to 'Including FPT only'")
+    INCLUDE_FPT_WITH_DETAILS @doc(description: "The displayed price includes the FPT amount while displaying the values of ProductPrice.fixed_product_taxes separately. This value corresponds to 'Including FPT and FPT description'")
+    EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values of ProductPrice.fixed_product_taxes and the price including the FPT are displayed separately. This value corresponds to 'Excluding FPT, Including FPT description and final price'")
+    EXCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values from ProductPrice.fixed_product_taxes are not displayed. This value corresponds to 'Excluding FPT'")
+    FPT_DISABLED @doc(description: "The FPT feature is not enabled. You can omit  ProductPrice.fixed_product_taxes from your query")
+}
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.3.graphqls b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.3.graphqls
new file mode 100644
index 00000000..6706a8b2
--- /dev/null
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.3.graphqls
@@ -0,0 +1,34 @@
+# Copyright 2020 Magento
+# See COPYING.txt for license details.
+
+enum PriceAdjustmentCodesEnum {
+    WEEE @deprecated(reason: "WEEE code is deprecated, use fixed_product_taxes.label")
+    WEEE_TAX @deprecated(reason: "Use fixed_product_taxes. PriceAdjustmentCodesEnum is deprecated. Tax is included or excluded in price. Tax is not shown separtely in Catalog")
+}
+
+type ProductPrice {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "The multiple FPTs that can be applied to a product price.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\FixedProductTax")
+}
+
+type CartItemPrices {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "Applied FPT to the cart item.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\Quote\\FixedProductTax")
+}
+
+type FixedProductTax @doc(description: "A single FPT that can be applied to a product price.") {
+    amount: Money @doc(description: "Amount of the FPT as a money object.")
+    label: String @doc(description: "The label assigned to the FPT to be displayed on the frontend.")
+}
+
+type StoreConfig {
+    product_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices On Product View Page' field. It indicates how FPT information is displayed on product pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    category_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Product Lists' field. It indicates how FPT information is displayed on category pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    sales_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Sales Modules' field. It indicates how FPT information is displayed on cart, checkout, and order pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+}
+
+enum FixedProductTaxDisplaySettings @doc(description: "This enumeration display settings for the fixed product tax") {
+    INCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price includes the FPT amount without displaying the ProductPrice.fixed_product_taxes values. This value corresponds to 'Including FPT only'")
+    INCLUDE_FPT_WITH_DETAILS @doc(description: "The displayed price includes the FPT amount while displaying the values of ProductPrice.fixed_product_taxes separately. This value corresponds to 'Including FPT and FPT description'")
+    EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values of ProductPrice.fixed_product_taxes and the price including the FPT are displayed separately. This value corresponds to 'Excluding FPT, Including FPT description and final price'")
+    EXCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values from ProductPrice.fixed_product_taxes are not displayed. This value corresponds to 'Excluding FPT'")
+    FPT_DISABLED @doc(description: "The FPT feature is not enabled. You can omit  ProductPrice.fixed_product_taxes from your query")
+}
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.4.graphqls b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.4.graphqls
new file mode 100644
index 00000000..c685a931
--- /dev/null
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.4.graphqls
@@ -0,0 +1,31 @@
+enum PriceAdjustmentCodesEnum {
+    WEEE @deprecated(reason: "WEEE code is deprecated, use fixed_product_taxes.label")
+    WEEE_TAX @deprecated(reason: "Use fixed_product_taxes. PriceAdjustmentCodesEnum is deprecated. Tax is included or excluded in price. Tax is not shown separtely in Catalog")
+}
+
+type ProductPrice {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "The multiple FPTs that can be applied to a product price.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\FixedProductTax")
+}
+
+type CartItemPrices {
+    fixed_product_taxes: [FixedProductTax] @doc(description: "Applied FPT to the cart item.") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\Quote\\FixedProductTax")
+}
+
+type FixedProductTax @doc(description: "A single FPT that can be applied to a product price.") {
+    amount: Money @doc(description: "Amount of the FPT as a money object.")
+    label: String @doc(description: "The label assigned to the FPT to be displayed on the frontend.")
+}
+
+type StoreConfig {
+    product_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices On Product View Page' field. It indicates how FPT information is displayed on product pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    category_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Product Lists' field. It indicates how FPT information is displayed on category pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    sales_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Sales Modules' field. It indicates how FPT information is displayed on cart, checkout, and order pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+}
+
+enum FixedProductTaxDisplaySettings @doc(description: "This enumeration display settings for the fixed product tax") {
+    INCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price includes the FPT amount without displaying the ProductPrice.fixed_product_taxes values. This value corresponds to 'Including FPT only'")
+    INCLUDE_FPT_WITH_DETAILS @doc(description: "The displayed price includes the FPT amount while displaying the values of ProductPrice.fixed_product_taxes separately. This value corresponds to 'Including FPT and FPT description'")
+    EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values of ProductPrice.fixed_product_taxes and the price including the FPT are displayed separately. This value corresponds to 'Excluding FPT, Including FPT description and final price'")
+    EXCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values from ProductPrice.fixed_product_taxes are not displayed. This value corresponds to 'Excluding FPT'")
+    FPT_DISABLED @doc(description: "The FPT feature is not enabled. You can omit  ProductPrice.fixed_product_taxes from your query")
+}
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
new file mode 100644
index 00000000..7cd23950
--- /dev/null
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2Framework\Tests\Header;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class CopyrightGraphQLUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = ''): array
+    {
+        if ($testFile === 'CopyrightGraphQLUnitTest.1.inc' || $testFile === 'CopyrightGraphQLUnitTest.2.inc') {
+            return [];
+        }
+
+        if ($testFile === 'CopyrightGraphQLUnitTest.3.inc' || $testFile === 'CopyrightGraphQLUnitTest.4.inc') {
+            return [
+                1 => 1
+            ];
+        }
+
+        return [];
+    }
+}
diff --git a/Magento2Framework/ruleset.xml b/Magento2Framework/ruleset.xml
index 434d10cc..80369df8 100644
--- a/Magento2Framework/ruleset.xml
+++ b/Magento2Framework/ruleset.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <ruleset name="Magento2Framework">
     <description>Magento Coding Standard sniffs applicable for the framework testing only</description>
+
+    <arg name="extensions" value="php,phtml,graphqls/GRAPHQL,less/CSS,html/CSS,css/CSS,xml,js/JS"/>
+
     <rule ref="Magento2Framework.Header.License">
         <severity>5</severity>
         <type>warning</type>
@@ -17,4 +20,13 @@
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
     </rule>
+    <rule ref="Magento2Framework.Header.CopyrightGraphQL">
+        <severity>5</severity>
+        <type>warning</type>
+        <include-pattern>*\.graphqls$</include-pattern>
+    </rule>
+
+    <rule ref="Internal.NoCodeFound">
+        <severity>0</severity>
+    </rule>
 </ruleset>

From e03be588fa3f1a7a8a9ee8388b2e665858f6102e Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 2 Nov 2021 09:57:34 +0000
Subject: [PATCH 372/630] Version 14

---
 composer.json |  2 +-
 composer.lock | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/composer.json b/composer.json
index ede320cf..9b728859 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "13",
+    "version": "14",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index 0e7a89fc..917d8ab1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5c6ca0b93a60923e59b9ef33f824cea0",
+    "content-hash": "a5487f1379f650278e6de506e0c5a645",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -64,22 +64,22 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.9.0",
+            "version": "v14.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "36b83621deb5eae354347a2e86dc7aec81b32a82"
+                "reference": "d191b0c34365c025c6cd953b5a63aa62946c7060"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/36b83621deb5eae354347a2e86dc7aec81b32a82",
-                "reference": "36b83621deb5eae354347a2e86dc7aec81b32a82",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d191b0c34365c025c6cd953b5a63aa62946c7060",
+                "reference": "d191b0c34365c025c6cd953b5a63aa62946c7060",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "php": "^7.1||^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "amphp/amp": "^2.3",
@@ -90,7 +90,7 @@
                 "phpstan/phpstan": "0.12.82",
                 "phpstan/phpstan-phpunit": "0.12.18",
                 "phpstan/phpstan-strict-rules": "0.12.9",
-                "phpunit/phpunit": "^7.2|^8.5",
+                "phpunit/phpunit": "^7.2 || ^8.5",
                 "psr/http-message": "^1.0",
                 "react/promise": "2.*",
                 "simpod/php-coveralls-mirror": "^3.0",
@@ -118,7 +118,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.9.0"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.0"
             },
             "funding": [
                 {
@@ -126,7 +126,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-06-15T16:14:17+00:00"
+            "time": "2021-10-29T13:08:08+00:00"
         }
     ],
     "packages-dev": [
@@ -479,16 +479,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
                 "shasum": ""
             },
             "require": {
@@ -499,7 +499,8 @@
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2"
+                "mockery/mockery": "~1.3.2",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -529,9 +530,9 @@
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
             },
-            "time": "2020-09-03T19:13:55+00:00"
+            "time": "2021-10-19T17:43:47+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -652,23 +653,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.7",
+            "version": "9.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218"
+                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218",
-                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
+                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.12.0",
+                "nikic/php-parser": "^4.13.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -717,7 +718,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.8"
             },
             "funding": [
                 {
@@ -725,7 +726,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-09-17T05:39:03+00:00"
+            "time": "2021-10-30T08:01:38+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1924,7 +1925,6 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {

From f75830dd0c6e9e0df2cc0e7544b6bb0d125be472 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Tue, 2 Nov 2021 13:07:54 +0100
Subject: [PATCH 373/630] Add Sniff for check autovivification on array

---
 .../Sniffs/PHP/ArrayAutovivificationSniff.php | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php

diff --git a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
new file mode 100644
index 00000000..f814bdba
--- /dev/null
+++ b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\PHP;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Sniff to validate array autovivification.
+ */
+class ArrayAutovivificationSniff implements Sniff
+{
+    /**
+     * String representation of error.
+     *
+     * @var string
+     */
+    private $warningMessage = 'Deprecated: Automatic conversion of false to array is deprecated.';
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    private $warningCode = 'Autovivification';
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_VARIABLE
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr): void
+    {
+        $positionSquareBracket = $phpcsFile->findNext(T_OPEN_SQUARE_BRACKET, $stackPtr, $stackPtr + 2);
+
+        if ($positionSquareBracket) {
+            $tokens = $phpcsFile->getTokens();
+            $propertyTokenKey = array_keys(array_column($tokens, 'content'), $tokens[$stackPtr]['content']);
+
+            arsort($propertyTokenKey);
+
+            foreach ($propertyTokenKey as $tokenKey) {
+                if ($tokenKey < $stackPtr && $tokens[$tokenKey + 2]['content'] === '=') {
+                    if ($tokens[$tokenKey + 4]['content'] != 'false') {
+                        return;
+                    }
+
+                    $phpcsFile->addWarning($this->warningMessage, $positionSquareBracket, $this->warningCode);
+                }
+            }
+        }
+    }
+}

From 437e157b5073b48e41ab46235de37299419e684b Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Tue, 2 Nov 2021 20:36:30 +0100
Subject: [PATCH 374/630] Created Unit Test for array autovivification sniff

---
 .../Sniffs/PHP/ArrayAutovivificationSniff.php |  7 ++-
 .../PHP/ArrayAutovivificationUnitTest.inc     | 60 +++++++++++++++++++
 .../PHP/ArrayAutovivificationUnitTest.php     | 35 +++++++++++
 Magento2/ruleset.xml                          |  5 ++
 4 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc
 create mode 100644 Magento2/Tests/PHP/ArrayAutovivificationUnitTest.php

diff --git a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
index f814bdba..f5893a3d 100644
--- a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
+++ b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
@@ -48,12 +48,15 @@ public function process(File $phpcsFile, $stackPtr): void
 
         if ($positionSquareBracket) {
             $tokens = $phpcsFile->getTokens();
-            $propertyTokenKey = array_keys(array_column($tokens, 'content'), $tokens[$stackPtr]['content']);
+            $positionFunction = $phpcsFile->findPrevious(T_FUNCTION, $positionSquareBracket) ?: 0;
+            $sliceLength = $stackPtr - $positionFunction;
+            $sliceToken = array_slice(array_column($tokens, 'content'), $positionFunction, $sliceLength, true);
+            $propertyTokenKey = array_keys($sliceToken, $tokens[$stackPtr]['content']);
 
             arsort($propertyTokenKey);
 
             foreach ($propertyTokenKey as $tokenKey) {
-                if ($tokenKey < $stackPtr && $tokens[$tokenKey + 2]['content'] === '=') {
+                if ($tokens[$tokenKey + 2]['content'] === '=') {
                     if ($tokens[$tokenKey + 4]['content'] != 'false') {
                         return;
                     }
diff --git a/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc b/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc
new file mode 100644
index 00000000..82b92c00
--- /dev/null
+++ b/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\PHP;
+
+/**
+ * Class to test array avtovivification.
+ */
+class Avtovivification
+{
+    /**
+     * @return array
+     */
+    public function testNullAvtovivification()
+    {
+        $productIds = null;
+
+        $productIds[] = 'test_array_value';
+
+        return $productIds;
+    }
+
+    /**
+     * @return array
+     */
+    public function testArrayAvtovivification()
+    {
+        $productIds = [];
+
+        $productIds[] = 'test_array_value';
+
+        return $productIds;
+    }
+
+    /**
+     * @return array
+     */
+    public function testFalseAvtovivification()
+    {
+        $productIds = false;
+
+        $productIds[] = 'test_array_value';
+
+        return $productIds;
+    }
+
+    /**
+     * @return array
+     */
+    public function testUndefineAvtovivification()
+    {
+        $productIds[] = 'test_array_value';
+
+        return $productIds;
+    }
+}
diff --git a/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.php b/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.php
new file mode 100644
index 00000000..faaecde5
--- /dev/null
+++ b/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\PHP;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ArrayAutovivificationUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = ''): array
+    {
+        if ($testFile === 'ArrayAutovivificationUnitTest.inc') {
+            return [
+                46 => 1
+            ];
+        }
+
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 442d9867..5ea68ff3 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -400,6 +400,11 @@
         <type>warning</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.PHP.ArrayAutovivification">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <rule ref="Magento2.Performance.ForeachArrayMerge">
         <severity>7</severity>
         <type>warning</type>

From 111c993f5ed4928031094a8c85ef2d2f1ecbd8ff Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 4 Nov 2021 16:43:17 +0000
Subject: [PATCH 375/630] Exluded JS files for PSR sniffs

---
 Magento2/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5ea68ff3..c35d5a9b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -502,6 +502,7 @@
         </properties>
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*\.js$</exclude-pattern>
     </rule>
     <rule ref="Magento2.GraphQL.ValidArgumentName">
         <severity>6</severity>
@@ -577,6 +578,7 @@
     <rule ref="PSR2.Methods.FunctionCallSignature">
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*\.js$</exclude-pattern>
     </rule>
     <rule ref="PSR2.Methods.FunctionCallSignature.SpaceAfterCloseBracket">
         <severity>0</severity>

From 1a9b4a48285cc913e648d8f6c8b877e51b87fde8 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Fri, 5 Nov 2021 11:14:46 +0100
Subject: [PATCH 376/630] Created Sniff to validate function without argument

---
 .../Functions/DeprecatedFunctionSniff.php     | 64 +++++++++++++++++++
 .../Functions/DeprecatedFunctionUnitTest.inc  | 32 ++++++++++
 .../Functions/DeprecatedFunctionUnitTest.php  | 38 +++++++++++
 Magento2/ruleset.xml                          |  5 ++
 4 files changed, 139 insertions(+)
 create mode 100644 Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php
 create mode 100644 Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc
 create mode 100644 Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php

diff --git a/Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php b/Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php
new file mode 100644
index 00000000..c573b8e5
--- /dev/null
+++ b/Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\Functions;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Sniff to validate PHP deprecated function.
+ */
+class DeprecatedFunctionSniff implements Sniff
+{
+    /**
+     * Deprecated functions without argument.
+     *
+     * @var array
+     */
+    private $deprecatedFunctions = [
+        'mb_check_encoding'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_OPEN_TAG
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr): void
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        foreach ($this->deprecatedFunctions as $deprecatedFunction) {
+            $deprecatedFunctionKeys = array_keys(array_column($tokens, 'content'), $deprecatedFunction);
+
+            foreach ($deprecatedFunctionKeys as $deprecatedFunctionKey) {
+                $openParenthesis = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $deprecatedFunctionKey);
+                $closeParenthesis = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $openParenthesis);
+                $argumentString = trim(
+                    $phpcsFile->getTokensAsString($openParenthesis + 1, $closeParenthesis - $openParenthesis - 1)
+                );
+
+                if (!$argumentString) {
+                    $warningMessage = sprintf(
+                        'Calling function %s() without argument is deprecated in PHP 8.1',
+                        $deprecatedFunction
+                    );
+                    $phpcsFile->addWarning($warningMessage, $deprecatedFunctionKey, 'DeprecatedFunction');
+                }
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc b/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc
new file mode 100644
index 00000000..08465f2a
--- /dev/null
+++ b/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Functions;
+
+/**
+ * Class to test PHP deprecated function.
+ */
+class DeprecatedFunction
+{
+    /**
+     * Test deprecation function.
+     *
+     * @return bool
+     */
+    public function testDeprecatedMethod(): bool
+    {
+        // Warning: function is deprecated without argument.
+        $testMethodParam = mb_check_encoding();
+
+        if ($testMethodParam) {
+            // The function is work correct.
+            $testMethodParam = mb_check_encoding('test-argument', null);
+        }
+
+        return $testMethodParam;
+    }
+}
diff --git a/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php b/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php
new file mode 100644
index 00000000..263b8491
--- /dev/null
+++ b/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Functions;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Sniff to validate PHP deprecated function.
+ */
+class DeprecatedFunctionUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = ''): array
+    {
+        if ($testFile === 'DeprecatedFunctionUnitTest.inc') {
+            return [
+                23 => 1
+            ];
+        }
+
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5ea68ff3..1a19e962 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -251,6 +251,11 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Functions.DeprecatedFunction">
+        <severity>7</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
         <severity>8</severity>
         <type>warning</type>

From e3dbe606ff40e499012ef12517c3004059564a4c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 5 Nov 2021 12:38:38 +0100
Subject: [PATCH 377/630] AC-1509: Remove outdated JSCS static tests from
 magento

---
 .github/workflows/php.yml                     |    3 -
 eslint/.eslintrc                              |    3 +-
 eslint/.eslintrc-jscs                         |   64 +
 eslint/rules/jquery-no-andSelf.js             |    6 +-
 eslint/rules/jquery-no-bind-unbind.js         |    6 +-
 .../rules/jquery-no-click-event-shorthand.js  |    6 +-
 eslint/rules/jquery-no-delegate-undelegate.js |    6 +-
 eslint/rules/jquery-no-event-shorthand.js     |    6 +-
 eslint/rules/jquery-no-size.js                |    6 +-
 eslint/rules/jquery-no-trim.js                |    8 +-
 jscs/.jscsrc                                  |  119 -
 package-lock.json                             | 6230 ++---------------
 package.json                                  |    6 +-
 13 files changed, 685 insertions(+), 5784 deletions(-)
 create mode 100644 eslint/.eslintrc-jscs
 delete mode 100644 jscs/.jscsrc

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 119d380e..a22f59c2 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -75,6 +75,3 @@ jobs:
 
       - name: Run ESLint
         run: npm run eslint -- eslint/rules
-
-      - name: Run JSCS
-        run: npm run jscs eslint/rules Magento2
diff --git a/eslint/.eslintrc b/eslint/.eslintrc
index 8f800d85..88aa88c7 100644
--- a/eslint/.eslintrc
+++ b/eslint/.eslintrc
@@ -3,6 +3,7 @@
     	"./.eslintrc-reset",
     	"./.eslintrc-magento",
     	"./.eslintrc-jquery",
-    	"./.eslintrc-misc"
+    	"./.eslintrc-misc",
+    	"./.eslintrc-jscs"
     ]
 }
diff --git a/eslint/.eslintrc-jscs b/eslint/.eslintrc-jscs
new file mode 100644
index 00000000..728e7dca
--- /dev/null
+++ b/eslint/.eslintrc-jscs
@@ -0,0 +1,64 @@
+{
+  "rules": {
+    "no-with": 2,
+    "space-before-function-paren": [
+      2,
+      {
+        "anonymous": "always",
+        "named": "never",
+        "asyncArrow": "always"
+      }
+    ],
+    "curly": [
+      2,
+      "all"
+    ],
+    "keyword-spacing": [
+      2,
+      {}
+    ],
+    "no-empty": [
+      2,
+      {
+        "allowEmptyCatch": true
+      }
+    ],
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multiple-empty-lines": 2,
+    "no-multi-str": 2,
+    "space-unary-ops": [
+      2,
+      {
+        "words": false,
+        "nonwords": false
+      }
+    ],
+    "space-in-parens": [
+      2,
+      "never"
+    ],
+    "comma-dangle": [
+      2,
+      "never"
+    ],
+    "no-trailing-spaces": 2,
+    "comma-style": [
+      2,
+      "last"
+    ],
+    "eol-last": 2,
+    "one-var": [
+      2,
+      "always"
+    ],
+    "space-infix-ops": 2,
+    "space-before-blocks": [
+      2,
+      "always"
+    ],
+    "quotes": [
+      2,
+      "single"
+    ]
+  }
+}
diff --git a/eslint/rules/jquery-no-andSelf.js b/eslint/rules/jquery-no-andSelf.js
index a72b694b..ad08cbb1 100644
--- a/eslint/rules/jquery-no-andSelf.js
+++ b/eslint/rules/jquery-no-andSelf.js
@@ -31,11 +31,9 @@ module.exports = {
              * @param {Object} node - The node to check.
              */
             CallExpression: function (node) {
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (node.callee.property.name !== 'andSelf') return;
-                // jscs:enable requireCurlyBraces
+                if (node.callee.property.name !== 'andSelf') {return;}
 
                 if (utils.isjQuery(node)) {
                     context.report({
diff --git a/eslint/rules/jquery-no-bind-unbind.js b/eslint/rules/jquery-no-bind-unbind.js
index d64a7c88..58b4e92c 100644
--- a/eslint/rules/jquery-no-bind-unbind.js
+++ b/eslint/rules/jquery-no-bind-unbind.js
@@ -31,11 +31,9 @@ module.exports = {
              * @param {Object} node - The node to check.
              */
             CallExpression: function (node) {
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
-                // jscs:enable requireCurlyBraces
+                if (!['bind', 'unbind'].includes(node.callee.property.name)) {return;}
 
                 if (utils.isjQuery(node)) {
                     context.report({
diff --git a/eslint/rules/jquery-no-click-event-shorthand.js b/eslint/rules/jquery-no-click-event-shorthand.js
index 3ae435dd..9c03f9d6 100644
--- a/eslint/rules/jquery-no-click-event-shorthand.js
+++ b/eslint/rules/jquery-no-click-event-shorthand.js
@@ -34,11 +34,9 @@ module.exports = {
                     'mouseup', 'mousemove','mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select',
                     'submit', 'keydown', 'keypress', 'keyup', 'contextmenu', 'click'];
 
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (!names.includes(node.callee.property.name)) return;
-                // jscs:enable requireCurlyBraces
+                if (!names.includes(node.callee.property.name)) {return;}
 
                 if (utils.isjQuery(node)) {
                     name = node.callee.property.name;
diff --git a/eslint/rules/jquery-no-delegate-undelegate.js b/eslint/rules/jquery-no-delegate-undelegate.js
index 8eb219ee..fd96c9f2 100644
--- a/eslint/rules/jquery-no-delegate-undelegate.js
+++ b/eslint/rules/jquery-no-delegate-undelegate.js
@@ -31,11 +31,9 @@ module.exports = {
              * @param {Object} node - The node to check.
              */
             CallExpression: function (node) {
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (!['delegate', 'undelegate'].includes(node.callee.property.name)) return;
-                // jscs:enable requireCurlyBraces
+                if (!['delegate', 'undelegate'].includes(node.callee.property.name)) {return;}
 
                 if (utils.isjQuery(node)) {
                     context.report({
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 4715c6b9..cc071b85 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -31,11 +31,9 @@ module.exports = {
                 var names = ['load', 'unload', 'error'],
                     name;
 
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (!names.includes(node.callee.property.name)) return;
-                // jscs:enable requireCurlyBraces
+                if (!names.includes(node.callee.property.name)) {return;}
 
                 if (utils.isjQuery(node)) {
                     name = node.callee.property.name;
diff --git a/eslint/rules/jquery-no-size.js b/eslint/rules/jquery-no-size.js
index adf58985..dc8b6477 100644
--- a/eslint/rules/jquery-no-size.js
+++ b/eslint/rules/jquery-no-size.js
@@ -31,11 +31,9 @@ module.exports = {
              * @param {Object} node - The node to check.
              */
             CallExpression: function (node) {
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (node.callee.property.name !== 'size') return;
-                // jscs:enable requireCurlyBraces
+                if (node.callee.property.name !== 'size') {return;}
 
                 if (utils.isjQuery(node)) {
                     context.report({
diff --git a/eslint/rules/jquery-no-trim.js b/eslint/rules/jquery-no-trim.js
index ec96ddd5..599c1b72 100644
--- a/eslint/rules/jquery-no-trim.js
+++ b/eslint/rules/jquery-no-trim.js
@@ -29,13 +29,11 @@ module.exports = {
              * @param {Object} node - The node to check.
              */
             CallExpression: function (node) {
-                // jscs:disable requireCurlyBraces
-                if (node.callee.type !== 'MemberExpression') return;
+                if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (node.callee.object.name !== '$') return;
+                if (node.callee.object.name !== '$') {return;}
 
-                if (node.callee.property.name !== 'trim') return;
-                // jscs:enable requireCurlyBraces
+                if (node.callee.property.name !== 'trim') {return;}
 
                 context.report({
                     node: node,
diff --git a/jscs/.jscsrc b/jscs/.jscsrc
deleted file mode 100644
index a7a0184b..00000000
--- a/jscs/.jscsrc
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "disallowKeywords": [
-        "with",
-        "continue"
-    ],
-    "disallowKeywordsOnNewLine": [
-        "else"
-    ],
-    "disallowSpaceBeforeBinaryOperators": [
-        ","
-    ],
-    "disallowSpacesInFunctionDeclaration": {
-        "beforeOpeningRoundBrace": true
-    },
-    "disallowSpacesInNamedFunctionExpression": {
-        "beforeOpeningRoundBrace": true
-    },
-    "requireCurlyBraces": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "try",
-        "catch"
-    ],
-    "requirePaddingNewlinesBeforeKeywords": [
-        "do",
-        "for",
-        "if",
-        "switch",
-        "case",
-        "try",
-        "void",
-        "while",
-        "with",
-        "return"
-    ],
-    "requireSpaceBeforeKeywords": [
-        "else",
-        "while",
-        "catch"
-    ],
-    "requireSpaceAfterKeywords": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "switch",
-        "case",
-        "return",
-        "try",
-        "catch",
-        "function",
-        "typeof"
-    ],
-    "requireSpacesInAnonymousFunctionExpression": {
-        "beforeOpeningCurlyBrace": true,
-        "beforeOpeningRoundBrace": true
-    },
-    "disallowNewlineBeforeBlockStatements": true,
-    "disallowDanglingUnderscores": null,
-    "disallowEmptyBlocks": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowMultipleLineBreaks": true,
-    "disallowMultipleLineStrings": true,
-    "disallowSpaceAfterObjectKeys": true,
-    "disallowSpaceAfterPrefixUnaryOperators": true,
-    "disallowSpaceBeforePostfixUnaryOperators": true,
-    "disallowSpacesInCallExpression": true,
-    "disallowSpacesInsideArrayBrackets": "all",
-    "disallowSpacesInsideObjectBrackets": "all",
-    "disallowSpacesInsideParentheses": true,
-    "disallowTrailingComma": true,
-    "disallowTrailingWhitespace": true,
-    "disallowYodaConditions": true,
-    "maxErrors": null,
-    "requireBlocksOnNewline": true,
-    "requireDotNotation": "except_snake_case",
-    "requireCamelCaseOrUpperCaseIdentifiers": true,
-    "requireCapitalizedConstructors": true,
-    "requireCommaBeforeLineBreak": true,
-    "requireLineBreakAfterVariableAssignment": true,
-    "requireLineFeedAtFileEnd": true,
-    "requireMultipleVarDecl": "onevar",
-    "requireOperatorBeforeLineBreak": true,
-    "requirePaddingNewLinesAfterUseStrict": true,
-    "requirePaddingNewLinesInObjects": true,
-    "requireParenthesesAroundIIFE": true,
-    "requireSpaceAfterBinaryOperators": true,
-    "requireSpaceBeforeBinaryOperators": true,
-    "requireSpaceBeforeBlockStatements": true,
-    "requireSpaceBeforeObjectValues": true,
-    "requireSpaceBetweenArguments": true,
-    "requireSpacesInConditionalExpression": true,
-    "requireSpacesInForStatement": true,
-    "validateIndentation": 4,
-    "validateParameterSeparator": ", ",
-    "validateQuoteMarks": "'",
-    "jsDoc": {
-        "checkAnnotations": {
-            "preset": "jsdoc3",
-            "extra": {
-                "override": true,
-                "inheritdoc": true,
-                "api": true
-            }
-        },
-        "checkParamNames": true,
-        "checkRedundantParams": true,
-        "checkRedundantReturns": true,
-        "checkReturnTypes": true,
-        "checkTypes": "capitalizedNativeCase",
-        "enforceExistence": "exceptExports",
-        "requireHyphenBeforeDescription": true,
-        "requireParamTypes": true
-    }
-}
diff --git a/package-lock.json b/package-lock.json
index f635c94d..ddb1aab8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "eslint": "^7.32.0",
-        "jscs": "^2.1.1"
+        "eslint": "^7.32.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -23,9 +22,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -193,38 +192,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/alter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
-      "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=",
-      "dev": true,
-      "dependencies": {
-        "stable": "~0.1.3"
-      }
-    },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.2"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -267,21 +234,6 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/ast-traverse": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz",
-      "integrity": "sha1-ac8rg4bxnc2hux4F1o/jWdiJfeY=",
-      "dev": true
-    },
-    "node_modules/ast-types": {
-      "version": "0.8.12",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz",
-      "integrity": "sha1-oNkOQ1G7iHcWyD/WN+v4GK9K38w=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -291,318 +243,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-      "dev": true
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/babel-core": {
-      "version": "5.8.38",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
-      "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=",
-      "dev": true,
-      "dependencies": {
-        "babel-plugin-constant-folding": "^1.0.1",
-        "babel-plugin-dead-code-elimination": "^1.0.2",
-        "babel-plugin-eval": "^1.0.1",
-        "babel-plugin-inline-environment-variables": "^1.0.1",
-        "babel-plugin-jscript": "^1.0.4",
-        "babel-plugin-member-expression-literals": "^1.0.1",
-        "babel-plugin-property-literals": "^1.0.1",
-        "babel-plugin-proto-to-assign": "^1.0.3",
-        "babel-plugin-react-constant-elements": "^1.0.3",
-        "babel-plugin-react-display-name": "^1.0.3",
-        "babel-plugin-remove-console": "^1.0.1",
-        "babel-plugin-remove-debugger": "^1.0.1",
-        "babel-plugin-runtime": "^1.0.7",
-        "babel-plugin-undeclared-variables-check": "^1.0.2",
-        "babel-plugin-undefined-to-void": "^1.1.6",
-        "babylon": "^5.8.38",
-        "bluebird": "^2.9.33",
-        "chalk": "^1.0.0",
-        "convert-source-map": "^1.1.0",
-        "core-js": "^1.0.0",
-        "debug": "^2.1.1",
-        "detect-indent": "^3.0.0",
-        "esutils": "^2.0.0",
-        "fs-readdir-recursive": "^0.1.0",
-        "globals": "^6.4.0",
-        "home-or-tmp": "^1.0.0",
-        "is-integer": "^1.0.4",
-        "js-tokens": "1.0.1",
-        "json5": "^0.4.0",
-        "lodash": "^3.10.0",
-        "minimatch": "^2.0.3",
-        "output-file-sync": "^1.1.0",
-        "path-exists": "^1.0.0",
-        "path-is-absolute": "^1.0.0",
-        "private": "^0.1.6",
-        "regenerator": "0.8.40",
-        "regexpu": "^1.3.0",
-        "repeating": "^1.1.2",
-        "resolve": "^1.1.6",
-        "shebang-regex": "^1.0.0",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.0",
-        "source-map-support": "^0.2.10",
-        "to-fast-properties": "^1.0.0",
-        "trim-right": "^1.0.0",
-        "try-resolve": "^1.0.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/globals": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz",
-      "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/js-tokens": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz",
-      "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=",
-      "dev": true
-    },
-    "node_modules/babel-core/node_modules/minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/babel-core/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/babel-core/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-jscs": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/babel-jscs/-/babel-jscs-2.0.5.tgz",
-      "integrity": "sha1-CjRwRrSBRay8pW6MjtX3NrxU+dA=",
-      "dev": true,
-      "dependencies": {
-        "babel-core": "~5.8.3",
-        "lodash.assign": "^3.2.0"
-      }
-    },
-    "node_modules/babel-plugin-constant-folding": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz",
-      "integrity": "sha1-g2HTZMmORJw2kr26Ue/whEKQqo4=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-dead-code-elimination": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz",
-      "integrity": "sha1-X3xFEnTc18zNv7s+C4XdKBIfD2U=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-eval": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz",
-      "integrity": "sha1-ovrtJc5r5preS/7CY/cBaRlZUNo=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-inline-environment-variables": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz",
-      "integrity": "sha1-H1jOkSB61qgmqL9kX6/mj/X+P/4=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-jscript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz",
-      "integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-member-expression-literals": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz",
-      "integrity": "sha1-zF7bD6qNyScXDnTW0cAkQAIWJNM=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-property-literals": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz",
-      "integrity": "sha1-AlIwGQAZKYCxwRjv6kjOk6q4MzY=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-proto-to-assign": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz",
-      "integrity": "sha1-xJ56/QL1d7xNoF6i3wAiUM980SM=",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^3.9.3"
-      }
-    },
-    "node_modules/babel-plugin-react-constant-elements": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz",
-      "integrity": "sha1-lGc26DeEKcvDSdz/YvUcFDs041o=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-react-display-name": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz",
-      "integrity": "sha1-dU/jiSboQkpOexWrbqYTne4FFPw=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-remove-console": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz",
-      "integrity": "sha1-2PJFVsOgUAXUKqqv0neH9T/wE6c=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-remove-debugger": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz",
-      "integrity": "sha1-/S6jzWGkKK0fO5yJiC/0KT6MFMc=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-runtime": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz",
-      "integrity": "sha1-v3x9lm3Vbs1cF/ocslPJrLflSq8=",
-      "dev": true
-    },
-    "node_modules/babel-plugin-undeclared-variables-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz",
-      "integrity": "sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=",
-      "dev": true,
-      "dependencies": {
-        "leven": "^1.0.2"
-      }
-    },
-    "node_modules/babel-plugin-undefined-to-void": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz",
-      "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=",
-      "dev": true
-    },
-    "node_modules/babylon": {
-      "version": "5.8.38",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz",
-      "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=",
-      "dev": true
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-      "dev": true
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -613,25 +259,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/breakable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
-      "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME=",
-      "dev": true
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -641,28 +268,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
-      "dependencies": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -679,29 +284,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/cli-table": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
-      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
-      "dev": true,
-      "dependencies": {
-        "colors": "1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.2.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "dev": true,
-      "dependencies": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -720,1709 +302,273 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
-    "node_modules/commander": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
-        "graceful-readlink": ">= 1.0.0"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.6.x"
+        "node": ">= 8"
       }
     },
-    "node_modules/comment-parser": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.2.tgz",
-      "integrity": "sha1-PAPwd2uGo239mgosl8YwfzMggv4=",
+    "node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
       "dev": true,
       "dependencies": {
-        "readable-stream": "^2.0.4"
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/comment-parser/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/comment-parser/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/comment-parser/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
-    "node_modules/commoner": {
-      "version": "0.10.8",
-      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
-      "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=",
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "dependencies": {
-        "commander": "^2.5.0",
-        "detective": "^4.3.1",
-        "glob": "^5.0.15",
-        "graceful-fs": "^4.1.2",
-        "iconv-lite": "^0.4.5",
-        "mkdirp": "^0.5.0",
-        "private": "^0.1.6",
-        "q": "^1.1.2",
-        "recast": "^0.11.17"
-      },
-      "bin": {
-        "commonize": "bin/commonize"
+        "ansi-colors": "^4.1.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8.6"
       }
     },
-    "node_modules/commoner/node_modules/ast-types": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-      "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commoner/node_modules/esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/commoner/node_modules/glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-      "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/commoner/node_modules/recast": {
-      "version": "0.11.23",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-      "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-      "dev": true,
-      "dependencies": {
-        "ast-types": "0.9.6",
-        "esprima": "~3.1.0",
-        "private": "~0.1.5",
-        "source-map": "~0.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
-      "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cycle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
-      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/deep-equal": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/deep-equal/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "node_modules/defs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
-      "integrity": "sha1-siYJ8sehG6ej2xFoBcE5scr/qdI=",
-      "dev": true,
-      "dependencies": {
-        "alter": "~0.2.0",
-        "ast-traverse": "~0.1.1",
-        "breakable": "~1.0.0",
-        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
-        "simple-fmt": "~0.1.0",
-        "simple-is": "~0.2.0",
-        "stringmap": "~0.2.2",
-        "stringset": "~0.2.1",
-        "tryor": "~0.1.2",
-        "yargs": "~3.27.0"
-      },
-      "bin": {
-        "defs": "build/es5/defs"
-      }
-    },
-    "node_modules/detect-indent": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
-      "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1",
-        "minimist": "^1.1.0",
-        "repeating": "^1.1.0"
-      },
-      "bin": {
-        "detect-indent": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^5.2.1",
-        "defined": "^1.0.0"
-      }
-    },
-    "node_modules/detective/node_modules/acorn": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "node_modules/domhandler": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-      "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-      "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-      "dev": true
-    },
-    "node_modules/es-abstract": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
-      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-get-iterator/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "node_modules/es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "node_modules/es6-set/node_modules/es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "dependencies": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/escope/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esprima-fb": {
-      "version": "15001.1001.0-dev-harmony-fb",
-      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-      "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
-      "dev": true,
-      "dependencies": {
-        "type": "^2.5.0"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-      "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-      "dev": true
-    },
-    "node_modules/eyes": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
-      "dev": true,
-      "engines": {
-        "node": "> 0.1.90"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-      "dev": true
-    },
-    "node_modules/foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "node_modules/fs-readdir-recursive": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz",
-      "integrity": "sha1-MVtPuMHKW4xH3v7zGdBz2tNWgFk=",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
-    "node_modules/graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-color": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-      "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/home-or-tmp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
-      "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "^1.0.1",
-        "user-home": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-      "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "1",
-        "domhandler": "2.3",
-        "domutils": "1.5",
-        "entities": "1.0",
-        "readable-stream": "1.1"
-      }
-    },
-    "node_modules/i": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
-      "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherit": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.7.tgz",
-      "integrity": "sha512-dxJmC1j0Q32NFAjvbd6g3lXYLZ49HgzotgbSMwMkoiTXGhC9412Oc24g7A7M9cPPkw/vDsF2cSII+2zJwocUtQ==",
-      "dev": true
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
-      "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-integer": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.7.tgz",
-      "integrity": "sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=",
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "dependencies": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/is-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
-      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
-        "has-tostringtag": "^1.0.0"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakset": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz",
-      "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/jscs": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.11.0.tgz",
-      "integrity": "sha1-bhHvDKqgdzH53MKysn2OzuHdvLY=",
-      "deprecated": "JSCS has merged with ESLint! See - https://medium.com/@markelog/jscs-end-of-the-line-bc9bf0b3fdb2",
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "dependencies": {
-        "babel-jscs": "^2.0.0",
-        "chalk": "~1.1.0",
-        "cli-table": "~0.3.1",
-        "commander": "~2.9.0",
-        "escope": "^3.2.0",
-        "esprima": "~2.7.0",
-        "estraverse": "^4.1.0",
-        "exit": "~0.1.2",
-        "glob": "^5.0.1",
-        "htmlparser2": "3.8.3",
-        "js-yaml": "~3.4.0",
-        "jscs-jsdoc": "^1.3.1",
-        "jscs-preset-wikimedia": "~1.0.0",
-        "jsonlint": "~1.6.2",
-        "lodash": "~3.10.0",
-        "minimatch": "~3.0.0",
-        "natural-compare": "~1.2.2",
-        "pathval": "~0.1.1",
-        "prompt": "~0.2.14",
-        "reserved-words": "^0.1.1",
-        "resolve": "^1.1.6",
-        "strip-bom": "^2.0.0",
-        "strip-json-comments": "~1.0.2",
-        "to-double-quotes": "^2.0.0",
-        "to-single-quotes": "^2.0.0",
-        "vow": "~0.4.8",
-        "vow-fs": "~0.3.4",
-        "xmlbuilder": "^3.1.0"
-      },
       "bin": {
-        "jscs": "bin/jscs"
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/jscs-jsdoc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-1.3.2.tgz",
-      "integrity": "sha1-HyyCtqtLl1JNqVj0a05WLgMF+ac=",
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "dev": true,
       "dependencies": {
-        "comment-parser": "^0.3.1",
-        "jsdoctypeparser": "~1.2.0"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/jscs-preset-wikimedia": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.1.tgz",
-      "integrity": "sha512-RWqu6IYSUlnYuCRCF0obCOHjJV0vhpLcvKbauwxmLQoZ0PiXDTWBYlfpsEfdhg7pmREAEwrARfDRz5qWD6qknA==",
-      "deprecated": "No longer maintained. We recomment migrating to ESLint with eslint-config-wikimedia.",
-      "dev": true
-    },
-    "node_modules/jscs/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/jscs/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/jscs/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jscs/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/jscs/node_modules/esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/jscs/node_modules/estraverse": {
+    "node_modules/estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
@@ -2431,257 +577,260 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/jscs/node_modules/glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
       "engines": {
-        "node": "*"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jscs/node_modules/js-yaml": {
-      "version": "3.4.6",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz",
-      "integrity": "sha1-a+GyP2JJ9T0pM3D9TRqqY84bTrA=",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.2",
-        "esprima": "^2.6.0",
-        "inherit": "^2.2.2"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
-    "node_modules/jscs/node_modules/natural-compare": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.2.2.tgz",
-      "integrity": "sha1-H5bWDjFBysG20FZTzg2urHY69qo=",
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "node_modules/jscs/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "flat-cache": "^3.0.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/jscs/node_modules/strip-json-comments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-      "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
-      "bin": {
-        "strip-json-comments": "cli.js"
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/jscs/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/jsdoctypeparser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-1.2.0.tgz",
-      "integrity": "sha1-597cFToRhJ/8UUEUSuhqfvDCU5I=",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^3.7.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
+    "node_modules/flatted": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "dev": true
     },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "node_modules/json-stable-stringify-without-jsonify": {
+    "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
-    "node_modules/json5": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-      "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jsonlint": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
-      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "dependencies": {
-        "JSV": "^4.0.x",
-        "nomnom": "^1.5.x"
-      },
-      "bin": {
-        "jsonlint": "lib/cli.js"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 6"
       }
     },
-    "node_modules/JSV": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
-      "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
+    "node_modules/globals": {
+      "version": "13.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
       "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 4"
       }
     },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "dependencies": {
-        "invert-kv": "^1.0.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/leven": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz",
-      "integrity": "sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true,
-      "bin": {
-        "leven": "cli.js"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/lodash": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "node_modules/lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "dependencies": {
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "node_modules/lodash.assign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "dependencies": {
-        "lodash._baseassign": "^3.0.0",
-        "lodash._createassigner": "^3.0.0",
-        "lodash.keys": "^3.0.0"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
     "node_modules/lodash.clonedeep": {
@@ -2690,56 +839,18 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "node_modules/lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "node_modules/lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "node_modules/lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "dependencies": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "dev": true
     },
-    "node_modules/longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -2764,164 +875,18 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node_modules/ncp": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
-      "dev": true,
-      "bin": {
-        "ncp": "bin/ncp"
-      }
-    },
-    "node_modules/next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "node_modules/nomnom": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-      "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
-      "dev": true,
-      "dependencies": {
-        "chalk": "~0.4.0",
-        "underscore": "~1.6.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/ansi-styles": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-      "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/chalk": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-      "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "~1.0.0",
-        "has-color": "~0.1.0",
-        "strip-ansi": "~0.1.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/strip-ansi": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-      "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-      "dev": true,
-      "bin": {
-        "strip-ansi": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -2948,38 +913,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/output-file-sync": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
-      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.4",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.1.0"
-      }
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -2992,15 +925,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/path-exists": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-      "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -3019,27 +943,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/pathval": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz",
-      "integrity": "sha1-CPkRzcqczllCiA2ngXvAtyO2bYI=",
-      "dev": true
-    },
-    "node_modules/pkginfo": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
-      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -3049,21 +952,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -3073,22 +961,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/prompt": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz",
-      "integrity": "sha1-V3VPZPVD/XsIRXB8gY7OYY8F/9w=",
-      "dev": true,
-      "dependencies": {
-        "pkginfo": "0.x.x",
-        "read": "1.0.x",
-        "revalidator": "0.1.x",
-        "utile": "0.2.x",
-        "winston": "0.8.x"
-      },
-      "engines": {
-        "node": ">= 0.6.6"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -3098,97 +970,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-      "dev": true,
-      "dependencies": {
-        "mute-stream": "~0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/recast": {
-      "version": "0.10.33",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz",
-      "integrity": "sha1-lCgI96oBbx+nFCxGHX5XBKqo1pc=",
-      "dev": true,
-      "dependencies": {
-        "ast-types": "0.8.12",
-        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
-        "private": "~0.1.5",
-        "source-map": "~0.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerator": {
-      "version": "0.8.40",
-      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz",
-      "integrity": "sha1-oORXxY69uuV1yfjNdRJ+k3VkNdg=",
-      "dev": true,
-      "dependencies": {
-        "commoner": "~0.10.3",
-        "defs": "~1.1.0",
-        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
-        "private": "~0.1.5",
-        "recast": "0.10.33",
-        "through": "~2.3.8"
-      },
-      "bin": {
-        "regenerator": "bin/regenerator"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
@@ -3201,103 +982,13 @@
         "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/regexpu": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz",
-      "integrity": "sha1-5TTcmRqeWEYFDJjebX3UpVyeoW0=",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^2.6.0",
-        "recast": "^0.10.10",
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
-      },
-      "bin": {
-        "regexpu": "bin/regexpu"
-      }
-    },
-    "node_modules/regexpu/node_modules/esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/repeating": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
-      "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
-      "dev": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "bin": {
-        "repeating": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/reserved-words": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
-      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
-      "dev": true
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/resolve-from": {
@@ -3309,27 +1000,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/revalidator": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
-      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "dependencies": {
-        "align-text": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -3345,18 +1015,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
     "node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -3393,41 +1051,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/simple-fmt": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
-      "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=",
-      "dev": true
-    },
-    "node_modules/simple-is": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
-      "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -3445,139 +1068,38 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
-      "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
-      "dev": true,
-      "dependencies": {
-        "source-map": "0.1.32"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.1.32",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-      "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "node_modules/stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
     "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/stringmap": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
-      "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=",
-      "dev": true
-    },
-    "node_modules/stringset": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
-      "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=",
-      "dev": true
-    },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -3596,379 +1118,109 @@
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/to-double-quotes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-2.0.0.tgz",
-      "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-single-quotes": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz",
-      "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/try-resolve": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz",
-      "integrity": "sha1-z95vq9ctY+V5fPqrhzq76OcA6RI=",
-      "dev": true
-    },
-    "node_modules/tryor": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
-      "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=",
-      "dev": true
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-      "dev": true
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true,
-      "bin": {
-        "user-home": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/utile": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
-      "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=",
-      "dev": true,
-      "dependencies": {
-        "async": "~0.2.9",
-        "deep-equal": "*",
-        "i": "0.3.x",
-        "mkdirp": "0.x.x",
-        "ncp": "0.4.x",
-        "rimraf": "2.x.x"
-      },
-      "engines": {
-        "node": ">= 0.6.4"
-      }
-    },
-    "node_modules/utile/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/vow": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.20.tgz",
-      "integrity": "sha512-YYoSYXUYABqY08D/WrjcWJxJSErcILRRTQpcPyUc0SFfgIPKSUFzVt7u1HC3TXGJZM/qhsSjCLNQstxqf7asgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/vow-fs": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.6.tgz",
-      "integrity": "sha1-LUxZviLivyYY3fWXq0uqkjvnIA0=",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.0.5",
-        "uuid": "^2.0.2",
-        "vow": "^0.4.7",
-        "vow-queue": "^0.4.1"
-      },
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/vow-queue": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz",
-      "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==",
-      "dev": true,
-      "dependencies": {
-        "vow": "^0.4.17"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+    "node_modules/table": {
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+      "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
       "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
       "dev": true,
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
-    "node_modules/which-typed-array": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
-      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.7"
+        "prelude-ls": "^1.2.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/window-size": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "bin": {
-        "window-size": "cli.js"
-      },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/winston": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz",
-      "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=",
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
       "dependencies": {
-        "async": "0.2.x",
-        "colors": "0.6.x",
-        "cycle": "1.0.x",
-        "eyes": "0.1.x",
-        "isstream": "0.1.x",
-        "pkginfo": "0.3.x",
-        "stack-trace": "0.0.x"
-      },
-      "engines": {
-        "node": ">= 0.6.0"
+        "punycode": "^2.1.0"
       }
     },
-    "node_modules/winston/node_modules/colors": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-      "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
     },
-    "node_modules/winston/node_modules/pkginfo": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-      "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">= 8"
       }
     },
     "node_modules/word-wrap": {
@@ -3980,58 +1232,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
-    "node_modules/xmlbuilder": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
-      "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^3.5.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-      "dev": true
-    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
-    },
-    "node_modules/yargs": {
-      "version": "3.27.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
-      "integrity": "sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^1.2.1",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "os-locale": "^1.4.0",
-        "window-size": "^0.1.2",
-        "y18n": "^3.2.0"
-      }
     }
   },
   "dependencies": {
@@ -4045,9 +1256,9 @@
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
       "dev": true
     },
     "@babel/highlight": {
@@ -4161,363 +1372,57 @@
     },
     "acorn-jsx": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "alter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
-      "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=",
-      "dev": true,
-      "requires": {
-        "stable": "~0.1.3"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "ast-traverse": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz",
-      "integrity": "sha1-ac8rg4bxnc2hux4F1o/jWdiJfeY=",
-      "dev": true
-    },
-    "ast-types": {
-      "version": "0.8.12",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz",
-      "integrity": "sha1-oNkOQ1G7iHcWyD/WN+v4GK9K38w=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-      "dev": true
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true
-    },
-    "babel-core": {
-      "version": "5.8.38",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
-      "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-constant-folding": "^1.0.1",
-        "babel-plugin-dead-code-elimination": "^1.0.2",
-        "babel-plugin-eval": "^1.0.1",
-        "babel-plugin-inline-environment-variables": "^1.0.1",
-        "babel-plugin-jscript": "^1.0.4",
-        "babel-plugin-member-expression-literals": "^1.0.1",
-        "babel-plugin-property-literals": "^1.0.1",
-        "babel-plugin-proto-to-assign": "^1.0.3",
-        "babel-plugin-react-constant-elements": "^1.0.3",
-        "babel-plugin-react-display-name": "^1.0.3",
-        "babel-plugin-remove-console": "^1.0.1",
-        "babel-plugin-remove-debugger": "^1.0.1",
-        "babel-plugin-runtime": "^1.0.7",
-        "babel-plugin-undeclared-variables-check": "^1.0.2",
-        "babel-plugin-undefined-to-void": "^1.1.6",
-        "babylon": "^5.8.38",
-        "bluebird": "^2.9.33",
-        "chalk": "^1.0.0",
-        "convert-source-map": "^1.1.0",
-        "core-js": "^1.0.0",
-        "debug": "^2.1.1",
-        "detect-indent": "^3.0.0",
-        "esutils": "^2.0.0",
-        "fs-readdir-recursive": "^0.1.0",
-        "globals": "^6.4.0",
-        "home-or-tmp": "^1.0.0",
-        "is-integer": "^1.0.4",
-        "js-tokens": "1.0.1",
-        "json5": "^0.4.0",
-        "lodash": "^3.10.0",
-        "minimatch": "^2.0.3",
-        "output-file-sync": "^1.1.0",
-        "path-exists": "^1.0.0",
-        "path-is-absolute": "^1.0.0",
-        "private": "^0.1.6",
-        "regenerator": "0.8.40",
-        "regexpu": "^1.3.0",
-        "repeating": "^1.1.2",
-        "resolve": "^1.1.6",
-        "shebang-regex": "^1.0.0",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.0",
-        "source-map-support": "^0.2.10",
-        "to-fast-properties": "^1.0.0",
-        "trim-right": "^1.0.0",
-        "try-resolve": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "globals": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz",
-          "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz",
-          "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "babel-jscs": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/babel-jscs/-/babel-jscs-2.0.5.tgz",
-      "integrity": "sha1-CjRwRrSBRay8pW6MjtX3NrxU+dA=",
-      "dev": true,
-      "requires": {
-        "babel-core": "~5.8.3",
-        "lodash.assign": "^3.2.0"
-      }
-    },
-    "babel-plugin-constant-folding": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz",
-      "integrity": "sha1-g2HTZMmORJw2kr26Ue/whEKQqo4=",
-      "dev": true
-    },
-    "babel-plugin-dead-code-elimination": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz",
-      "integrity": "sha1-X3xFEnTc18zNv7s+C4XdKBIfD2U=",
-      "dev": true
-    },
-    "babel-plugin-eval": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz",
-      "integrity": "sha1-ovrtJc5r5preS/7CY/cBaRlZUNo=",
-      "dev": true
-    },
-    "babel-plugin-inline-environment-variables": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz",
-      "integrity": "sha1-H1jOkSB61qgmqL9kX6/mj/X+P/4=",
-      "dev": true
-    },
-    "babel-plugin-jscript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz",
-      "integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w=",
-      "dev": true
-    },
-    "babel-plugin-member-expression-literals": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz",
-      "integrity": "sha1-zF7bD6qNyScXDnTW0cAkQAIWJNM=",
-      "dev": true
-    },
-    "babel-plugin-property-literals": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz",
-      "integrity": "sha1-AlIwGQAZKYCxwRjv6kjOk6q4MzY=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
     },
-    "babel-plugin-proto-to-assign": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz",
-      "integrity": "sha1-xJ56/QL1d7xNoF6i3wAiUM980SM=",
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "requires": {
-        "lodash": "^3.9.3"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
-    "babel-plugin-react-constant-elements": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz",
-      "integrity": "sha1-lGc26DeEKcvDSdz/YvUcFDs041o=",
-      "dev": true
-    },
-    "babel-plugin-react-display-name": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz",
-      "integrity": "sha1-dU/jiSboQkpOexWrbqYTne4FFPw=",
-      "dev": true
-    },
-    "babel-plugin-remove-console": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz",
-      "integrity": "sha1-2PJFVsOgUAXUKqqv0neH9T/wE6c=",
-      "dev": true
-    },
-    "babel-plugin-remove-debugger": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz",
-      "integrity": "sha1-/S6jzWGkKK0fO5yJiC/0KT6MFMc=",
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true
     },
-    "babel-plugin-runtime": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz",
-      "integrity": "sha1-v3x9lm3Vbs1cF/ocslPJrLflSq8=",
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
-    "babel-plugin-undeclared-variables-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz",
-      "integrity": "sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=",
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "requires": {
-        "leven": "^1.0.2"
+        "color-convert": "^2.0.1"
       }
     },
-    "babel-plugin-undefined-to-void": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz",
-      "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=",
-      "dev": true
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
     },
-    "babylon": {
-      "version": "5.8.38",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz",
-      "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=",
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
     "balanced-match": {
@@ -4526,12 +1431,6 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-      "dev": true
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4542,44 +1441,12 @@
         "concat-map": "0.0.1"
       }
     },
-    "breakable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
-      "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME=",
-      "dev": true
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
-    "camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-      "dev": true
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      }
-    },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -4590,26 +1457,6 @@
         "supports-color": "^7.1.0"
       }
     },
-    "cli-table": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
-      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
-      "dev": true,
-      "requires": {
-        "colors": "1.0.3"
-      }
-    },
-    "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "dev": true,
-      "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      }
-    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4625,145 +1472,12 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "dev": true
-    },
-    "commander": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-      "dev": true,
-      "requires": {
-        "graceful-readlink": ">= 1.0.0"
-      }
-    },
-    "comment-parser": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.2.tgz",
-      "integrity": "sha1-PAPwd2uGo239mgosl8YwfzMggv4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.4"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "commoner": {
-      "version": "0.10.8",
-      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
-      "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=",
-      "dev": true,
-      "requires": {
-        "commander": "^2.5.0",
-        "detective": "^4.3.1",
-        "glob": "^5.0.15",
-        "graceful-fs": "^4.1.2",
-        "iconv-lite": "^0.4.5",
-        "mkdirp": "^0.5.0",
-        "private": "^0.1.6",
-        "q": "^1.1.2",
-        "recast": "^0.11.17"
-      },
-      "dependencies": {
-        "ast-types": {
-          "version": "0.9.6",
-          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-          "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
-          "dev": true
-        },
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "recast": {
-          "version": "0.11.23",
-          "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-          "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-          "dev": true,
-          "requires": {
-            "ast-types": "0.9.6",
-            "esprima": "~3.1.0",
-            "private": "~0.1.5",
-            "source-map": "~0.5.0"
-          }
-        }
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -4775,22 +1489,6 @@
         "which": "^2.0.1"
       }
     },
-    "cycle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
-      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
     "debug": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
@@ -4800,111 +1498,12 @@
         "ms": "2.1.2"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "deep-equal": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "defs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
-      "integrity": "sha1-siYJ8sehG6ej2xFoBcE5scr/qdI=",
-      "dev": true,
-      "requires": {
-        "alter": "~0.2.0",
-        "ast-traverse": "~0.1.1",
-        "breakable": "~1.0.0",
-        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
-        "simple-fmt": "~0.1.0",
-        "simple-is": "~0.2.0",
-        "stringmap": "~0.2.2",
-        "stringset": "~0.2.1",
-        "tryor": "~0.1.2",
-        "yargs": "~3.27.0"
-      }
-    },
-    "detect-indent": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
-      "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1",
-        "minimist": "^1.1.0",
-        "repeating": "^1.1.0"
-      }
-    },
-    "detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.2.1",
-        "defined": "^1.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-          "dev": true
-        }
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -4914,55 +1513,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-      "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -4975,187 +1525,15 @@
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
-    "entities": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-      "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-      "dev": true
-    },
-    "es-abstract": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
-      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      }
-    },
-    "es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
-      },
-      "dependencies": {
-        "es6-symbol": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-          "dev": true,
-          "requires": {
-            "d": "1",
-            "es5-ext": "~0.10.14"
-          }
-        }
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true
-    },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-          "dev": true
-        }
+        "ansi-colors": "^4.1.1"
       }
     },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
     "eslint": {
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
@@ -5202,14 +1580,6 @@
         "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
       }
     },
     "eslint-scope": {
@@ -5220,14 +1590,6 @@
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-          "dev": true
-        }
       }
     },
     "eslint-utils": {
@@ -5237,12 +1599,20 @@
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
@@ -5254,6 +1624,14 @@
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
         "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "esprima": {
@@ -5262,12 +1640,6 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
-    "esprima-fb": {
-      "version": "15001.1001.0-dev-harmony-fb",
-      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-      "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=",
-      "dev": true
-    },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -5275,6 +1647,14 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
       }
     },
     "esrecurse": {
@@ -5284,12 +1664,20 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
       }
     },
     "estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
     "esutils": {
@@ -5298,45 +1686,6 @@
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
-      "dev": true,
-      "requires": {
-        "type": "^2.5.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-          "dev": true
-        }
-      }
-    },
-    "eyes": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
-      "dev": true
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5380,479 +1729,121 @@
       "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "fs-readdir-recursive": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz",
-      "integrity": "sha1-MVtPuMHKW4xH3v7zGdBz2tNWgFk=",
-      "dev": true
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globals": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "has-color": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-      "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "home-or-tmp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
-      "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "^1.0.1",
-        "user-home": "^1.1.1"
-      }
-    },
-    "htmlparser2": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-      "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1",
-        "domhandler": "2.3",
-        "domutils": "1.5",
-        "entities": "1.0",
-        "readable-stream": "1.1"
-      }
-    },
-    "i": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
-      "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherit": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.7.tgz",
-      "integrity": "sha512-dxJmC1j0Q32NFAjvbd6g3lXYLZ49HgzotgbSMwMkoiTXGhC9412Oc24g7A7M9cPPkw/vDsF2cSII+2zJwocUtQ==",
-      "dev": true
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true
-    },
-    "is-core-module": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
-      "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
+      "dev": true
     },
-    "is-integer": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.7.tgz",
-      "integrity": "sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=",
+    "glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
-    "is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
-        "has-tostringtag": "^1.0.0"
+        "is-glob": "^4.0.1"
       }
     },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "globals": {
+      "version": "13.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "type-fest": "^0.20.2"
       }
     },
-    "is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true
     },
-    "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "requires": {
-        "has-tostringtag": "^1.0.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       }
     },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
     },
-    "is-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
-      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
-        "has-tostringtag": "^1.0.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
-    "is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0"
+        "is-extglob": "^2.1.1"
       }
     },
-    "is-weakset": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz",
-      "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==",
-      "dev": true
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -5869,169 +1860,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "jscs": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.11.0.tgz",
-      "integrity": "sha1-bhHvDKqgdzH53MKysn2OzuHdvLY=",
-      "dev": true,
-      "requires": {
-        "babel-jscs": "^2.0.0",
-        "chalk": "~1.1.0",
-        "cli-table": "~0.3.1",
-        "commander": "~2.9.0",
-        "escope": "^3.2.0",
-        "esprima": "~2.7.0",
-        "estraverse": "^4.1.0",
-        "exit": "~0.1.2",
-        "glob": "^5.0.1",
-        "htmlparser2": "3.8.3",
-        "js-yaml": "~3.4.0",
-        "jscs-jsdoc": "^1.3.1",
-        "jscs-preset-wikimedia": "~1.0.0",
-        "jsonlint": "~1.6.2",
-        "lodash": "~3.10.0",
-        "minimatch": "~3.0.0",
-        "natural-compare": "~1.2.2",
-        "pathval": "~0.1.1",
-        "prompt": "~0.2.14",
-        "reserved-words": "^0.1.1",
-        "resolve": "^1.1.6",
-        "strip-bom": "^2.0.0",
-        "strip-json-comments": "~1.0.2",
-        "to-double-quotes": "^2.0.0",
-        "to-single-quotes": "^2.0.0",
-        "vow": "~0.4.8",
-        "vow-fs": "~0.3.4",
-        "xmlbuilder": "^3.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "js-yaml": {
-          "version": "3.4.6",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz",
-          "integrity": "sha1-a+GyP2JJ9T0pM3D9TRqqY84bTrA=",
-          "dev": true,
-          "requires": {
-            "argparse": "^1.0.2",
-            "esprima": "^2.6.0",
-            "inherit": "^2.2.2"
-          }
-        },
-        "natural-compare": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.2.2.tgz",
-          "integrity": "sha1-H5bWDjFBysG20FZTzg2urHY69qo=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "jscs-jsdoc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-1.3.2.tgz",
-      "integrity": "sha1-HyyCtqtLl1JNqVj0a05WLgMF+ac=",
-      "dev": true,
-      "requires": {
-        "comment-parser": "^0.3.1",
-        "jsdoctypeparser": "~1.2.0"
-      }
-    },
-    "jscs-preset-wikimedia": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.1.tgz",
-      "integrity": "sha512-RWqu6IYSUlnYuCRCF0obCOHjJV0vhpLcvKbauwxmLQoZ0PiXDTWBYlfpsEfdhg7pmREAEwrARfDRz5qWD6qknA==",
-      "dev": true
-    },
-    "jsdoctypeparser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-1.2.0.tgz",
-      "integrity": "sha1-597cFToRhJ/8UUEUSuhqfvDCU5I=",
-      "dev": true,
-      "requires": {
-        "lodash": "^3.7.0"
-      }
-    },
-    "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -6044,58 +1872,6 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "json5": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-      "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
-      "dev": true
-    },
-    "jsonlint": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
-      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
-      "dev": true,
-      "requires": {
-        "JSV": "^4.0.x",
-        "nomnom": "^1.5.x"
-      }
-    },
-    "JSV": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
-      "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "leven": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz",
-      "integrity": "sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=",
-      "dev": true
-    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -6106,121 +1882,24 @@
         "type-check": "~0.4.0"
       }
     },
-    "lodash": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-      "dev": true
-    },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-      "dev": true
-    },
-    "lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-      "dev": true,
-      "requires": {
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "lodash.assign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-      "dev": true,
-      "requires": {
-        "lodash._baseassign": "^3.0.0",
-        "lodash._createassigner": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "dev": true
     },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -6239,125 +1918,17 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "ncp": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
-      "dev": true
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "nomnom": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-      "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-      "dev": true,
-      "requires": {
-        "chalk": "~0.4.0",
-        "underscore": "~1.6.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-          "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-          "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "~1.0.0",
-            "has-color": "~0.1.0",
-            "strip-ansi": "~0.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-          "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-          "dev": true
-        }
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      }
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
     },
     "once": {
       "version": "1.4.0",
@@ -6382,32 +1953,6 @@
         "word-wrap": "^1.2.3"
       }
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "output-file-sync": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
-      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.4",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.1.0"
-      }
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -6417,12 +1962,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "path-exists": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-      "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -6435,236 +1974,42 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "pathval": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz",
-      "integrity": "sha1-CPkRzcqczllCiA2ngXvAtyO2bYI=",
-      "dev": true
-    },
-    "pkginfo": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
-      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=",
-      "dev": true
-    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
-    "prompt": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz",
-      "integrity": "sha1-V3VPZPVD/XsIRXB8gY7OYY8F/9w=",
-      "dev": true,
-      "requires": {
-        "pkginfo": "0.x.x",
-        "read": "1.0.x",
-        "revalidator": "0.1.x",
-        "utile": "0.2.x",
-        "winston": "0.8.x"
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
-    "read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-      "dev": true,
-      "requires": {
-        "mute-stream": "~0.0.4"
-      }
-    },
-    "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "recast": {
-      "version": "0.10.33",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz",
-      "integrity": "sha1-lCgI96oBbx+nFCxGHX5XBKqo1pc=",
-      "dev": true,
-      "requires": {
-        "ast-types": "0.8.12",
-        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
-        "private": "~0.1.5",
-        "source-map": "~0.5.0"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "regenerator": {
-      "version": "0.8.40",
-      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz",
-      "integrity": "sha1-oORXxY69uuV1yfjNdRJ+k3VkNdg=",
-      "dev": true,
-      "requires": {
-        "commoner": "~0.10.3",
-        "defs": "~1.1.0",
-        "esprima-fb": "~15001.1001.0-dev-harmony-fb",
-        "private": "~0.1.5",
-        "recast": "0.10.33",
-        "through": "~2.3.8"
-      }
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
-    "regexpu": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz",
-      "integrity": "sha1-5TTcmRqeWEYFDJjebX3UpVyeoW0=",
-      "dev": true,
-      "requires": {
-        "esprima": "^2.6.0",
-        "recast": "^0.10.10",
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        }
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      }
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
-      "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
-    "reserved-words": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
-      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      }
-    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "revalidator": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
-      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
-      "dev": true
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.1"
-      }
-    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -6674,18 +2019,6 @@
         "glob": "^7.1.3"
       }
     },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
     "semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -6710,35 +2043,6 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "simple-fmt": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
-      "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=",
-      "dev": true
-    },
-    "simple-is": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
-      "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=",
-      "dev": true
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
-    },
     "slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -6750,115 +2054,30 @@
         "is-fullwidth-code-point": "^3.0.0"
       }
     },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-support": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
-      "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
-      "dev": true,
-      "requires": {
-        "source-map": "0.1.32"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.1.32",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-          "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
     "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "strip-ansi": "^6.0.1"
       }
     },
-    "stringmap": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
-      "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=",
-      "dev": true
-    },
-    "stringset": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
-      "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=",
-      "dev": true
-    },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-json-comments": {
@@ -6877,17 +2096,17 @@
       }
     },
     "table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+      "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
         "ajv": {
@@ -6916,54 +2135,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "to-double-quotes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-2.0.0.tgz",
-      "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "to-single-quotes": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz",
-      "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=",
-      "dev": true
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "try-resolve": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz",
-      "integrity": "sha1-z95vq9ctY+V5fPqrhzq76OcA6RI=",
-      "dev": true
-    },
-    "tryor": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
-      "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=",
-      "dev": true
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6979,24 +2150,6 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-      "dev": true
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -7006,82 +2159,12 @@
         "punycode": "^2.1.0"
       }
     },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "utile": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
-      "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=",
-      "dev": true,
-      "requires": {
-        "async": "~0.2.9",
-        "deep-equal": "*",
-        "i": "0.3.x",
-        "mkdirp": "0.x.x",
-        "ncp": "0.4.x",
-        "rimraf": "2.x.x"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "uuid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-      "dev": true
-    },
     "v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
-    "vow": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.20.tgz",
-      "integrity": "sha512-YYoSYXUYABqY08D/WrjcWJxJSErcILRRTQpcPyUc0SFfgIPKSUFzVt7u1HC3TXGJZM/qhsSjCLNQstxqf7asgQ==",
-      "dev": true
-    },
-    "vow-fs": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.6.tgz",
-      "integrity": "sha1-LUxZviLivyYY3fWXq0uqkjvnIA0=",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.5",
-        "uuid": "^2.0.2",
-        "vow": "^0.4.7",
-        "vow-queue": "^0.4.1"
-      }
-    },
-    "vow-queue": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz",
-      "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==",
-      "dev": true,
-      "requires": {
-        "vow": "^0.4.17"
-      }
-    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7091,132 +2174,23 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "requires": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
-      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.7"
-      }
-    },
-    "window-size": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
-      "dev": true
-    },
-    "winston": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz",
-      "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=",
-      "dev": true,
-      "requires": {
-        "async": "0.2.x",
-        "colors": "0.6.x",
-        "cycle": "1.0.x",
-        "eyes": "0.1.x",
-        "isstream": "0.1.x",
-        "pkginfo": "0.3.x",
-        "stack-trace": "0.0.x"
-      },
-      "dependencies": {
-        "colors": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
-          "dev": true
-        },
-        "pkginfo": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
-          "dev": true
-        }
-      }
-    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
-    "wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-      "dev": true
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
-    "xmlbuilder": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
-      "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
-      "dev": true,
-      "requires": {
-        "lodash": "^3.5.0"
-      }
-    },
-    "y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-      "dev": true
-    },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
-    },
-    "yargs": {
-      "version": "3.27.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
-      "integrity": "sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^1.2.1",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "os-locale": "^1.4.0",
-        "window-size": "^0.1.2",
-        "y18n": "^3.2.0"
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index dba7339e..4aeec6d0 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,11 @@
   "description": "",
   "main": "eslint/.eslintrc",
   "scripts": {
-    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules",
-    "jscs": "./node_modules/.bin/jscs -c jscs/.jscsrc"
+    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules"
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "^7.32.0",
-    "jscs": "^2.1.1"
+    "eslint": "^7.32.0"
   }
 }

From c8957167a3c4cfbc3de08a1311145253e2e76e78 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Fri, 5 Nov 2021 14:51:57 +0100
Subject: [PATCH 378/630] Fixed code by recommendation

---
 .../Functions/DeprecatedFunctionSniff.php     | 64 ----------------
 ...unctionsDeprecatedWithoutArgumentSniff.php | 73 +++++++++++++++++++
 .../Functions/DeprecatedFunctionUnitTest.inc  | 32 --------
 ...tionsDeprecatedWithoutArgumentUnitTest.inc | 33 +++++++++
 ...ionsDeprecatedWithoutArgumentUnitTest.php} | 19 +++--
 Magento2/ruleset.xml                          |  2 +-
 6 files changed, 116 insertions(+), 107 deletions(-)
 delete mode 100644 Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php
 create mode 100644 Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
 delete mode 100644 Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc
 create mode 100644 Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
 rename Magento2/Tests/Functions/{DeprecatedFunctionUnitTest.php => FunctionsDeprecatedWithoutArgumentUnitTest.php} (55%)

diff --git a/Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php b/Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php
deleted file mode 100644
index c573b8e5..00000000
--- a/Magento2/Sniffs/Functions/DeprecatedFunctionSniff.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento2\Sniffs\Functions;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Sniff to validate PHP deprecated function.
- */
-class DeprecatedFunctionSniff implements Sniff
-{
-    /**
-     * Deprecated functions without argument.
-     *
-     * @var array
-     */
-    private $deprecatedFunctions = [
-        'mb_check_encoding'
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register(): array
-    {
-        return [
-            T_OPEN_TAG
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr): void
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        foreach ($this->deprecatedFunctions as $deprecatedFunction) {
-            $deprecatedFunctionKeys = array_keys(array_column($tokens, 'content'), $deprecatedFunction);
-
-            foreach ($deprecatedFunctionKeys as $deprecatedFunctionKey) {
-                $openParenthesis = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $deprecatedFunctionKey);
-                $closeParenthesis = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $openParenthesis);
-                $argumentString = trim(
-                    $phpcsFile->getTokensAsString($openParenthesis + 1, $closeParenthesis - $openParenthesis - 1)
-                );
-
-                if (!$argumentString) {
-                    $warningMessage = sprintf(
-                        'Calling function %s() without argument is deprecated in PHP 8.1',
-                        $deprecatedFunction
-                    );
-                    $phpcsFile->addWarning($warningMessage, $deprecatedFunctionKey, 'DeprecatedFunction');
-                }
-            }
-        }
-    }
-}
diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
new file mode 100644
index 00000000..13d53fc3
--- /dev/null
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\Functions;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Sniff to validate PHP functions usage of which without passing arguments is deprecated.
+ */
+class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
+{
+    /**
+     * String representation of warning.
+     *
+     * @var string
+     */
+    private $warningMessage = 'Calling function %s() without argument is deprecated in PHP 8.1. '
+        . 'Please pass the input to validate as the first argument of the function.';
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    private $warningCode = 'FunctionsDeprecatedWithoutArgument';
+
+    /**
+     * Deprecated functions without argument.
+     *
+     * @var array
+     */
+    private $deprecatedFunctions = [
+        'mb_check_encoding',
+        'get_class',
+        'get_parent_class',
+        'get_called_class'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_OPEN_PARENTHESIS
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr): void
+    {
+        $closeParenthesisPtr = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr);
+        $arguments = trim($phpcsFile->getTokensAsString($stackPtr + 1, $closeParenthesisPtr - $stackPtr - 1));
+
+        if ($arguments) {
+            return;
+        }
+
+        $functionName = $phpcsFile->getTokensAsString($phpcsFile->findPrevious(T_STRING, $stackPtr), 1);
+
+        if (in_array($functionName, $this->deprecatedFunctions)) {
+            $phpcsFile->addWarning(sprintf($this->warningMessage, $functionName), $stackPtr, $this->warningCode);
+        }
+    }
+}
diff --git a/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc b/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc
deleted file mode 100644
index 08465f2a..00000000
--- a/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento2\Tests\Functions;
-
-/**
- * Class to test PHP deprecated function.
- */
-class DeprecatedFunction
-{
-    /**
-     * Test deprecation function.
-     *
-     * @return bool
-     */
-    public function testDeprecatedMethod(): bool
-    {
-        // Warning: function is deprecated without argument.
-        $testMethodParam = mb_check_encoding();
-
-        if ($testMethodParam) {
-            // The function is work correct.
-            $testMethodParam = mb_check_encoding('test-argument', null);
-        }
-
-        return $testMethodParam;
-    }
-}
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
new file mode 100644
index 00000000..63b449b9
--- /dev/null
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Functions;
+
+/**
+ * Class to test validate PHP functions usage of which without passing arguments.
+ */
+class FunctionsDeprecatedWithoutArgument
+{
+    /**
+     * Test deprecation function.
+     *
+     * @return array
+     */
+    public function testDeprecatedMethod(): array
+    {
+        return [
+            mb_check_encoding(), // Calling without argument is deprecated.
+            mb_check_encoding('test-argument', null),
+            get_class(), // Calling without argument is deprecated.
+            get_class(new FunctionsDeprecatedWithoutArgument()),
+            get_parent_class(), // Calling without argument is deprecated.
+            get_parent_class('test-argument'),
+            get_called_class(), // Calling without argument is deprecated.
+            get_called_class('test-argument')
+        ];
+    }
+}
diff --git a/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php
similarity index 55%
rename from Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php
rename to Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php
index 263b8491..691dd43a 100644
--- a/Magento2/Tests/Functions/DeprecatedFunctionUnitTest.php
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php
@@ -10,9 +10,9 @@
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
 /**
- * Sniff to validate PHP deprecated function.
+ * Test to validate PHP functions usage of which without passing arguments.
  */
-class DeprecatedFunctionUnitTest extends AbstractSniffUnitTest
+class FunctionsDeprecatedWithoutArgumentUnitTest extends AbstractSniffUnitTest
 {
     /**
      * @inheritdoc
@@ -25,14 +25,13 @@ public function getErrorList(): array
     /**
      * @inheritdoc
      */
-    public function getWarningList($testFile = ''): array
+    public function getWarningList(): array
     {
-        if ($testFile === 'DeprecatedFunctionUnitTest.inc') {
-            return [
-                23 => 1
-            ];
-        }
-
-        return [];
+        return [
+            23 => 1,
+            25 => 1,
+            27 => 1,
+            29 => 1
+        ];
     }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1a19e962..12114bdb 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -251,7 +251,7 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Functions.DeprecatedFunction">
+    <rule ref="Magento2.Functions.FunctionsDeprecatedWithoutArgument">
         <severity>7</severity>
         <type>warning</type>
         <exclude-pattern>*\.xml$</exclude-pattern>

From c595fbc9181382e2238ce6c91cf42b253d1a1329 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Fri, 5 Nov 2021 15:28:42 +0100
Subject: [PATCH 379/630] Added deprecated function PHP 8.1 to
 DiscouragedFunctionSniff

---
 .../Functions/DiscouragedFunctionSniff.php    |  7 ++++++
 .../Functions/DiscouragedFunctionUnitTest.inc | 22 +++++++++++++++++++
 .../Functions/DiscouragedFunctionUnitTest.php | 13 ++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index 4982f8cc..a3332c0c 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -238,5 +238,12 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^fseek$' => 'Magento\Framework\Filesystem\DriverInterface::fileSeek()',
         '^feof$' => 'Magento\Framework\Filesystem\DriverInterface::endOfFile()',
         '^flock$' => 'Magento\Framework\Filesystem\DriverInterface::fileLock()',
+        '^date_sunrise$' => 'date_sun_info',
+        '^date_sunset$' => 'date_sun_info',
+        '^strptime$' => 'date_parse_from_format',
+        '^strftime$' => null,
+        '^gmstrftime$' => null,
+        '^(mhash|mhash_.*)$' => null,
+        '^odbc_result_all$' => null
     ];
 }
diff --git a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc
index 0302ff56..7aaafaf1 100644
--- a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc
+++ b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.inc
@@ -482,3 +482,25 @@ fseek($file, 0);
 feof($fp);
 
 flock($fp, LOCK_EX);
+
+$test = date_sunrise(0);
+
+$test = date_sunset(0);
+
+$test = strptime('12.12.12 00:00:00', 'D, d M Y H:i:s');
+
+strftime('D, d M Y H:i:s');
+
+gmstrftime('D, d M Y H:i:s');
+
+$test = mhash(1000, 'test_value');
+
+$test = mhash_count();
+
+$test = mhash_get_block_size(1000);
+
+$test = mhash_get_hash_name(1000);
+
+$test = mhash_keygen_s2k(1000, 'password', 'abccdf' , 10);
+
+$test = odbc_result_all('test_value', 'test_value');
diff --git a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
index 2a30100e..dee3dd92 100644
--- a/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
+++ b/Magento2/Tests/Functions/DiscouragedFunctionUnitTest.php
@@ -255,7 +255,18 @@ public function getWarningList()
             478 => 1,
             480 => 1,
             482 => 1,
-            484 => 1
+            484 => 1,
+            486 => 1,
+            488 => 1,
+            490 => 1,
+            492 => 1,
+            494 => 1,
+            496 => 1,
+            498 => 1,
+            500 => 1,
+            502 => 1,
+            504 => 1,
+            506 => 1
         ];
     }
 }

From dc7c3f4ff211aaa150d4e6e3bb46b59c62328f6f Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Sun, 7 Nov 2021 17:36:44 +0100
Subject: [PATCH 380/630] Fixed code by recommendation, added constants

---
 .../FunctionsDeprecatedWithoutArgumentSniff.php        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 13d53fc3..331e918e 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -20,7 +20,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
      *
      * @var string
      */
-    private $warningMessage = 'Calling function %s() without argument is deprecated in PHP 8.1. '
+    private const WARNING_MESSAGE = 'Calling function %s() without argument is deprecated in PHP 8.1. '
         . 'Please pass the input to validate as the first argument of the function.';
 
     /**
@@ -28,14 +28,14 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
      *
      * @var string
      */
-    private $warningCode = 'FunctionsDeprecatedWithoutArgument';
+    private const WARNING_CODE = 'FunctionsDeprecatedWithoutArgument';
 
     /**
      * Deprecated functions without argument.
      *
      * @var array
      */
-    private $deprecatedFunctions = [
+    private const FUNCTIONS_LIST = [
         'mb_check_encoding',
         'get_class',
         'get_parent_class',
@@ -66,8 +66,8 @@ public function process(File $phpcsFile, $stackPtr): void
 
         $functionName = $phpcsFile->getTokensAsString($phpcsFile->findPrevious(T_STRING, $stackPtr), 1);
 
-        if (in_array($functionName, $this->deprecatedFunctions)) {
-            $phpcsFile->addWarning(sprintf($this->warningMessage, $functionName), $stackPtr, $this->warningCode);
+        if (in_array($functionName, self::FUNCTIONS_LIST)) {
+            $phpcsFile->addWarning(sprintf(self::WARNING_MESSAGE, $functionName), $stackPtr, self::WARNING_CODE);
         }
     }
 }

From acc31851ad3dca892782f954cadce0f96a58cef7 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Mon, 8 Nov 2021 10:32:51 +0100
Subject: [PATCH 381/630] Remove JSCS references from README

---
 README.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 08a530e9..be9937d0 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Also, verify that the sniffer code itself is written according to the Magento Co
 vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php
 ```
 
-### ESLint and JSCS
+### ESLint
 Prerequisites: [Node.js](https://nodejs.org/) (`^12.22.0`, `^14.17.0`, or `>=16.0.0`).
 
 You need to run the following command to install all the necessary packages described in the `package.json` file:
@@ -107,15 +107,11 @@ You need to run the following command to install all the necessary packages desc
 npm install
 ```
 
-You can just execute ESLint as follows:
+You can execute ESLint as follows:
 ```bash
 npm run eslint -- path/to/analyze
 ```
 
-Run the following command to execute JSCS:
-```bash
-npm run jscs path/to/analyze
-```
 ## License
 
 Each Magento source file included in this distribution is licensed under the OSL-3.0 license.

From ef8bd3fc91c5a75b1a7fcd3f936fcd8117b58f1f Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Sun, 7 Nov 2021 18:22:41 +0100
Subject: [PATCH 382/630] Fixed code by recommendation

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index a3332c0c..13acffdc 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -241,9 +241,9 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^date_sunrise$' => 'date_sun_info',
         '^date_sunset$' => 'date_sun_info',
         '^strptime$' => 'date_parse_from_format',
-        '^strftime$' => null,
-        '^gmstrftime$' => null,
-        '^(mhash|mhash_.*)$' => null,
+        '^strftime$' => 'IntlDateFormatter::format',
+        '^gmstrftime$' => 'IntlDateFormatter::format',
+        '^(mhash|mhash_.*)$' => 'hash_*',
         '^odbc_result_all$' => null
     ];
 }

From 4c83cfbe95d9075bd1999f35e01a8ecdab031c35 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 8 Nov 2021 19:30:20 +0000
Subject: [PATCH 383/630] Update rule names for better messaging

---
 .../Annotation/MethodArgumentsSniff.php       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
index 09c8208b..cf483356 100644
--- a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -228,7 +228,7 @@ private function validateParameterAnnotationForArgumentExists(
                 $phpcsFile->addError(
                     '{@inheritdoc} does not import parameter annotation',
                     $stackPtr,
-                    'MethodArguments'
+                    'InheritDoc'
                 );
             } elseif ($this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)
                 && !$inheritdocAnnotationWithoutBracesExists
@@ -236,7 +236,7 @@ private function validateParameterAnnotationForArgumentExists(
                 $phpcsFile->addError(
                     'Missing @param for argument in method annotation',
                     $stackPtr,
-                    'MethodArguments'
+                    'ParamMissing'
                 );
             }
         }
@@ -260,13 +260,13 @@ private function validateCommentBlockDoesnotHaveExtraParameterAnnotation(
             $phpcsFile->addError(
                 'Extra @param found in method annotation',
                 $stackPtr,
-                'MethodArguments'
+                'ExtraParam'
             );
         } elseif ($argumentsCount > 0 && $argumentsCount != $parametersCount && $parametersCount != 0) {
             $phpcsFile->addError(
                 '@param is not found for one or more params in method annotation',
                 $stackPtr,
-                'MethodArguments'
+                'ParamMissing'
             );
         }
     }
@@ -290,7 +290,7 @@ private function validateArgumentNameInParameterAnnotationExists(
         $parameterNames = $this->getMethodParameters($paramDefinitions);
         if (!in_array($methodArguments[$ptr], $parameterNames)) {
             $error = $methodArguments[$ptr] . ' parameter is missing in method annotation';
-            $phpcsFile->addError($error, $stackPtr, 'MethodArguments');
+            $phpcsFile->addError($error, $stackPtr, 'ArgumentMissing');
         }
     }
 
@@ -314,7 +314,7 @@ private function validateParameterPresentInMethodSignature(
             $phpcsFile->addError(
                 $paramDefinitionsArguments . ' parameter is missing in method arguments signature',
                 $paramPointers[$ptr],
-                'MethodArguments'
+                'ArgumentMissing'
             );
         }
     }
@@ -343,7 +343,7 @@ private function validateParameterOrderIsCorrect(
                     $phpcsFile->addError(
                         $methodArguments[$ptr] . ' parameter is not in order',
                         $paramPointers[$ptr],
-                        'MethodArguments'
+                        'ParamOrder'
                     );
                 }
             }
@@ -386,7 +386,7 @@ private function validateDuplicateAnnotationDoesnotExists(
                 $phpcsFile->addError(
                     $value . ' duplicate found in method annotation',
                     $stackPtr,
-                    'MethodArguments'
+                    'DuplicateParam'
                 );
             }
         }
@@ -413,7 +413,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                 $phpcsFile->addError(
                     'Missing both type and parameter',
                     $paramPointers[$ptr],
-                    'MethodArguments'
+                    'Malformed'
                 );
                 break;
             case 1:
@@ -421,7 +421,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                     $phpcsFile->addError(
                         'Type is not specified',
                         $paramPointers[$ptr],
-                        'MethodArguments'
+                        'NoTypeSpecified'
                     );
                 }
                 break;
@@ -430,7 +430,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                     $phpcsFile->addError(
                         $paramDefinitions[0] . ' is not a valid PHP type',
                         $paramPointers[$ptr],
-                        'MethodArguments'
+                        'NotValidType'
                     );
                 }
                 $this->validateParameterPresentInMethodSignature(
@@ -446,13 +446,13 @@ private function validateParameterAnnotationFormatIsCorrect(
                     $phpcsFile->addError(
                         'Type is not specified',
                         $paramPointers[$ptr],
-                        'MethodArguments'
+                        'NoTypeSpecified'
                     );
                     if ($this->isInvalidType($paramDefinitions[0])) {
                         $phpcsFile->addError(
                             $paramDefinitions[0] . ' is not a valid PHP type',
                             $paramPointers[$ptr],
-                            'MethodArguments'
+                            'NotValidType'
                         );
                     }
                 }
@@ -552,7 +552,7 @@ public function process(File $phpcsFile, $stackPtr)
         $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
         if ($previousCommentClosePtr && $previousCommentOpenPtr) {
             if (!$this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)) {
-                $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
+                $phpcsFile->addError('Comment block is missing', $stackPtr, 'NoCommentBlock');
                 return;
             }
         } else {
@@ -636,7 +636,7 @@ private function validateFormattingConsistency(
             $phpcsFile->addError(
                 'Method arguments visual alignment must be consistent',
                 $paramPointers[0],
-                'MethodArguments'
+                'VisualAlignment'
             );
         }
     }

From 32026fb38e0b1dff1744a04720d2508c0ae204fe Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 9 Nov 2021 10:36:45 +0100
Subject: [PATCH 384/630] Version 15

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 9b728859..36a71bbf 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "14",
+    "version": "15",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",
diff --git a/composer.lock b/composer.lock
index 917d8ab1..8346f504 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a5487f1379f650278e6de506e0c5a645",
+    "content-hash": "ccc9b708a197fb981876af4623ec26a3",
     "packages": [
         {
             "name": "squizlabs/php_codesniffer",
@@ -259,16 +259,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.0",
+            "version": "v4.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
+                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
                 "shasum": ""
             },
             "require": {
@@ -309,9 +309,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
             },
-            "time": "2021-09-20T12:20:58+00:00"
+            "time": "2021-11-03T20:52:16+00:00"
         },
         {
             "name": "phar-io/manifest",

From ec4b9b531a9d322fa4e945c222c4501ab14f2489 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Tue, 9 Nov 2021 11:51:02 +0100
Subject: [PATCH 385/630] Fixed code array autovivification

---
 .../Sniffs/PHP/ArrayAutovivificationSniff.php | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
index f5893a3d..852aed30 100644
--- a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
+++ b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
@@ -20,14 +20,14 @@ class ArrayAutovivificationSniff implements Sniff
      *
      * @var string
      */
-    private $warningMessage = 'Deprecated: Automatic conversion of false to array is deprecated.';
+    private const WARNING_MESSAGE = 'Deprecated: Automatic conversion of false to array is deprecated.';
 
     /**
-     * Warning violation code.
+     * Error violation code.
      *
      * @var string
      */
-    private $warningCode = 'Autovivification';
+    private const WARNING_CODE = 'Autovivification';
 
     /**
      * @inheritdoc
@@ -44,25 +44,37 @@ public function register(): array
      */
     public function process(File $phpcsFile, $stackPtr): void
     {
-        $positionSquareBracket = $phpcsFile->findNext(T_OPEN_SQUARE_BRACKET, $stackPtr, $stackPtr + 2);
+        $openSquareBracketKey = $phpcsFile->findNext(T_OPEN_SQUARE_BRACKET, $stackPtr, $stackPtr + 2);
 
-        if ($positionSquareBracket) {
-            $tokens = $phpcsFile->getTokens();
-            $positionFunction = $phpcsFile->findPrevious(T_FUNCTION, $positionSquareBracket) ?: 0;
-            $sliceLength = $stackPtr - $positionFunction;
-            $sliceToken = array_slice(array_column($tokens, 'content'), $positionFunction, $sliceLength, true);
-            $propertyTokenKey = array_keys($sliceToken, $tokens[$stackPtr]['content']);
+        if (!$openSquareBracketKey) {
+            return;
+        }
+
+        $closeSquareBracketKey = $phpcsFile->findNext(T_CLOSE_SQUARE_BRACKET, $openSquareBracketKey);
+        $hasEqualKey = $phpcsFile->findNext(T_EQUAL, $closeSquareBracketKey, $closeSquareBracketKey + 3);
+
+        if (!$hasEqualKey) {
+            return;
+        }
 
-            arsort($propertyTokenKey);
+        $tokens = $phpcsFile->getTokens();
+        $functionKey = $phpcsFile->findPrevious(T_FUNCTION, $openSquareBracketKey) ?: 0;
+        $sliceToken = array_slice(array_column($tokens, 'content'), $functionKey, $stackPtr - $functionKey, true);
+        $propertyTokenKey = array_keys($sliceToken, $tokens[$stackPtr]['content']);
 
-            foreach ($propertyTokenKey as $tokenKey) {
-                if ($tokens[$tokenKey + 2]['content'] === '=') {
-                    if ($tokens[$tokenKey + 4]['content'] != 'false') {
-                        return;
-                    }
+        arsort($propertyTokenKey);
 
-                    $phpcsFile->addWarning($this->warningMessage, $positionSquareBracket, $this->warningCode);
+        foreach ($propertyTokenKey as $propertyKey) {
+            $positionEqualKey = $phpcsFile->findNext(T_EQUAL, $propertyKey, $propertyKey + 3);
+
+            if ($positionEqualKey) {
+                $falseKey = $phpcsFile->findNext(T_FALSE, $positionEqualKey, $positionEqualKey + 3);
+
+                if (!($falseKey && $phpcsFile->findNext(T_SEMICOLON, $falseKey, $falseKey + 2))) {
+                    return;
                 }
+
+                $phpcsFile->addWarning(self::WARNING_MESSAGE, $openSquareBracketKey, self::WARNING_CODE);
             }
         }
     }

From 795a005d90a7ef1d8c875e92482731298415ea61 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Tue, 9 Nov 2021 13:58:35 +0100
Subject: [PATCH 386/630] Added Static Test

---
 .../PHP/ArrayAutovivificationUnitTest.inc     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc b/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc
index 82b92c00..72e57499 100644
--- a/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc
+++ b/Magento2/Tests/PHP/ArrayAutovivificationUnitTest.inc
@@ -57,4 +57,44 @@ class Avtovivification
 
         return $productIds;
     }
+
+    /**
+     * @return array
+     */
+    public function testAvtovivification($testData)
+    {
+        $productIds = false !== $testData ? $testData : null;
+
+        $productIds[] = 'test_array_value';
+
+        return $productIds;
+    }
+
+    /**
+     * @param array $productIds
+     *
+     * @return array
+     */
+    public function testWithParameterArray($productIds)
+    {
+        if (!empty($productIds['test_array_key'])) {
+            $productIds['test_array_key'] = 'test_array_value';
+        }
+
+        return $productIds;
+    }
+
+    /**
+     * @param false|array $productIds
+     *
+     * @return false|array
+     */
+    public function testWithParameterFalse($productIds = false)
+    {
+        if ($productIds !== false) {
+            $productIds[] = 'test_array_value';
+        }
+
+        return $productIds;
+    }
 }

From 8bcf8c9de8d73c6e893ebb53c7a700357f4b560b Mon Sep 17 00:00:00 2001
From: MeenakshiSundaram <msundara@adobe.com>
Date: Tue, 9 Nov 2021 19:23:04 +0530
Subject: [PATCH 387/630] Added Constant visibility in the ruleset

---
 Magento2/ruleset.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index c35d5a9b..14b109a9 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -732,4 +732,11 @@
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+    <rule ref="PSR12.Properties.ConstantVisibility">
+        <severity>5</severity>
+        <type>warning</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+    </rule>
 </ruleset>

From bf297665f566ae96f230e9e621115694d128407e Mon Sep 17 00:00:00 2001
From: MeenakshiSundaram <msundara@adobe.com>
Date: Tue, 9 Nov 2021 19:43:40 +0530
Subject: [PATCH 388/630] Added visibility to all the exisiting constant

---
 .../Classes/DiscouragedDependenciesSniff.php   |  2 +-
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php    |  8 ++++----
 Magento2/Sniffs/Less/CommentLevelsSniff.php    |  6 +++---
 .../Sniffs/Less/TokenizerSymbolsInterface.php  | 18 +++++++++---------
 Magento2/Sniffs/Less/ZeroUnitsSniff.php        |  6 +++---
 .../Methods/DeprecatedModelMethodSniff.php     |  2 +-
 Magento2/ruleset.xml                           |  3 ---
 7 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index f5e45c63..fbaad301 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -15,7 +15,7 @@
  */
 class DiscouragedDependenciesSniff implements Sniff
 {
-    const CONSTRUCT_METHOD_NAME = '__construct';
+    private const CONSTRUCT_METHOD_NAME = '__construct';
 
     /**
      * String representation of warning.
diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
index d140f96c..2fdc0518 100644
--- a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -16,10 +16,10 @@
  */
 class HtmlDirectiveSniff implements Sniff
 {
-    const CONSTRUCTION_DEPEND_PATTERN = '/{{depend\s*(.*?)}}(.*?){{\\/depend\s*}}/si';
-    const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
-    const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
-    const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
+    private const CONSTRUCTION_DEPEND_PATTERN = '/{{depend\s*(.*?)}}(.*?){{\\/depend\s*}}/si';
+    private const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
+    private const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
+    private const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
 
     /**
      * @var array
diff --git a/Magento2/Sniffs/Less/CommentLevelsSniff.php b/Magento2/Sniffs/Less/CommentLevelsSniff.php
index e192f659..be7c93c9 100644
--- a/Magento2/Sniffs/Less/CommentLevelsSniff.php
+++ b/Magento2/Sniffs/Less/CommentLevelsSniff.php
@@ -19,11 +19,11 @@
  */
 class CommentLevelsSniff implements Sniff
 {
-    const COMMENT_STRING = '//';
+    private const COMMENT_STRING = '//';
 
-    const FIRST_LEVEL_COMMENT = '_____________________________________________';
+    private const FIRST_LEVEL_COMMENT = '_____________________________________________';
 
-    const SECOND_LEVEL_COMMENT = '--';
+    private const SECOND_LEVEL_COMMENT = '--';
 
     /**
      * @var array
diff --git a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
index da690f79..c640e27a 100644
--- a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
+++ b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
@@ -10,18 +10,18 @@
  */
 interface TokenizerSymbolsInterface
 {
-    const TOKENIZER_CSS = 'CSS';
+    public const TOKENIZER_CSS = 'CSS';
 
     /**#@+
      * Symbols for usage into Sniffers
      */
-    const BITWISE_AND         = '&';
-    const COLON               = ';';
-    const OPEN_PARENTHESIS    = '(';
-    const CLOSE_PARENTHESIS   = ')';
-    const NEW_LINE            = "\n";
-    const WHITESPACE          = ' ';
-    const DOUBLE_WHITESPACE   = '  ';
-    const INDENT_SPACES       = '    ';
+    public const BITWISE_AND         = '&';
+    public const COLON               = ';';
+    public const OPEN_PARENTHESIS    = '(';
+    public const CLOSE_PARENTHESIS   = ')';
+    public const NEW_LINE            = "\n";
+    public const WHITESPACE          = ' ';
+    public const DOUBLE_WHITESPACE   = '  ';
+    public const INDENT_SPACES       = '    ';
     /**#@-*/
 }
diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
index 5b8851fa..7117bdb8 100644
--- a/Magento2/Sniffs/Less/ZeroUnitsSniff.php
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -19,9 +19,9 @@
  */
 class ZeroUnitsSniff implements Sniff
 {
-    const CSS_PROPERTY_UNIT_PX = 'px';
-    const CSS_PROPERTY_UNIT_EM = 'em';
-    const CSS_PROPERTY_UNIT_REM = 'rem';
+    private const CSS_PROPERTY_UNIT_PX = 'px';
+    private const CSS_PROPERTY_UNIT_EM = 'em';
+    private const CSS_PROPERTY_UNIT_REM = 'rem';
 
     /**
      * @var array
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index f094c353..41a9f97b 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -13,7 +13,7 @@
  */
 class DeprecatedModelMethodSniff implements Sniff
 {
-    const RESOURCE_METHOD = "getResource";
+    private const RESOURCE_METHOD = "getResource";
 
     /**
      * String representation of warning.
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 14b109a9..988a46a0 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -735,8 +735,5 @@
     <rule ref="PSR12.Properties.ConstantVisibility">
         <severity>5</severity>
         <type>warning</type>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
 </ruleset>

From 53b58c7750b042e19562459b15c19d21c96d38ea Mon Sep 17 00:00:00 2001
From: MeenakshiSundaram <msundara@adobe.com>
Date: Wed, 10 Nov 2021 18:57:13 +0530
Subject: [PATCH 389/630] Updated ConstantVisibility severity

---
 Magento2/ruleset.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 988a46a0..97d40604 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -696,6 +696,10 @@
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
         <severity>0</severity>
     </rule>
+    <rule ref="PSR12.Properties.ConstantVisibility">
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
 
     <!-- Severity 5 warnings: PHPDoc formatting and commenting issues. -->
     <rule ref="Magento2.Commenting.ClassAndInterfacePHPDocFormatting">
@@ -732,8 +736,4 @@
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
-    <rule ref="PSR12.Properties.ConstantVisibility">
-        <severity>5</severity>
-        <type>warning</type>
-    </rule>
 </ruleset>

From 1b2153fb9a8c682a15172135437979f0742282c3 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 15 Nov 2021 10:45:27 +0100
Subject: [PATCH 390/630] AC-1059: Move PHPCompatibility rules from Magento
 tests

---
 Magento2/ruleset.xml |  6 ++++
 composer.json        |  3 +-
 composer.lock        | 78 +++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index c200c35e..0ea74416 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -738,3 +738,9 @@
         <severity>0</severity>
     </rule>
 </ruleset>
+<ruleset name="PHPCompatibilityMagento">
+    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
+    <rule ref="PHPCompatibility">
+        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+    </rule>
+</ruleset>
diff --git a/composer.json b/composer.json
index 36a71bbf..cf6dd7e4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,8 @@
         "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
-        "ext-dom": "*"
+        "ext-dom": "*",
+        "phpcompatibility/php-compatibility": "^9.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 8346f504..b8be775a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,70 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ccc9b708a197fb981876af4623ec26a3",
+    "content-hash": "a726e6e7caa0f654b55b3a78d8ea170b",
     "packages": [
+        {
+            "name": "phpcompatibility/php-compatibility",
+            "version": "9.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
+            "time": "2019-12-27T09:44:58+00:00"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.6.1",
@@ -1501,16 +1563,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
@@ -1559,14 +1621,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1574,7 +1636,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",

From 1d3fa20c044c2cc0811af0f071ff93eb40d752db Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 15 Nov 2021 14:24:23 +0100
Subject: [PATCH 391/630] AC-1059: Move PHPCompatibility rules from Magento
 tests

---
 Magento2/ruleset.xml                |  6 ------
 PHPCompatibilityMagento/ruleset.xml | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 PHPCompatibilityMagento/ruleset.xml

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 0ea74416..c200c35e 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -738,9 +738,3 @@
         <severity>0</severity>
     </rule>
 </ruleset>
-<ruleset name="PHPCompatibilityMagento">
-    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
-    <rule ref="PHPCompatibility">
-        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
-    </rule>
-</ruleset>
diff --git a/PHPCompatibilityMagento/ruleset.xml b/PHPCompatibilityMagento/ruleset.xml
new file mode 100644
index 00000000..b69dae75
--- /dev/null
+++ b/PHPCompatibilityMagento/ruleset.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ruleset name="PHPCompatibilityMagento">
+    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
+    <rule ref="../vendor/phpcompatibility/php-compatibility/PHPCompatibility">
+        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+        <exclude name="PHPCompatibility.FunctionUse.RequiredToOptionalFunctionParameters" />
+        <exclude name="PHPCompatibility.ParameterValues.RemovedPCREModifiers" />
+        <exclude name="PHPCompatibility.InitialValue.NewConstantScalarExpressions" />
+    </rule>
+</ruleset>

From c01fed6617e16df5b23d4995360331e57d3e19cd Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 16 Nov 2021 12:59:44 +0100
Subject: [PATCH 392/630] AC-1059: Move PHPCompatibility rules from Magento
 tests

---
 Magento2/ruleset.xml                          |  13 +
 ...ionalToRequiredFunctionParametersSniff.php | 270 ++++++++++
 ...uiredToOptionalFunctionParametersSniff.php | 485 ++++++++++++++++++
 PHPCompatibilityMagento/ruleset.xml           |   7 +
 composer.lock                                 |  12 +-
 5 files changed, 781 insertions(+), 6 deletions(-)
 create mode 100644 PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php
 create mode 100644 PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index c200c35e..bc732d71 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -737,4 +737,17 @@
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+    <rule ref="../vendor/phpcompatibility/php-compatibility/PHPCompatibility">
+        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+        <exclude name="PHPCompatibility.FunctionUse.RequiredToOptionalFunctionParameters" />
+        <exclude name="PHPCompatibility.ParameterValues.RemovedPCREModifiers" />
+        <exclude name="PHPCompatibility.InitialValue.NewConstantScalarExpressions" />
+    </rule>
+    <!--
+    These sniffs are copied from latest development version of PHPCompatibility, and are included here due to  bug
+    in version 9.3 of PHPCompatibility. Once version 10 is released, this hack must me removed.
+
+    See https://github.com/PHPCompatibility/PHPCompatibility/issues/793 form more information
+    -->
+    <rule ref="../PHPCompatibilityMagento/Sniffs/FunctionUse" />
 </ruleset>
diff --git a/PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php b/PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php
new file mode 100644
index 00000000..cee82cae
--- /dev/null
+++ b/PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibilityMagento\Sniffs\FunctionUse;
+
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detect missing required function parameters in calls to native PHP functions.
+ *
+ * Specifically when those function parameters used to be optional in older PHP versions.
+ *
+ * PHP version All
+ *
+ * @link https://www.php.net/manual/en/doc.changelog.php
+ *
+ * @since 8.1.0
+ * @since 9.0.0  Renamed from `OptionalRequiredFunctionParametersSniff` to `OptionalToRequiredFunctionParametersSniff`.
+ * @since 10.0.0 Now extends the base `AbstractFunctionCallParameterSniff` class.
+ *               Previously the sniff extended the sister-sniff `RequiredToOptionalFunctionParametersSniff`.
+ *               Methods which were previously required due to the extending of the (grand-parent)
+ *               `AbstractComplexVersionSniff` have been removed.
+ */
+class OptionalToRequiredFunctionParametersSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * A list of function parameters, which were optional in older versions and became required later on.
+     *
+     * The array lists : version number with true (required) and false (optional use deprecated).
+     *
+     * The index is the location of the parameter in the parameter list, starting at 0 !
+     * If's sufficient to list the last version in which the parameter was not yet required.
+     *
+     * @since 8.1.0
+     * @since 10.0.0 Parameter renamed from `$functionParameters` to `$targetFunctions` for
+     *               compatibility with the `AbstractFunctionCallParameterSniff` class.
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'crypt' => [
+            1 => [
+                'name' => 'salt',
+                '5.6'  => false,
+                '8.0'  => true,
+            ],
+        ],
+        'gmmktime' => [
+            1 => [
+                'name' => 'hour',
+                '8.0'  => true,
+            ],
+        ],
+        'mb_parse_str' => [
+            1 => [
+                'name' => 'result',
+                '8.0'  => true,
+            ],
+        ],
+        'mktime' => [
+            0 => [
+                'name' => 'hour',
+                '5.1'  => false,
+                '8.0'  => true,
+            ],
+        ],
+        'openssl_seal' => [
+            4 => [
+                'name' => 'method',
+                '8.0'  => true,
+            ],
+        ],
+        'openssl_open' => [
+            4 => [
+                'name' => 'method',
+                '8.0'  => true,
+            ],
+        ],
+        'parse_str' => [
+            1 => [
+                'name' => 'result',
+                '7.2'  => false,
+                '8.0'  => true,
+            ],
+        ],
+    ];
+
+
+    /**
+     * Bowing out early is not applicable to this sniff.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return false;
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0 Part of the logic in this method was previously contained in the
+     *               parent sniff `process()` method (now removed).
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        $functionLc           = \strtolower($functionName);
+        $parameterCount       = \count($parameters);
+        $parameterOffsetFound = $parameterCount - 1;
+
+        foreach ($this->targetFunctions[$functionLc] as $offset => $parameterDetails) {
+            if ($offset > $parameterOffsetFound) {
+                $itemInfo = [
+                    'name'   => $functionName,
+                    'nameLc' => $functionLc,
+                    'offset' => $offset,
+                ];
+                $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+            }
+        }
+    }
+
+    /**
+     * Process the function if no parameters were found.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
+    {
+        $this->processParameters($phpcsFile, $stackPtr, $functionName, []);
+    }
+
+    /**
+     * Retrieve the relevant detail (version) information for use in an error message.
+     *
+     * @since 8.1.0
+     * @since 10.0.0 - Method renamed from `getErrorInfo()` to `getVersionInfo().
+     *               - Second function parameter `$itemInfo` removed.
+     *               - Method visibility changed from `public` to `protected`.
+     *
+     * @param array $itemArray Version and other information about the item.
+     *
+     * @return array
+     */
+    protected function getVersionInfo(array $itemArray)
+    {
+        $versionInfo = [
+            'optionalDeprecated' => '',
+            'optionalRemoved'    => '',
+            'error'              => false,
+        ];
+
+        foreach ($itemArray as $version => $required) {
+            if (\preg_match('`^\d\.\d(\.\d{1,2})?$`', $version) !== 1) {
+                // Not a version key.
+                continue;
+            }
+
+            if ($this->supportsAbove($version) === true) {
+                if ($required === true && $versionInfo['optionalRemoved'] === '') {
+                    $versionInfo['optionalRemoved'] = $version;
+                    $versionInfo['error']           = true;
+                } elseif ($versionInfo['optionalDeprecated'] === '') {
+                    $versionInfo['optionalDeprecated'] = $version;
+                }
+            }
+        }
+
+        return $versionInfo;
+    }
+
+    /**
+     * Handle the retrieval of relevant information and - if necessary - throwing of an
+     * error for a matched item.
+     *
+     * @since 10.0.0 This was previously handled via a similar method in the `AbstractComplexVersionSniff`.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the relevant token in
+     *                                               the stack.
+     * @param array                       $itemInfo  Base information about the item.
+     *
+     * @return void
+     */
+    protected function handleFeature(File $phpcsFile, $stackPtr, array $itemInfo)
+    {
+        $itemArray   = $this->targetFunctions[$itemInfo['nameLc']][$itemInfo['offset']];
+        $versionInfo = $this->getVersionInfo($itemArray);
+
+        if (empty($versionInfo['optionalDeprecated']) && empty($versionInfo['optionalRemoved'])) {
+            return;
+        }
+
+        $this->addError($phpcsFile, $stackPtr, $itemInfo, $itemArray, $versionInfo);
+    }
+
+    /**
+     * Generates the error or warning for this item.
+     *
+     * @since 8.1.0
+     * @since 10.0.0 - Method visibility changed from `public` to `protected`.
+     *               - Introduced $itemArray parameter.
+     *               - Renamed the last parameter from `$errorInfo` to `$versionInfo`.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
+     * @param int                         $stackPtr    The position of the relevant token in
+     *                                                 the stack.
+     * @param array                       $itemInfo    Base information about the item.
+     * @param array                       $itemArray   The sub-array with all the details about
+     *                                                 this item.
+     * @param array                       $versionInfo Array with detail (version) information
+     *                                                 relevant to the item.
+     *
+     * @return void
+     */
+    protected function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $itemArray, array $versionInfo)
+    {
+        $error      = 'The "%s" parameter for function %s() is missing. Passing this parameter is no longer optional. The optional nature of the parameter is ';
+        $errorCode  = $this->stringToErrorCode($itemInfo['name'] . '_' . $itemArray['name']);
+        $codeSuffix = '';
+        $data       = [
+            $itemArray['name'],
+            $itemInfo['name'],
+        ];
+
+        if ($versionInfo['optionalDeprecated'] !== '') {
+            $error     .= 'deprecated since PHP %s and ';
+            $codeSuffix = 'Soft';
+            $data[]     = $versionInfo['optionalDeprecated'];
+        }
+
+        if ($versionInfo['optionalRemoved'] !== '') {
+            $error     .= 'removed since PHP %s and ';
+            $codeSuffix = 'Hard';
+            $data[]     = $versionInfo['optionalRemoved'];
+        }
+
+        // Remove the last 'and' from the message.
+        $error      = \substr($error, 0, (\strlen($error) - 5));
+        $errorCode .= $codeSuffix . 'Required';
+
+        $this->addMessage($phpcsFile, $error, $stackPtr, $versionInfo['error'], $errorCode, $data);
+    }
+}
\ No newline at end of file
diff --git a/PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php b/PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php
new file mode 100644
index 00000000..f4755bab
--- /dev/null
+++ b/PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php
@@ -0,0 +1,485 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibilityMagento\Sniffs\FunctionUse;
+
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detect missing required function parameters in calls to native PHP functions.
+ *
+ * Specifically when those function parameters are no longer required in more recent PHP versions.
+ *
+ * PHP version All
+ *
+ * @link https://www.php.net/manual/en/doc.changelog.php
+ *
+ * @since 7.0.3
+ * @since 7.1.0  Now extends the `AbstractComplexVersionSniff` instead of the base `Sniff` class.
+ * @since 9.0.0  Renamed from `RequiredOptionalFunctionParametersSniff` to `RequiredToOptionalFunctionParametersSniff`.
+ * @since 10.0.0 Now extends the base `AbstractFunctionCallParameterSniff` class.
+ *               Methods which were previously required due to the extending of the `AbstractComplexVersionSniff`
+ *               have been removed.
+ */
+class RequiredToOptionalFunctionParametersSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * A list of function parameters, which were required in older versions and became optional later on.
+     *
+     * The array lists : version number with true (required) and false (optional).
+     *
+     * The index is the location of the parameter in the parameter list, starting at 0 !
+     * If's sufficient to list the last version in which the parameter was still required.
+     *
+     * @since 7.0.3
+     * @since 10.0.0 Parameter renamed from `$functionParameters` to `$targetFunctions` for
+     *               compatibility with the `AbstractFunctionCallParameterSniff` class.
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'array_diff_assoc' => [
+            1 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_diff_key' => [
+            1 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_diff_uassoc' => [
+            /*
+             * $array2 is actually at position 1, but has another required parameter after it,
+             * so we need to detect on the last parameter.
+             */
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_diff_ukey' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_diff' => [
+            1 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_intersect_assoc' => [
+            1 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_intersect_key' => [
+            1 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_intersect_uassoc' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_intersect_ukey' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_intersect' => [
+            1 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_merge' => [
+            0 => [
+                'name' => 'array(s) to merge',
+                '7.3'  => true,
+                '7.4'  => false,
+            ],
+        ],
+        'array_merge_recursive' => [
+            0 => [
+                'name' => 'array(s) to merge',
+                '7.3'  => true,
+                '7.4'  => false,
+            ],
+        ],
+        'array_push' => [
+            1 => [
+                'name' => 'element to push',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'array_udiff_assoc' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_udiff_uassoc' => [
+            // Note from array_diff_uassoc applies here too.
+            3 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_udiff' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_uintersect_assoc' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_uintersect_uassoc' => [
+            // Note from array_diff_uassoc applies here too.
+            3 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_uintersect' => [
+            // Note from array_diff_uassoc applies here too.
+            2 => [
+                'name' => 'array2',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'array_unshift' => [
+            1 => [
+                'name' => 'element to prepend',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'bcscale' => [
+            0 => [
+                'name' => 'scale',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'fgetcsv' => [
+            1 => [
+                'name' => 'length',
+                '5.0'  => true,
+                '5.1'  => false,
+            ],
+        ],
+        'ftp_fget' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_fput' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_get' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_nb_fget' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_nb_fput' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_nb_get' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_nb_put' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'ftp_put' => [
+            3 => [
+                'name' => 'mode',
+                '7.2'  => true,
+                '7.3'  => false,
+            ],
+        ],
+        'getenv' => [
+            0 => [
+                'name' => 'varname',
+                '7.0'  => true,
+                '7.1'  => false,
+            ],
+        ],
+        'imagepolygon' => [
+            /*
+             * $num_points is actually at position 2, but has another required parameter after it,
+             * so we need to detect on the last parameter.
+             */
+            3 => [
+                'name' => 'num_points',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'imageopenpolygon' => [
+            // Note from imagepolygon applies here too.
+            3 => [
+                'name' => 'num_points',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'imagefilledpolygon' => [
+            // Note from imagepolygon applies here too.
+            3 => [
+                'name' => 'num_points',
+                '7.4'  => true,
+                '8.0'  => false,
+            ],
+        ],
+        'preg_match_all' => [
+            2 => [
+                'name' => 'matches',
+                '5.3'  => true,
+                '5.4'  => false,
+            ],
+        ],
+        'stream_socket_enable_crypto' => [
+            2 => [
+                'name' => 'crypto_type',
+                '5.5'  => true,
+                '5.6'  => false,
+            ],
+        ],
+        'xmlwriter_write_element' => [
+            2 => [
+                'name'  => 'content',
+                '5.2.2' => true,
+                '5.2.3' => false,
+            ],
+        ],
+        'xmlwriter_write_element_ns' => [
+            4 => [
+                'name'  => 'content',
+                '5.2.2' => true,
+                '5.2.3' => false,
+            ],
+        ],
+    ];
+
+
+    /**
+     * Bowing out early is not applicable to this sniff.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return false;
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0 Part of the logic in this method was previously contained in the
+     *               `process()` method (now removed).
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return void
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        $functionLc           = \strtolower($functionName);
+        $parameterCount       = \count($parameters);
+        $parameterOffsetFound = $parameterCount - 1;
+
+        foreach ($this->targetFunctions[$functionLc] as $offset => $parameterDetails) {
+            if ($offset > $parameterOffsetFound) {
+                $itemInfo = [
+                    'name'   => $functionName,
+                    'nameLc' => $functionLc,
+                    'offset' => $offset,
+                ];
+                $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+            }
+        }
+    }
+
+    /**
+     * Process the function if no parameters were found.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     *
+     * @return void
+     */
+    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
+    {
+        $this->processParameters($phpcsFile, $stackPtr, $functionName, []);
+    }
+
+    /**
+     * Retrieve the relevant detail (version) information for use in an error message.
+     *
+     * @since 7.1.0
+     * @since 10.0.0 - Method renamed from `getErrorInfo()` to `getVersionInfo().
+     *               - Second function parameter `$itemInfo` removed.
+     *               - Method visibility changed from `public` to `protected`.
+     *
+     * @param array $itemArray Version and other information about the item.
+     *
+     * @return array
+     */
+    protected function getVersionInfo(array $itemArray)
+    {
+        $versionInfo = [
+            'requiredVersion' => '',
+        ];
+
+        foreach ($itemArray as $version => $required) {
+            if (\preg_match('`^\d\.\d(\.\d{1,2})?$`', $version) !== 1) {
+                // Not a version key.
+                continue;
+            }
+
+            if ($required === true && $this->supportsBelow($version) === true) {
+                $versionInfo['requiredVersion'] = $version;
+            }
+        }
+
+        return $versionInfo;
+    }
+
+    /**
+     * Handle the retrieval of relevant information and - if necessary - throwing of an
+     * error for a matched item.
+     *
+     * @since 10.0.0 This was previously handled via a similar method in the `AbstractComplexVersionSniff`.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the relevant token in
+     *                                               the stack.
+     * @param array                       $itemInfo  Base information about the item.
+     *
+     * @return void
+     */
+    protected function handleFeature(File $phpcsFile, $stackPtr, array $itemInfo)
+    {
+        $itemArray   = $this->targetFunctions[$itemInfo['nameLc']][$itemInfo['offset']];
+        $versionInfo = $this->getVersionInfo($itemArray);
+
+        if (empty($versionInfo['requiredVersion'])) {
+            return;
+        }
+
+        $this->addError($phpcsFile, $stackPtr, $itemInfo, $itemArray, $versionInfo);
+    }
+
+    /**
+     * Generates the error for this item.
+     *
+     * @since 7.1.0
+     * @since 10.0.0 - Method visibility changed from `public` to `protected`.
+     *               - Introduced $itemArray parameter.
+     *               - Renamed the last parameter from `$errorInfo` to `$versionInfo`.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
+     * @param int                         $stackPtr    The position of the relevant token in
+     *                                                 the stack.
+     * @param array                       $itemInfo    Base information about the item.
+     * @param array                       $itemArray   The sub-array with all the details about
+     *                                                 this item.
+     * @param array                       $versionInfo Array with detail (version) information
+     *                                                 relevant to the item.
+     *
+     * @return void
+     */
+    protected function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $itemArray, array $versionInfo)
+    {
+        $error     = 'The "%s" parameter for function %s() is missing, but was required for PHP version %s and lower';
+        $errorCode = $this->stringToErrorCode($itemInfo['name'] . '_' . $itemArray['name']) . 'Missing';
+        $data      = [
+            $itemArray['name'],
+            $itemInfo['name'],
+            $versionInfo['requiredVersion'],
+        ];
+
+        $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+    }
+}
\ No newline at end of file
diff --git a/PHPCompatibilityMagento/ruleset.xml b/PHPCompatibilityMagento/ruleset.xml
index b69dae75..601ae60c 100644
--- a/PHPCompatibilityMagento/ruleset.xml
+++ b/PHPCompatibilityMagento/ruleset.xml
@@ -13,4 +13,11 @@
         <exclude name="PHPCompatibility.ParameterValues.RemovedPCREModifiers" />
         <exclude name="PHPCompatibility.InitialValue.NewConstantScalarExpressions" />
     </rule>
+    <!--
+    These sniffs are copied from latest development version of PHPCompatibility, and are included here due to  bug
+    in version 9.3 of PHPCompatibility. Once version 10 is released, this hack must me removed.
+
+    See https://github.com/PHPCompatibility/PHPCompatibility/issues/793 form more information
+    -->
+    <rule ref="./Sniffs/FunctionUse" />
 </ruleset>
diff --git a/composer.lock b/composer.lock
index b8be775a..46bc7eca 100644
--- a/composer.lock
+++ b/composer.lock
@@ -126,16 +126,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.0",
+            "version": "v14.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "d191b0c34365c025c6cd953b5a63aa62946c7060"
+                "reference": "8f3e584335696c2eb8d307019f0afdff64fc0e35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d191b0c34365c025c6cd953b5a63aa62946c7060",
-                "reference": "d191b0c34365c025c6cd953b5a63aa62946c7060",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/8f3e584335696c2eb8d307019f0afdff64fc0e35",
+                "reference": "8f3e584335696c2eb8d307019f0afdff64fc0e35",
                 "shasum": ""
             },
             "require": {
@@ -180,7 +180,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.0"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.1"
             },
             "funding": [
                 {
@@ -188,7 +188,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-10-29T13:08:08+00:00"
+            "time": "2021-11-15T10:25:57+00:00"
         }
     ],
     "packages-dev": [

From d3dc3f4ebc67f6d97a535854faf7ffe5de7d3276 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 15:04:43 +0100
Subject: [PATCH 393/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 .github/workflows/php.yml |   4 ++
 composer.json             |   3 +-
 composer.lock             | 126 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 131 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index a22f59c2..eaafb162 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -58,6 +58,10 @@ jobs:
 
     - name: Run framework suite
       run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+    
+    - name: Run rector
+      run: vendor/bin/rector process --dry-run
+
   js:
     runs-on: ubuntu-latest
     name: Javascript tests
diff --git a/composer.json b/composer.json
index 36a71bbf..a913150c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,8 @@
         "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
-        "ext-dom": "*"
+        "ext-dom": "*",
+        "rector/rector": "^0.12.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 8346f504..d7cbfb9d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,132 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ccc9b708a197fb981876af4623ec26a3",
+    "content-hash": "d86f5662d65e6586d8e61e5e0aad77c0",
     "packages": [
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "bcea0ae85868a89d5789c75f012c93129f842934"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bcea0ae85868a89d5789c75f012c93129f842934",
+                "reference": "bcea0ae85868a89d5789c75f012c93129f842934",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-11-09T12:41:09+00:00"
+        },
+        {
+            "name": "rector/rector",
+            "version": "0.12.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/rector.git",
+                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
+                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0",
+                "phpstan/phpstan": "^1.1.1"
+            },
+            "conflict": {
+                "phpstan/phpdoc-parser": "<1.2",
+                "rector/rector-cakephp": "*",
+                "rector/rector-doctrine": "*",
+                "rector/rector-laravel": "*",
+                "rector/rector-nette": "*",
+                "rector/rector-phpoffice": "*",
+                "rector/rector-phpunit": "*",
+                "rector/rector-prefixed": "*",
+                "rector/rector-symfony": "*"
+            },
+            "bin": [
+                "bin/rector"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Prefixed and PHP 7.1 downgraded version of rector/rector",
+            "support": {
+                "issues": "https://github.com/rectorphp/rector/issues",
+                "source": "https://github.com/rectorphp/rector/tree/0.12.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-11-15T14:06:50+00:00"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.6.1",

From 874884f45c6cbff7ef22f792ef0c1a4257db6b59 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 15:20:50 +0100
Subject: [PATCH 394/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index eaafb162..00f2bcbc 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -60,7 +60,7 @@ jobs:
       run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
     
     - name: Run rector
-      run: vendor/bin/rector process --dry-run
+      run: vendor/bin/rector process . --dry-run
 
   js:
     runs-on: ubuntu-latest

From cdf641edb8736981159098f20adf9da98e116fcb Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 15:42:25 +0100
Subject: [PATCH 395/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 rector.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 rector.php

diff --git a/rector.php b/rector.php
new file mode 100644
index 00000000..c156f125
--- /dev/null
+++ b/rector.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Set\ValueObject\SetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // get parameters
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PATHS, [
+        __DIR__ . '/src'
+    ]);
+
+    // Define what rule sets will be applied
+    $containerConfigurator->import(SetList::PHP_73);
+    $containerConfigurator->import(SetList::PHP_74);
+    $containerConfigurator->import(SetList::PHP_80);
+    $containerConfigurator->import(SetList::PHP_81);
+
+    // get services (needed for register a single rule)
+    // $services = $containerConfigurator->services();
+
+    // register a single rule
+    // $services->set(TypedPropertyRector::class);
+};

From b669d8c22c4af75a6ef67a6335bf1c047b81467c Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 15:51:02 +0100
Subject: [PATCH 396/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 rector.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rector.php b/rector.php
index c156f125..cae6fba3 100644
--- a/rector.php
+++ b/rector.php
@@ -15,8 +15,6 @@
     ]);
 
     // Define what rule sets will be applied
-    $containerConfigurator->import(SetList::PHP_73);
-    $containerConfigurator->import(SetList::PHP_74);
     $containerConfigurator->import(SetList::PHP_80);
     $containerConfigurator->import(SetList::PHP_81);
 

From 372da919ecda7a7e2f277590f61266506596020d Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 16:07:37 +0100
Subject: [PATCH 397/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 .github/workflows/php.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 00f2bcbc..9f9e1496 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -58,9 +58,6 @@ jobs:
 
     - name: Run framework suite
       run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
-    
-    - name: Run rector
-      run: vendor/bin/rector process . --dry-run
 
   js:
     runs-on: ubuntu-latest
@@ -79,3 +76,11 @@ jobs:
 
       - name: Run ESLint
         run: npm run eslint -- eslint/rules
+
+  rector:
+    runs-on: ubuntu-latest
+    name: Rector tests
+    
+    steps:
+      - name: Run rector
+        run: vendor/bin/rector process . --dry-run

From 503878b47656843bd8cd677230e20acdc46ef67f Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 16:22:58 +0100
Subject: [PATCH 398/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 .github/workflows/php.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9f9e1496..fdfff385 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -82,5 +82,15 @@ jobs:
     name: Rector tests
     
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: composer install  
+            
       - name: Run rector
         run: vendor/bin/rector process . --dry-run

From 7059a4b6bd29e247f7615e22c7ce5eb5727893f7 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 16 Nov 2021 16:25:06 +0100
Subject: [PATCH 399/630] AC-1059: Move PHPCompatibility rules from Magento
 tests

---
 Magento2/ruleset.xml                          |  12 +-
 ...ionalToRequiredFunctionParametersSniff.php | 270 ----------
 ...uiredToOptionalFunctionParametersSniff.php | 485 ------------------
 PHPCompatibilityMagento/ruleset.xml           |  23 -
 composer.json                                 |   8 +-
 composer.lock                                 |   2 +-
 6 files changed, 6 insertions(+), 794 deletions(-)
 delete mode 100644 PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php
 delete mode 100644 PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php
 delete mode 100644 PHPCompatibilityMagento/ruleset.xml

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index bc732d71..b6b9ab27 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -737,17 +737,7 @@
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
-    <rule ref="../vendor/phpcompatibility/php-compatibility/PHPCompatibility">
+    <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
-        <exclude name="PHPCompatibility.FunctionUse.RequiredToOptionalFunctionParameters" />
-        <exclude name="PHPCompatibility.ParameterValues.RemovedPCREModifiers" />
-        <exclude name="PHPCompatibility.InitialValue.NewConstantScalarExpressions" />
     </rule>
-    <!--
-    These sniffs are copied from latest development version of PHPCompatibility, and are included here due to  bug
-    in version 9.3 of PHPCompatibility. Once version 10 is released, this hack must me removed.
-
-    See https://github.com/PHPCompatibility/PHPCompatibility/issues/793 form more information
-    -->
-    <rule ref="../PHPCompatibilityMagento/Sniffs/FunctionUse" />
 </ruleset>
diff --git a/PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php b/PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php
deleted file mode 100644
index cee82cae..00000000
--- a/PHPCompatibilityMagento/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibilityMagento\Sniffs\FunctionUse;
-
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Detect missing required function parameters in calls to native PHP functions.
- *
- * Specifically when those function parameters used to be optional in older PHP versions.
- *
- * PHP version All
- *
- * @link https://www.php.net/manual/en/doc.changelog.php
- *
- * @since 8.1.0
- * @since 9.0.0  Renamed from `OptionalRequiredFunctionParametersSniff` to `OptionalToRequiredFunctionParametersSniff`.
- * @since 10.0.0 Now extends the base `AbstractFunctionCallParameterSniff` class.
- *               Previously the sniff extended the sister-sniff `RequiredToOptionalFunctionParametersSniff`.
- *               Methods which were previously required due to the extending of the (grand-parent)
- *               `AbstractComplexVersionSniff` have been removed.
- */
-class OptionalToRequiredFunctionParametersSniff extends AbstractFunctionCallParameterSniff
-{
-
-    /**
-     * A list of function parameters, which were optional in older versions and became required later on.
-     *
-     * The array lists : version number with true (required) and false (optional use deprecated).
-     *
-     * The index is the location of the parameter in the parameter list, starting at 0 !
-     * If's sufficient to list the last version in which the parameter was not yet required.
-     *
-     * @since 8.1.0
-     * @since 10.0.0 Parameter renamed from `$functionParameters` to `$targetFunctions` for
-     *               compatibility with the `AbstractFunctionCallParameterSniff` class.
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'crypt' => [
-            1 => [
-                'name' => 'salt',
-                '5.6'  => false,
-                '8.0'  => true,
-            ],
-        ],
-        'gmmktime' => [
-            1 => [
-                'name' => 'hour',
-                '8.0'  => true,
-            ],
-        ],
-        'mb_parse_str' => [
-            1 => [
-                'name' => 'result',
-                '8.0'  => true,
-            ],
-        ],
-        'mktime' => [
-            0 => [
-                'name' => 'hour',
-                '5.1'  => false,
-                '8.0'  => true,
-            ],
-        ],
-        'openssl_seal' => [
-            4 => [
-                'name' => 'method',
-                '8.0'  => true,
-            ],
-        ],
-        'openssl_open' => [
-            4 => [
-                'name' => 'method',
-                '8.0'  => true,
-            ],
-        ],
-        'parse_str' => [
-            1 => [
-                'name' => 'result',
-                '7.2'  => false,
-                '8.0'  => true,
-            ],
-        ],
-    ];
-
-
-    /**
-     * Bowing out early is not applicable to this sniff.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return false;
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0 Part of the logic in this method was previously contained in the
-     *               parent sniff `process()` method (now removed).
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        $functionLc           = \strtolower($functionName);
-        $parameterCount       = \count($parameters);
-        $parameterOffsetFound = $parameterCount - 1;
-
-        foreach ($this->targetFunctions[$functionLc] as $offset => $parameterDetails) {
-            if ($offset > $parameterOffsetFound) {
-                $itemInfo = [
-                    'name'   => $functionName,
-                    'nameLc' => $functionLc,
-                    'offset' => $offset,
-                ];
-                $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-            }
-        }
-    }
-
-    /**
-     * Process the function if no parameters were found.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
-    {
-        $this->processParameters($phpcsFile, $stackPtr, $functionName, []);
-    }
-
-    /**
-     * Retrieve the relevant detail (version) information for use in an error message.
-     *
-     * @since 8.1.0
-     * @since 10.0.0 - Method renamed from `getErrorInfo()` to `getVersionInfo().
-     *               - Second function parameter `$itemInfo` removed.
-     *               - Method visibility changed from `public` to `protected`.
-     *
-     * @param array $itemArray Version and other information about the item.
-     *
-     * @return array
-     */
-    protected function getVersionInfo(array $itemArray)
-    {
-        $versionInfo = [
-            'optionalDeprecated' => '',
-            'optionalRemoved'    => '',
-            'error'              => false,
-        ];
-
-        foreach ($itemArray as $version => $required) {
-            if (\preg_match('`^\d\.\d(\.\d{1,2})?$`', $version) !== 1) {
-                // Not a version key.
-                continue;
-            }
-
-            if ($this->supportsAbove($version) === true) {
-                if ($required === true && $versionInfo['optionalRemoved'] === '') {
-                    $versionInfo['optionalRemoved'] = $version;
-                    $versionInfo['error']           = true;
-                } elseif ($versionInfo['optionalDeprecated'] === '') {
-                    $versionInfo['optionalDeprecated'] = $version;
-                }
-            }
-        }
-
-        return $versionInfo;
-    }
-
-    /**
-     * Handle the retrieval of relevant information and - if necessary - throwing of an
-     * error for a matched item.
-     *
-     * @since 10.0.0 This was previously handled via a similar method in the `AbstractComplexVersionSniff`.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the relevant token in
-     *                                               the stack.
-     * @param array                       $itemInfo  Base information about the item.
-     *
-     * @return void
-     */
-    protected function handleFeature(File $phpcsFile, $stackPtr, array $itemInfo)
-    {
-        $itemArray   = $this->targetFunctions[$itemInfo['nameLc']][$itemInfo['offset']];
-        $versionInfo = $this->getVersionInfo($itemArray);
-
-        if (empty($versionInfo['optionalDeprecated']) && empty($versionInfo['optionalRemoved'])) {
-            return;
-        }
-
-        $this->addError($phpcsFile, $stackPtr, $itemInfo, $itemArray, $versionInfo);
-    }
-
-    /**
-     * Generates the error or warning for this item.
-     *
-     * @since 8.1.0
-     * @since 10.0.0 - Method visibility changed from `public` to `protected`.
-     *               - Introduced $itemArray parameter.
-     *               - Renamed the last parameter from `$errorInfo` to `$versionInfo`.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
-     * @param int                         $stackPtr    The position of the relevant token in
-     *                                                 the stack.
-     * @param array                       $itemInfo    Base information about the item.
-     * @param array                       $itemArray   The sub-array with all the details about
-     *                                                 this item.
-     * @param array                       $versionInfo Array with detail (version) information
-     *                                                 relevant to the item.
-     *
-     * @return void
-     */
-    protected function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $itemArray, array $versionInfo)
-    {
-        $error      = 'The "%s" parameter for function %s() is missing. Passing this parameter is no longer optional. The optional nature of the parameter is ';
-        $errorCode  = $this->stringToErrorCode($itemInfo['name'] . '_' . $itemArray['name']);
-        $codeSuffix = '';
-        $data       = [
-            $itemArray['name'],
-            $itemInfo['name'],
-        ];
-
-        if ($versionInfo['optionalDeprecated'] !== '') {
-            $error     .= 'deprecated since PHP %s and ';
-            $codeSuffix = 'Soft';
-            $data[]     = $versionInfo['optionalDeprecated'];
-        }
-
-        if ($versionInfo['optionalRemoved'] !== '') {
-            $error     .= 'removed since PHP %s and ';
-            $codeSuffix = 'Hard';
-            $data[]     = $versionInfo['optionalRemoved'];
-        }
-
-        // Remove the last 'and' from the message.
-        $error      = \substr($error, 0, (\strlen($error) - 5));
-        $errorCode .= $codeSuffix . 'Required';
-
-        $this->addMessage($phpcsFile, $error, $stackPtr, $versionInfo['error'], $errorCode, $data);
-    }
-}
\ No newline at end of file
diff --git a/PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php b/PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php
deleted file mode 100644
index f4755bab..00000000
--- a/PHPCompatibilityMagento/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibilityMagento\Sniffs\FunctionUse;
-
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Detect missing required function parameters in calls to native PHP functions.
- *
- * Specifically when those function parameters are no longer required in more recent PHP versions.
- *
- * PHP version All
- *
- * @link https://www.php.net/manual/en/doc.changelog.php
- *
- * @since 7.0.3
- * @since 7.1.0  Now extends the `AbstractComplexVersionSniff` instead of the base `Sniff` class.
- * @since 9.0.0  Renamed from `RequiredOptionalFunctionParametersSniff` to `RequiredToOptionalFunctionParametersSniff`.
- * @since 10.0.0 Now extends the base `AbstractFunctionCallParameterSniff` class.
- *               Methods which were previously required due to the extending of the `AbstractComplexVersionSniff`
- *               have been removed.
- */
-class RequiredToOptionalFunctionParametersSniff extends AbstractFunctionCallParameterSniff
-{
-
-    /**
-     * A list of function parameters, which were required in older versions and became optional later on.
-     *
-     * The array lists : version number with true (required) and false (optional).
-     *
-     * The index is the location of the parameter in the parameter list, starting at 0 !
-     * If's sufficient to list the last version in which the parameter was still required.
-     *
-     * @since 7.0.3
-     * @since 10.0.0 Parameter renamed from `$functionParameters` to `$targetFunctions` for
-     *               compatibility with the `AbstractFunctionCallParameterSniff` class.
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'array_diff_assoc' => [
-            1 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_diff_key' => [
-            1 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_diff_uassoc' => [
-            /*
-             * $array2 is actually at position 1, but has another required parameter after it,
-             * so we need to detect on the last parameter.
-             */
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_diff_ukey' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_diff' => [
-            1 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_intersect_assoc' => [
-            1 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_intersect_key' => [
-            1 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_intersect_uassoc' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_intersect_ukey' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_intersect' => [
-            1 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_merge' => [
-            0 => [
-                'name' => 'array(s) to merge',
-                '7.3'  => true,
-                '7.4'  => false,
-            ],
-        ],
-        'array_merge_recursive' => [
-            0 => [
-                'name' => 'array(s) to merge',
-                '7.3'  => true,
-                '7.4'  => false,
-            ],
-        ],
-        'array_push' => [
-            1 => [
-                'name' => 'element to push',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'array_udiff_assoc' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_udiff_uassoc' => [
-            // Note from array_diff_uassoc applies here too.
-            3 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_udiff' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_uintersect_assoc' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_uintersect_uassoc' => [
-            // Note from array_diff_uassoc applies here too.
-            3 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_uintersect' => [
-            // Note from array_diff_uassoc applies here too.
-            2 => [
-                'name' => 'array2',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'array_unshift' => [
-            1 => [
-                'name' => 'element to prepend',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'bcscale' => [
-            0 => [
-                'name' => 'scale',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'fgetcsv' => [
-            1 => [
-                'name' => 'length',
-                '5.0'  => true,
-                '5.1'  => false,
-            ],
-        ],
-        'ftp_fget' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_fput' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_get' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_nb_fget' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_nb_fput' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_nb_get' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_nb_put' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'ftp_put' => [
-            3 => [
-                'name' => 'mode',
-                '7.2'  => true,
-                '7.3'  => false,
-            ],
-        ],
-        'getenv' => [
-            0 => [
-                'name' => 'varname',
-                '7.0'  => true,
-                '7.1'  => false,
-            ],
-        ],
-        'imagepolygon' => [
-            /*
-             * $num_points is actually at position 2, but has another required parameter after it,
-             * so we need to detect on the last parameter.
-             */
-            3 => [
-                'name' => 'num_points',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'imageopenpolygon' => [
-            // Note from imagepolygon applies here too.
-            3 => [
-                'name' => 'num_points',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'imagefilledpolygon' => [
-            // Note from imagepolygon applies here too.
-            3 => [
-                'name' => 'num_points',
-                '7.4'  => true,
-                '8.0'  => false,
-            ],
-        ],
-        'preg_match_all' => [
-            2 => [
-                'name' => 'matches',
-                '5.3'  => true,
-                '5.4'  => false,
-            ],
-        ],
-        'stream_socket_enable_crypto' => [
-            2 => [
-                'name' => 'crypto_type',
-                '5.5'  => true,
-                '5.6'  => false,
-            ],
-        ],
-        'xmlwriter_write_element' => [
-            2 => [
-                'name'  => 'content',
-                '5.2.2' => true,
-                '5.2.3' => false,
-            ],
-        ],
-        'xmlwriter_write_element_ns' => [
-            4 => [
-                'name'  => 'content',
-                '5.2.2' => true,
-                '5.2.3' => false,
-            ],
-        ],
-    ];
-
-
-    /**
-     * Bowing out early is not applicable to this sniff.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return false;
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0 Part of the logic in this method was previously contained in the
-     *               `process()` method (now removed).
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return void
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        $functionLc           = \strtolower($functionName);
-        $parameterCount       = \count($parameters);
-        $parameterOffsetFound = $parameterCount - 1;
-
-        foreach ($this->targetFunctions[$functionLc] as $offset => $parameterDetails) {
-            if ($offset > $parameterOffsetFound) {
-                $itemInfo = [
-                    'name'   => $functionName,
-                    'nameLc' => $functionLc,
-                    'offset' => $offset,
-                ];
-                $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-            }
-        }
-    }
-
-    /**
-     * Process the function if no parameters were found.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     *
-     * @return void
-     */
-    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
-    {
-        $this->processParameters($phpcsFile, $stackPtr, $functionName, []);
-    }
-
-    /**
-     * Retrieve the relevant detail (version) information for use in an error message.
-     *
-     * @since 7.1.0
-     * @since 10.0.0 - Method renamed from `getErrorInfo()` to `getVersionInfo().
-     *               - Second function parameter `$itemInfo` removed.
-     *               - Method visibility changed from `public` to `protected`.
-     *
-     * @param array $itemArray Version and other information about the item.
-     *
-     * @return array
-     */
-    protected function getVersionInfo(array $itemArray)
-    {
-        $versionInfo = [
-            'requiredVersion' => '',
-        ];
-
-        foreach ($itemArray as $version => $required) {
-            if (\preg_match('`^\d\.\d(\.\d{1,2})?$`', $version) !== 1) {
-                // Not a version key.
-                continue;
-            }
-
-            if ($required === true && $this->supportsBelow($version) === true) {
-                $versionInfo['requiredVersion'] = $version;
-            }
-        }
-
-        return $versionInfo;
-    }
-
-    /**
-     * Handle the retrieval of relevant information and - if necessary - throwing of an
-     * error for a matched item.
-     *
-     * @since 10.0.0 This was previously handled via a similar method in the `AbstractComplexVersionSniff`.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the relevant token in
-     *                                               the stack.
-     * @param array                       $itemInfo  Base information about the item.
-     *
-     * @return void
-     */
-    protected function handleFeature(File $phpcsFile, $stackPtr, array $itemInfo)
-    {
-        $itemArray   = $this->targetFunctions[$itemInfo['nameLc']][$itemInfo['offset']];
-        $versionInfo = $this->getVersionInfo($itemArray);
-
-        if (empty($versionInfo['requiredVersion'])) {
-            return;
-        }
-
-        $this->addError($phpcsFile, $stackPtr, $itemInfo, $itemArray, $versionInfo);
-    }
-
-    /**
-     * Generates the error for this item.
-     *
-     * @since 7.1.0
-     * @since 10.0.0 - Method visibility changed from `public` to `protected`.
-     *               - Introduced $itemArray parameter.
-     *               - Renamed the last parameter from `$errorInfo` to `$versionInfo`.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
-     * @param int                         $stackPtr    The position of the relevant token in
-     *                                                 the stack.
-     * @param array                       $itemInfo    Base information about the item.
-     * @param array                       $itemArray   The sub-array with all the details about
-     *                                                 this item.
-     * @param array                       $versionInfo Array with detail (version) information
-     *                                                 relevant to the item.
-     *
-     * @return void
-     */
-    protected function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $itemArray, array $versionInfo)
-    {
-        $error     = 'The "%s" parameter for function %s() is missing, but was required for PHP version %s and lower';
-        $errorCode = $this->stringToErrorCode($itemInfo['name'] . '_' . $itemArray['name']) . 'Missing';
-        $data      = [
-            $itemArray['name'],
-            $itemInfo['name'],
-            $versionInfo['requiredVersion'],
-        ];
-
-        $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
-    }
-}
\ No newline at end of file
diff --git a/PHPCompatibilityMagento/ruleset.xml b/PHPCompatibilityMagento/ruleset.xml
deleted file mode 100644
index 601ae60c..00000000
--- a/PHPCompatibilityMagento/ruleset.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<ruleset name="PHPCompatibilityMagento">
-    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
-    <rule ref="../vendor/phpcompatibility/php-compatibility/PHPCompatibility">
-        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
-        <exclude name="PHPCompatibility.FunctionUse.RequiredToOptionalFunctionParameters" />
-        <exclude name="PHPCompatibility.ParameterValues.RemovedPCREModifiers" />
-        <exclude name="PHPCompatibility.InitialValue.NewConstantScalarExpressions" />
-    </rule>
-    <!--
-    These sniffs are copied from latest development version of PHPCompatibility, and are included here due to  bug
-    in version 9.3 of PHPCompatibility. Once version 10 is released, this hack must me removed.
-
-    See https://github.com/PHPCompatibility/PHPCompatibility/issues/793 form more information
-    -->
-    <rule ref="./Sniffs/FunctionUse" />
-</ruleset>
diff --git a/composer.json b/composer.json
index cf6dd7e4..3ad22f70 100644
--- a/composer.json
+++ b/composer.json
@@ -9,11 +9,11 @@
     "version": "15",
     "require": {
         "php": ">=7.3",
-        "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
         "ext-dom": "*",
-        "phpcompatibility/php-compatibility": "^9.3"
+        "phpcompatibility/php-compatibility": "^9.3",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
@@ -33,7 +33,7 @@
         }
     },
     "scripts": {
-        "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..",
-        "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../.."
+        "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility",
+        "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility"
     }
 }
diff --git a/composer.lock b/composer.lock
index 46bc7eca..47559dbd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a726e6e7caa0f654b55b3a78d8ea170b",
+    "content-hash": "2e8abe33e655572c04bb6cdc53f88626",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",

From 01e243e228e4659aba438f52deb4c8380389b1aa Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 16:25:53 +0100
Subject: [PATCH 400/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 .github/workflows/php.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index fdfff385..7d676673 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -58,7 +58,6 @@ jobs:
 
     - name: Run framework suite
       run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
-
   js:
     runs-on: ubuntu-latest
     name: Javascript tests
@@ -76,7 +75,6 @@ jobs:
 
       - name: Run ESLint
         run: npm run eslint -- eslint/rules
-
   rector:
     runs-on: ubuntu-latest
     name: Rector tests

From cda190fcd03333274dd3880c189c251777b2ea0a Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 16 Nov 2021 17:00:26 +0100
Subject: [PATCH 401/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 .github/workflows/php.yml | 2 +-
 rector.php                | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 7d676673..9caefb77 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -91,4 +91,4 @@ jobs:
         run: composer install  
             
       - name: Run rector
-        run: vendor/bin/rector process . --dry-run
+        run: vendor/bin/rector process --dry-run
diff --git a/rector.php b/rector.php
index cae6fba3..10dff94c 100644
--- a/rector.php
+++ b/rector.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Core\Configuration\Option;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Core\ValueObject\PhpVersion;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -11,8 +11,11 @@
     // get parameters
     $parameters = $containerConfigurator->parameters();
     $parameters->set(Option::PATHS, [
-        __DIR__ . '/src'
+        __DIR__ . '/Magento2',
+        __DIR__ . '/Magento2Framework',
+        __DIR__ . '/PHP_CodeSniffer',
     ]);
+    $parameters->set(Option::BOOTSTRAP_FILES, [__DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php']);
 
     // Define what rule sets will be applied
     $containerConfigurator->import(SetList::PHP_80);

From a4595dfde20da30f446cf5532e12b47136628abb Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 17 Nov 2021 10:30:17 +0100
Subject: [PATCH 402/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 rector.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rector.php b/rector.php
index 10dff94c..3350f685 100644
--- a/rector.php
+++ b/rector.php
@@ -17,6 +17,9 @@
     ]);
     $parameters->set(Option::BOOTSTRAP_FILES, [__DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php']);
 
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
+
     // Define what rule sets will be applied
     $containerConfigurator->import(SetList::PHP_80);
     $containerConfigurator->import(SetList::PHP_81);

From f7fdb0278f44166d305a0a6fb0f895a948524911 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Wed, 17 Nov 2021 10:35:30 +0100
Subject: [PATCH 403/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 rector.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rector.php b/rector.php
index 3350f685..10dff94c 100644
--- a/rector.php
+++ b/rector.php
@@ -17,9 +17,6 @@
     ]);
     $parameters->set(Option::BOOTSTRAP_FILES, [__DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php']);
 
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
-
     // Define what rule sets will be applied
     $containerConfigurator->import(SetList::PHP_80);
     $containerConfigurator->import(SetList::PHP_81);

From a18b7f2a5be7209d0cd0895e8844b9e7fd5ee565 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 18 Nov 2021 12:13:12 +0100
Subject: [PATCH 404/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard

---
 rector.php | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/rector.php b/rector.php
index 10dff94c..83195b31 100644
--- a/rector.php
+++ b/rector.php
@@ -4,6 +4,23 @@
 
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
+use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
+use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
+use Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector;
+use Rector\Php80\Rector\FuncCall\TokenGetAllToObjectRector;
+use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
+use Rector\Php80\Rector\Identical\StrEndsWithRector;
+use Rector\Php80\Rector\Identical\StrStartsWithRector;
+use Rector\Php80\Rector\NotIdentical\StrContainsRector;
+use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
+use Rector\Php80\Rector\Ternary\GetDebugTypeRector;
+use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
+use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
+use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
+use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
+use Rector\Php81\Rector\FunctionLike\IntersectionTypesRector;
+use Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -13,10 +30,33 @@
     $parameters->set(Option::PATHS, [
         __DIR__ . '/Magento2',
         __DIR__ . '/Magento2Framework',
-        __DIR__ . '/PHP_CodeSniffer',
+        __DIR__ . '/PHP_CodeSniffer'
     ]);
     $parameters->set(Option::BOOTSTRAP_FILES, [__DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php']);
 
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
+    
+    $parameters->set(Option::SKIP, [
+        ReadOnlyPropertyRector::class, 
+        StrContainsRector::class,
+        UnionTypesRector::class,
+        StrStartsWithRector::class,
+        StrEndsWithRector::class,
+        FinalizePublicClassConstantRector::class,
+        RemoveUnusedVariableInCatchRector::class,
+        ClassOnObjectRector::class,
+        Php8ResourceReturnToObjectRector::class,
+        TokenGetAllToObjectRector::class,
+        GetDebugTypeRector::class,
+        ChangeSwitchToMatchRector::class,
+        NewInInitializerRector::class,
+        IntersectionTypesRector::class,
+        MyCLabsMethodCallToEnumConstRector::class,
+        MyCLabsClassToEnumRector::class,
+        SpatieEnumClassToEnumRector::class
+    ]);
+
     // Define what rule sets will be applied
     $containerConfigurator->import(SetList::PHP_80);
     $containerConfigurator->import(SetList::PHP_81);

From 18ff789bcd7843be66e895ef6d280b97bbec10b0 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 18 Nov 2021 15:12:02 +0100
Subject: [PATCH 405/630] Fix unit tests

---
 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
index 7cd23950..62f48e35 100644
--- a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
@@ -22,11 +22,13 @@ public function getErrorList(): array
      */
     public function getWarningList($testFile = ''): array
     {
-        if ($testFile === 'CopyrightGraphQLUnitTest.1.inc' || $testFile === 'CopyrightGraphQLUnitTest.2.inc') {
+        if ($testFile === 'CopyrightGraphQLUnitTest.1.graphqls' || 
+            $testFile === 'CopyrightGraphQLUnitTest.2.graphqls') {
             return [];
         }
 
-        if ($testFile === 'CopyrightGraphQLUnitTest.3.inc' || $testFile === 'CopyrightGraphQLUnitTest.4.inc') {
+        if ($testFile === 'CopyrightGraphQLUnitTest.3.graphqls' || 
+            $testFile === 'CopyrightGraphQLUnitTest.4.graphqls') {
             return [
                 1 => 1
             ];

From b485a41063c846ec24017276d5f8242282f51e4d Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 18 Nov 2021 15:17:17 +0100
Subject: [PATCH 406/630] Fix unit tests

---
 Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
index 62f48e35..485e91f1 100644
--- a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
@@ -30,7 +30,7 @@ public function getWarningList($testFile = ''): array
         if ($testFile === 'CopyrightGraphQLUnitTest.3.graphqls' || 
             $testFile === 'CopyrightGraphQLUnitTest.4.graphqls') {
             return [
-                1 => 1
+                null => 1
             ];
         }
 

From 168882eac64fa22a717bd3a138f4856450ee66bf Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 18 Nov 2021 16:51:43 +0100
Subject: [PATCH 407/630] AC-1059: Added minimal supported PHP version to
 PHPCompatibility

---
 Magento2/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index b6b9ab27..6cf906ec 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -739,5 +739,7 @@
     </rule>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+        <!-- Check for cross-version support for stated PHP version and higher. -->
+        <config name="testVersion" value="7.4-"/>
     </rule>
 </ruleset>

From 39de3e6663f76ac38ec7b576cfb0551eb24bb21b Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Fri, 19 Nov 2021 01:19:44 -0800
Subject: [PATCH 408/630] [Imported] AC-1059: Move PHPCompatibility rules from
 Magento tests (#122)

* AC-1059: Move PHPCompatibility rules from Magento tests
---
 Magento2/ruleset.xml |  5 +++
 composer.json        |  9 +++--
 composer.lock        | 90 +++++++++++++++++++++++++++++++++++++-------
 3 files changed, 86 insertions(+), 18 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5b03a4c6..daeef23f 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -741,4 +741,9 @@
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+    <rule ref="PHPCompatibility">
+        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+        <!-- Check for cross-version support for stated PHP version and higher. -->
+        <config name="testVersion" value="7.4-"/>
+    </rule>
 </ruleset>
diff --git a/composer.json b/composer.json
index 36a71bbf..3ad22f70 100644
--- a/composer.json
+++ b/composer.json
@@ -9,10 +9,11 @@
     "version": "15",
     "require": {
         "php": ">=7.3",
-        "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
-        "ext-dom": "*"
+        "ext-dom": "*",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
@@ -32,7 +33,7 @@
         }
     },
     "scripts": {
-        "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..",
-        "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../.."
+        "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility",
+        "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility"
     }
 }
diff --git a/composer.lock b/composer.lock
index 8346f504..47559dbd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,70 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ccc9b708a197fb981876af4623ec26a3",
+    "content-hash": "2e8abe33e655572c04bb6cdc53f88626",
     "packages": [
+        {
+            "name": "phpcompatibility/php-compatibility",
+            "version": "9.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
+            "time": "2019-12-27T09:44:58+00:00"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.6.1",
@@ -64,16 +126,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.0",
+            "version": "v14.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "d191b0c34365c025c6cd953b5a63aa62946c7060"
+                "reference": "8f3e584335696c2eb8d307019f0afdff64fc0e35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d191b0c34365c025c6cd953b5a63aa62946c7060",
-                "reference": "d191b0c34365c025c6cd953b5a63aa62946c7060",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/8f3e584335696c2eb8d307019f0afdff64fc0e35",
+                "reference": "8f3e584335696c2eb8d307019f0afdff64fc0e35",
                 "shasum": ""
             },
             "require": {
@@ -118,7 +180,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.0"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.1"
             },
             "funding": [
                 {
@@ -126,7 +188,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-10-29T13:08:08+00:00"
+            "time": "2021-11-15T10:25:57+00:00"
         }
     ],
     "packages-dev": [
@@ -1501,16 +1563,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
@@ -1559,14 +1621,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1574,7 +1636,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",

From eca701cd157589101bf91ef08367cfaf835a8b38 Mon Sep 17 00:00:00 2001
From: Karyna <k.tsymbal@atwix.com>
Date: Fri, 19 Nov 2021 12:54:03 +0100
Subject: [PATCH 409/630] Fix Comment block is missing Failure when Attribute
 is present after docblock

---
 .../Sniffs/Annotation/MethodArgumentsSniff.php   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
index cf483356..27ac0dfd 100644
--- a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -70,7 +70,23 @@ private function isTokenBeforeClosingCommentTagValid(string $type): bool
     private function validateCommentBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr): bool
     {
         $tokens = $phpcsFile->getTokens();
+        $attributeFlag = false;
         for ($tempPtr = $previousCommentClosePtr + 1; $tempPtr < $stackPtr; $tempPtr++) {
+            $tokenCode = $tokens[$tempPtr]['code'];
+
+            // Ignore attributes e.g. #[\ReturnTypeWillChange]
+            if ($tokenCode === T_ATTRIBUTE_END) {
+                $attributeFlag = false;
+                continue;
+            }
+            if ($attributeFlag) {
+                continue;
+            }
+            if ($tokenCode === T_ATTRIBUTE) {
+                $attributeFlag = true;
+                continue;
+            }
+
             if (!$this->isTokenBeforeClosingCommentTagValid($tokens[$tempPtr]['type'])) {
                 return false;
             }

From 77885d7f5a302bc4bfee46dc9b61805635d769e0 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 19 Nov 2021 13:07:59 +0000
Subject: [PATCH 410/630] Fixed AutogeneratedClassNotInConstructorSniff for
 specific code constructions

---
 .../PHP/AutogeneratedClassNotInConstructorSniff.php   | 11 +++++++----
 ...togeneratedClassNotInConstructorUnitTest.2.php.inc |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 0b397523..6b074a2e 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -47,10 +47,13 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if (!isset($tokens[$stackPtr + 4]) || $tokens[$stackPtr + 4]['code'] !== T_SEMICOLON) {
-            $this->validateRequestedClass(
-                $phpcsFile,
-                $phpcsFile->findNext(T_OBJECT_OPERATOR, $stackPtr)
-            );
+            $arrowPosition = $phpcsFile->findNext(T_OBJECT_OPERATOR, $stackPtr);
+            if ($arrowPosition !== false) {
+                $this->validateRequestedClass(
+                    $phpcsFile,
+                    $arrowPosition
+                );
+            }
             return;
         }
 
diff --git a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
index 0e474247..f8e57de8 100644
--- a/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
+++ b/Magento2/Tests/PHP/AutogeneratedClassNotInConstructorUnitTest.2.php.inc
@@ -36,5 +36,10 @@ class Bad
         ObjectManager::getInstance()
             ->get(\Full\Class\NameFactory::class);
     }
+
+    private function foo(): void
+    {
+        ObjectManager::getInstance() ;
+    }
 }
 

From a5ad00bc074bf7d9c88a172970cff5b2c4dce3a5 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Fri, 19 Nov 2021 14:30:49 +0100
Subject: [PATCH 411/630] AC-1740

---
 composer.json |   3 +-
 composer.lock | 126 +-------------------------------------------------
 2 files changed, 2 insertions(+), 127 deletions(-)

diff --git a/composer.json b/composer.json
index a913150c..36a71bbf 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,7 @@
         "squizlabs/php_codesniffer": "^3.6",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
-        "ext-dom": "*",
-        "rector/rector": "^0.12.4"
+        "ext-dom": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index d7cbfb9d..8346f504 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,132 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d86f5662d65e6586d8e61e5e0aad77c0",
+    "content-hash": "ccc9b708a197fb981876af4623ec26a3",
     "packages": [
-        {
-            "name": "phpstan/phpstan",
-            "version": "1.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "bcea0ae85868a89d5789c75f012c93129f842934"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bcea0ae85868a89d5789c75f012c93129f842934",
-                "reference": "bcea0ae85868a89d5789c75f012c93129f842934",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1|^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan-shim": "*"
-            },
-            "bin": [
-                "phpstan",
-                "phpstan.phar"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPStan - PHP Static Analysis Tool",
-            "support": {
-                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.1.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ondrejmirtes",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/phpstan",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-11-09T12:41:09+00:00"
-        },
-        {
-            "name": "rector/rector",
-            "version": "0.12.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
-                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1|^8.0",
-                "phpstan/phpstan": "^1.1.1"
-            },
-            "conflict": {
-                "phpstan/phpdoc-parser": "<1.2",
-                "rector/rector-cakephp": "*",
-                "rector/rector-doctrine": "*",
-                "rector/rector-laravel": "*",
-                "rector/rector-nette": "*",
-                "rector/rector-phpoffice": "*",
-                "rector/rector-phpunit": "*",
-                "rector/rector-prefixed": "*",
-                "rector/rector-symfony": "*"
-            },
-            "bin": [
-                "bin/rector"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "0.12-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Prefixed and PHP 7.1 downgraded version of rector/rector",
-            "support": {
-                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/tomasvotruba",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-11-15T14:06:50+00:00"
-        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.6.1",

From 5ebccb08c840c011d9c21863ae1b0caa8e35e9dd Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Fri, 19 Nov 2021 14:33:07 +0100
Subject: [PATCH 412/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard and run it as part of the GitHub actions

---
 composer.json |   3 +-
 composer.lock | 126 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3ad22f70..9b59a792 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
         "ext-simplexml": "*",
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
-        "squizlabs/php_codesniffer": "^3.6"
+        "squizlabs/php_codesniffer": "^3.6",
+        "rector/rector": "^0.12.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 47559dbd..0e07e918 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2e8abe33e655572c04bb6cdc53f88626",
+    "content-hash": "61cf9451f97627aeb7908e83b51a1d82",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -68,6 +68,130 @@
             },
             "time": "2019-12-27T09:44:58+00:00"
         },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
+                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-11-18T14:09:01+00:00"
+        },
+        {
+            "name": "rector/rector",
+            "version": "0.12.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/rector.git",
+                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
+                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0",
+                "phpstan/phpstan": "^1.1.1"
+            },
+            "conflict": {
+                "phpstan/phpdoc-parser": "<1.2",
+                "rector/rector-cakephp": "*",
+                "rector/rector-doctrine": "*",
+                "rector/rector-laravel": "*",
+                "rector/rector-nette": "*",
+                "rector/rector-phpoffice": "*",
+                "rector/rector-phpunit": "*",
+                "rector/rector-prefixed": "*",
+                "rector/rector-symfony": "*"
+            },
+            "bin": [
+                "bin/rector"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Prefixed and PHP 7.1 downgraded version of rector/rector",
+            "support": {
+                "issues": "https://github.com/rectorphp/rector/issues",
+                "source": "https://github.com/rectorphp/rector/tree/0.12.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-11-15T14:06:50+00:00"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.6.1",

From 29970d6c268fac5d36440ad06a43d363d2e249bc Mon Sep 17 00:00:00 2001
From: Karyna <k.tsymbal@atwix.com>
Date: Fri, 19 Nov 2021 14:39:35 +0100
Subject: [PATCH 413/630] Add test cases for attributes fix

---
 .../Annotation/MethodArgumentsUnitTest.inc     | 18 ++++++++++++++++++
 .../Annotation/MethodArgumentsUnitTest.php     |  1 +
 2 files changed, 19 insertions(+)

diff --git a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
index 7add3ae9..6694c8cc 100644
--- a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc
@@ -33,3 +33,21 @@ public function invalidDocBlockShouldNotCauseFatalErrorInSniff(int $number): int
 {
     return $number;
 }
+
+/**
+ * Short description.
+ *
+ * @param string $text
+ * @return string
+ */
+#[\ReturnTypeWillChange]
+public function methodWithAttributeAndValidDocblock(string $text): string
+{
+    return $text;
+}
+
+#[\ReturnTypeWillChange]
+public function methodWithAttributeAndWithoutDocblock(string $text): string
+{
+    return $text;
+}
diff --git a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
index 86854e83..b47c4159 100644
--- a/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
+++ b/Magento2/Tests/Annotation/MethodArgumentsUnitTest.php
@@ -18,6 +18,7 @@ public function getErrorList()
             12 => 1,
             21 => 1,
             32 => 1,
+            50 => 1
         ];
     }
 

From d463a5aebf3b928da12a1ec6dd2721dedebd2930 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Fri, 19 Nov 2021 15:23:26 +0100
Subject: [PATCH 414/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard and run it as part of the GitHub actions

---
 rector.php | 55 +++++++++++-------------------------------------------
 1 file changed, 11 insertions(+), 44 deletions(-)

diff --git a/rector.php b/rector.php
index 83195b31..7ed6d2fe 100644
--- a/rector.php
+++ b/rector.php
@@ -4,24 +4,11 @@
 
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
-use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
-use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
-use Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector;
-use Rector\Php80\Rector\FuncCall\TokenGetAllToObjectRector;
-use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
-use Rector\Php80\Rector\Identical\StrEndsWithRector;
-use Rector\Php80\Rector\Identical\StrStartsWithRector;
-use Rector\Php80\Rector\NotIdentical\StrContainsRector;
-use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
-use Rector\Php80\Rector\Ternary\GetDebugTypeRector;
-use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
-use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
-use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
-use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
-use Rector\Php81\Rector\FunctionLike\IntersectionTypesRector;
-use Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector;
-use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
-use Rector\Set\ValueObject\SetList;
+use Rector\Php80\Rector\Class_\StringableForToStringRector;
+use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
+use Rector\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
+use Rector\Php80\Rector\ClassMethod\SetStateToStaticRector;
+use Rector\Php81\Rector\FuncCall\Php81ResourceReturnToObjectRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -36,34 +23,14 @@
 
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
-    
-    $parameters->set(Option::SKIP, [
-        ReadOnlyPropertyRector::class, 
-        StrContainsRector::class,
-        UnionTypesRector::class,
-        StrStartsWithRector::class,
-        StrEndsWithRector::class,
-        FinalizePublicClassConstantRector::class,
-        RemoveUnusedVariableInCatchRector::class,
-        ClassOnObjectRector::class,
-        Php8ResourceReturnToObjectRector::class,
-        TokenGetAllToObjectRector::class,
-        GetDebugTypeRector::class,
-        ChangeSwitchToMatchRector::class,
-        NewInInitializerRector::class,
-        IntersectionTypesRector::class,
-        MyCLabsMethodCallToEnumConstRector::class,
-        MyCLabsClassToEnumRector::class,
-        SpatieEnumClassToEnumRector::class
-    ]);
-
-    // Define what rule sets will be applied
-    $containerConfigurator->import(SetList::PHP_80);
-    $containerConfigurator->import(SetList::PHP_81);
 
     // get services (needed for register a single rule)
-    // $services = $containerConfigurator->services();
+    $services = $containerConfigurator->services();
 
     // register a single rule
-    // $services->set(TypedPropertyRector::class);
+    $services->set(FinalPrivateToPrivateVisibilityRector::class);
+    $services->set(OptionalParametersAfterRequiredRector::class);
+    $services->set(SetStateToStaticRector::class);
+    $services->set(StringableForToStringRector::class);
+    $services->set(Php81ResourceReturnToObjectRector::class);
 };

From 4b3df3e6a690de4cddd3572387e2130d4cd99072 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 22 Nov 2021 16:11:36 +0100
Subject: [PATCH 415/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard and run it as part of the GitHub actions

---
 .github/workflows/php.yml |  2 +-
 README.md                 | 19 +++++++++++++++++++
 rector.php                |  6 ------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9caefb77..db251e6f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -91,4 +91,4 @@ jobs:
         run: composer install  
             
       - name: Run rector
-        run: vendor/bin/rector process --dry-run
+        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autload-file vendor/squizlabs/php_codesniffer/autoload.php
diff --git a/README.md b/README.md
index be9937d0..98dee90d 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,25 @@ You can execute ESLint as follows:
 npm run eslint -- path/to/analyze
 ```
 
+### RECTOR PHP
+Inside `magento-condign-standard` project. You can execute rector php as follows:
+```bash
+vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php
+```
+The rules from rector that are applied are set inside the config file: `rector.php`
+
+The option `--dry-run` allows that the errors are displayed, but the code is not automatically refactored.
+
+To run rector for `magento` projects you need to:
+- Specify the magento path and the autoload file for the magento project: 
+```bash
+vendor/bin/rector process MAGENTO_PATH --dry-run --autoload-file MAGENTO_AUTOLOAD_FILE
+```
+Example:
+```bash
+vendor/bin/rector process magento2ce/app/code/Magento/Cms/Model --dry-run --autoload-file magento2ce/vendor/autoload.php
+```
+
 ## License
 
 Each Magento source file included in this distribution is licensed under the OSL-3.0 license.
diff --git a/rector.php b/rector.php
index 7ed6d2fe..502f7744 100644
--- a/rector.php
+++ b/rector.php
@@ -14,12 +14,6 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     // get parameters
     $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PATHS, [
-        __DIR__ . '/Magento2',
-        __DIR__ . '/Magento2Framework',
-        __DIR__ . '/PHP_CodeSniffer'
-    ]);
-    $parameters->set(Option::BOOTSTRAP_FILES, [__DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php']);
 
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);

From 692b23d62e763963f8a7502c552a230b723c82a9 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Mon, 22 Nov 2021 16:12:48 +0100
Subject: [PATCH 416/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard and run it as part of the GitHub actions

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index db251e6f..54a02483 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -91,4 +91,4 @@ jobs:
         run: composer install  
             
       - name: Run rector
-        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autload-file vendor/squizlabs/php_codesniffer/autoload.php
+        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php

From a10e77ce28e0f69a0517f6e1d011e847717c0a71 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 23 Nov 2021 09:28:26 +0100
Subject: [PATCH 417/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard and run it as part of the GitHub actions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 98dee90d..5a18833d 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run -
 ```
 The rules from rector that are applied are set inside the config file: `rector.php`
 
-The option `--dry-run` allows that the errors are displayed, but the code is not automatically refactored.
+The option `--dry-run` displays errors found, but code is not automatically fixed.
 
 To run rector for `magento` projects you need to:
 - Specify the magento path and the autoload file for the magento project: 

From 856d8ca15d7c561e1516d8095c51086b580697c8 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 23 Nov 2021 09:32:53 +0100
Subject: [PATCH 418/630] AC-1740: Add rectorphp as a dependency to
 magento-coding-standard and run it as part of the GitHub actions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5a18833d..3cfd6c0a 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ npm run eslint -- path/to/analyze
 ```
 
 ### RECTOR PHP
-Inside `magento-condign-standard` project. You can execute rector php as follows:
+From `magento-condign-standard` project, you can execute rector php as follows:
 ```bash
 vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php
 ```

From e320122b6ad59f17ca7ab101948a342e204069ec Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 23 Nov 2021 11:51:19 +0100
Subject: [PATCH 419/630] Version 16

---
 composer.json |  2 +-
 composer.lock | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 9b59a792..168dd8be 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "15",
+    "version": "16",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 0e07e918..477af2cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "61cf9451f97627aeb7908e83b51a1d82",
+    "content-hash": "20e40c8c33e9c2fc21cae5999414b4c0",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -250,16 +250,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.1",
+            "version": "v14.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "8f3e584335696c2eb8d307019f0afdff64fc0e35"
+                "reference": "a7192e7a2b0487dc5e185feb4f4df1fc24d35d86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/8f3e584335696c2eb8d307019f0afdff64fc0e35",
-                "reference": "8f3e584335696c2eb8d307019f0afdff64fc0e35",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/a7192e7a2b0487dc5e185feb4f4df1fc24d35d86",
+                "reference": "a7192e7a2b0487dc5e185feb4f4df1fc24d35d86",
                 "shasum": ""
             },
             "require": {
@@ -304,7 +304,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.1"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.3"
             },
             "funding": [
                 {
@@ -312,7 +312,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-11-15T10:25:57+00:00"
+            "time": "2021-11-19T09:42:02+00:00"
         }
     ],
     "packages-dev": [
@@ -839,16 +839,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.8",
+            "version": "9.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e"
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
-                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
                 "shasum": ""
             },
             "require": {
@@ -904,7 +904,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.8"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
             },
             "funding": [
                 {
@@ -912,7 +912,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-10-30T08:01:38+00:00"
+            "time": "2021-11-19T15:21:02+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2111,6 +2111,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {

From 5157584b5a3ca1b78da8a56bf77f74736ef816f8 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 25 Nov 2021 17:15:12 +0100
Subject: [PATCH 420/630] AC-1060 move relevant sniffs from phpcompatibility
 (#130)

* AC-1060: Move relevant sniffs from PHPCompatibility
---
 .github/workflows/php.yml                     |   8 +-
 .../AbstractPrivateMethodsSniff.php           | 104 +++++
 .../ChangedIntToBoolParamTypeSniff.php        | 123 +++++
 .../ForbiddenFinalPrivateMethodsSniff.php     |  96 ++++
 .../PHPCompatibility/NewAttributesSniff.php   | 234 ++++++++++
 ...ewInterpolatedStringDereferencingSniff.php |  93 ++++
 .../NewMagicClassConstantSniff.php            | 124 +++++
 .../NewMagicConstantDereferencingSniff.php    | 126 ++++++
 .../NewNestedStaticAccessSniff.php            | 153 +++++++
 .../NewNonCapturingCatchSniff.php             |  84 ++++
 .../NewTrailingCommaSniff.php                 | 128 ++++++
 .../RemovedAssertStringAssertionSniff.php     | 133 ++++++
 ...llingDestructAfterConstructorExitSniff.php | 207 +++++++++
 ...inedFunctionsExcludeDisabledFalseSniff.php |  83 ++++
 ...emovedOptionalBeforeRequiredParamSniff.php | 152 +++++++
 ...ovedSplAutoloadRegisterThrowFalseSniff.php |  84 ++++
 .../AbstractPrivateMethodsUnitTest.inc        |  44 ++
 .../AbstractPrivateMethodsUnitTest.php        | 142 ++++++
 .../Tests/PHPCompatibility/BaseSniffTest.php  | 422 ++++++++++++++++++
 .../ChangedIntToBoolParamTypeUnitTest.inc     |  27 ++
 .../ChangedIntToBoolParamTypeUnitTest.php     | 112 +++++
 .../ForbiddenFinalPrivateMethodsUnitTest.inc  |  47 ++
 .../ForbiddenFinalPrivateMethodsUnitTest.php  | 105 +++++
 .../NewAttributesUnitTest.inc                 | 112 +++++
 .../NewAttributesUnitTest.php                 | 156 +++++++
 ...nterpolatedStringDereferencingUnitTest.inc |  30 ++
 ...nterpolatedStringDereferencingUnitTest.php | 113 +++++
 .../NewMagicClassConstantUnitTest.inc         |  52 +++
 .../NewMagicClassConstantUnitTest.php         | 150 +++++++
 .../NewMagicConstantDereferencingUnitTest.inc |  40 ++
 .../NewMagicConstantDereferencingUnitTest.php | 113 +++++
 .../NewNestedStaticAccessUnitTest.inc         |  38 ++
 .../NewNestedStaticAccessUnitTest.php         | 147 ++++++
 .../NewNonCapturingCatchUnitTest.inc          |  34 ++
 .../NewNonCapturingCatchUnitTest.php          | 103 +++++
 .../NewTrailingCommaUnitTest.inc              | 101 +++++
 .../NewTrailingCommaUnitTest.php              | 141 ++++++
 .../RemovedAssertStringAssertionUnitTest.inc  |  28 ++
 .../RemovedAssertStringAssertionUnitTest.php  |  89 ++++
 ...ngDestructAfterConstructorExitUnitTest.inc | 124 +++++
 ...ngDestructAfterConstructorExitUnitTest.php | 121 +++++
 ...dFunctionsExcludeDisabledFalseUnitTest.inc |  11 +
 ...dFunctionsExcludeDisabledFalseUnitTest.php |  82 ++++
 ...vedOptionalBeforeRequiredParamUnitTest.inc |  51 +++
 ...vedOptionalBeforeRequiredParamUnitTest.php | 117 +++++
 ...dSplAutoloadRegisterThrowFalseUnitTest.inc |  13 +
 ...dSplAutoloadRegisterThrowFalseUnitTest.php |  82 ++++
 .../Util/CoreMethodTestFrame.php              |  51 +++
 .../Util/TestHelperPHPCompatibility.php       |  90 ++++
 Magento2/ruleset.xml                          |  23 +
 Magento2Framework/ruleset.xml                 |   2 +
 composer.json                                 |   5 +-
 composer.lock                                 | 148 +++++-
 phpunit-bootstrap.php                         |  84 ++++
 phpunit.xml.dist                              |   2 +-
 55 files changed, 5274 insertions(+), 10 deletions(-)
 create mode 100644 Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/BaseSniffTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
 create mode 100644 Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
 create mode 100644 Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
 create mode 100644 phpunit-bootstrap.php

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 54a02483..d8e87bc9 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -78,7 +78,7 @@ jobs:
   rector:
     runs-on: ubuntu-latest
     name: Rector tests
-    
+
     steps:
       - name: Setup node
         uses: actions/setup-node@v2
@@ -88,7 +88,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install dependencies
-        run: composer install  
-            
+        run: composer install
+
       - name: Run rector
-        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php
+        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php --autoload-file vendor/phpcompatibility/php-compatibility/PHPCSAliases.php
diff --git a/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
new file mode 100644
index 00000000..b96672e0
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\BackCompat\BCTokens;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\Scopes;
+
+/**
+ * Abstract private methods are not allowed since PHP 5.1, though they are allowed in traits since PHP 8.0.
+ *
+ * Abstract private methods were supported between PHP 5.0.0 and PHP 5.0.4, but
+ * were then disallowed on the grounds that the behaviours of `private` and `abstract`
+ * are mutually exclusive.
+ *
+ * As of PHP 8.0, traits are allowed to declare abstract private methods.
+ *
+ * PHP version 5.1
+ * PHP version 8.0
+ *
+ * @link https://www.php.net/manual/en/migration51.oop.php#migration51.oop-methods
+ * @link https://wiki.php.net/rfc/abstract_trait_method_validation
+ *
+ * @since 9.2.0
+ * @since 10.0.0 The sniff has been renamed from `PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods`
+ *               to `PHPCompatibility.FunctionDeclarations.AbstractPrivateMethods` and now
+ *               includes detection of the PHP 8 change.
+ */
+class AbstractPrivateMethodsSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 9.2.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_FUNCTION];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 9.2.0
+     * @since 10.0.0 New error message for abstract private methods in traits.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('5.1') === false) {
+            return;
+        }
+
+        $tokens   = $phpcsFile->getTokens();
+        $scopePtr = Scopes::validDirectScope($phpcsFile, $stackPtr, BCTokens::ooScopeTokens());
+        if ($scopePtr === false) {
+            // Function, not method.
+            return;
+        }
+
+        $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
+        if ($properties['scope'] !== 'private' || $properties['is_abstract'] !== true) {
+            // Not an abstract private method.
+            return;
+        }
+
+        if ($tokens[$scopePtr]['code'] === \T_TRAIT) {
+            if ($this->supportsBelow('7.4') === true) {
+                $phpcsFile->addError(
+                    'Traits cannot declare "abstract private" methods in PHP 7.4 or below',
+                    $stackPtr,
+                    'InTrait'
+                );
+            }
+
+            return;
+        }
+
+        // Not a trait.
+        $phpcsFile->addError(
+            'Abstract methods cannot be declared as private since PHP 5.1',
+            $stackPtr,
+            'Found'
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
new file mode 100644
index 00000000..f01be4f6
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHPCSUtils\BackCompat\BCTokens;
+
+/**
+ * Detect calls to functions where the expected type of a parameter has been changed from integer to boolean.
+ *
+ * Throws an error when a hard-coded numeric value is passed.
+ *
+ * PHP version 8.0+
+ *
+ * @since 10.0.0
+ */
+class ChangedIntToBoolParamTypeSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'ob_implicit_flush' => [
+            1 => [
+                'name'  => 'flag',
+                'since' => '8.0',
+            ],
+        ],
+        'sem_get' => [
+            4 => [
+                'name'  => 'auto_release',
+                'since' => '8.0',
+            ],
+        ],
+    ];
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * Checks against the first PHP version listed in the above array.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('8.0') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        static $search;
+
+        if (isset($search) === false) {
+            $search  = [
+                \T_LNUMBER => \T_LNUMBER,
+                \T_DNUMBER => \T_DNUMBER,
+            ];
+            $search += BCTokens::arithmeticTokens();
+            $search += Tokens::$emptyTokens;
+        }
+
+        $functionLC   = \strtolower($functionName);
+        $functionInfo = $this->targetFunctions[$functionLC];
+        foreach ($functionInfo as $offset => $paramInfo) {
+            if (isset($parameters[$offset]) === false) {
+                continue;
+            }
+
+            if ($this->supportsAbove($paramInfo['since']) === false) {
+                continue;
+            }
+
+            $target = $parameters[$offset];
+
+            $hasNonNumeric = $phpcsFile->findNext($search, $target['start'], ($target['end'] + 1), true);
+            if ($hasNonNumeric !== false) {
+                // Not a purely numerical value. Ignore.
+                continue;
+            }
+
+            $error = 'The $%s parameter of %s() expects a boolean value instead of an integer since PHP %s. Found: %s';
+            $code  = $this->stringToErrorCode($functionName . '_' . $paramInfo['name']) . 'NumericFound';
+            $data  = [
+                $paramInfo['name'],
+                $functionLC,
+                $paramInfo['since'],
+                $target['raw'],
+            ];
+
+            $phpcsFile->addError($error, $target['start'], $code, $data);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
new file mode 100644
index 00000000..8b33ee99
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\Scopes;
+
+/**
+ * Applying the final modifier on a private method will produce a warning since PHP 8.0
+ * unless that method is the constructor.
+ *
+ * Previously final private methods were allowed and overriding the method in a child class
+ * would result in a fatal "Cannot override final method". This was inappropriate as
+ * private methods are not inherited.
+ *
+ * > Due to how common the usage of `final private function __construct` is and given that
+ * > the same results cannot be achieved with a protected visibility, an exception to this rule
+ * > is made for constructors.
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/inheritance_private_methods
+ *
+ * @since 10.0.0
+ */
+class ForbiddenFinalPrivateMethodsSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_FUNCTION];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.0') === false) {
+            return;
+        }
+
+        if (Scopes::isOOMethod($phpcsFile, $stackPtr) === false) {
+            // Function, not method.
+            return;
+        }
+
+        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
+        if (empty($name) === true) {
+            // Parse error or live coding.
+            return;
+        }
+
+        if (\strtolower($name) === '__construct') {
+            // The rule does not apply to constructors. Bow out.
+            return;
+        }
+
+        $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
+        if ($properties['scope'] !== 'private' || $properties['is_final'] === false) {
+            // Not an private final method.
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'Private methods should not be declared as final since PHP 8.0',
+            $stackPtr,
+            'Found'
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php b/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
new file mode 100644
index 00000000..70f08521
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\GetTokensAsString;
+
+/**
+ * Attributes as a form of structured, syntactic metadata to declarations of classes, properties,
+ * functions, methods, parameters and constants is supported as of PHP 8.0.
+ *
+ * {@internal This sniff does not check whether attributes are used correctly and in
+ * combination with syntaxes for which attributes are valid.
+ * If that's not the case, PHP 8.0 would throw a parse error anyway.}
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/attributes_v2
+ * @link https://wiki.php.net/rfc/attribute_amendments
+ * @link https://wiki.php.net/rfc/shorter_attribute_syntax
+ * @link https://wiki.php.net/rfc/shorter_attribute_syntax_change
+ * @link https://www.php.net/manual/en/language.attributes.php
+ *
+ * @since 10.0.0
+ */
+class NewAttributesSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        $targets = [\T_COMMENT];
+
+        if (\defined('T_ATTRIBUTE') === true) {
+            // PHP 8.0 or PHPCS >= 3.6.0.
+            $targets[] = \T_ATTRIBUTE;
+
+        }
+
+        return $targets;
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        if ($tokens[$stackPtr]['type'] === 'T_ATTRIBUTE') {
+            /*
+             * Either PHP 8.0 or PHPCS 3.6.0+.
+             * PHP 8.0 tokenizes the start marker of the attribute as `T_ATTRIBUTE` and the
+             * end marker as `T_CLOSE_SQUARE_BRACKET.
+             * In PHPCS 3.6.0+ the end marker will be tokenized as `T_ATTRIBUTE_END` and
+             * the start marker will have an 'attribute_closer' token array index.
+             */
+            if (isset($tokens[$stackPtr]['attribute_closer']) === true) {
+                // This is PHPCS >= 3.6.0.
+                $this->throwError(
+                    $phpcsFile,
+                    $stackPtr,
+                    GetTokensAsString::compact($phpcsFile, $stackPtr, $tokens[$stackPtr]['attribute_closer'], true)
+                );
+                return;
+            }
+
+            // This must be PHP 8.0 in combination with PHPCS < 3.6.0.
+            $nestedBrackets = 1;
+            for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
+                if ($tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET) {
+                    ++$nestedBrackets;
+                    continue;
+                }
+
+                if ($tokens[$i]['code'] === \T_CLOSE_SQUARE_BRACKET) {
+                    --$nestedBrackets;
+
+                    if ($nestedBrackets === 0) {
+                        // Found the end of the attribute.
+                        break;
+                    }
+                }
+
+                if ($tokens[$i]['code'] === \T_CLOSE_TAG) {
+                    /*
+                     * Prevent looping to the end of the file for a particular edge case which
+                     * breaks the tokenizer 8.0.
+                     */
+                    break;
+                }
+            }
+
+            $this->throwError($phpcsFile, $stackPtr, GetTokensAsString::compact($phpcsFile, $stackPtr, $i, true));
+            return;
+        }
+
+        /*
+         * PHP < 8.0 in combination with PHPCS < 3.6.0 will tokenize attributes as comments.
+         * This comment can contain multiple attributes on the same line or can be followed
+         * by actual code.
+         * The attribute closer can also be on a later line.
+         */
+        $contents = $tokens[$stackPtr]['content'];
+
+        if (\substr($contents, 0, 2) !== '#[') {
+            // Bow out early if we already know this is not an attribute.
+            return;
+        }
+
+        $expectedErrors = \substr_count($contents, '#[');
+        $actualErrors   = 0;
+
+        while (empty($contents) === false && \substr($contents, 0, 2) === '#[') {
+            $length         = \strlen($contents);
+            $nestedBrackets = 1;
+
+            for ($i = 2; $i < $length; $i++) {
+                if ($contents[$i] === '[') {
+                    ++$nestedBrackets;
+                    continue;
+                }
+
+                if ($contents[$i] === ']') {
+                    --$nestedBrackets;
+
+                    if ($nestedBrackets === 0) {
+                        // Found the end of the attribute.
+                        $this->throwError($phpcsFile, $stackPtr, \substr($contents, 0, ($i + 1)));
+                        ++$actualErrors;
+
+                        if (($i + 1) === $length) {
+                            $contents = '';
+                        } else {
+                            $contents = \trim(\substr($contents, ($i + 1)));
+                        }
+                        break;
+                    }
+                }
+            }
+
+            if ($i === $length) {
+                // Reached the end of the content without finding a closing bracket.
+                break;
+            }
+        }
+
+        if ($expectedErrors === $actualErrors) {
+            // This was a single-line attribute, closer found.
+            return;
+        }
+
+        // This must be a multi-line attribute.
+        $nestedBrackets = 1;
+        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
+            if ($tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET) {
+                ++$nestedBrackets;
+                continue;
+            }
+
+            if ($tokens[$i]['code'] === \T_CLOSE_SQUARE_BRACKET) {
+                --$nestedBrackets;
+
+                if ($nestedBrackets === 0) {
+                    // Found the end of the attribute.
+                    break;
+                }
+            }
+
+            if ($tokens[$i]['code'] === \T_CLOSE_TAG) {
+                /*
+                 * Prevent looping to the end of the file for a particular edge case which
+                 * breaks the tokenizer on PHP < 8.0.
+                 */
+                break;
+            }
+        }
+
+        $this->throwError(
+            $phpcsFile,
+            $stackPtr,
+            \rtrim($contents, "\r\n") . GetTokensAsString::compact($phpcsFile, $stackPtr, $i, true)
+        );
+    }
+
+    /**
+     * Throw an error when an attribute is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     * @param string                      $content   Attribute content for use in the error message.
+     *
+     * @return void
+     */
+    protected function throwError($phpcsFile, $stackPtr, $content)
+    {
+        $phpcsFile->addError(
+            'Attributes are not supported in PHP 7.4 or earlier. Found: %s',
+            $stackPtr,
+            'Found',
+            [$content]
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php b/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
new file mode 100644
index 00000000..86a65127
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2009-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHPCSUtils\Utils\TextStrings;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Detect dereferencing of interpolated strings.
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/variable_syntax_tweaks#interpolated_and_non-interpolated_strings
+ * @link https://www.php.net/manual/en/language.types.string.php#language.types.string.parsing
+ *
+ * @since 10.0.0
+ */
+class NewInterpolatedStringDereferencingSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [
+            \T_DOUBLE_QUOTED_STRING,
+        ];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // PHP 8.0 supports dereferencing interpolated strings
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        // Check whether the text string uses interpolation.
+        $string     = TextStrings::getCompleteTextString($phpcsFile, $stackPtr, true);
+        $endOfQuote = $phpcsFile->findNext([\T_DOUBLE_QUOTED_STRING], $stackPtr + 1, null, true);
+        if ($this->stripVariables($string) === $string) {
+            return $endOfQuote;
+        }
+
+        // Check whether the string is being dereferenced.
+        $nextNonEmpty     = $phpcsFile->findNext(Tokens::$emptyTokens, $endOfQuote, null, true);
+        $nextNonEmptyCode = $tokens[$nextNonEmpty]['code'];
+        if ($nextNonEmptyCode !== \T_OPEN_SQUARE_BRACKET
+            && $nextNonEmptyCode !== \T_OBJECT_OPERATOR
+            // Work-around for a bug in PHPCS < 3.6.0.
+            // @link https://github.com/squizlabs/PHP_CodeSniffer/pull/3172
+            && $nextNonEmptyCode !== \T_OPEN_SHORT_ARRAY
+        ) {
+            return $endOfQuote;
+        }
+
+        $phpcsFile->addError(
+            'Dereferencing of interpolated strings is not supported in PHP 7.4 or earlier',
+            $stackPtr,
+            'Found'
+        );
+
+        return $endOfQuote;
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php b/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
new file mode 100644
index 00000000..34fe976f
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+
+/**
+ * Detect usage of the magic `::class` constant introduced in PHP 5.5.
+ *
+ * The special `ClassName::class` constant is available as of PHP 5.5.0, and allows
+ * for fully qualified class name resolution at compile time.
+ *
+ * As of PHP 8.0, `::class` can also be used on objects.
+ *
+ * PHP version 5.5
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/class_name_scalars
+ * @link https://www.php.net/manual/en/language.oop5.constants.php#example-186
+ * @link https://wiki.php.net/rfc/class_name_literal_on_object
+ *
+ * @since 7.1.4
+ * @since 7.1.5  Removed the incorrect checks against invalid usage of the constant.
+ * @since 10.0.0 Now differentiates between Name::class (PHP 5.5+) and $obj::class (PHP 8.0+).
+ */
+class NewMagicClassConstantSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 7.1.4
+     *
+     * @return array
+     */
+    public function register()
+    {
+        /*
+         * In PHPCS < 3.4.1, the class keyword after a double colon + comment may be tokenized as
+         * `T_CLASS` instead of as `T_STRING`, so registering both.
+         *
+         * @link https://github.com/squizlabs/php_codesniffer/issues/2431
+         */
+        return [
+            \T_STRING,
+            \T_CLASS,
+        ];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 7.1.4
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        if (\strtolower($tokens[$stackPtr]['content']) !== 'class') {
+            return;
+        }
+
+        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+        if ($prevToken === false || $tokens[$prevToken]['code'] !== \T_DOUBLE_COLON) {
+            return;
+        }
+
+        $subjectPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true, null, true);
+        if ($subjectPtr === false) {
+            // Shouldn't be possible.
+            return;
+        }
+
+        $preSubjectPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($subjectPtr - 1), null, true, null, true);
+        if (isset(Collections::$OOHierarchyKeywords[$tokens[$subjectPtr]['code']]) === true
+            || ($tokens[$subjectPtr]['code'] === \T_STRING
+                && isset(Collections::$objectOperators[$tokens[$preSubjectPtr]['code']]) === false)
+        ) {
+            // This is a syntax which is supported on PHP 5.5 and higher.
+            if ($this->supportsBelow('5.4') === true) {
+                $phpcsFile->addError(
+                    'The magic class constant ClassName::class was not available in PHP 5.4 or earlier',
+                    $stackPtr,
+                    'Found'
+                );
+            }
+
+            return;
+        }
+
+        /*
+         * This syntax was not supported until PHP 8.0.
+         *
+         * Includes throwing an error for syntaxes which are still not supported, as differentiating
+         * between them would be hard, if not impossible, and cause more overhead than it's worth.
+         */
+        $phpcsFile->addError(
+            'Using the magic class constant ::class with dynamic class names is not supported in PHP 7.4 or earlier',
+            $stackPtr,
+            'UsedOnObject'
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php b/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
new file mode 100644
index 00000000..92b223c5
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\Sniff;
+use PHPCSUtils\BackCompat\BCTokens;
+use PHPCSUtils\Tokens\Collections;
+
+/**
+ * Detect dereferencing of magic constants as allowed per PHP 8.0.
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/variable_syntax_tweaks#constants_and_magic_constants
+ *
+ * @since 10.0.0
+ */
+class NewMagicConstantDereferencingSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return Collections::$magicConstants;
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in
+     *                                               the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens       = $phpcsFile->getTokens();
+        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($nextNonEmpty === false) {
+            return;
+        }
+
+        if ($tokens[$nextNonEmpty]['code'] !== \T_OPEN_SQUARE_BRACKET
+            // Work around bug #3013 in PHPCS 3.5.5 and lower.
+            && $tokens[$nextNonEmpty]['code'] !== \T_OPEN_SHORT_ARRAY
+        ) {
+            return;
+        }
+
+        if (isset($tokens[$nextNonEmpty]['bracket_closer']) === false) {
+            // Live coding or parse error.
+            return;
+        }
+
+        $hasContent = $phpcsFile->findNext(
+            Tokens::$emptyTokens,
+            ($nextNonEmpty + 1),
+            $tokens[$nextNonEmpty]['bracket_closer'],
+            true
+        );
+
+        if ($hasContent === false) {
+            /*
+             * Attempt to assign to the magic constant as if it were an array.
+             * Not allowed now, nor prior to PHP 8, so not our concern.
+             */
+            return;
+        }
+
+        // Make sure this isn't an array assignment. That would be illegal, i.e. a parse error.
+        $nextNext = $tokens[$nextNonEmpty]['bracket_closer'];
+        do {
+            $nextNext = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNext + 1), null, true);
+            if ($nextNext === false) {
+                break;
+            }
+
+            // If the next token is an assignment, that's all we need to know.
+            if (isset(BCTokens::assignmentTokens()[$tokens[$nextNext]['code']]) === true) {
+                return;
+            }
+
+            // Check if this is an multi-access array assignment, e.g., `__FILE__[1][2] = 'val';` .
+            if (($tokens[$nextNext]['code'] === \T_OPEN_SQUARE_BRACKET
+                // Work around for nested array access being incorrectly tokenized in PHPCS 2.8.x.
+                || $tokens[$nextNext]['code'] === \T_OPEN_SHORT_ARRAY)
+                && isset($tokens[$nextNext]['bracket_closer']) === true
+            ) {
+                $nextNext = $tokens[$nextNext]['bracket_closer'];
+                continue;
+            }
+
+            break;
+        } while (true);
+
+        $phpcsFile->addError(
+            'Dereferencing of magic constants is not present in PHP version 7.4 or earlier. Found dereferencing of: %s',
+            $nextNonEmpty,
+            'Found',
+            [$tokens[$stackPtr]['content']]
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php b/Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php
new file mode 100644
index 00000000..1e4c6b12
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * (Nested) Static property and constant fetches as well as method calls can be applied to
+ * any dereferencable expression since PHP 7.0.
+ *
+ * Class constants can be dereferenced since PHP 8.0.
+ *
+ * PHP version 7.0
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/uniform_variable_syntax
+ * @link https://wiki.php.net/rfc/variable_syntax_tweaks#class_constant_dereferencability
+ *
+ * @since 10.0.0
+ */
+class NewNestedStaticAccessSniff extends Sniff
+{
+
+    /**
+     * Access operators.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    private $accessOperators = [
+        \T_OBJECT_OPERATOR => true,
+        \T_DOUBLE_COLON    => true,
+    ];
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_DOUBLE_COLON];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // PHP 8.0 supports both nested static access and class constant dereferencing
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens       = $phpcsFile->getTokens();
+        $prev         = $stackPtr;
+        $seenBrackets = false;
+        $prevOperator = false;
+
+        do {
+            $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
+
+            if ($prev === false) {
+                return;
+            }
+
+            if ($tokens[$prev]['code'] === \T_CLOSE_SQUARE_BRACKET
+                || $tokens[$prev]['code'] === \T_CLOSE_CURLY_BRACKET
+            ) {
+                if (isset($tokens[$prev]['bracket_opener']) === false) {
+                    // Parse error.
+                    return;
+                }
+
+                $prev         = $tokens[$prev]['bracket_opener'];
+                $seenBrackets = true;
+                continue;
+            }
+
+            if ($tokens[$prev]['code'] === \T_CLOSE_PARENTHESIS) {
+                if (isset($tokens[$prev]['parenthesis_opener']) === false) {
+                    // Parse error.
+                    return;
+                }
+
+                $prev         = $tokens[$prev]['parenthesis_opener'];
+                $seenBrackets = true;
+                continue;
+            }
+
+            // Now this should either be a T_STRING or a T_VARIABLE.
+            if ($tokens[$prev]['code'] !== \T_STRING && $tokens[$prev]['code'] !== \T_VARIABLE) {
+                // Not sure what's happening, but this is outside the scope of this sniff.
+                return;
+            }
+
+            // OK, we have the start of the access, let see if it's nested.
+            $prevOperator = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
+            break;
+
+        } while (true);
+
+        if ($prevOperator === false
+            || isset($this->accessOperators[$tokens[$prevOperator]['code']]) === false
+        ) {
+            return;
+        }
+
+        // Class constants cannot be dereferenced before PHP 8.0.
+        if ($seenBrackets === false
+            && $tokens[$prev]['code'] === \T_STRING
+            && $tokens[$prevOperator]['code'] === \T_DOUBLE_COLON
+            && $this->supportsBelow('7.4') === true
+        ) {
+            $phpcsFile->addError(
+                'Dereferencing class constants was not supported in PHP 7.4 or earlier.',
+                $stackPtr,
+                'ClassConstantDereferenced'
+            );
+            return;
+        }
+
+        // This is nested static access.
+        if ($this->supportsBelow('5.6') === true) {
+            $phpcsFile->addError(
+                'Nested access to static properties, constants and methods was not supported in PHP 5.6 or earlier.',
+                $stackPtr,
+                'NestedStaticAccess'
+            );
+        }
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php b/Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php
new file mode 100644
index 00000000..b9fc74e6
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\Sniff;
+
+/**
+ * Catching exceptions without capturing them to a variable is allowed since PHP 8.0.
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/non-capturing_catches
+ * @link https://www.php.net/manual/en/language.exceptions.php#language.exceptions.catch
+ *
+ * @since 10.0.0
+ */
+class NewNonCapturingCatchSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_CATCH];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $token  = $tokens[$stackPtr];
+
+        // Bow out during live coding.
+        if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
+            return;
+        }
+
+        $lastNonEmptyToken = $phpcsFile->findPrevious(
+            Tokens::$emptyTokens,
+            ($token['parenthesis_closer'] - 1),
+            $token['parenthesis_opener'],
+            true
+        );
+
+        if ($tokens[$lastNonEmptyToken]['code'] === \T_VARIABLE) {
+            return;
+        }
+
+        $phpcsFile->addError(
+            'Catching exceptions without capturing them to a variable is not supported in PHP 7.4 or earlier.',
+            $stackPtr,
+            'Found'
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php b/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
new file mode 100644
index 00000000..8d925c00
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+
+/**
+ * Detect trailing comma's in function declarations and closure use lists as allowed since PHP 8.
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/trailing_comma_in_parameter_list
+ * @link https://wiki.php.net/rfc/trailing_comma_in_closure_use_list
+ *
+ * @since 10.0.0
+ */
+class NewTrailingCommaSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return Collections::functionDeclarationTokensBC();
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in
+     *                                               the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsBelow('7.4') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset(Collections::arrowFunctionTokensBC()[$tokens[$stackPtr]['code']]) === true) {
+            $arrowInfo = FunctionDeclarations::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
+            if ($arrowInfo === false) {
+                // Not an arrow function.
+                return;
+            }
+
+            $closer = $arrowInfo['parenthesis_closer'];
+        } else {
+            if (isset($tokens[$stackPtr]['parenthesis_closer']) === false) {
+                // Live coding or parse error.
+                return;
+            }
+
+            $closer = $tokens[$stackPtr]['parenthesis_closer'];
+        }
+
+        /*
+         * Check for trailing comma's in a function declaration parameter list.
+         */
+        $lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), null, true);
+
+        if ($tokens[$lastInParenthesis]['code'] === \T_COMMA) {
+            $phpcsFile->addError(
+                'Trailing comma\'s are not allowed in function declaration parameter lists in PHP 7.4 or earlier',
+                $lastInParenthesis,
+                'InParameterList'
+            );
+        }
+
+        /*
+         * From this point forward, we're only interested in closures to check for
+         * trailing comma's in closure use lists.
+         * Bow out for any of the other tokens.
+         */
+        if ($tokens[$stackPtr]['code'] !== \T_CLOSURE) {
+            return;
+        }
+
+        $usePtr = $phpcsFile->findNext(Tokens::$emptyTokens, ($closer + 1), null, true);
+        if ($usePtr === false || $tokens[$usePtr]['code'] !== \T_USE) {
+            // Closure without use list or live coding/parse error.
+            return;
+        }
+
+        $openParens = $phpcsFile->findNext(Tokens::$emptyTokens, ($usePtr + 1), null, true);
+        if ($openParens === false
+            || $tokens[$openParens]['code'] !== \T_OPEN_PARENTHESIS
+            || isset($tokens[$openParens]['parenthesis_closer']) === false
+        ) {
+            // Live coding/parse error.
+            return;
+        }
+
+        $closer            = $tokens[$openParens]['parenthesis_closer'];
+        $lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), null, true);
+
+        if ($tokens[$lastInParenthesis]['code'] === \T_COMMA) {
+            $phpcsFile->addError(
+                'Trailing comma\'s are not allowed in closure use lists in PHP 7.4 or earlier',
+                $lastInParenthesis,
+                'InClosureUseList'
+            );
+        }
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
new file mode 100644
index 00000000..294a4106
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+
+/**
+ * Detect the use of assertions passed as a string.
+ *
+ * PHP 7.2:
+ * > Usage of a string as the assertion became deprecated. It now emits an E_DEPRECATED
+ * > notice when both assert.active and zend.assertions are set to 1.
+ *
+ * PHP 8.0:
+ * > assert() will no longer evaluate string arguments, instead they will be treated
+ * > like any other argument. `assert($a == $b)` should be used instead of `assert('$a == $b')`.
+ *
+ * PHP version 7.2
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/deprecations_php_7_2#assert_with_string_argument
+ * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L350-L354
+ * @link https://www.php.net/manual/en/function.assert.php#refsect1-function.assert-changelog
+ *
+ * @since 10.0.0
+ */
+class RemovedAssertStringAssertionSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'assert' => true,
+    ];
+
+    /**
+     * Target tokens.
+     *
+     * If there is anything but any of these tokens in the parameter, we bow out as undetermined.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    private $targetTokens = [];
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        // Set $targetTokens only once.
+        $this->targetTokens                   = Tokens::$emptyTokens;
+        $this->targetTokens                  += Tokens::$stringTokens + Tokens::$heredocTokens;
+        $this->targetTokens[\T_STRING_CONCAT] = \T_STRING_CONCAT;
+
+        return parent::register();
+    }
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('7.2') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        if (isset($parameters[1]) === false) {
+            return;
+        }
+
+        $targetParam = $parameters[1];
+        $hasOther    = $phpcsFile->findNext($this->targetTokens, $targetParam['start'], ($targetParam['end'] + 1), true);
+        if ($hasOther !== false) {
+            // Some other token was found, unclear whether this is really a text string. Bow out.
+            return;
+        }
+
+        $error   = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2%s. Found: %s';
+        $code    = 'Deprecated';
+        $isError = false;
+        $data    = [
+            '',
+            $targetParam['raw'],
+        ];
+
+        if ($this->supportsAbove('8.0') === true) {
+            $data[0] = ' and removed since PHP 8.0';
+            $isError = true;
+            $code    = 'Removed';
+        }
+
+        $this->addMessage($phpcsFile, $error, $targetParam['start'], $isError, $code, $data);
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
new file mode 100644
index 00000000..fa0e7919
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\UseStatements;
+
+/**
+ * As of PHP 8.0, when an object constructor exit()s, the destructor will no longer be called.
+ *
+ * Note: shutdown functions registered with `register_shutdown_function()` will still be called.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/71bfa5344ab207072f4cd25745d7023096338385/UPGRADING#L200-L201
+ *
+ * @since 10.0.0
+ */
+class RemovedCallingDestructAfterConstructorExitSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_FUNCTION];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.0') === false) {
+            return;
+        }
+
+        $classPtr = Scopes::validDirectScope($phpcsFile, $stackPtr, [\T_CLASS, \T_ANON_CLASS, \T_TRAIT]);
+        if ($classPtr === false) {
+            // Function, not method.
+            return;
+        }
+
+        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
+        if (empty($name) === true) {
+            // Parse error or live coding.
+            return;
+        }
+
+        if (\strtolower($name) !== '__construct') {
+            // The rule only applies to constructors. Bow out.
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+            // Parse error or live coding.
+            return;
+        }
+
+        $functionOpen  = $tokens[$stackPtr]['scope_opener'];
+        $functionClose = $tokens[$stackPtr]['scope_closer'];
+        $exits         = [];
+        for ($current = ($functionOpen + 1); $current < $functionClose; $current++) {
+            if (isset(Tokens::$emptyTokens[$tokens[$current]['code']]) === true) {
+                continue;
+            }
+
+            if ($tokens[$current]['code'] === \T_EXIT) {
+                $exits[] = $current;
+                continue;
+            }
+
+            // Skip over nested closed scopes as possible for efficiency.
+            // Ignore arrow functions as they aren't closed scopes.
+            if (isset(Collections::$closedScopes[$tokens[$current]['code']]) === true
+                && isset($tokens[$current]['scope_closer']) === true
+            ) {
+                $current = $tokens[$current]['scope_closer'];
+                continue;
+            }
+
+            // Skip over array access and short arrays/lists, but not control structures.
+            if (isset($tokens[$current]['bracket_closer']) === true
+                && isset($tokens[$current]['scope_closer']) === false
+            ) {
+                $current = $tokens[$current]['bracket_closer'];
+                continue;
+            }
+
+            // Skip over long array/lists as they can't contain an exit statement, except within a closed scope.
+            if (($tokens[$current]['code'] === \T_ARRAY || $tokens[$current]['code'] === \T_LIST)
+                && isset($tokens[$current]['parenthesis_closer']) === true
+            ) {
+                $current = $tokens[$current]['parenthesis_closer'];
+                continue;
+            }
+        }
+
+        if (empty($exits) === true) {
+            // No calls to exit or die found.
+            return;
+        }
+
+        if (isset($tokens[$classPtr]['scope_opener'], $tokens[$classPtr]['scope_closer']) === false) {
+            // Parse error, tokenizer error or live coding.
+            return;
+        }
+
+        $hasDestruct = false;
+        $usesTraits  = false;
+        $isError     = false;
+        $classOpen   = $tokens[$classPtr]['scope_opener'];
+        $classClose  = $tokens[$classPtr]['scope_closer'];
+        $nextFunc    = $classOpen;
+
+        while (($nextFunc = $phpcsFile->findNext([\T_FUNCTION, \T_DOC_COMMENT_OPEN_TAG, \T_USE], ($nextFunc + 1), $classClose)) !== false) {
+            // Skip over docblocks.
+            if ($tokens[$nextFunc]['code'] === \T_DOC_COMMENT_OPEN_TAG) {
+                $nextFunc = $tokens[$nextFunc]['comment_closer'];
+                continue;
+            }
+
+            if ($tokens[$nextFunc]['code'] === \T_USE
+                && UseStatements::isTraitUse($phpcsFile, $nextFunc) === true
+            ) {
+                $usesTraits = true;
+                continue;
+            }
+
+            $functionScopeCloser = $nextFunc;
+            if (isset($tokens[$nextFunc]['scope_closer'])) {
+                // Normal (non-abstract) method.
+                $functionScopeCloser = $tokens[$nextFunc]['scope_closer'];
+            }
+
+            $funcName = FunctionDeclarations::getName($phpcsFile, $nextFunc);
+            $nextFunc = $functionScopeCloser; // Set up to skip over the method content.
+
+            if (empty($funcName) === true) {
+                continue;
+            }
+
+            if (\strtolower($funcName) !== '__destruct') {
+                continue;
+            }
+
+            $hasDestruct = true;
+            $isError     = true;
+            break;
+        }
+
+        if ($hasDestruct === false && $usesTraits === false) {
+            /*
+             * No destruct method or trait use found, check if this class extends another one
+             * which may contain a destruct method.
+             */
+            $extends = ObjectDeclarations::findExtendedClassName($phpcsFile, $classPtr);
+            if (empty($extends) === true) {
+                // No destruct method and class doesn't extend nor uses traits, so the calls to exit can be ignored.
+                return;
+            }
+        }
+
+        /*
+         * Ok, either a destruct method has been found and we can throw an error, or either a class extends
+         * or trait use has been found and no destruct method, in which case, we throw a warning.
+         */
+        $error     = 'When %s() is called within an object constructor, the object destructor will no longer be called since PHP 8.0';
+        $errorCode = 'Found';
+        if ($isError === false) {
+            $error    .= ' While no __destruct() method was found in this class, one may be declared in the parent class or in a trait being used.';
+            $errorCode = 'NeedsInspection';
+        }
+
+        foreach ($exits as $ptr) {
+            $this->addMessage($phpcsFile, $error, $ptr, $isError, $errorCode, [$tokens[$ptr]['content']]);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
new file mode 100644
index 00000000..0b26ea5e
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detect: Passing `false` to `get_defined_functions()` is deprecated as of PHP 8.0.
+ *
+ * > Calling `get_defined_functions()` with `$exclude_disabled` explicitly set to `false`
+ * > is deprecated. `get_defined_functions()` will never include disabled functions.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L514-L516
+ *
+ * @since 10.0.0
+ */
+class RemovedGetDefinedFunctionsExcludeDisabledFalseSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'get_defined_functions' => true,
+    ];
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('8.0') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        if (isset($parameters[1]) === false) {
+            return;
+        }
+
+        if ($parameters[1]['raw'] !== 'false') {
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.',
+            $parameters[1]['start'],
+            'Deprecated'
+        );
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
new file mode 100644
index 00000000..39a574c1
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\Sniff;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+
+/**
+ * Declaring a required function parameter after an optional parameter is deprecated since PHP 8.0.
+ *
+ * > Declaring a required parameter after an optional one is deprecated. As an
+ * > exception, declaring a parameter of the form "Type $param = null" before
+ * > a required one continues to be allowed, because this pattern was sometimes
+ * > used to achieve nullable types in older PHP versions.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L145-L151
+ *
+ * @since 10.0.0
+ */
+class RemovedOptionalBeforeRequiredParamSniff extends Sniff
+{
+
+    /**
+     * Tokens allowed in the default value.
+     *
+     * This property will be enriched in the register() method.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    private $allowedInDefault = [
+        \T_NULL => \T_NULL,
+    ];
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        $this->allowedInDefault += Tokens::$emptyTokens;
+
+        return Collections::functionDeclarationTokensBC();
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.0') === false) {
+            return;
+        }
+
+        try {
+            // Get all parameters from the function signature.
+            $parameters = FunctionDeclarations::getParameters($phpcsFile, $stackPtr);
+            if (empty($parameters)) {
+                return;
+            }
+        } catch (RuntimeException $e) {
+            // Most likely a T_STRING which wasn't an arrow function.
+            return;
+        }
+
+        $error = 'Declaring a required parameter after an optional one is deprecated since PHP 8.0. Parameter %s is optional, while parameter %s is required.';
+
+        $paramCount    = \count($parameters);
+        $lastKey       = ($paramCount - 1);
+        $firstOptional = null;
+
+        foreach ($parameters as $key => $param) {
+            /*
+             * Ignore variadic parameters, which are optional by nature.
+             * These always have to be declared last and this has been this way since their introduction.
+             */
+            if ($param['variable_length'] === true) {
+                continue;
+            }
+
+            // Handle optional parameters.
+            if (isset($param['default']) === true) {
+                if ($key === $lastKey) {
+                    // This is the last parameter and it's optional, no further checking needed.
+                    break;
+                }
+
+                if (isset($firstOptional) === false) {
+                    // Check if it's typed and has a null default value, in which case we can ignore it.
+                    if ($param['type_hint'] !== '') {
+                        $hasNull    = $phpcsFile->findNext(\T_NULL, $param['default_token'], $param['comma_token']);
+                        $hasNonNull = $phpcsFile->findNext(
+                            $this->allowedInDefault,
+                            $param['default_token'],
+                            $param['comma_token'],
+                            true
+                        );
+
+                        if ($hasNull !== false && $hasNonNull === false) {
+                            continue;
+                        }
+                    }
+
+                    // Non-null default value. This is an optional param we need to take into account.
+                    $firstOptional = $param['name'];
+                }
+
+                continue;
+            }
+
+            // Found a required parameter.
+            if (isset($firstOptional) === false) {
+                // No optional params found yet.
+                continue;
+            }
+
+            // Found a required parameter with an optional param before it.
+            $data = [
+                $firstOptional,
+                $param['name'],
+            ];
+
+            $phpcsFile->addWarning($error, $param['token'], 'Deprecated', $data);
+        }
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
new file mode 100644
index 00000000..4f42c01f
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detect: Passing `false` to `spl_autoload_register()` is deprecated as of PHP 8.0.
+ *
+ * > spl_autoload_register() will now always throw a TypeError on invalid
+ * > arguments, therefore the second argument $throw is ignored and a
+ * > notice will be emitted if it is set to false.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/c0172aa2bdb9ea223c8491bdb300995b93a857a0/UPGRADING#L393-L395
+ *
+ * @since 10.0.0
+ */
+class RemovedSplAutoloadRegisterThrowFalseSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'spl_autoload_register' => true,
+    ];
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('8.0') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        if (isset($parameters[2]) === false) {
+            return;
+        }
+
+        if ($parameters[2]['raw'] !== 'false') {
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.',
+            $parameters[2]['start'],
+            'Deprecated'
+        );
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc
new file mode 100644
index 00000000..216e8c62
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc
@@ -0,0 +1,44 @@
+<?php
+
+abstract class CrossVersionValid
+{
+    abstract public function publicOverload();
+    abstract protected static function protectedOverload();
+    private function privateNonOverloadable() {}
+}
+
+trait CrossVersionValidTrait
+{
+    abstract public static function publicOverload();
+    abstract protected function protectedOverload();
+    private function privateNonOverloadable() {}
+}
+
+// Abstract methods can not be declared in an anonymous class as the abstract keyword
+// will not be accepted for the class, but that is not our concern.
+$anon = new class() {
+    abstract public static function publicOverload();
+    abstract protected function protectedOverload();
+    private function privateNonOverloadable() {}
+};
+
+// PHP 5.1: abstract functions can not be private.
+abstract class CrossVersionInValid
+{
+    abstract private function privateOverload();
+    static private abstract function privateStaticOverload();
+}
+
+$anon = new class() {
+    abstract private function privateOverload();
+    static private abstract function privateStaticOverload();
+};
+
+/*
+ * PHP 8.0: abstract private methods in traits.
+ */
+trait CrossVersionInValidTrait
+{
+    abstract private function privateOverload();
+    static private abstract function privateStaticOverload();
+}
diff --git a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
new file mode 100644
index 00000000..e256c785
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the AbstractPrivateMethods sniff.
+ *
+ * @group abstractPrivateMethods
+ * @group functiondeclarations
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\AbstractPrivateMethodsSniff
+ *
+ * @since 9.2.0
+ * @since 10.0.0 Moved from `Classes` to `FunctionDeclarations`.
+ */
+class AbstractPrivateMethodsUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that the sniff throws an error for non-trait abstract private methods for PHP 5.1+.
+     *
+     * @dataProvider dataForbiddenAbstractPrivateMethods
+     *
+     * @param int $line The line number where an error is expected.
+     *
+     * @return void
+     */
+    public function testForbiddenAbstractPrivateMethods($line)
+    {
+        $file = $this->sniffFile(__FILE__, '5.1');
+        $this->assertError($file, $line, 'Abstract methods cannot be declared as private since PHP 5.1');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testForbiddenAbstractPrivateMethods()
+     *
+     * @return array
+     */
+    public function dataForbiddenAbstractPrivateMethods()
+    {
+        return [
+            [28],
+            [29],
+            [33],
+            [34],
+        ];
+    }
+
+
+    /**
+     * Verify that the sniff throws an error for abstract private methods in traits for PHP 7.4
+     * and doesn't for PHP 8.0.
+     *
+     * @dataProvider dataNewTraitAbstractPrivateMethods
+     *
+     * @param int $line The line number where a warning is expected.
+     *
+     * @return void
+     */
+    public function testNewTraitAbstractPrivateMethods($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, 'Traits cannot declare "abstract private" methods in PHP 7.4 or below');
+
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNewTraitAbstractPrivateMethods()
+     *
+     * @return array
+     */
+    public function dataNewTraitAbstractPrivateMethods()
+    {
+        return [
+            [42],
+            [43],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '5.1');
+        $this->assertNoViolation($file, $line);
+
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $cases = [];
+        // No errors expected on the first 24 lines.
+        for ($line = 1; $line <= 24; $line++) {
+            $cases[] = [$line];
+        }
+
+        return $cases;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '5.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
new file mode 100644
index 00000000..29cc22ef
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
@@ -0,0 +1,422 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+use PHPUnit\Framework\TestCase;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\BackCompat\Helper;
+
+/**
+ * Base sniff test class file.
+ *
+ * Adds PHPCS sniffing logic and custom assertions for PHPCS errors and
+ * warnings.
+ *
+ * @since 5.5
+ * @since 7.0.4  Caches sniff results per file and testVersion.
+ * @since 7.1.3  Compatible with PHPUnit 6.
+ * @since 7.1.3  Limits the sniff run to the actual sniff being tested.
+ * @since 8.0.0  Compatible with PHP_CodeSniffer 3+.
+ * @since 8.2.0  Allows for sniffs in multiple categories.
+ * @since 9.0.0  Dropped support for PHP_CodeSniffer 1.x.
+ * @since 10.0.0 Updated for preliminary support of PHP_CodeSniffer 4.
+ */
+class BaseSniffTest extends TestCase
+{
+
+    /**
+     * The name of the standard as registered with PHPCS.
+     *
+     * @since 7.1.3
+     *
+     * @var string
+     */
+    const STANDARD_NAME = 'Magento2';
+
+    /**
+     * The PHP_CodeSniffer object used for testing.
+     *
+     * Used by PHPCS 2.x.
+     *
+     * @since 5.5
+     *
+     * @var \PHP_CodeSniffer
+     */
+    protected static $phpcs = null;
+
+    /**
+     * An array of PHPCS results by filename and PHP version.
+     *
+     * @since 7.0.4
+     *
+     * @var array
+     */
+    public static $sniffFiles = [];
+
+    /**
+     * Last PHPCS config instance used, if any. (PHPCS > 3)
+     *
+     * @since 10.0.0
+     *
+     * @var \PHP_CodeSniffer\Config
+     */
+    public static $lastConfig = null;
+
+    /**
+     * Reset the sniff file cache before/after each test class.
+     *
+     * @beforeClass
+     * @afterClass
+     *
+     * @since 7.0.4
+     * @since 10.0.0 Renamed the method from `setUpBeforeClass()` to `resetSniffFiles()` and
+     *               now using the `@beforeClass`/`@afterClass` annotations to allow for
+     *               PHPUnit cross-version compatibility.
+     *
+     * @return void
+     */
+    public static function resetSniffFiles()
+    {
+        self::$sniffFiles = [];
+    }
+
+    /**
+     * Sets up this unit test.
+     *
+     * @before
+     *
+     * @since 5.5
+     * @since 10.0.0 Renamed the method from `setUp()` to `setUpPHPCS()` and now using
+     *               the `@before` annotation to allow for PHPUnit cross-version compatibility.
+     *
+     * @return void
+     */
+    protected function setUpPHPCS()
+    {
+        if (\class_exists('\PHP_CodeSniffer') === true) {
+            /*
+             * PHPCS 2.x.
+             */
+            if (self::$phpcs === null) {
+                self::$phpcs = new \PHP_CodeSniffer();
+            }
+
+            self::$phpcs->cli->setCommandLineValues(['-pq', '--colors']);
+
+            // Restrict the sniffing of the test case files to the particular sniff being tested.
+            self::$phpcs->initStandard(self::STANDARD_NAME, [$this->getSniffCode()]);
+
+            self::$phpcs->setIgnorePatterns([]);
+        }
+    }
+
+    /**
+     * Reset the testVersion after each test.
+     *
+     * @after
+     *
+     * @since 5.5
+     * @since 10.0.0 Renamed the method from `tearDwon()` to `resetTestVersion()` and now using
+     *               the `@after` annotation to allow for PHPUnit cross-version compatibility.
+     *
+     * @return void
+     */
+    public function resetTestVersion()
+    {
+        // Reset the targetPhpVersion.
+        Helper::setConfigData('testVersion', null, true, self::$lastConfig);
+    }
+
+    /**
+     * Get the sniff code for the current sniff being tested.
+     *
+     * @since 7.1.3
+     *
+     * @return string
+     */
+    protected function getSniffCode()
+    {
+        $class    = \get_class($this);
+        $parts    = \explode('\\', $class);
+        $sniff    = \array_pop($parts);
+        $sniff    = \str_replace('UnitTest', '', $sniff);
+        $category = \array_pop($parts);
+        return self::STANDARD_NAME . '.' . $category . '.' . $sniff;
+    }
+
+    /**
+     * Sniff a file and return resulting file object.
+     *
+     * @since 5.5
+     * @since 9.0.0 Signature change. The `$filename` parameter was renamed to
+     *              `$pathToFile` and now expects an absolute path instead of
+     *              a relative one.
+     *
+     * @param string $pathToFile       Absolute path to the file to sniff.
+     *                                 Allows for passing __FILE__ from the unit test
+     *                                 file. In that case, the test case file is presumed
+     *                                 to have the same name, but with an `inc` extension.
+     * @param string $targetPhpVersion Value of 'testVersion' to set on PHPCS object.
+     *
+     * @return \PHP_CodeSniffer\Files\File|false File object.
+     */
+    public function sniffFile($pathToFile, $targetPhpVersion = 'none')
+    {
+        if (\strpos($pathToFile, 'UnitTest.php') !== false) {
+            // Ok, so __FILE__ was passed, change the file extension.
+            $pathToFile = \str_replace('UnitTest.php', 'UnitTest.inc', $pathToFile);
+        }
+        $pathToFile = \realpath($pathToFile);
+
+        if (isset(self::$sniffFiles[$pathToFile][$targetPhpVersion])) {
+            return self::$sniffFiles[$pathToFile][$targetPhpVersion];
+        }
+
+        try {
+            if (\class_exists('\PHP_CodeSniffer\Files\LocalFile')) {
+                // PHPCS 3.x, 4.x.
+                $config            = new \PHP_CodeSniffer\Config();
+                $config->cache     = false;
+                $config->standards = [self::STANDARD_NAME];
+                $config->sniffs    = [$this->getSniffCode()];
+                $config->ignored   = [];
+
+                if ($targetPhpVersion !== 'none') {
+                    Helper::setConfigData('testVersion', $targetPhpVersion, true, $config);
+                }
+
+                self::$lastConfig = $config;
+
+                $ruleset = new \PHP_CodeSniffer\Ruleset($config);
+
+                self::$sniffFiles[$pathToFile][$targetPhpVersion] = new \PHP_CodeSniffer\Files\LocalFile($pathToFile, $ruleset, $config);
+                self::$sniffFiles[$pathToFile][$targetPhpVersion]->process();
+            } else {
+                // PHPCS 2.x.
+                self::$lastConfig = null;
+
+                if ($targetPhpVersion !== 'none') {
+                    Helper::setConfigData('testVersion', $targetPhpVersion, true);
+                }
+
+                self::$sniffFiles[$pathToFile][$targetPhpVersion] = self::$phpcs->processFile($pathToFile);
+            }
+        } catch (\Exception $e) {
+            $this->fail('An unexpected exception has been caught when loading file "' . $pathToFile . '" : ' . $e->getMessage());
+            return false;
+        }
+
+        return self::$sniffFiles[$pathToFile][$targetPhpVersion];
+    }
+
+    /**
+     * Assert a PHPCS error on a particular line number.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $file            Codesniffer file object.
+     * @param int                         $lineNumber      Line number.
+     * @param string                      $expectedMessage Expected error message (assertContains).
+     *
+     * @return bool
+     */
+    public function assertError(File $file, $lineNumber, $expectedMessage)
+    {
+        $errors = $this->gatherErrors($file);
+
+        return $this->assertForType($errors, 'error', $lineNumber, $expectedMessage);
+    }
+
+    /**
+     * Assert a PHPCS warning on a particular line number.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $file            Codesniffer file object.
+     * @param int                         $lineNumber      Line number.
+     * @param string                      $expectedMessage Expected message (assertContains).
+     *
+     * @return bool
+     */
+    public function assertWarning(File $file, $lineNumber, $expectedMessage)
+    {
+        $warnings = $this->gatherWarnings($file);
+
+        return $this->assertForType($warnings, 'warning', $lineNumber, $expectedMessage);
+    }
+
+    /**
+     * Assert a PHPCS error or warning on a particular line number.
+     *
+     * @since 7.0.3
+     *
+     * @param array  $issues          Array of issues of a particular type.
+     * @param string $type            The type of issues, either 'error' or 'warning'.
+     * @param int    $lineNumber      Line number.
+     * @param string $expectedMessage Expected message (assertContains).
+     *
+     * @return bool
+     *
+     * @throws \Exception When no issues of a certain type where found on a line
+     *                    for which issues of that type where expected.
+     */
+    private function assertForType($issues, $type, $lineNumber, $expectedMessage)
+    {
+        if (isset($issues[$lineNumber]) === false) {
+            $this->fail("Expected $type '$expectedMessage' on line number $lineNumber, but none found.");
+        }
+
+        $insteadFoundMessages = [];
+
+        // Concat any error messages so we can do an assertContains.
+        foreach ($issues[$lineNumber] as $issue) {
+            $insteadFoundMessages[] = $issue['message'];
+        }
+
+        $insteadMessagesString = \implode(', ', $insteadFoundMessages);
+
+        $msg = "Expected $type message '$expectedMessage' on line $lineNumber not found. Instead found: $insteadMessagesString.";
+
+        if (\method_exists($this, 'assertStringContainsString') === false) {
+            // PHPUnit < 7.
+            return $this->assertContains($expectedMessage, $insteadMessagesString, $msg);
+        }
+
+        return $this->assertStringContainsString($expectedMessage, $insteadMessagesString, $msg);
+    }
+
+    /**
+     * Assert no violation (warning or error) on a given line number.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $file       Codesniffer File object.
+     * @param mixed                       $lineNumber Line number.
+     *
+     * @return bool
+     */
+    public function assertNoViolation(File $file, $lineNumber = 0)
+    {
+        $errors   = $this->gatherErrors($file);
+        $warnings = $this->gatherWarnings($file);
+
+        if (empty($errors) && empty($warnings)) {
+            return $this->assertTrue(true);
+        }
+
+        if ($lineNumber === 0) {
+            $failMessage = 'Failed asserting no violations in file. Found ' . \count($errors) . ' errors and ' . \count($warnings) . ' warnings.';
+            $allMessages = $errors + $warnings;
+            // TODO: Update the fail message to give the tester some
+            // indication of what the errors or warnings were.
+            return $this->assertEmpty($allMessages, $failMessage);
+        }
+
+        $encounteredMessages = [];
+        if (isset($errors[$lineNumber])) {
+            foreach ($errors[$lineNumber] as $error) {
+                $encounteredMessages[] = 'ERROR: ' . $error['message'];
+            }
+        }
+
+        if (isset($warnings[$lineNumber])) {
+            foreach ($warnings[$lineNumber] as $warning) {
+                $encounteredMessages[] = 'WARNING: ' . $warning['message'];
+            }
+        }
+
+        $failMessage = "Failed asserting no standards violation on line $lineNumber. Found: \n"
+            . \implode("\n", $encounteredMessages);
+        $this->assertCount(0, $encounteredMessages, $failMessage);
+    }
+
+    /**
+     * Show violations in file by line number.
+     *
+     * This is useful for debugging sniffs on a file.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $file Codesniffer file object.
+     *
+     * @return array
+     */
+    public function showViolations(File $file)
+    {
+        $violations = [
+            'errors'   => $this->gatherErrors($file),
+            'warnings' => $this->gatherWarnings($file),
+        ];
+
+        return $violations;
+    }
+
+    /**
+     * Gather all error messages by line number from phpcs file result.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $file Codesniffer File object.
+     *
+     * @return array
+     */
+    public function gatherErrors(File $file)
+    {
+        $foundErrors = $file->getErrors();
+
+        return $this->gatherIssues($foundErrors);
+    }
+
+    /**
+     * Gather all warning messages by line number from phpcs file result.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $file Codesniffer File object.
+     *
+     * @return array
+     */
+    public function gatherWarnings(File $file)
+    {
+        $foundWarnings = $file->getWarnings();
+
+        return $this->gatherIssues($foundWarnings);
+    }
+
+    /**
+     * Gather all messages or a particular type by line number.
+     *
+     * @since 7.0.3
+     *
+     * @param array $issuesArray Array of a particular type of issues,
+     *                           i.e. errors or warnings.
+     *
+     * @return array
+     */
+    private function gatherIssues($issuesArray)
+    {
+        $allIssues = [];
+        foreach ($issuesArray as $line => $lineIssues) {
+            foreach ($lineIssues as $column => $issues) {
+                foreach ($issues as $issue) {
+
+                    if (isset($allIssues[$line]) === false) {
+                        $allIssues[$line] = [];
+                    }
+
+                    $allIssues[$line][] = $issue;
+                }
+            }
+        }
+
+        return $allIssues;
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc
new file mode 100644
index 00000000..31d6511c
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc
@@ -0,0 +1,27 @@
+<?php
+
+// OK.
+sem_get( $key, $max_acquire, $perm, );
+sem_get($SHM_KEY, 1024, 0644 | IPC_CREAT);
+sem_get( $SEMKey, 2, 0666, true);
+sem_get( $SEMKey, 2, 0666, false);
+ob_implicit_flush();
+ob_implicit_flush(true);
+
+// Ignore as undetermined.
+sem_get( $key, $max_acquire, $perm, $auto_release );
+sem_get( $key, $max_acquire, $perm, SEMVER_RELEASE );
+sem_get( $key, $max_acquire, $perm, self::RELEASE_TOGGLE );
+ob_implicit_flush($flag);
+
+// Ignore for complexity + could be valid cross-version toggle.
+sem_get( $key, $max_acquire, $perm, $test ? 1 : true );
+
+// Error.
+sem_get( $key, $max_acquire, $perm, 0 );
+sem_get( $key, $max_acquire, $perm, 1 );
+sem_get( $key, $max_acquire, $perm, -1 );
+Sem_Get( $key, $max_acquire, $perm, 0 );
+sem_get( $key, $max_acquire, $perm, 1.0 );
+sem_get( $key, $max_acquire, $perm, 1 * 1);
+ob_implicit_flush(0);
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
new file mode 100644
index 00000000..2c19c355
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the ChangedIntToBoolParamType sniff.
+ *
+ * @group changedIntToBoolParamType
+ * @group parameterValues
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\ChangedIntToBoolParamTypeSniff
+ *
+ * @since 10.0.0
+ */
+class ChangedIntToBoolParamTypeUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test that numeric values being passed as $auto_release to sem_get() throw an error.
+     *
+     * @dataProvider dataChangedIntToBoolParamType
+     *
+     * @param int    $line         Line number where the error should occur.
+     * @param string $since        The PHP version in which the change was made.
+     * @param string $paramName    The name of the parameter the error relates to.
+     * @param string $functionName The name of the function the error relates to.
+     *
+     * @return void
+     */
+    public function testChangedIntToBoolParamType($line, $since, $paramName, $functionName)
+    {
+        $file  = $this->sniffFile(__FILE__, $since);
+        $error = "The {$paramName} parameter of {$functionName}() expects a boolean value instead of an integer since PHP {$since}";
+
+        $this->assertError($file, $line, $error);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testChangedIntToBoolParamType)
+     *
+     * @return array
+     */
+    public function dataChangedIntToBoolParamType()
+    {
+        return [
+            [21, '8.0', '$auto_release', 'sem_get'],
+            [22, '8.0', '$auto_release', 'sem_get'],
+            [23, '8.0', '$auto_release', 'sem_get'],
+            [24, '8.0', '$auto_release', 'sem_get'],
+            [25, '8.0', '$auto_release', 'sem_get'],
+            [26, '8.0', '$auto_release', 'sem_get'],
+            [27, '8.0', '$flag', 'ob_implicit_flush'],
+        ];
+    }
+
+
+    /**
+     * Verify no false positives are thrown for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line Line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '99.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $data = [];
+
+        // No errors expected on the first 19 lines.
+        for ($line = 1; $line <= 19; $line++) {
+            $data[] = [$line];
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4'); // Version before first change.
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
new file mode 100644
index 00000000..486d0584
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * OK cross version.
+ */
+class CrossVersionValid
+{
+    private final function __construct() {}
+    final public function publicFinal() {}
+    final protected static function protectedFinal() {}
+    private function privateNonOverloadable() {}
+}
+
+trait CrossVersionValidTrait
+{
+    final private function __CONSTRUCT() {}
+    final public static function publicFinal() {}
+    final protected function protectedFinal() {}
+    private function privateStillOverloadable() {} // Open question in RFC PR https://github.com/php/php-src/pull/5401
+}
+
+$anon = new class() {
+    final private function __Construct() {}
+    final public static function publicFinal();
+    final protected function protectedFinal();
+    private function privateNonOverloadable() {}
+};
+
+/*
+ * PHP 8.0: private methods cannot be final as they are never overridden by other classes.
+ */
+class CrossVersionInValid
+{
+    final private function privateFinal();
+    static private final function privateStaticFinal();
+}
+
+$anon = new class() {
+    final private function privateFinal();
+    static final private function privateStaticFinal();
+};
+
+trait CrossVersionInValidTrait
+{
+    final private function privateFinal();
+    static private final function privateStaticFinal();
+}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
new file mode 100644
index 00000000..5b7afd91
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the ForbiddenFinalPrivateMethods sniff.
+ *
+ * @group forbiddenFinalPrivateMethods
+ * @group functiondeclarations
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\ForbiddenFinalPrivateMethodsSniff
+ *
+ * @since 10.0.0
+ */
+class ForbiddenFinalPrivateMethodsUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that the sniff throws a warning for non-construct final private methods for PHP 8.0+.
+     *
+     * @dataProvider dataForbiddenFinalPrivateMethods
+     *
+     * @param int $line The line number where a warning is expected.
+     *
+     * @return void
+     */
+    public function testForbiddenFinalPrivateMethods($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Private methods should not be declared as final since PHP 8.0');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testForbiddenFinalPrivateMethods()
+     *
+     * @return array
+     */
+    public function dataForbiddenFinalPrivateMethods()
+    {
+        return [
+            [34],
+            [35],
+            [39],
+            [40],
+            [45],
+            [46],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $cases = [];
+        // No errors expected on the first 28 lines.
+        for ($line = 1; $line <= 28; $line++) {
+            $cases[] = [$line];
+        }
+
+        return $cases;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc
new file mode 100644
index 00000000..1817c84c
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * Not attributes.
+ */
+
+/*[StarComment*/
+//[SlashComment]
+# [HashComment]
+
+$var = 10; # Hash comment
+
+/*
+ * PHP 8.0: Attributes.
+ */
+
+#[Attribute]
+class MyAttribute {}
+
+#[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_FUNCTION)]
+class MyOtherAttribute {}
+
+#[MyAttribute]
+#[\MyExample\MyAttribute]
+#[MyAttribute(1234)]
+#[MyAttribute(value: 1234)]
+/**
+ * docblock
+ */
+#[MyAttribute(MyAttribute::VALUE)]
+#[MyAttribute(array("key" => "value"))]
+#[MyAttribute(100 + 200)]
+class Thing {}
+
+#[MyAttribute(1234), MyAttribute(5678)]
+class MultipleAttributesGrouped {}
+
+$object = new #[ExampleAttribute] class () { };
+
+#[WithoutArgument]
+#[Another\SingleArgument(0)]
+#[FewArguments('Hello', 'World')]
+#[\My\Attributes\FewArguments("foo", "bar")]
+function multipleAttributesMultipleLines() {}
+
+$f2 = #[ExampleAttribute] function () { };
+
+$f3 = #[ExampleAttribute] fn () => 1;
+
+#[WithoutArgument]#[SingleArgument(0)]#[FewArguments('Hello', 'World')]
+function multipleAttributesSingleLines() {}
+
+#[ORM\Entity]
+class User
+{
+    #[ORM\Id]#[ORM\Column("integer")]   #[ORM\GeneratedValue]
+    private $id;
+
+    #[Assert\Range(["min" => 120, "max" => 180, "minMessage" => "You must be at least {{ limit }}cm tall to enter"])]
+    #[ORM\Column(ORM\Column::T_INTEGER)]
+    protected $height;
+}
+
+#[Attr1, Attr2]
+class MultilineAttributeExamples
+{
+    #[Attr2("foo"),
+      Attr2("bar")]
+    public function testMultiLine()
+    {
+    }
+
+    #[
+      Attr1("foo"),
+      Attr2("bar"),
+    ]
+    public function testMultiLineDifferentFormatAndTrailingComma()
+    {
+    }
+}
+
+function attributeUsedForTypedParameter(
+    #[MyAttr([1, 2])] Type $myParam,
+) {}
+
+#[
+  ORM\Entity,
+  ORM\Table("user")
+]
+class AnotherMultilineAttributeTest
+{
+    #[ORM\Id, ORM\Column("integer"), ORM\GeneratedValue]
+    private $id;
+
+    #[ORM\Column("string", ORM\Column::UNIQUE)]
+    #[Assert\Email(["message" => "text"])] #[Assert\Text(["message" => "text"]),
+        Assert\Domain(["message" => "text"]),
+        Assert\Id(Assert\Id::REGEX[10]),
+    ]
+    private $email;
+}
+
+// This code will cause a tokenizer error in PHP < 8.0. This must be the last test in the file!
+#[DeprecationReason('reason: <https://some-website/reason?>')]
+function attribute_containing_text_looking_like_close_tag() {}
+const APP_SECRET = 'app-secret';
+echo "Test\n";
+
+#[DeprecationReason(
+    'reason: <https://some-website/reason?>'
+)]
+function attribute_containing_mulitline_text_looking_like_close_tag() {}
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
new file mode 100644
index 00000000..6983b2a8
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+use PHPCSUtils\BackCompat\Helper;
+
+/**
+ * Test the NewAttributes sniff.
+ *
+ * @group newAttributes
+ * @group attributes
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewAttributesSniff
+ *
+ * @since 10.0.0
+ */
+class NewAttributesUnitTest extends BaseSniffTest
+{
+
+    /**
+     * testNewAttributes
+     *
+     * @dataProvider dataNewAttributes
+     *
+     * @param int    $line  The line number.
+     * @param string $found Optional. Found attribute contents.
+     *
+     * @return void
+     */
+    public function testNewAttributes($line, $found = '')
+    {
+        $file  = $this->sniffFile(__FILE__, '7.4');
+        $error = 'Attributes are not supported in PHP 7.4 or earlier.';
+        if ($found !== '') {
+            $error .= ' Found: ' . $found;
+        }
+
+        $this->assertError($file, $line, $error);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNewAttributes()
+     *
+     * @return array
+     */
+    public function dataNewAttributes()
+    {
+        $data = [
+            [17],
+            [20],
+            [23],
+            [24],
+            [25],
+            [26],
+            [30],
+            [31],
+            [32],
+            [35],
+            [38],
+            [40],
+            [41],
+            [42],
+            [43],
+            [46],
+            [48],
+            [50, '#[WithoutArgument]'],
+            [50, '#[SingleArgument(0)]'],
+            [50, "#[FewArguments('Hello', 'World')]"],
+            [53],
+            [56, '#[ORM\Id]'],
+            [56, '#[ORM\Column("integer")]'],
+            [56, '#[ORM\GeneratedValue]'],
+            [59],
+            [60],
+            [64],
+            [67, '#[Attr2("foo"), Attr2("bar")]'],
+            [73, '#[ Attr1("foo"), Attr2("bar"), ]'],
+            [83, '#[MyAttr([1, 2])]'],
+            [86, '#[ ORM\Entity, ORM\Table("user") ]'],
+            [92],
+            [95],
+            [96, '#[Assert\Email(["message" => "text"])]'],
+            [96, '#[Assert\Text(["message" => "text"]), Assert\Domain(["message" => "text"]), Assert\Id(Assert\Id::REGEX[10]), ]'],
+            [104],
+        ];
+
+        /*
+         * In PHP < 8.0 in combination with PHPCS < 3.6.1, anything after the test case on
+         * line 104 will be tokenized as `T_INLINE_HTML` and undetectable.
+         */
+        if (version_compare(Helper::getVersion(), '3.6.1', '>=') === true
+            || version_compare(PHP_VERSION_ID, '80000', '>=') === true
+        ) {
+            $data[] = [109];
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $data = [];
+
+        // No errors expected on the first 12 lines.
+        for ($line = 1; $line <= 12; $line++) {
+            $data[] = [$line];
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc
new file mode 100644
index 00000000..17d50363
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc
@@ -0,0 +1,30 @@
+<?php
+
+// OK: strings that don't use interpolation or dereferencing.
+$a = 'foo';
+$a = "foo";
+$a = "foo
+bar";
+
+// OK: strings that use interpolation, but not dereferencing.
+$a = "$bar";
+$a = "foo$bar";
+$a = "foo
+$bar";
+
+// OK: strings that use dereferencing, but not interpolation.
+$a = 'foo'[0];
+$a = "foo"[0];
+$a = 'foo'->baz();
+$a = "foo"->baz();
+$a = "foo
+bar"->baz();
+
+// PHP 8.0: strings that use interpolation and dereferencing.
+$a = "foo$bar"[0];
+$a = "foo$bar"->baz();
+$a = "foo
+$bar"->baz();
+$a = "foo $lines
+$bar
+more foo"[10];
diff --git a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
new file mode 100644
index 00000000..da8b6817
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+
+/**
+ * Test the NewInterpolatedStringDereferencing sniff.
+ *
+ * @group newInterpolatedStringDereferencing
+ * @group syntax
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewInterpolatedStringDereferencingSniff
+ *
+ * @since 10.0.0
+ */
+class NewInterpolatedStringDereferencingUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test that an error is thrown for interpolated string dereferencing prior to PHP 8.0.
+     *
+     * @dataProvider dataInterpolatedStringDereferencing
+     *
+     * @param int $line Line number where the error should occur.
+     *
+     * @return void
+     */
+    public function testInterpolatedStringDereferencing($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, 'Dereferencing of interpolated strings is not supported in PHP 7.4 or earlier');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testInterpolatedStringDereferencing
+     *
+     * @return array
+     */
+    public function dataInterpolatedStringDereferencing()
+    {
+        return [
+            [24],
+            [25],
+            [26],
+            [28],
+        ];
+    }
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            // No interpolation, no dereferencing.
+            [4],
+            [5],
+            [6],
+
+            // Interpolation, no dereferencing.
+            [10],
+            [11],
+            [12],
+
+            // Dereferencing, no interpolation.
+            [16],
+            [17],
+            [18],
+            [19],
+            [20],
+        ];
+    }
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc
new file mode 100644
index 00000000..5708f7af
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc
@@ -0,0 +1,52 @@
+<?php
+
+namespace foo {
+    class bar {}
+
+    echo bar::class; // foo\bar
+}
+
+namespace MyNameSpace {
+    class xyz {}
+
+    remove_filter('theme_filter', [\MyNameSpace\xyz:: /* comment */ class, 'methodName'], 30);
+}
+
+/*
+ * False positives check.
+ */
+echo bar::classProp; // Not the keyword.
+$anon = new class {}; // Anonymous class, not the keyword.
+
+/*
+ * Differentiate between Name::class (PHP 5.5) and $obj::class (PHP 8.0)
+ */
+class Foo {
+    public function test() {
+        // PHP 5.5+.
+        if (class_exists(Name::class)) {}
+        if (class_exists(Vendor\Name::CLASS)) {}
+        if (class_exists(namespace\Name::class)) {}
+        if (class_exists(self::class)) {}
+        if (class_exists(parent::class)) {}
+        if (class_exists(static::class)) {}
+
+        // PHP 8.0+, but only if the result of the expression is an object.
+        if (class_exists($obj::class)) {}
+        var_dump((new stdClass)::Class);
+        var_dump((new MyClass($paramA, $paramB))::class);
+        if (class_exists($array['object']::class)) {}
+        if (class_exists($obj->otherObjectSavedAsProperty::class)) {}
+    }
+}
+
+/*
+ * Syntaxes which are not supported in any version.
+ * PHPCompatibility shouldn't throw an error for these, but it's darn hard to figure out if it's
+ * a supported or non-supported syntax.
+ * As it would be a fatal error anyway, don't bother differentiating for now.
+ */
+$name = ($string = 'text')::class; // Using ::class on a string literal.
+$name = (1+1)::class; // Using ::class on a literal.
+const A = [0]::class; // Using ::class on a literal.
+$name = ClassName::CONSTANT_NAME::class; // Objects can not be set as the value for a constant.
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
new file mode 100644
index 00000000..de7d47b8
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+
+/**
+ * Test the NewMagicClassConstant sniff.
+ *
+ * @group newMagicClassConstant
+ * @group constants
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewMagicClassConstantSniff
+ *
+ * @since 7.1.4
+ */
+class NewMagicClassConstantUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test correctly identifying the magic class constant.
+     *
+     * @dataProvider dataNewMagicClassConstant
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNewMagicClassConstant($line)
+    {
+        $file = $this->sniffFile(__FILE__, '5.4');
+        $this->assertError($file, $line, 'The magic class constant ClassName::class was not available in PHP 5.4 or earlier');
+
+        $file = $this->sniffFile(__FILE__, '5.5');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNewMagicClassConstant()
+     *
+     * @return array
+     */
+    public function dataNewMagicClassConstant()
+    {
+        return [
+            [6],
+            [12],
+            [27],
+            [28],
+            [29],
+            [30],
+            [31],
+            [32],
+        ];
+    }
+
+
+    /**
+     * Verify that no false positives are thrown for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '5.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            [4],
+            [10],
+            [18],
+            [19],
+        ];
+    }
+
+
+    /**
+     * Test correctly identifying the magic class constant when used on instantiated objects.
+     *
+     * @dataProvider dataNewMagicClassConstantOnObject
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNewMagicClassConstantOnObject($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, 'Using the magic class constant ::class with dynamic class names is not supported in PHP 7.4 or earlier');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNewMagicClassConstantOnObject()
+     *
+     * @return array
+     */
+    public function dataNewMagicClassConstantOnObject()
+    {
+        return [
+            [35],
+            [36],
+            [37],
+            [38],
+            [39],
+
+            // Still not supported, but throwing an error anyhow.
+            [49],
+            [50],
+            [51],
+            [52],
+        ];
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc
new file mode 100644
index 00000000..5c5ef295
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * OK - normal use of magic constants.
+ */
+require __DIR__ . '/filename.php';
+expectsCallback([__CLASS__, 'method']);
+
+// Not a magic constant.
+echo __MAGIC__;
+
+/*
+ * PHP 8.0: Magic constant dereferencing.
+ */
+echo __FUNCTION__[0];
+$a = array(__trait__[$i]);
+$b = __NAMESPACE__[$x][$y];
+expectsCallback([__CLASS__[strlen(__CLASS__) - 1], 'method']);
+$var = functionCall(__METHOD__[++$i]);
+echo __LINE__[0][1];
+echo __file__[strlen(__FILE__) - 1];
+require __DIR__[0];
+
+/*
+ * Check against false positives.
+ */
+
+// Array assignments to magic constants is not possible.
+__NAMESPACE__[] = 'x';
+__Dir__[ /* comment */ ] += 'x';
+__line__[0] -= 'x';
+__METHOD__[0][1] .= 'x';
+__namespace__[0][1][2] *= 'x';
+
+// Dereferencing using curly braces is not supported.
+echo __LINE__{0};
+
+// Live coding.
+// Intentional parse error, this has to be the last test case in the file.
+echo __METHOD__[
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
new file mode 100644
index 00000000..718487ff
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+
+/**
+ * Test the NewMagicConstantDereferencing sniff.
+ *
+ * @group newMagicConstantDereferencing
+ * @group syntax
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewMagicConstantDereferencingSniff
+ *
+ * @since 10.0.0
+ */
+class NewMagicConstantDereferencingUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test that an error is thrown for magic constant dereferencing prior to PHP 8.
+     *
+     * @dataProvider dataNewMagicConstantDereferencing
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNewMagicConstantDereferencing($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, 'Dereferencing of magic constants is not present in PHP version 7.4 or earlier');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNewMagicConstantDereferencing()
+     *
+     * @return array
+     */
+    public function dataNewMagicConstantDereferencing()
+    {
+        return [
+            [15],
+            [16],
+            [17],
+            [18],
+            [19],
+            [20],
+            [21],
+            [22],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code, nor for code which is still invalid.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            [6],
+            [7],
+            [10],
+            [29],
+            [30],
+            [31],
+            [32],
+            [33],
+            [36],
+            [40],
+        ];
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc
new file mode 100644
index 00000000..da51bbe5
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc
@@ -0,0 +1,38 @@
+<?php
+
+// Non-nested static access is valid cross version.
+echo $foo['bar']::$baz;
+
+// PHP 7.0: new nested static access to properties, constants and method calls.
+echo $foo::$bar::$baz;
+echo $foo::$bar::BAZ;
+echo $foo->bar()::baz();
+echo $instance->prop::MY_CONSTANT;
+echo $bar::$foo['bar']::$baz;
+echo $bar::$foo{'bar'}::$baz;
+echo $bar::foo()['bar']::$baz;
+echo $bar::foo(){'bar'}::$baz;
+echo Foo::$boo::$baz;
+echo self::$boo::$baz;
+echo self::MY_CONSTANT[0]::$baz;
+echo Foo::MY_CONSTANT[0]::$baz;
+echo Bar::$bar::BAZ;
+
+// Test code style independent sniffing.
+echo $obj  ->   /* comment */ $var()
+	 :: $bar; // Bad.
+
+// PHP 7.0 change, but outside the scope of this sniff
+// (dereferencing operations can now be applied to arbitrary parenthesis-expressions).
+echo ($foo::$bar)::$baz;
+echo ($foo->bar())::baz();
+
+// Parse error in any PHP version. Outside the scope of this sniff.
+echo $bar::($foo['bar'])::$baz;
+
+// PHP 8.0: class constant dereferencing.
+self::MY_CONSTANT::$baz;
+Foo::MY_CONSTANT::$baz;
+
+// Issue #1016.
+echo Foo::bar()::baz();
diff --git a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
new file mode 100644
index 00000000..e34ffd30
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the NewNestedStaticAccess sniff.
+ *
+ * @group newNestedStaticAccess
+ * @group syntax
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewNestedStaticAccessSniff
+ *
+ * @since 10.0.0
+ */
+class NewNestedStaticAccessUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that nested static access emits an error in PHP 5.6, but not in PHP 7.0.
+     *
+     * @dataProvider dataNestedStaticAccess
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNestedStaticAccess($line)
+    {
+        $file = $this->sniffFile(__FILE__, '5.6');
+        $this->assertError($file, $line, 'Nested access to static properties, constants and methods was not supported in PHP 5.6 or earlier.');
+
+        $file = $this->sniffFile(__FILE__, '7.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNestedStaticAccess()
+     *
+     * @return array
+     */
+    public function dataNestedStaticAccess()
+    {
+        return [
+            [7],
+            [8],
+            [9],
+            [10],
+            [11],
+            [12],
+            [13],
+            [14],
+            [15],
+            [16],
+            [17],
+            [18],
+            [19],
+            [23],
+            [38],
+        ];
+    }
+
+
+    /**
+     * Verify that class constant dereferencing emits an error in PHP 7.4.
+     *
+     * @dataProvider dataClassConstantDereferencing
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testClassConstantDereferencing($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, 'Dereferencing class constants was not supported in PHP 7.4 or earlier.');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testClassConstantDereferencing()
+     *
+     * @return array
+     */
+    public function dataClassConstantDereferencing()
+    {
+        return [
+            [34],
+            [35],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff doesn't throw false positives.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '5.6');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            [4],
+            [27],
+            [28],
+            [31],
+        ];
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc
new file mode 100644
index 00000000..a8a9881f
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Valid pre-PHP 8.0.
+ */
+try {
+    foo();
+} catch (SomeException $ex) {
+    die($ex->getMessage());
+} catch (ExceptionType1 | ExceptionType2 $e) {
+    die($e->getMessage());
+} catch (CustomException::class $e) {
+   // ...
+}
+
+/**
+ * Non-capturing catch - only valid in PHP 8.0+.
+ */
+try {
+   // Some code...
+} catch (ExceptionType1 | ExceptionType2) {
+   // Code to handle the exception.
+} catch (CustomException::class) {
+   // ...
+} catch ($exceptionObject::class) { // PHP 8 syntax - using ::class on objects.
+   // ...
+} catch (\Exception) {
+   // ...
+}
+
+// Don't throw errors during live code review.
+try {
+   // Some code...
+} catch (
diff --git a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
new file mode 100644
index 00000000..2c90e229
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the NewNonCapturingCatch sniff.
+ *
+ * @group newNonCapturingCatch
+ * @group controlStructures
+ * @group exceptions
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewNonCapturingCatchSniff
+ *
+ * @since 10.0.0
+ */
+class NewNonCapturingCatchUnitTest extends BaseSniffTest
+{
+
+    /**
+     * testNewNonCapturingCatch
+     *
+     * @dataProvider dataNewNonCapturingCatch
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNewNonCapturingCatch($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, 'Catching exceptions without capturing them to a variable is not supported in PHP 7.4 or earlier.');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNewNonCapturingCatch()
+     *
+     * @return array
+     */
+    public function dataNewNonCapturingCatch()
+    {
+        return [
+            [21],
+            [23],
+            [25],
+            [27],
+        ];
+    }
+
+
+    /**
+     * Verify no false positives are thrown for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            [8],
+            [10],
+            [12],
+            [34], // Live coding.
+        ];
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc
new file mode 100644
index 00000000..4ee5f21f
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * Allowed pre-PHP 8.0.
+ */
+function Foo7(
+    $foo,
+    $bar
+) {
+    return $foo + $bar;
+}
+
+$closure = function ($foo, $bar) use ($baz, $booboo) {
+    return ($foo + $bar) * $baz / $booboo;
+};
+
+$arrow = fn($foo, $bar) => $foo + $bar;
+
+class LotsOfParams7 {
+    private function __construct(
+        ?string $scheme,
+        ?string $user,
+        ?string $pass,
+        ?string $host,
+        ?int $port,
+        string $path,
+        ?string $query,
+        ?string $fragment // <-- ARGH!
+    ) {
+        // Do something.
+    }
+}
+
+/*
+ * PHP 8.0 trailing comma's in function declarations.
+ */
+function Foo8(
+    $foo,
+    $bar,
+) {
+    return $foo + $bar;
+}
+
+$closure = function ($foo, $bar,) {
+    return $foo + $bar;
+};
+
+$arrow = fn($foo, $bar,) => $foo + $bar;
+
+class LotsOfParams8 {
+    private function __construct(
+        ?string $scheme,
+        ?string $user,
+        ?string $pass,
+        ?string $host,
+        ?int $port,
+        string $path,
+        ?string $query,
+        ?string $fragment, // Trailing comment.
+    ) {
+        // Do something.
+    }
+}
+
+/*
+ * PHP 8.0 trailing comma's in closure use lists.
+ */
+$closure = function ($foo, $bar) use ($baz, $booboo,) {
+    return ($foo + $bar) * $baz / $booboo;
+};
+
+$longArgs_longVars = function (
+    $longArgument,
+    $longerArgument,
+    $muchLongerArgument,
+) use (
+    $longVar1,
+    $longerVar2,
+    $muchLongerVar3,
+) {
+   // body
+};
+
+/*
+ * Still not allowed.
+ */
+
+// Free-standing comma.
+$c = function(,) {}; // Parse error, but throw an error anyway.
+
+$c = function($foo) use(,) {}; // Parse error, but throw an error anyway.
+
+// Multiple trailing comma's.
+$a = fn($foo, $bar,,) => $bar; // Parse error, but throw an error anyway.
+
+// Leading comma.
+function Leading(, $foo, $bar) {} // Parse error, but not our concern.
+
+// Live coding.
+// Intentional parse error. This has to be the last test in the file.
+function Unfinished( $foo, $bar,
diff --git a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
new file mode 100644
index 00000000..50e2c081
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the NewTrailingComma sniff.
+ *
+ * @group newTrailingComma
+ * @group syntax
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\NewTrailingCommaSniff
+ *
+ * @since 10.0.0
+ */
+class NewTrailingCommaUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test correctly identifying trailing comma's in function declarations.
+     *
+     * @dataProvider dataTrailingComma
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testTrailingComma($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, "Trailing comma's are not allowed in function declaration parameter lists in PHP 7.4 or earlier");
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testTrailingComma()
+     *
+     * @return array
+     */
+    public function dataTrailingComma()
+    {
+        return [
+            [39],
+            [44],
+            [48],
+            [59],
+            [75],
+            [89],
+            [94],
+        ];
+    }
+
+
+    /**
+     * Test correctly identifying trailing comma's in closure use lists.
+     *
+     * @dataProvider dataTrailingCommaClosureUse
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testTrailingCommaClosureUse($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertError($file, $line, "Trailing comma's are not allowed in closure use lists in PHP 7.4 or earlier");
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testTrailingCommaClosureUse()
+     *
+     * @return array
+     */
+    public function dataTrailingCommaClosureUse()
+    {
+        return [
+            [68],
+            [79],
+            [91],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        // No errors expected on the first 33 lines.
+        $data = [];
+        for ($line = 1; $line <= 33; $line++) {
+            $data[] = [$line];
+        }
+
+        $data[] = [97];
+        $data[] = [101];
+
+        return $data;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.inc
new file mode 100644
index 00000000..2f0d9d2e
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.inc
@@ -0,0 +1,28 @@
+<?php
+
+// Incorrect call. Ignore.
+assert();
+
+// OK in all versions.
+assert(false);
+assert(true);
+
+// Undetermined. Ignore.
+assert($assertion);
+
+// Expression, PHP 7+, not our concern.
+assert(true == false);
+assert((bool) ($input));
+
+// Deprecated as of PHP 7.2.
+assert('mysql_query("")');
+assert("2 < 1" /* just a demo */, 'Two is less than one');
+assert(<<<'EOT'
+    is_string($result) &&
+    (strlen($result) > 0);
+EOT
+);
+assert(
+    'is_int($int)'
+    . '&& $int > 10'
+);
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
new file mode 100644
index 00000000..4e5708f7
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedAssertStringAssertion sniff.
+ *
+ * @group removedAssertStringAssertion
+ * @group parameterValues
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedAssertStringAssertionSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedAssertStringAssertionUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test the sniff correctly detects assertions passed as strings.
+     *
+     * @dataProvider dataRemovedAssertStringAssertion
+     *
+     * @param int $line Line number where the warning should occur.
+     *
+     * @return void
+     */
+    public function testRemovedAssertStringAssertion($line)
+    {
+        $file  = $this->sniffFile(__FILE__, '7.2');
+        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2';
+        $this->assertWarning($file, $line, $error);
+
+        $file  = $this->sniffFile(__FILE__, '8.0');
+        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2 and removed since PHP 8.0';
+        $this->assertError($file, $line, $error);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedAssertStringAssertion()
+     *
+     * @return array
+     */
+    public function dataRemovedAssertStringAssertion()
+    {
+        return [
+            [18],
+            [19],
+            [20],
+            [25],
+        ];
+    }
+
+
+    /**
+     * Verify there are no false positives on code this sniff should ignore.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '7.2');
+
+        // No errors expected on the first 16 lines.
+        for ($line = 1; $line <= 16; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.1');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc
new file mode 100644
index 00000000..db453a1d
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * OK no change in behaviour cross-version.
+ */
+class CrossVersionValid
+{
+    function __construct() {
+        throw new Exception();
+    }
+
+    function __destruct() {
+        // Destructor will not be called on thrown exception in constructor.
+    }
+}
+
+$anon = new class() {
+    function __Construct() {
+        throw new Exception();
+    }
+
+    function __Destruct() {
+        // Destructor will not be called on thrown exception in constructor.
+    }
+};
+
+/*
+ * PHP 8.0: If an object constructor exit()s, the object destructor will no longer be called.
+ */
+class CrossVersionInValid
+{
+    public function __construct() {
+        exit(1); // Error.
+    }
+
+    public function __destruct() {
+        // Destructor will not be called on exit() in constructor.
+    }
+}
+
+$anon = new class() extends ClassWhichMayOrMayNotContainADestructMethod {
+    function __CONSTRUCT() {
+        if ($something) {
+            die(); // Warning.
+        } else {
+            exit(2); // Warning.
+        }
+    }
+};
+
+abstract class HasDestructAndExtends extends ClassWhichMayOrMayNotContainADestructMethod
+{
+    public function __construct() {
+        // Test skipping over irrelevant code.
+        $array = [
+            'closure' => function() { exit; }, // Ignore, nested closed scope.
+        ];
+
+        $anon = new class {
+            function something() {
+                exit; // Ignore, nested closed scope.
+            }
+        };
+
+        $array = array(
+            'closure' => function() { exit; }, // Ignore, nested closed scope.
+        );
+
+        die; // Error.
+    }
+
+    /**
+     * This should be easily skipped over.
+     */
+    abstract function something();
+
+    public function __DeStruct() {
+        // Destructor will not be called on exit() in constructor.
+    }
+}
+
+trait CrossVersionInValid
+{
+    public function __construct() {
+        exit(1); // Error.
+    }
+
+    public function __destruct() {
+        // Destructor will not be called on exit() in constructor.
+    }
+}
+
+class DoesntExtendAndDoesntHaveDestructMethodButUsesTrait {
+    use TraitWhichMayOrMayNotContainADestructMethod;
+
+    public function __construct() {
+        die(1); // Warning.
+    }
+}
+
+/*
+ * Prevent false positives.
+ */
+class DoesntExtendAndDoesntHaveDestructMethod {
+    public function __construct() {
+        exit(1);
+    }
+}
+
+trait CantExtendAndDoesntHaveDestructMethod {
+    public function __construct() {
+        exit(1);
+    }
+}
+
+class ExitNotInFunctionScope {
+    public function __construct() {
+        $this->property = function($param) {
+            exit(1);
+        };
+    }
+
+    public function __destruct() {}
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
new file mode 100644
index 00000000..25d97718
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+
+/**
+ * Test the RemovedCallingDestructAfterConstructorExit sniff.
+ *
+ * @group removedCallingDestructAfterConstructorExit
+ * @group functiondeclarations
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedCallingDestructAfterConstructorExitSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedCallingDestructAfterConstructorExitUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that the sniff throws an error when an exit/die is encountered in a class constructor for PHP 8.0+.
+     *
+     * @dataProvider dataRemovedCallingDestructAfterConstructorExit
+     *
+     * @param int    $line    The line number where an error is expected.
+     * @param string $name    The name of the exit type used.
+     * @param bool   $isError Whether to expect an error or a warning. Defaults to true (= error).
+     *
+     * @return void
+     */
+    public function testRemovedCallingDestructAfterConstructorExit($line, $name, $isError = true)
+    {
+        $file  = $this->sniffFile(__FILE__, '8.0');
+        $error = "When $name() is called within an object constructor, the object destructor will no longer be called since PHP 8.0";
+
+        if ($isError === true) {
+            $this->assertError($file, $line, $error);
+        } else {
+            $this->assertWarning($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedCallingDestructAfterConstructorExit()
+     *
+     * @return array
+     */
+    public function dataRemovedCallingDestructAfterConstructorExit()
+    {
+        return [
+            [33, 'exit'],
+            [44, 'die', false],
+            [46, 'exit', false],
+            [69, 'die'],
+            [85, 'exit'],
+            [97, 'die', false],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $cases = [];
+        // No errors expected on the first 26 lines.
+        for ($line = 1; $line <= 26; $line++) {
+            $cases[] = [$line];
+        }
+
+        $cases[] = [56];
+        $cases[] = [61];
+        $cases[] = [66];
+        $cases[] = [106];
+        $cases[] = [112];
+        $cases[] = [119];
+
+        return $cases;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
new file mode 100644
index 00000000..40353bc7
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
@@ -0,0 +1,11 @@
+<?php
+/*
+ * Test get_defined_functions() PHP 8.0 change in accepted values.
+ */
+
+// OK.
+get_defined_functions();
+get_defined_functions($exclude_disabled);
+
+// Not OK.
+get_defined_functions(false);
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
new file mode 100644
index 00000000..43390cb3
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedGetDefinedFunctionsExcludeDisabledFalse sniff.
+ *
+ * @group removedGetDefinedFunctionsExcludeDisabledFalse
+ * @group parameterValues
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest extends BaseSniffTest
+{
+
+    /**
+     * testRemovedGetDefinedFunctionsExcludeDisabledFalse
+     *
+     * @dataProvider dataRemovedGetDefinedFunctionsExcludeDisabledFalse
+     *
+     * @param int $line Line number where the error should occur.
+     *
+     * @return void
+     */
+    public function testRemovedGetDefinedFunctionsExcludeDisabledFalse($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedGetDefinedFunctionsExcludeDisabledFalse()
+     *
+     * @return array
+     */
+    public function dataRemovedGetDefinedFunctionsExcludeDisabledFalse()
+    {
+        return [
+            [11],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+
+        // No errors expected on the first 9 lines.
+        for ($line = 1; $line <= 9; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.inc
new file mode 100644
index 00000000..4cd62436
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.inc
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * OK on all versions.
+ */
+function requiredBeforeOptional($a, $b, $c = null, $d = true) {}
+function requiredBeforeOptionalWithTypes(?int $a, string $b, callable $c = null, bool $d = /*comment*/ true) {}
+function nullableTypedOptionalBeforeRequired(Foo $a = /* comment */ null, ?int $b = null, $c, $d) {}
+
+/*
+ * Deprecated in PHP 8.
+ */
+function optionalBeforeRequired($a = [], $b, $c) {}
+function nonNullTypedOptionalBeforeRequired(int $a = 1, bool $b) {}
+
+$closure = function ($a = 10 * DAY_IN_SECONDS, $b) {};
+$arrow = fn(?bool $a = true, ?bool $b): string => $a ? (string) $b : '';
+
+// Parse error, nothing in default, not our concern. Throw error anyway.
+$closure = function ($a = /*comment*/, $b) {};
+
+// Prevent false positives on variadic parameters.
+function variadicIsOptionalByNature($a, int ...$b) {}
+function variadicIsOptionalByNatureWithExtraOptional($a, $b = null, ...$c) {}
+// Intentional parse error. This has always been an error though, so ignore for this sniff.
+function variadicBeforeRequiredWasAlwaysAnError(...$a, $b) {}
+
+// Rule also applies to constructor property promotion.
+class ConstructorPropertyPromotion {
+    public function __construct(
+        public $propA = 10,
+        protected $propB,
+    ) {}
+}
+
+class MixedWithOptionalProperty {
+    public function __construct(
+        public $propA = false,
+        $normalParam
+    ) {}
+}
+
+class MixedWithOptionalParam {
+    public function __construct(
+        public $propA,
+        $normalParam = 10, // OK.
+    ) {}
+}
+
+// Intentional parse error. This has to be the last test in the file.
+$closure = function( $a = [], $b
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
new file mode 100644
index 00000000..e219a916
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedOptionalBeforeRequiredParam sniff.
+ *
+ * @group removedOptionalBeforeRequiredParam
+ * @group functiondeclarations
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedOptionalBeforeRequiredParamSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedOptionalBeforeRequiredParamUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that the sniff throws a warning for optional parameters before required.
+     *
+     * @dataProvider dataRemovedOptionalBeforeRequiredParam
+     *
+     * @param int $line The line number where a warning is expected.
+     *
+     * @return void
+     */
+    public function testRemovedOptionalBeforeRequiredParam($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Declaring a required parameter after an optional one is deprecated since PHP 8.0');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedOptionalBeforeRequiredParam()
+     *
+     * @return array
+     */
+    public function dataRemovedOptionalBeforeRequiredParam()
+    {
+        return [
+            [13], // Warning x 2.
+            [14],
+            [16],
+            [17],
+            [20],
+            [32],
+            [39],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $cases = [];
+        // No errors expected on the first 9 lines.
+        for ($line = 1; $line <= 9; $line++) {
+            $cases[] = [$line];
+        }
+
+        // Don't error on variadic parameters.
+        $cases[] = [23];
+        $cases[] = [24];
+        $cases[] = [26];
+
+        // Constructor property promotion - valid example.
+        $cases[] = [46];
+
+        // Add parse error test case.
+        $cases[] = [51];
+
+        return $cases;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
new file mode 100644
index 00000000..7e7f3e09
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
@@ -0,0 +1,13 @@
+<?php
+/*
+ * Test spl_autoload_register() PHP 8.0 change in accepted values.
+ */
+
+// OK.
+spl_autoload_register();
+spl_autoload_register($autoload_function);
+spl_autoload_register($autoload_function, true, false);
+spl_autoload_register($autoload_function, $throw, $prepend);
+
+// Not OK.
+spl_autoload_register($autoload_function, false);
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
new file mode 100644
index 00000000..b78e2a4b
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedSplAutoloadRegisterThrowFalse sniff.
+ *
+ * @group removedSplAutoloadRegisterThrowFalse
+ * @group parameterValues
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedSplAutoloadRegisterThrowFalseSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedSplAutoloadRegisterThrowFalseUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify a warning is thrown when an explicit false is passed as the second parameter.
+     *
+     * @dataProvider dataRemovedSplAutoloadRegisterThrowFalse
+     *
+     * @param int $line Line number where the error should occur.
+     *
+     * @return void
+     */
+    public function testRemovedSplAutoloadRegisterThrowFalse($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedSplAutoloadRegisterThrowFalse()
+     *
+     * @return array
+     */
+    public function dataRemovedSplAutoloadRegisterThrowFalse()
+    {
+        return [
+            [13],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+
+        // No errors expected on the first 11 lines.
+        for ($line = 1; $line <= 11; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php b/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
new file mode 100644
index 00000000..c908d409
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility\Util;
+
+use PHPCSUtils\TestUtils\UtilityMethodTestCase;
+
+/**
+ * Base class to use when testing utility methods.
+ *
+ * Set up and Tear down methods for testing methods in the Sniff.php file.
+ *
+ * @since 7.0.3
+ * @since 7.0.5  Renamed from `BaseAbstractClassMethodTest` to `CoreMethodTestFrame`.
+ * @since 7.1.2  No longer extends the `BaseSniffTest` class.
+ * @since 10.0.0 Now extends the PHPCSUtils `UtilityMethodTestCase`.
+ */
+abstract class CoreMethodTestFrame extends UtilityMethodTestCase
+{
+
+    /**
+     * Instance of the PHPCompatibility Sniff test double.
+     *
+     * @since 7.0.3
+     *
+     * @var TestHelperPHPCompatibility
+     */
+    public static $helperClass;
+
+    /**
+     * Initialize PHPCS & tokenize the test case file.
+     *
+     * @beforeClass
+     *
+     * @since 10.0.0
+     *
+     * @return void
+     */
+    public static function setUpTestFile()
+    {
+        parent::setUpTestFile();
+        self::$helperClass = new TestHelperPHPCompatibility();
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php b/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
new file mode 100644
index 00000000..a7e389ad
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility\Util;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Helper class to facilitate testing of the methods within the abstract \PHPCompatibility\Sniff class.
+ *
+ * @since 7.0.3
+ */
+class TestHelperPHPCompatibility extends Sniff
+{
+
+    /**
+     * Dummy method to bypass the abstract method implementation requirements.
+     *
+     * @since 7.0.3
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+
+    /**
+     * Dummy method to bypass the abstract method implementation requirements.
+     *
+     * @since 7.0.3
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in
+     *                                               the stack.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+    }
+
+    /**
+     * Wrapper to make the protected parent::isNumber() method testable.
+     *
+     * @since 8.2.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
+     * @param int                         $start       Start of the snippet (inclusive), i.e. this
+     *                                                 token will be examined as part of the
+     *                                                 snippet.
+     * @param int                         $end         End of the snippet (inclusive), i.e. this
+     *                                                 token will be examined as part of the
+     *                                                 snippet.
+     * @param bool                        $allowFloats Whether to only consider integers, or also floats.
+     *
+     * @return int|float|bool
+     */
+    public function isNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+    {
+        return parent::isNumber($phpcsFile, $start, $end, $allowFloats);
+    }
+
+    /**
+     * Wrapper to make the protected parent::isNumericCalculation() method testable.
+     *
+     * @since 9.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $start     Start of the snippet (inclusive), i.e. this
+     *                                               token will be examined as part of the
+     *                                               snippet.
+     * @param int                         $end       End of the snippet (inclusive), i.e. this
+     *                                               token will be examined as part of the
+     *                                               snippet.
+     *
+     * @return bool
+     */
+    public function isNumericCalculation(File $phpcsFile, $start, $end)
+    {
+        return parent::isNumericCalculation($phpcsFile, $start, $end);
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index daeef23f..d85452b3 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -471,6 +471,7 @@
         </properties>
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
     </rule>
     <rule ref="Generic.Formatting.DisallowMultipleStatements">
         <severity>6</severity>
@@ -743,7 +744,29 @@
     </rule>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+        <!-- Following sniffs has been updated or renamed in PHPCompatibility 10 -->
+        <exclude name="PHPCompatibility.Constants.NewMagicClassConstant" />
+        <exclude name="PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods" />
         <!-- Check for cross-version support for stated PHP version and higher. -->
         <config name="testVersion" value="7.4-"/>
     </rule>
+    <!--
+     All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is
+     updated to version 10
+     -->
+    <rule ref="Magento2.PHPCompatibility.NewAttributes" />
+    <rule ref="Magento2.PHPCompatibility.NewMagicClassConstant" />
+    <rule ref="Magento2.PHPCompatibility.NewNonCapturingCatch" />
+    <rule ref="Magento2.PHPCompatibility.AbstractPrivateMethods" />
+    <rule ref="Magento2.PHPCompatibility.ForbiddenFinalPrivateMethods" />
+    <rule ref="Magento2.PHPCompatibility.NewTrailingComma" />
+    <rule ref="Magento2.PHPCompatibility.RemovedCallingDestructAfterConstructorExit" />
+    <rule ref="Magento2.PHPCompatibility.RemovedOptionalBeforeRequiredParam" />
+    <rule ref="Magento2.PHPCompatibility.ChangedIntToBoolParamType" />
+    <rule ref="Magento2.PHPCompatibility.RemovedAssertStringAssertion" />
+    <rule ref="Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse" />
+    <rule ref="Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse" />
+    <rule ref="Magento2.PHPCompatibility.NewInterpolatedStringDereferencing" />
+    <rule ref="Magento2.PHPCompatibility.NewMagicConstantDereferencing" />
+    <rule ref="Magento2.PHPCompatibility.NewNestedStaticAccess" />
 </ruleset>
diff --git a/Magento2Framework/ruleset.xml b/Magento2Framework/ruleset.xml
index 80369df8..879ce559 100644
--- a/Magento2Framework/ruleset.xml
+++ b/Magento2Framework/ruleset.xml
@@ -7,6 +7,7 @@
     <rule ref="Magento2Framework.Header.License">
         <severity>5</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
     </rule>
     <rule ref="Magento2Framework.Header.CopyrightAnotherExtensionsFiles">
         <severity>5</severity>
@@ -17,6 +18,7 @@
     <rule ref="Magento2Framework.Header.Copyright">
         <severity>5</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
     </rule>
diff --git a/composer.json b/composer.json
index 168dd8be..2533bf43 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6",
+        "phpcsstandards/phpcsutils": "^1.0@alpha",
         "rector/rector": "^0.12.4"
     },
     "require-dev": {
@@ -36,5 +37,7 @@
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility",
         "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility"
-    }
+    },
+    "minimum-stability": "alpha",
+    "prefer-stable": true
 }
diff --git a/composer.lock b/composer.lock
index 477af2cd..1ba34e0f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,78 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "20e40c8c33e9c2fc21cae5999414b4c0",
+    "content-hash": "60d3c6d032137be43c4740222c2bc6d1",
     "packages": [
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v0.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
+                "reference": "fe390591e0241955f22eb9ba327d137e501c771c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c",
+                "reference": "fe390591e0241955f22eb9ba327d137e501c771c",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "sensiolabs/security-checker": "^4.1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
+            "time": "2020-12-07T18:04:37+00:00"
+        },
         {
             "name": "phpcompatibility/php-compatibility",
             "version": "9.3.5",
@@ -68,6 +138,74 @@
             },
             "time": "2019-12-27T09:44:58+00:00"
         },
+        {
+            "name": "phpcsstandards/phpcsutils",
+            "version": "1.0.0-alpha3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
+                "reference": "a16c989b8421e29c336ece5c4099b48585994673"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/a16c989b8421e29c336ece5c4099b48585994673",
+                "reference": "a16c989b8421e29c336ece5c4099b48585994673",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^2.6.0 || ^3.1.0 || 4.0.x-dev@dev"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "3.5.3"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-console-highlighter": "^0.5",
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "autoload": {
+                "classmap": [
+                    "PHPCSUtils/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors"
+                }
+            ],
+            "description": "A suite of utility functions for use with PHP_CodeSniffer",
+            "homepage": "https://phpcsutils.com/",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "phpcbf",
+                "phpcodesniffer-standard",
+                "phpcs",
+                "phpcs2",
+                "phpcs3",
+                "standards",
+                "tokens",
+                "utility"
+            ],
+            "support": {
+                "docs": "https://phpcsutils.com/",
+                "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+                "source": "https://github.com/PHPCSStandards/PHPCSUtils"
+            },
+            "time": "2020-06-28T21:57:33+00:00"
+        },
         {
             "name": "phpstan/phpstan",
             "version": "1.2.0",
@@ -2412,9 +2550,11 @@
         }
     ],
     "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
+    "minimum-stability": "alpha",
+    "stability-flags": {
+        "phpcsstandards/phpcsutils": 15
+    },
+    "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.3",
diff --git a/phpunit-bootstrap.php b/phpunit-bootstrap.php
new file mode 100644
index 00000000..2cf8c7f6
--- /dev/null
+++ b/phpunit-bootstrap.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * Bootstrap file for tests.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2019 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ *
+ * @since 5.5
+ */
+
+if (defined('PHP_CODESNIFFER_IN_TESTS') === false) {
+    define('PHP_CODESNIFFER_IN_TESTS', true);
+}
+
+// The below two defines are needed for PHPCS 3.x.
+if (defined('PHP_CODESNIFFER_CBF') === false) {
+    define('PHP_CODESNIFFER_CBF', false);
+}
+
+if (defined('PHP_CODESNIFFER_VERBOSITY') === false) {
+    define('PHP_CODESNIFFER_VERBOSITY', 0);
+}
+
+$ds = DIRECTORY_SEPARATOR;
+
+// Get the PHPCS dir from an environment variable.
+$phpcsDir = getenv('PHPCS_DIR');
+
+// This may be a Composer install.
+if ($phpcsDir === false && is_dir(__DIR__ . $ds . 'vendor' . $ds . 'squizlabs' . $ds . 'php_codesniffer')) {
+    $vendorDir = __DIR__ . $ds . 'vendor';
+    $phpcsDir  = $vendorDir . $ds . 'squizlabs' . $ds . 'php_codesniffer';
+} elseif ($phpcsDir !== false) {
+    $phpcsDir = realpath($phpcsDir);
+}
+
+// Try and load the PHPCS autoloader.
+if ($phpcsDir !== false && file_exists($phpcsDir . $ds . 'autoload.php')) {
+    // PHPCS 3.x.
+    require_once $phpcsDir . $ds . 'autoload.php';
+
+    /*
+     * Alias the PHPCS 3.x classes to their PHPCS 2.x equivalent if necessary.
+     * Also provide a custom autoloader for our abstract base classes as the PHPCS native autoloader
+     * has trouble with them in combination with the PHPCompatibility custom unit test suite.
+     */
+    require_once __DIR__ . $ds . 'vendor/phpcompatibility/php-compatibility/PHPCSAliases.php';
+
+} elseif ($phpcsDir !== false && file_exists($phpcsDir . $ds . 'CodeSniffer.php')) {
+    // PHPCS 2.x.
+    require_once $phpcsDir . $ds . 'CodeSniffer.php';
+
+    if (isset($vendorDir) && file_exists($vendorDir . $ds . 'autoload.php')) {
+        require_once $vendorDir . $ds . 'autoload.php';
+    }
+
+} else {
+    echo 'Uh oh... can\'t find PHPCS.
+
+If you use Composer, please run `composer install --prefer-source`.
+Otherwise, make sure you set a `PHPCS_DIR` environment variable in your phpunit.xml file
+pointing to the PHPCS directory.
+
+Please read the contributors guidelines for more information:
+https://is.gd/PHPCompatibilityContrib
+';
+
+    die(1);
+}
+
+
+// PHPUnit cross version compatibility.
+if (class_exists('PHPUnit\Runner\Version')
+    && version_compare(PHPUnit\Runner\Version::id(), '6.0', '>=')
+    && class_exists('PHPUnit_Framework_TestCase') === false
+) {
+    class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
+}
+
+unset($ds, $phpcsDir, $vendorDir);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6d1afb07..c79afe8a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="vendor/squizlabs/php_codesniffer/tests/bootstrap.php">
+<phpunit backupGlobals="true" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="phpunit-bootstrap.php">
     <testsuites>
         <testsuite name="PHP_CodeSniffer Test Suite">
             <file>vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>

From 90ee4887c6f34d1fa5fa0c973cb2b69b570b300f Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Fri, 26 Nov 2021 03:18:30 -0800
Subject: [PATCH 421/630] [Imported] AC-1060: Move relevant sniffs from
 PHPCompatibility (#131)

* AC-1060: Move relevant sniffs from PHPCompatibility

From 1547f2a0edd7cd2f814a0dfbea161904fd6ec302 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 8 Dec 2021 06:03:22 -0600
Subject: [PATCH 422/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Improved static test coverage:
    - Removed jQuery.load(handler) test as jQuery.load(handler) is a valid function
    - Removed jQuery.error(handler) test as jQuery.error(msg) is a valid function
    - Added static tests for $.isFunction, $.type, $.parseJson, $.isArray
    - Added test for $.expr[':'] and $.expr.filters
---
 .../Tests/Eslint/AbstractEslintTestCase.php   |  2 +-
 Magento2/Tests/Eslint/AndSelfTest.js          |  2 +-
 Magento2/Tests/Eslint/BindUnbindTest.js       |  2 +-
 .../Tests/Eslint/ClickEventShorthandTest.js   |  5 +-
 .../Tests/Eslint/ClickEventShorthandTest.php  |  7 ++-
 .../Tests/Eslint/DelegateUndelegateTest.js    |  2 +-
 Magento2/Tests/Eslint/EventShorthandTest.js   |  3 +-
 Magento2/Tests/Eslint/EventShorthandTest.php  |  7 ++-
 .../Tests/Eslint/MiscDeprecatedExprTest.js    |  6 ++
 .../Tests/Eslint/MiscDeprecatedExprTest.php   | 27 +++++++++
 .../Eslint/MiscDeprecatedFunctionsTest.js     |  8 +++
 .../Eslint/MiscDeprecatedFunctionsTest.php    | 29 ++++++++++
 Magento2/Tests/Eslint/SizeTest.js             |  2 +-
 Magento2/Tests/Eslint/TrimTest.js             |  2 +-
 eslint/.eslintrc-jquery                       |  4 +-
 eslint/rules/jquery-no-deprecated-expr.js     | 48 ++++++++++++++++
 eslint/rules/jquery-no-event-shorthand.js     | 15 +++--
 .../jquery-no-misc-deprecated-functions.js    | 57 +++++++++++++++++++
 eslint/rules/utils.js                         |  2 +-
 19 files changed, 208 insertions(+), 22 deletions(-)
 create mode 100644 Magento2/Tests/Eslint/MiscDeprecatedExprTest.js
 create mode 100644 Magento2/Tests/Eslint/MiscDeprecatedExprTest.php
 create mode 100644 Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
 create mode 100644 Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php
 create mode 100644 eslint/rules/jquery-no-deprecated-expr.js
 create mode 100644 eslint/rules/jquery-no-misc-deprecated-functions.js

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index dc4b6b86..8772d6bf 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -23,7 +23,7 @@ abstract class AbstractEslintTestCase extends TestCase
     protected function assertFileContainsError(string $testFile, array $expectedMessages): void
     {
         exec(
-            'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
+            'npm run eslint -- Magento2/Tests/Eslint/' . $testFile . ' 2>&1',
             $output
         );
 
diff --git a/Magento2/Tests/Eslint/AndSelfTest.js b/Magento2/Tests/Eslint/AndSelfTest.js
index 036dec01..1cd6f278 100644
--- a/Magento2/Tests/Eslint/AndSelfTest.js
+++ b/Magento2/Tests/Eslint/AndSelfTest.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(function () {
     'use strict';
 
     $('div').find('p').andSelf().addClass('border');
diff --git a/Magento2/Tests/Eslint/BindUnbindTest.js b/Magento2/Tests/Eslint/BindUnbindTest.js
index befb2b3a..1fa50a2f 100644
--- a/Magento2/Tests/Eslint/BindUnbindTest.js
+++ b/Magento2/Tests/Eslint/BindUnbindTest.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(function () {
     'use strict';
 
     $('.btn1').bind('click');
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.js b/Magento2/Tests/Eslint/ClickEventShorthandTest.js
index a4ae7529..586dfce8 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.js
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.js
@@ -1,5 +1,6 @@
-$(document).ready(function () {
+$(function () {
     'use strict';
 
-    $('input').blur();
+    $('#result').blur();
+    $.fn.focus(function () {});
 });
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.php b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
index 2f5fe0bc..caed6926 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.php
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
@@ -18,7 +18,10 @@ public function testExecute(): void
     {
         $this->assertFileContainsError(
             'ClickEventShorthandTest.js',
-            ['Instead of .blur(fn) use .on("blur", fn). Instead of .blur() use .trigger("blur")']
+            [
+                'Instead of .blur(fn) use .on("blur", fn). Instead of .blur() use .trigger("blur")',
+                'Instead of .focus(fn) use .on("focus", fn). Instead of .focus() use .trigger("focus")',
+            ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.js b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
index a2ed68cc..57b2b262 100644
--- a/Magento2/Tests/Eslint/DelegateUndelegateTest.js
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(function () {
     'use strict';
 
     $('table').delegate('td', 'click', function () {
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.js b/Magento2/Tests/Eslint/EventShorthandTest.js
index 23762969..a0269289 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.js
+++ b/Magento2/Tests/Eslint/EventShorthandTest.js
@@ -1,5 +1,4 @@
 $(document).ready(function () {
     'use strict';
-
-    $('#result').load('ajax/test.html');
+    $('#result').unload(function () {});
 });
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.php b/Magento2/Tests/Eslint/EventShorthandTest.php
index f79eebd2..1e988786 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.php
+++ b/Magento2/Tests/Eslint/EventShorthandTest.php
@@ -18,7 +18,10 @@ public function testExecute(): void
     {
         $this->assertFileContainsError(
             'EventShorthandTest.js',
-            ['jQuery.load() was removed, use .on("load", fn) instead']
+            [
+                'jQuery.unload() was removed, use .on("unload", fn) instead',
+                'jQuery.ready(handler) is deprecated and should be replaced with jQuery(handler)'
+            ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedExprTest.js b/Magento2/Tests/Eslint/MiscDeprecatedExprTest.js
new file mode 100644
index 00000000..20b6c7df
--- /dev/null
+++ b/Magento2/Tests/Eslint/MiscDeprecatedExprTest.js
@@ -0,0 +1,6 @@
+$(function () {
+    'use strict';
+
+    $.extend($.expr[':'], {});
+    jQuery.extend($.expr.filters, {});
+});
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedExprTest.php b/Magento2/Tests/Eslint/MiscDeprecatedExprTest.php
new file mode 100644
index 00000000..ab21c39e
--- /dev/null
+++ b/Magento2/Tests/Eslint/MiscDeprecatedExprTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class EventShorthandTest
+ *
+ * Test Eslint Rule: jquery-no-event-shorthand.js
+ */
+class MiscDeprecatedExprTest extends AbstractEslintTestCase
+{
+    public function testExecute(): void
+    {
+        $this->assertFileContainsError(
+            'MiscDeprecatedExprTest.js',
+            [
+                'jQuery.expr[":"] is deprecated; Use jQuery.expr.pseudos instead',
+                'jQuery.expr.filters is deprecated; Use jQuery.expr.pseudos instead'
+            ]
+        );
+    }
+}
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
new file mode 100644
index 00000000..5905894b
--- /dev/null
+++ b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
@@ -0,0 +1,8 @@
+$(function () {
+    'use strict';
+
+    $.parseJSON('');
+    jQuery.type({});
+    $.isArray({});
+    $.isFunction({})
+});
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php
new file mode 100644
index 00000000..4eb1cd85
--- /dev/null
+++ b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Eslint;
+
+/**
+ * Class EventShorthandTest
+ *
+ * Test Eslint Rule: jquery-no-event-shorthand.js
+ */
+class MiscDeprecatedFunctionsTest extends AbstractEslintTestCase
+{
+    public function testExecute(): void
+    {
+        $this->assertFileContainsError(
+            'MiscDeprecatedFunctionsTest.js',
+            [
+                'jQuery.isFunction() is deprecated. In most cases, it can be replaced by [typeof x === "function"]',
+                'jQuery.type() is deprecated. Replace with an appropriate type check like [typeof x === "function"]',
+                'jQuery.isArray() is deprecated. Use the native Array.isArray method instead',
+                'jQuery.parseJSON() is deprecated. To parse JSON strings, use the native JSON.parse method instead'
+            ]
+        );
+    }
+}
diff --git a/Magento2/Tests/Eslint/SizeTest.js b/Magento2/Tests/Eslint/SizeTest.js
index b6b767ee..c78cd48e 100644
--- a/Magento2/Tests/Eslint/SizeTest.js
+++ b/Magento2/Tests/Eslint/SizeTest.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(function () {
     'use strict';
 
     $('div').size();
diff --git a/Magento2/Tests/Eslint/TrimTest.js b/Magento2/Tests/Eslint/TrimTest.js
index 6f9251ec..4793aa7d 100644
--- a/Magento2/Tests/Eslint/TrimTest.js
+++ b/Magento2/Tests/Eslint/TrimTest.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(function () {
     'use strict';
 
     $.trim('    hello, how are you?    ');
diff --git a/eslint/.eslintrc-jquery b/eslint/.eslintrc-jquery
index 0051d6f0..75ef9f86 100644
--- a/eslint/.eslintrc-jquery
+++ b/eslint/.eslintrc-jquery
@@ -6,6 +6,8 @@
         "jquery-no-delegate-undelegate": 2,
         "jquery-no-event-shorthand": 2,
         "jquery-no-size": 2,
-        "jquery-no-trim": 2
+        "jquery-no-trim": 2,
+        "jquery-no-misc-deprecated-functions": 2,
+        "jquery-no-deprecated-expr": 2
     }
 }
diff --git a/eslint/rules/jquery-no-deprecated-expr.js b/eslint/rules/jquery-no-deprecated-expr.js
new file mode 100644
index 00000000..e5332dc7
--- /dev/null
+++ b/eslint/rules/jquery-no-deprecated-expr.js
@@ -0,0 +1,48 @@
+module.exports = {
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of shorthand event methods',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/load/'
+        },
+        schema: []
+    },
+
+    /**
+     * Executes the function to check if shorthand methods are used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
+
+        var utils = require('./utils.js');
+
+        return {
+            /**
+             * Checks if shorthand methods are used and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            'MemberExpression[property.value=":"] MemberExpression[property.name="expr"]': function (node) {
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        message: 'jQuery.expr[":"] is deprecated; Use jQuery.expr.pseudos instead'
+                    });
+                }
+            },
+            'MemberExpression[property.name="filters"] MemberExpression[property.name="expr"]': function (node) {
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        message: 'jQuery.expr.filters is deprecated; Use jQuery.expr.pseudos instead'
+                    });
+                }
+            }
+        };
+    }
+};
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index cc071b85..883ff5eb 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -2,7 +2,7 @@ module.exports = {
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Disallow the use of shorthand methods',
+            description: 'Disallow the use of shorthand event methods',
             category: 'jQuery deprecated functions',
             recommended: true,
             url: 'https://api.jquery.com/load/'
@@ -23,23 +23,26 @@ module.exports = {
 
         return {
             /**
-             * Checks if shorthand methods are used and reports it.
+             * Checks if deprecated functions are used and reports it.
              *
              * @param {Object} node - The node to check.
              */
             CallExpression: function (node) {
-                var names = ['load', 'unload', 'error'],
+                var namesToMsg = {
+                        'unload': 'jQuery.unload() was removed, use .on("unload", fn) instead.',
+                        'ready': 'jQuery.ready(handler) is deprecated and should be replaced with jQuery(handler)'
+                    },
                     name;
 
                 if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (!names.includes(node.callee.property.name)) {return;}
+                name = node.callee.property.name;
+                if (!(name in namesToMsg)) {return;}
 
                 if (utils.isjQuery(node)) {
-                    name = node.callee.property.name;
                     context.report({
                         node: node,
-                        message: 'jQuery.' + name + '() was removed, use .on("' + name + '", fn) instead.'
+                        message: namesToMsg[name]
                     });
                 }
             }
diff --git a/eslint/rules/jquery-no-misc-deprecated-functions.js b/eslint/rules/jquery-no-misc-deprecated-functions.js
new file mode 100644
index 00000000..aa76184f
--- /dev/null
+++ b/eslint/rules/jquery-no-misc-deprecated-functions.js
@@ -0,0 +1,57 @@
+module.exports = {
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Disallow the use of shorthand event methods',
+            category: 'jQuery deprecated functions',
+            recommended: true,
+            url: 'https://api.jquery.com/load/'
+        },
+        schema: []
+    },
+
+    /**
+     * Executes the function to check if shorthand methods are used.
+     *
+     * @param {Object} context
+     * @returns {Object}
+     */
+    create: function (context) {
+        'use strict';
+
+        var utils = require('./utils.js');
+
+        return {
+            /**
+             * Checks if shorthand methods are used and reports it.
+             *
+             * @param {Object} node - The node to check.
+             */
+            CallExpression: function (node) {
+                var namesToMsg = {
+                        'isFunction': 'jQuery.isFunction() is deprecated. '
+                            + 'In most cases, it can be replaced by [typeof x === "function"]',
+                        'type': 'jQuery.type() is deprecated. ' +
+                            'Replace with an appropriate type check like [typeof x === "function"]',
+                        'isArray': 'jQuery.isArray() is deprecated. ' +
+                            'Use the native Array.isArray method instead',
+                        'parseJSON' : 'jQuery.parseJSON() is deprecated. ' +
+                            'To parse JSON strings, use the native JSON.parse method instead'
+                    },
+                    name;
+
+                if (node.callee.type !== 'MemberExpression') {return;}
+
+                name = node.callee.property.name;
+                if (!(name in namesToMsg)) {return;}
+
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        message: namesToMsg[name]
+                    });
+                }
+            }
+        };
+    }
+};
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index fee127a2..106689c8 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -40,7 +40,7 @@ function isjQuery(node) {
 
     var id = traverse(node);
 
-    return id && id.name.startsWith('$');
+    return id && id.name.startsWith('$') || id.name.toLowerCase() === 'jquery';
 }
 
 module.exports = {

From ddda4247cc5056d252291d296dfae0db74b067cc Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 8 Dec 2021 06:21:30 -0600
Subject: [PATCH 423/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Improved static test coverage:
    - Removed jQuery.load(handler) test as jQuery.load(handler) is a valid function
    - Removed jQuery.error(handler) test as jQuery.error(msg) is a valid function
    - Added static tests for $.isFunction, $.type, $.parseJson, $.isArray
    - Added test for $.expr[':'] and $.expr.filters
---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index 8772d6bf..dc4b6b86 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -23,7 +23,7 @@ abstract class AbstractEslintTestCase extends TestCase
     protected function assertFileContainsError(string $testFile, array $expectedMessages): void
     {
         exec(
-            'npm run eslint -- Magento2/Tests/Eslint/' . $testFile . ' 2>&1',
+            'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
             $output
         );
 

From 27d0c44337a3b190aa7153764e0751cf93e10d47 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 8 Dec 2021 06:52:47 -0600
Subject: [PATCH 424/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fixed styling
---
 Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
index 5905894b..8cebe90e 100644
--- a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
+++ b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
@@ -4,5 +4,5 @@ $(function () {
     $.parseJSON('');
     jQuery.type({});
     $.isArray({});
-    $.isFunction({})
+    $.isFunction({});
 });

From e4c8f2020e0b2c912cf2ea0facb514a970143874 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 8 Dec 2021 10:11:21 -0600
Subject: [PATCH 425/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fixed transversal issues
---
 Magento2/Tests/Eslint/EventShorthandTest.js         | 1 +
 eslint/rules/jquery-no-click-event-shorthand.js     | 3 +--
 eslint/rules/jquery-no-event-shorthand.js           | 6 ++++--
 eslint/rules/jquery-no-misc-deprecated-functions.js | 8 +++++---
 eslint/rules/utils.js                               | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Magento2/Tests/Eslint/EventShorthandTest.js b/Magento2/Tests/Eslint/EventShorthandTest.js
index a0269289..d10428fc 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.js
+++ b/Magento2/Tests/Eslint/EventShorthandTest.js
@@ -2,3 +2,4 @@ $(document).ready(function () {
     'use strict';
     $('#result').unload(function () {});
 });
+
diff --git a/eslint/rules/jquery-no-click-event-shorthand.js b/eslint/rules/jquery-no-click-event-shorthand.js
index 9c03f9d6..3215206a 100644
--- a/eslint/rules/jquery-no-click-event-shorthand.js
+++ b/eslint/rules/jquery-no-click-event-shorthand.js
@@ -42,8 +42,7 @@ module.exports = {
                     name = node.callee.property.name;
                     context.report({
                         node: node,
-                        message:
-                            'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
+                        message: 'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
                             '() use .trigger("' + name + '")'
                     });
                 }
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 883ff5eb..4f6520aa 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -32,12 +32,14 @@ module.exports = {
                         'unload': 'jQuery.unload() was removed, use .on("unload", fn) instead.',
                         'ready': 'jQuery.ready(handler) is deprecated and should be replaced with jQuery(handler)'
                     },
-                    name;
+                    name,
+                    message;
 
                 if (node.callee.type !== 'MemberExpression') {return;}
 
                 name = node.callee.property.name;
-                if (!(name in namesToMsg)) {return;}
+                if (!namesToMsg.hasOwnProperty(name)) {return;}
+                message = namesToMsg[name];
 
                 if (utils.isjQuery(node)) {
                     context.report({
diff --git a/eslint/rules/jquery-no-misc-deprecated-functions.js b/eslint/rules/jquery-no-misc-deprecated-functions.js
index aa76184f..26fde9bc 100644
--- a/eslint/rules/jquery-no-misc-deprecated-functions.js
+++ b/eslint/rules/jquery-no-misc-deprecated-functions.js
@@ -38,17 +38,19 @@ module.exports = {
                         'parseJSON' : 'jQuery.parseJSON() is deprecated. ' +
                             'To parse JSON strings, use the native JSON.parse method instead'
                     },
-                    name;
+                    name,
+                    message;
 
                 if (node.callee.type !== 'MemberExpression') {return;}
 
                 name = node.callee.property.name;
-                if (!(name in namesToMsg)) {return;}
+                if (!namesToMsg.hasOwnProperty(name)) {return;}
+                message = namesToMsg[name];
 
                 if (utils.isjQuery(node)) {
                     context.report({
                         node: node,
-                        message: namesToMsg[name]
+                        message: message
                     });
                 }
             }
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index 106689c8..8df4c7a3 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -40,7 +40,7 @@ function isjQuery(node) {
 
     var id = traverse(node);
 
-    return id && id.name.startsWith('$') || id.name.toLowerCase() === 'jquery';
+    return id && (id.name.startsWith('$') || id.name.toLowerCase() === 'jquery');
 }
 
 module.exports = {

From 8bf94b6c8ae775e4988adf84054152e884a39cae Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Sun, 12 Dec 2021 18:36:07 -0600
Subject: [PATCH 426/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fixed naming and comment issues
---
 ...MiscDeprecatedExprTest.js => DeprecatedExprTest.js} |  0
 ...scDeprecatedExprTest.php => DeprecatedExprTest.php} |  8 ++++----
 ...ventShorthandTest.js => InputEventShorthandTest.js} |  0
 ...ntShorthandTest.php => InputEventShorthandTest.php} |  8 ++++----
 Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php  |  4 ++--
 eslint/.eslintrc-jquery                                |  3 ++-
 eslint/rules/jquery-no-deprecated-expr.js              | 10 ++++++++--
 eslint/rules/jquery-no-event-shorthand.js              |  2 +-
 ...shorthand.js => jquery-no-input-event-shorthand.js} |  2 +-
 eslint/rules/jquery-no-misc-deprecated-functions.js    |  6 +++---
 package.json                                           |  2 +-
 11 files changed, 26 insertions(+), 19 deletions(-)
 rename Magento2/Tests/Eslint/{MiscDeprecatedExprTest.js => DeprecatedExprTest.js} (100%)
 rename Magento2/Tests/Eslint/{MiscDeprecatedExprTest.php => DeprecatedExprTest.php} (72%)
 rename Magento2/Tests/Eslint/{ClickEventShorthandTest.js => InputEventShorthandTest.js} (100%)
 rename Magento2/Tests/Eslint/{ClickEventShorthandTest.php => InputEventShorthandTest.php} (72%)
 rename eslint/rules/{jquery-no-click-event-shorthand.js => jquery-no-input-event-shorthand.js} (93%)

diff --git a/Magento2/Tests/Eslint/MiscDeprecatedExprTest.js b/Magento2/Tests/Eslint/DeprecatedExprTest.js
similarity index 100%
rename from Magento2/Tests/Eslint/MiscDeprecatedExprTest.js
rename to Magento2/Tests/Eslint/DeprecatedExprTest.js
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedExprTest.php b/Magento2/Tests/Eslint/DeprecatedExprTest.php
similarity index 72%
rename from Magento2/Tests/Eslint/MiscDeprecatedExprTest.php
rename to Magento2/Tests/Eslint/DeprecatedExprTest.php
index ab21c39e..5d1437aa 100644
--- a/Magento2/Tests/Eslint/MiscDeprecatedExprTest.php
+++ b/Magento2/Tests/Eslint/DeprecatedExprTest.php
@@ -8,16 +8,16 @@
 namespace Magento2\Tests\Eslint;
 
 /**
- * Class EventShorthandTest
+ * Class DeprecatedExprTest
  *
- * Test Eslint Rule: jquery-no-event-shorthand.js
+ * Test Eslint Rule: jquery-no-deprecated-expr.js
  */
-class MiscDeprecatedExprTest extends AbstractEslintTestCase
+class DeprecatedExprTest extends AbstractEslintTestCase
 {
     public function testExecute(): void
     {
         $this->assertFileContainsError(
-            'MiscDeprecatedExprTest.js',
+            'DeprecatedExprTest.js',
             [
                 'jQuery.expr[":"] is deprecated; Use jQuery.expr.pseudos instead',
                 'jQuery.expr.filters is deprecated; Use jQuery.expr.pseudos instead'
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.js b/Magento2/Tests/Eslint/InputEventShorthandTest.js
similarity index 100%
rename from Magento2/Tests/Eslint/ClickEventShorthandTest.js
rename to Magento2/Tests/Eslint/InputEventShorthandTest.js
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.php b/Magento2/Tests/Eslint/InputEventShorthandTest.php
similarity index 72%
rename from Magento2/Tests/Eslint/ClickEventShorthandTest.php
rename to Magento2/Tests/Eslint/InputEventShorthandTest.php
index caed6926..984f586e 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.php
+++ b/Magento2/Tests/Eslint/InputEventShorthandTest.php
@@ -8,16 +8,16 @@
 namespace Magento2\Tests\Eslint;
 
 /**
- * Class ClickEventShorthandTest
+ * Class InputEventShorthandTest
  *
- * Test Eslint Rule: jquery-no-click-event-shorthand.js
+ * Test Eslint Rule: jquery-no-input-event-shorthand.js
  */
-class ClickEventShorthandTest extends AbstractEslintTestCase
+class InputEventShorthandTest extends AbstractEslintTestCase
 {
     public function testExecute(): void
     {
         $this->assertFileContainsError(
-            'ClickEventShorthandTest.js',
+            'InputEventShorthandTest.js',
             [
                 'Instead of .blur(fn) use .on("blur", fn). Instead of .blur() use .trigger("blur")',
                 'Instead of .focus(fn) use .on("focus", fn). Instead of .focus() use .trigger("focus")',
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php
index 4eb1cd85..48f87b94 100644
--- a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php
+++ b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.php
@@ -8,9 +8,9 @@
 namespace Magento2\Tests\Eslint;
 
 /**
- * Class EventShorthandTest
+ * Class MiscDeprecatedFunctionsTest
  *
- * Test Eslint Rule: jquery-no-event-shorthand.js
+ * Test Eslint Rule: jquery-no-misc-deprecated-functions.js
  */
 class MiscDeprecatedFunctionsTest extends AbstractEslintTestCase
 {
diff --git a/eslint/.eslintrc-jquery b/eslint/.eslintrc-jquery
index 75ef9f86..d9363e15 100644
--- a/eslint/.eslintrc-jquery
+++ b/eslint/.eslintrc-jquery
@@ -1,8 +1,9 @@
 {
+    "ignorePatterns": ["**/vendor/**/*.js", "**/node_modules/**/*.js"],
     "rules": {
         "jquery-no-andSelf": 2,
         "jquery-no-bind-unbind": 2,
-        "jquery-no-click-event-shorthand": 2,
+        "jquery-no-input-event-shorthand": 2,
         "jquery-no-delegate-undelegate": 2,
         "jquery-no-event-shorthand": 2,
         "jquery-no-size": 2,
diff --git a/eslint/rules/jquery-no-deprecated-expr.js b/eslint/rules/jquery-no-deprecated-expr.js
index e5332dc7..2a9e2377 100644
--- a/eslint/rules/jquery-no-deprecated-expr.js
+++ b/eslint/rules/jquery-no-deprecated-expr.js
@@ -2,7 +2,7 @@ module.exports = {
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Disallow the use of shorthand event methods',
+            description: 'Disallow the use of deprecated way to add to custom selectors',
             category: 'jQuery deprecated functions',
             recommended: true,
             url: 'https://api.jquery.com/load/'
@@ -23,7 +23,7 @@ module.exports = {
 
         return {
             /**
-             * Checks if shorthand methods are used and reports it.
+             * Checks for jQuery.expr[':']
              *
              * @param {Object} node - The node to check.
              */
@@ -35,6 +35,12 @@ module.exports = {
                     });
                 }
             },
+
+            /**
+             * Checks for jQuery.expr.filters
+             *
+             * @param {Object} node - The node to check.
+             */
             'MemberExpression[property.name="filters"] MemberExpression[property.name="expr"]': function (node) {
                 if (utils.isjQuery(node)) {
                     context.report({
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 4f6520aa..9ad8db2a 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -44,7 +44,7 @@ module.exports = {
                 if (utils.isjQuery(node)) {
                     context.report({
                         node: node,
-                        message: namesToMsg[name]
+                        message: message
                     });
                 }
             }
diff --git a/eslint/rules/jquery-no-click-event-shorthand.js b/eslint/rules/jquery-no-input-event-shorthand.js
similarity index 93%
rename from eslint/rules/jquery-no-click-event-shorthand.js
rename to eslint/rules/jquery-no-input-event-shorthand.js
index 3215206a..6983fa5e 100644
--- a/eslint/rules/jquery-no-click-event-shorthand.js
+++ b/eslint/rules/jquery-no-input-event-shorthand.js
@@ -2,7 +2,7 @@ module.exports = {
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Disallow the use of shortcuts to trigger events',
+            description: 'Disallow the use of shortcuts to input events via keyboard/mouse trigger events',
             category: 'jQuery deprecated functions',
             recommended: true,
             url: 'https://api.jquery.com/bind/'
diff --git a/eslint/rules/jquery-no-misc-deprecated-functions.js b/eslint/rules/jquery-no-misc-deprecated-functions.js
index 26fde9bc..b4b7b52e 100644
--- a/eslint/rules/jquery-no-misc-deprecated-functions.js
+++ b/eslint/rules/jquery-no-misc-deprecated-functions.js
@@ -2,7 +2,7 @@ module.exports = {
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Disallow the use of shorthand event methods',
+            description: 'Disallow the use of various deprecated methods methods',
             category: 'jQuery deprecated functions',
             recommended: true,
             url: 'https://api.jquery.com/load/'
@@ -11,7 +11,7 @@ module.exports = {
     },
 
     /**
-     * Executes the function to check if shorthand methods are used.
+     * Executes the function to check if deprecated methods methods are used
      *
      * @param {Object} context
      * @returns {Object}
@@ -23,7 +23,7 @@ module.exports = {
 
         return {
             /**
-             * Checks if shorthand methods are used and reports it.
+             * Checks if deprecated methods are used and reports it.
              *
              * @param {Object} node - The node to check.
              */
diff --git a/package.json b/package.json
index 4aeec6d0..0525e9c4 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "eslint/.eslintrc",
   "scripts": {
-    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules"
+    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc-jquery --rulesdir eslint/rules"
   },
   "author": "",
   "license": "ISC",

From 05b2fdc401b965943c8a0c767a453a8b7dd5f750 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Mon, 13 Dec 2021 12:32:35 -0600
Subject: [PATCH 427/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fixed CR issues
---
 eslint/rules/jquery-no-event-shorthand.js | 4 ++--
 package.json                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 9ad8db2a..28e66353 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -11,7 +11,7 @@ module.exports = {
     },
 
     /**
-     * Executes the function to check if shorthand methods are used.
+     * Executes the function to check if shorthand event methods are used.
      *
      * @param {Object} context
      * @returns {Object}
@@ -23,7 +23,7 @@ module.exports = {
 
         return {
             /**
-             * Checks if deprecated functions are used and reports it.
+             * Checks if shorthand event methods are used.
              *
              * @param {Object} node - The node to check.
              */
diff --git a/package.json b/package.json
index 0525e9c4..4aeec6d0 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "eslint/.eslintrc",
   "scripts": {
-    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc-jquery --rulesdir eslint/rules"
+    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules"
   },
   "author": "",
   "license": "ISC",

From 68eadc2e88966cdae74eecaf1835cfc6f952aaec Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Tue, 14 Dec 2021 06:15:23 -0800
Subject: [PATCH 428/630] Fixed graphql unit test failing as it was extending
 from a wrong class (#134)

Co-authored-by: Sergio Vera <svera@adobe.com>
---
 .../Tests/Header/CopyrightGraphQLUnitTest.php             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
index 485e91f1..7323bd96 100644
--- a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento2Framework\Tests\Header;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use Magento2\Tests\GraphQL\AbstractGraphQLSniffUnitTestCase;
 
-class CopyrightGraphQLUnitTest extends AbstractSniffUnitTest
+class CopyrightGraphQLUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
     /**
      * @inheritdoc
@@ -22,12 +22,12 @@ public function getErrorList(): array
      */
     public function getWarningList($testFile = ''): array
     {
-        if ($testFile === 'CopyrightGraphQLUnitTest.1.graphqls' || 
+        if ($testFile === 'CopyrightGraphQLUnitTest.1.graphqls' ||
             $testFile === 'CopyrightGraphQLUnitTest.2.graphqls') {
             return [];
         }
 
-        if ($testFile === 'CopyrightGraphQLUnitTest.3.graphqls' || 
+        if ($testFile === 'CopyrightGraphQLUnitTest.3.graphqls' ||
             $testFile === 'CopyrightGraphQLUnitTest.4.graphqls') {
             return [
                 null => 1

From f4a8132dcfaca1af5f4c0347b9a083f5f6eada79 Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Tue, 14 Dec 2021 06:40:02 -0800
Subject: [PATCH 429/630] [Imported] AC-1902: Remove PHPCSUtils dependency from
 coding standard (#135)

* AC-1902: Remove PHPCSUtils dependency from coding standard
---
 .../PHPCSUtils/BackCompat/BCTokens.php        | 109 +++
 .../Helpers/PHPCSUtils/BackCompat/Helper.php  | 242 ++++++
 .../TestUtils/UtilityMethodTestCase.php       | 450 +++++++++++
 .../Helpers/PHPCSUtils/Tokens/Collections.php | 369 +++++++++
 .../Helpers/PHPCSUtils/Utils/Conditions.php   | 119 +++
 .../PHPCSUtils/Utils/FunctionDeclarations.php | 754 ++++++++++++++++++
 .../PHPCSUtils/Utils/GetTokensAsString.php    | 188 +++++
 .../PHPCSUtils/Utils/ObjectDeclarations.php   | 363 +++++++++
 .../Helpers/PHPCSUtils/Utils/Parentheses.php  | 155 ++++
 Magento2/Helpers/PHPCSUtils/Utils/Scopes.php  |  80 ++
 .../Helpers/PHPCSUtils/Utils/TextStrings.php  | 133 +++
 .../PHPCSUtils/Utils/UseStatements.php        | 412 ++++++++++
 .../AbstractPrivateMethodsSniff.php           |   6 +-
 .../ChangedIntToBoolParamTypeSniff.php        |   2 +-
 .../ForbiddenFinalPrivateMethodsSniff.php     |   4 +-
 .../PHPCompatibility/NewAttributesSniff.php   |   2 +-
 ...ewInterpolatedStringDereferencingSniff.php |   2 +-
 .../NewMagicClassConstantSniff.php            |   2 +-
 .../NewMagicConstantDereferencingSniff.php    |   4 +-
 .../NewTrailingCommaSniff.php                 |   4 +-
 ...llingDestructAfterConstructorExitSniff.php |  10 +-
 ...emovedOptionalBeforeRequiredParamSniff.php |   4 +-
 .../Tests/PHPCompatibility/BaseSniffTest.php  |   2 +-
 .../NewAttributesUnitTest.php                 |   2 +-
 .../Util/CoreMethodTestFrame.php              |   2 +-
 Magento2/ruleset.xml                          |  11 +
 Magento2Framework/ruleset.xml                 |   1 +
 composer.json                                 |   5 +-
 composer.lock                                 | 148 +---
 29 files changed, 3414 insertions(+), 171 deletions(-)
 create mode 100644 Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Tokens/Collections.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/Conditions.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/Scopes.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php
 create mode 100644 Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php

diff --git a/Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php b/Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php
new file mode 100644
index 00000000..4542f9c6
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\BackCompat;
+
+use PHP_CodeSniffer\Util\Tokens;
+
+class BCTokens
+{
+    /**
+     * Tokens that open class and object scopes.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha3 Visibility changed from `protected` to `private`.
+     *
+     * @var array <int|string> => <int|string>
+     */
+    private static $ooScopeTokens = [
+        \T_CLASS      => \T_CLASS,
+        \T_ANON_CLASS => \T_ANON_CLASS,
+        \T_INTERFACE  => \T_INTERFACE,
+        \T_TRAIT      => \T_TRAIT,
+    ];
+
+    /**
+     * Tokens that open class and object scopes.
+     *
+     * Retrieve the OO scope tokens array in a cross-version compatible manner.
+     *
+     * Changelog for the PHPCS native array:
+     * - Introduced in PHPCS 3.1.0.
+     *
+     * @see \PHP_CodeSniffer\Util\Tokens::$ooScopeTokens Original array.
+     *
+     * @since 1.0.0
+     *
+     * @return array <int|string> => <int|string> Token array.
+     */
+    public static function ooScopeTokens()
+    {
+        return self::$ooScopeTokens;
+    }
+
+    /**
+     * Tokens that represent arithmetic operators.
+     *
+     * Retrieve the PHPCS arithmetic tokens array in a cross-version compatible manner.
+     *
+     * Changelog for the PHPCS native array:
+     * - Introduced in PHPCS 0.5.0.
+     * - PHPCS 2.9.0: The PHP 5.6 `T_POW` token was added to the array.
+     *                The `T_POW` token was introduced in PHPCS 2.4.0.
+     *
+     * @see \PHP_CodeSniffer\Util\Tokens::$arithmeticTokens Original array.
+     *
+     * @since 1.0.0
+     *
+     * @return array <int|string> => <int|string> Token array or an empty array for PHPCS versions in
+     *                         which the PHPCS native comment tokens did not exist yet.
+     */
+    public static function arithmeticTokens()
+    {
+        return Tokens::$arithmeticTokens + [\T_POW => \T_POW];
+    }
+
+    /**
+     * Tokens that represent assignment operators.
+     *
+     * Retrieve the PHPCS assignment tokens array in a cross-version compatible manner.
+     *
+     * Changelog for the PHPCS native array:
+     * - Introduced in PHPCS 0.0.5.
+     * - PHPCS 2.9.0: The PHP 7.4 `T_COALESCE_EQUAL` token was added to the array.
+     *                The `T_COALESCE_EQUAL` token was introduced in PHPCS 2.8.1.
+     * - PHPCS 3.2.0: The JS `T_ZSR_EQUAL` token was added to the array.
+     *                The `T_ZSR_EQUAL` token was introduced in PHPCS 2.8.0.
+     *
+     * @see \PHP_CodeSniffer\Util\Tokens::$assignmentTokens Original array.
+     *
+     * @since 1.0.0
+     *
+     * @return array <int|string> => <int|string> Token array.
+     */
+    public static function assignmentTokens()
+    {
+        $tokens = Tokens::$assignmentTokens;
+
+        /*
+         * The `T_COALESCE_EQUAL` token may be available pre-PHPCS 2.8.1 depending on
+         * the PHP version used to run PHPCS.
+         */
+        if (\defined('T_COALESCE_EQUAL')) {
+            $tokens[\T_COALESCE_EQUAL] = \T_COALESCE_EQUAL;
+        }
+
+        if (\defined('T_ZSR_EQUAL')) {
+            $tokens[\T_ZSR_EQUAL] = \T_ZSR_EQUAL;
+        }
+
+        return $tokens;
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php b/Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php
new file mode 100644
index 00000000..d82f39c2
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php
@@ -0,0 +1,242 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\BackCompat;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Utility methods to retrieve (configuration) information from PHP_CodeSniffer.
+ *
+ * PHP_CodeSniffer cross-version compatibility helper for PHPCS 2.x vs PHPCS 3.x.
+ *
+ * A number of PHPCS classes were split up into several classes in PHPCS 3.x
+ * Those classes cannot be aliased as they don't represent the same object.
+ * This class provides helper methods for functions which were contained in
+ * one of these classes and which are commonly used by external standards.
+ *
+ * @since 1.0.0 The initial methods in this class have been ported over from
+ *              the external PHPCompatibility & WPCS standards.
+ */
+class Helper
+{
+
+    /**
+     * The default tab width used by PHP_CodeSniffer.
+     *
+     * @since 1.0.0
+     *
+     * @var int
+     */
+    const DEFAULT_TABWIDTH = 4;
+
+    /**
+     * Get the PHP_CodeSniffer version number.
+     *
+     * @since 1.0.0
+     *
+     * @return string
+     */
+    public static function getVersion()
+    {
+        if (\defined('\PHP_CodeSniffer\Config::VERSION') === false) {
+            // PHPCS 2.x.
+            return \PHP_CodeSniffer::VERSION;
+        }
+
+        // PHPCS 3.x.
+        return \PHP_CodeSniffer\Config::VERSION;
+    }
+
+    /**
+     * Pass config data to PHP_CodeSniffer.
+     *
+     * @since 1.0.0
+     *
+     * @param string                  $key    The name of the config value.
+     * @param string|null             $value  The value to set. If `null`, the config entry
+     *                                        is deleted, reverting it to the default value.
+     * @param bool                    $temp   Set this config data temporarily for this script run.
+     *                                        This will not write the config data to the config file.
+     * @param \PHP_CodeSniffer\Config $config The PHPCS config object.
+     *                                        This parameter is required for PHPCS 4.x, optional
+     *                                        for PHPCS 3.x and not possible to pass for PHPCS 2.x.
+     *                                        Passing the `$phpcsFile->config` property should work
+     *                                        in PHPCS 3.x and higher.
+     *
+     * @return bool Whether the setting of the data was successfull.
+     */
+    public static function setConfigData($key, $value, $temp = false, $config = null)
+    {
+        if (\method_exists('\PHP_CodeSniffer\Config', 'setConfigData') === false) {
+            // PHPCS 2.x.
+            return \PHP_CodeSniffer::setConfigData($key, $value, $temp);
+        }
+
+        if (isset($config) === true) {
+            // PHPCS 3.x and 4.x.
+            return $config->setConfigData($key, $value, $temp);
+        }
+
+        if (\version_compare(self::getVersion(), '3.99.99', '>') === true) {
+            throw new RuntimeException('Passing the $config parameter is required in PHPCS 4.x');
+        }
+
+        // PHPCS 3.x.
+        return \PHP_CodeSniffer\Config::setConfigData($key, $value, $temp);
+    }
+
+    /**
+     * Get the value of a single PHP_CodeSniffer config key.
+     *
+     * @see Helper::getCommandLineData() Alternative for the same which is more reliable
+     *                                   if the `$phpcsFile` object is available.
+     *
+     * @since 1.0.0
+     *
+     * @param string $key The name of the config value.
+     *
+     * @return string|null
+     */
+    public static function getConfigData($key)
+    {
+        if (\method_exists('\PHP_CodeSniffer\Config', 'getConfigData') === false) {
+            // PHPCS 2.x.
+            return \PHP_CodeSniffer::getConfigData($key);
+        }
+
+        // PHPCS 3.x.
+        return \PHP_CodeSniffer\Config::getConfigData($key);
+    }
+
+    /**
+     * Get the value of a CLI overrulable single PHP_CodeSniffer config key.
+     *
+     * Use this for config keys which can be set in the `CodeSniffer.conf` file,
+     * on the command-line or in a ruleset.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
+     * @param string                      $key       The name of the config value.
+     *
+     * @return string|null
+     */
+    public static function getCommandLineData(File $phpcsFile, $key)
+    {
+        if (\class_exists('\PHP_CodeSniffer\Config') === false) {
+            // PHPCS 2.x.
+            $config = $phpcsFile->phpcs->cli->getCommandLineValues();
+            if (isset($config[$key])) {
+                return $config[$key];
+            }
+        } else {
+            // PHPCS 3.x.
+            $config = $phpcsFile->config;
+            if (isset($config->{$key})) {
+                return $config->{$key};
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the applicable tab width as passed to PHP_CodeSniffer from the
+     * command-line or the ruleset.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
+     *
+     * @return int Tab width. Defaults to the PHPCS native default of 4.
+     */
+    public static function getTabWidth(File $phpcsFile)
+    {
+        $tabWidth = self::getCommandLineData($phpcsFile, 'tabWidth');
+        if ($tabWidth > 0) {
+            return (int) $tabWidth;
+        }
+
+        return self::DEFAULT_TABWIDTH;
+    }
+
+    /**
+     * Get the applicable (file) encoding as passed to PHP_CodeSniffer from the
+     * command-line or the ruleset.
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @param \PHP_CodeSniffer\Files\File|null $phpcsFile Optional. The current file being processed.
+     *
+     * @return string Encoding. Defaults to the PHPCS native default, which is 'utf-8'
+     *                for PHPCS 3.x and was 'iso-8859-1' for PHPCS 2.x.
+     */
+    public static function getEncoding(File $phpcsFile = null)
+    {
+        static $default;
+
+        if (isset($default) === false) {
+            $default = 'utf-8';
+            if (\version_compare(self::getVersion(), '2.99.99', '<=') === true) {
+                // In PHPCS 2.x, the default encoding is `iso-8859-1`.
+                $default = 'iso-8859-1';
+            }
+        }
+
+        if ($phpcsFile instanceof File) {
+            // Most reliable.
+            $encoding = self::getCommandLineData($phpcsFile, 'encoding');
+            if ($encoding === null) {
+                $encoding = $default;
+            }
+
+            return $encoding;
+        }
+
+        // Less reliable.
+        $encoding = self::getConfigData('encoding');
+        if ($encoding === null) {
+            $encoding = $default;
+        }
+
+        return $encoding;
+    }
+
+    /**
+     * Check whether the "--ignore-annotations" option is in effect.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File|null $phpcsFile Optional. The current file being processed.
+     *
+     * @return bool `TRUE` if annotations should be ignored, `FALSE` otherwise.
+     */
+    public static function ignoreAnnotations(File $phpcsFile = null)
+    {
+        if (\class_exists('\PHP_CodeSniffer\Config') === false) {
+            // PHPCS 2.x does not support `--ignore-annotations`.
+            return false;
+        }
+
+        // PHPCS 3.x.
+        if (isset($phpcsFile, $phpcsFile->config->annotations)) {
+            return ! $phpcsFile->config->annotations;
+        }
+
+        $annotations = \PHP_CodeSniffer\Config::getConfigData('annotations');
+        if (isset($annotations)) {
+            return ! $annotations;
+        }
+
+        return false;
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php b/Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
new file mode 100644
index 00000000..7ffcc1e3
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
@@ -0,0 +1,450 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\TestUtils;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Exceptions\TokenizerException;
+use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use RuntimeException as PHPRuntimeException;
+
+/**
+ * Base class for use when testing utility methods for PHP_CodeSniffer.
+ *
+ * This class is compatible with PHP_CodeSniffer 2.x as well as 3.x.
+ *
+ * This class is compatible with {@link http://phpunit.de/ PHPUnit} 4.5 - 9.x providing the PHPCSUtils
+ * autoload file is included in the test bootstrap. For more information about that, please consult
+ * the project's {@link https://github.com/PHPCSStandards/PHPCSUtils/blob/develop/README.md README}.
+ *
+ * To allow for testing of tab vs space content, the `tabWidth` is set to `4` by default.
+ *
+ * Typical usage:
+ *
+ * Test case file `path/to/ClassUnderTestUnitTest.inc`:
+ * ```php
+ * <?php
+ *
+ * /* testTestCaseDescription * /
+ * const BAR = false;
+ * ```
+ *
+ * Test file `path/to/ClassUnderTestUnitTest.php`:
+ * ```php
+ * <?php
+ *
+ * use Magento2\Helpers\PHPCSUtils\TestUtils\UtilityMethodTestCase;
+ * use YourStandard\ClassUnderTest;
+ *
+ * class ClassUnderTestUnitTest extends UtilityMethodTestCase {
+ *
+ *     /**
+ *      * Testing utility method MyMethod.
+ *      *
+ *      * @dataProvider dataMyMethod
+ *      *
+ *      * @covers \YourStandard\ClassUnderTest::MyMethod
+ *      *
+ *      * @param string $commentString The comment which prefaces the target token in the test file.
+ *      * @param string $expected      The expected return value.
+ *      *
+ *      * @return void
+ *      * /
+ *     public function testMyMethod($commentString, $expected)
+ *     {
+ *         $stackPtr = $this->getTargetToken($commentString, [\T_TOKEN_CONSTANT, \T_ANOTHER_TOKEN]);
+ *         $class    = new ClassUnderTest();
+ *         $result   = $class->MyMethod(self::$phpcsFile, $stackPtr);
+ *         // Or for static utility methods:
+ *         $result   = ClassUnderTest::MyMethod(self::$phpcsFile, $stackPtr);
+ *
+ *         $this->assertSame($expected, $result);
+ *     }
+ *
+ *     /**
+ *      * Data Provider.
+ *      *
+ *      * @see ClassUnderTestUnitTest::testMyMethod() For the array format.
+ *      *
+ *      * @return array
+ *      * /
+ *     public function dataMyMethod()
+ *     {
+ *         return array(
+ *             array('/* testTestCaseDescription * /', false),
+ *         );
+ *     }
+ * }
+ * ```
+ *
+ * Note:
+ * - Remove the space between the comment closers `* /` for a working example.
+ * - Each test case separator comment MUST start with `/* test`.
+ *   This is to allow the {@see UtilityMethodTestCase::getTargetToken()} method to
+ *   distinquish between the test separation comments and comments which may be part
+ *   of the test case.
+ * - The test case file and unit test file should be placed in the same directory.
+ * - For working examples using this abstract class, have a look at the unit tests
+ *   for the PHPCSUtils utility functions themselves.
+ *
+ * @since 1.0.0
+ */
+abstract class UtilityMethodTestCase extends TestCase
+{
+
+    /**
+     * The PHPCS version the tests are being run on.
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @var string
+     */
+    protected static $phpcsVersion = '0';
+
+    /**
+     * The file extension of the test case file (without leading dot).
+     *
+     * This allows concrete test classes to overrule the default `"inc"` with, for instance,
+     * `"js"` or `"css"` when applicable.
+     *
+     * @since 1.0.0
+     *
+     * @var string
+     */
+    protected static $fileExtension = 'inc';
+
+    /**
+     * Full path to the test case file associated with the concrete test class.
+     *
+     * Optional. If left empty, the case file will be presumed to be in
+     * the same directory and named the same as the test class, but with an
+     * `"inc"` file extension.
+     *
+     * @since 1.0.0
+     *
+     * @var string
+     */
+    protected static $caseFile = '';
+
+    /**
+     * The tab width setting to use when tokenizing the file.
+     *
+     * This allows for test case files to use a different tab width than the default.
+     *
+     * @since 1.0.0
+     *
+     * @var int
+     */
+    protected static $tabWidth = 4;
+
+    /**
+     * The \PHP_CodeSniffer\Files\File object containing the parsed contents of the test case file.
+     *
+     * @since 1.0.0
+     *
+     * @var \PHP_CodeSniffer\Files\File
+     */
+    protected static $phpcsFile;
+
+    /**
+     * Set the name of a sniff to pass to PHPCS to limit the run (and force it to record errors).
+     *
+     * Normally, this propery won't need to be overloaded, but for utility methods which record
+     * violations and contain fixers, setting a dummy sniff name equal to the sniff name passed
+     * in the error code for `addError()`/`addWarning()` during the test, will allow for testing
+     * the recording of these violations, as well as testing the fixer.
+     *
+     * @since 1.0.0
+     *
+     * @var array
+     */
+    protected static $selectedSniff = ['Dummy.Dummy.Dummy'];
+
+    /**
+     * Initialize PHPCS & tokenize the test case file.
+     *
+     * The test case file for a unit test class has to be in the same directory
+     * directory and use the same file name as the test class, using the `.inc` extension
+     * or be explicitly set using the {@see UtilityMethodTestCase::$fileExtension}/
+     * {@see UtilityMethodTestCase::$caseFile} properties.
+     *
+     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::setUpBeforeClass()}
+     * method.
+     *
+     * @since 1.0.0
+     *
+     * @beforeClass
+     *
+     * @return void
+     */
+    public static function setUpTestFile()
+    {
+        parent::setUpBeforeClass();
+
+        self::$phpcsVersion = Helper::getVersion();
+
+        $caseFile = static::$caseFile;
+        if (\is_string($caseFile) === false || $caseFile === '') {
+            $testClass = \get_called_class();
+            $testFile  = (new ReflectionClass($testClass))->getFileName();
+            $caseFile  = \substr($testFile, 0, -3) . static::$fileExtension;
+        }
+
+        if (\is_readable($caseFile) === false) {
+            parent::fail("Test case file missing. Expected case file location: $caseFile");
+        }
+
+        $contents = \file_get_contents($caseFile);
+
+        if (\version_compare(self::$phpcsVersion, '2.99.99', '>')) {
+            // PHPCS 3.x.
+            $config = new \PHP_CodeSniffer\Config();
+
+            /*
+             * We just need to provide a standard so PHPCS will tokenize the file.
+             * The standard itself doesn't actually matter for testing utility methods,
+             * so use the smallest one to get the fastest results.
+             */
+            $config->standards = ['PSR1'];
+
+            /*
+             * Limiting the run to just one sniff will make it, yet again, slightly faster.
+             * Picked the simplest/fastest sniff available which is registered in PSR1.
+             */
+            $config->sniffs = static::$selectedSniff;
+
+            // Disable caching.
+            $config->cache = false;
+
+            // Also set a tab-width to enable testing tab-replaced vs `orig_content`.
+            $config->tabWidth = static::$tabWidth;
+
+            $ruleset = new \PHP_CodeSniffer\Ruleset($config);
+
+            // Make sure the file gets parsed correctly based on the file type.
+            $contents = 'phpcs_input_file: ' . $caseFile . \PHP_EOL . $contents;
+
+            self::$phpcsFile = new \PHP_CodeSniffer\Files\DummyFile($contents, $ruleset, $config);
+
+            // Only tokenize the file, do not process it.
+            try {
+                self::$phpcsFile->parse();
+            } catch (TokenizerException $e) {
+                // PHPCS 3.5.0 and higher.
+            } catch (RuntimeException $e) {
+                // PHPCS 3.0.0 < 3.5.0.
+            }
+        } else {
+            // PHPCS 2.x.
+            $phpcs           = new \PHP_CodeSniffer(null, static::$tabWidth);
+            self::$phpcsFile = new \PHP_CodeSniffer_File(
+                $caseFile,
+                [],
+                [],
+                $phpcs
+            );
+
+            /*
+             * Using error silencing to drown out "undefined index" notices for tokenizer
+             * issues in PHPCS 2.x which won't get fixed anymore anyway.
+             */
+            @self::$phpcsFile->start($contents);
+        }
+
+        // Fail the test if the case file failed to tokenize.
+        if (self::$phpcsFile->numTokens === 0) {
+            parent::fail("Tokenizing of the test case file failed for case file: $caseFile");
+        }
+    }
+
+    /**
+     * Skip JS and CSS related tests on PHPCS 4.x.
+     *
+     * PHPCS 4.x drops support for the JS and CSS tokenizers.
+     * This method takes care of automatically skipping tests involving JS/CSS case files
+     * when the tests are being run with PHPCS 4.x.
+     *
+     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::setUp()}
+     * method.
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @before
+     *
+     * @return void
+     */
+    public function skipJSCSSTestsOnPHPCS4()
+    {
+        if (static::$fileExtension !== 'js' && static::$fileExtension !== 'css') {
+            return;
+        }
+
+        if (\version_compare(self::$phpcsVersion, '3.99.99', '<=')) {
+            return;
+        }
+
+        $this->markTestSkipped('JS and CSS support has been removed in PHPCS 4.');
+    }
+
+    /**
+     * Clean up after finished test.
+     *
+     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::tearDownAfterClass()}
+     * method.
+     *
+     * @since 1.0.0
+     *
+     * @afterClass
+     *
+     * @return void
+     */
+    public static function resetTestFile()
+    {
+        self::$phpcsFile = null;
+    }
+
+    /**
+     * Check whether or not the PHP 8.0 identifier name tokens will be in use.
+     *
+     * The expected token positions/token counts for certain tokens will differ depending
+     * on whether the PHP 8.0 identifier name tokenization is used or the PHP < 8.0
+     * identifier name tokenization.
+     *
+     * Tests can use this method to determine which flavour of tokenization to expect and
+     * to set test expectations accordingly.
+     *
+     * @codeCoverageIgnore Nothing to test.
+     *
+     * @since 1.0.0
+     *
+     * @return bool
+     */
+    public static function usesPhp8NameTokens()
+    {
+        $version = Helper::getVersion();
+        if ((\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
+                && \version_compare($version, '3.5.7', '<') === true)
+            || \version_compare($version, '4.0.0', '>=') === true
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the token pointer for a target token based on a specific comment.
+     *
+     * Note: the test delimiter comment MUST start with `/* test` to allow this function to
+     * distinguish between comments used *in* a test and test delimiters.
+     *
+     * If the delimiter comment is not found, the test will automatically be failed.
+     *
+     * @since 1.0.0
+     *
+     * @param string           $commentString The complete delimiter comment to look for as a string.
+     *                                        This string should include the comment opener and closer.
+     * @param int|string|array $tokenType     The type of token(s) to look for.
+     * @param string           $tokenContent  Optional. The token content for the target token.
+     * @param bool             $failTest      Optional. Whether the test should be marked as failed when
+     *                                        the target token cannot be found. Defaults to `true`.
+     *                                        When set to `false`, a catchable PHP native `RuntimeException`
+     *                                        will be thrown instead.
+     *
+     * @return int
+     *
+     * @throws \RuntimeException When the target token cannot be found and `$failTest` has been set to `false`.
+     */
+    public function getTargetToken($commentString, $tokenType, $tokenContent = null, $failTest = true)
+    {
+        $start   = (self::$phpcsFile->numTokens - 1);
+        $comment = self::$phpcsFile->findPrevious(
+            \T_COMMENT,
+            $start,
+            null,
+            false,
+            $commentString
+        );
+
+        if ($comment === false) {
+            $msg = 'Failed to find the test marker: ' . $commentString;
+            $this->fail($msg);
+        }
+
+        $tokens = self::$phpcsFile->getTokens();
+        $end    = ($start + 1);
+
+        // Limit the token finding to between this and the next delimiter comment.
+        for ($i = ($comment + 1); $i < $end; $i++) {
+            if ($tokens[$i]['code'] !== \T_COMMENT) {
+                continue;
+            }
+
+            if (\stripos($tokens[$i]['content'], '/* test') === 0) {
+                $end = $i;
+                break;
+            }
+        }
+
+        $target = self::$phpcsFile->findNext(
+            $tokenType,
+            ($comment + 1),
+            $end,
+            false,
+            $tokenContent
+        );
+
+        if ($target === false) {
+            $msg = 'Failed to find test target token for comment string: ' . $commentString;
+            if ($tokenContent !== null) {
+                $msg .= ' With token content: ' . $tokenContent;
+            }
+
+            if ($failTest === false) {
+                throw new PHPRuntimeException($msg);
+            }
+
+            $this->fail($msg);
+        }
+
+        return $target;
+    }
+
+    /**
+     * Helper method to tell PHPUnit to expect a PHPCS Exception in a PHPUnit and PHPCS cross-version
+     * compatible manner.
+     *
+     * @since 1.0.0
+     *
+     * @param string $msg  The expected exception message.
+     * @param string $type The PHPCS native exception type to expect. Either 'runtime' or 'tokenizer'.
+     *                     Defaults to 'runtime'.
+     *
+     * @return void
+     */
+    public function expectPhpcsException($msg, $type = 'runtime')
+    {
+        $exception = 'PHP_CodeSniffer\Exceptions\RuntimeException';
+        if ($type === 'tokenizer') {
+            $exception = 'PHP_CodeSniffer\Exceptions\TokenizerException';
+        }
+
+        if (\method_exists($this, 'expectException')) {
+            // PHPUnit 5+.
+            $this->expectException($exception);
+            $this->expectExceptionMessage($msg);
+        } else {
+            // PHPUnit 4.
+            $this->setExpectedException($exception, $msg);
+        }
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Tokens/Collections.php b/Magento2/Helpers/PHPCSUtils/Tokens/Collections.php
new file mode 100644
index 00000000..bc8e30a4
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Tokens/Collections.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Tokens;
+
+/**
+ * Collections of related tokens as often used and needed for sniffs.
+ *
+ * These are additional "token groups" to compliment the ones available through the PHPCS
+ * native {@see \PHP_CodeSniffer\Util\Tokens} class.
+ *
+ * @see \PHP_CodeSniffer\Util\Tokens    PHPCS native token groups.
+ * @see \PHPCSUtils\BackCompat\BCTokens Backward compatible version of the PHPCS native token groups.
+ *
+ * @since 1.0.0
+ */
+class Collections
+{
+    /**
+     * Tokens for the PHP magic constants.
+     *
+     * @link https://www.php.net/language.constants.predefined PHP Manual on magic constants
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @var array <int|string> => <int|string>
+     */
+    public static $magicConstants = [
+        \T_CLASS_C  => \T_CLASS_C,
+        \T_DIR      => \T_DIR,
+        \T_FILE     => \T_FILE,
+        \T_FUNC_C   => \T_FUNC_C,
+        \T_LINE     => \T_LINE,
+        \T_METHOD_C => \T_METHOD_C,
+        \T_NS_C     => \T_NS_C,
+        \T_TRAIT_C  => \T_TRAIT_C,
+    ];
+
+    /**
+     * Object operators.
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @var array <int> => <int>
+     */
+    public static $objectOperators = [
+        \T_OBJECT_OPERATOR => \T_OBJECT_OPERATOR,
+        \T_DOUBLE_COLON    => \T_DOUBLE_COLON,
+    ];
+
+    /**
+     * Tokens types used for "forwarding" calls within OO structures.
+     *
+     * @link https://www.php.net/language.oop5.paamayim-nekudotayim PHP Manual on OO forwarding calls
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @var array <int|string> => <int|string>
+     */
+    public static $OOHierarchyKeywords = [
+        \T_PARENT => \T_PARENT,
+        \T_SELF   => \T_SELF,
+        \T_STATIC => \T_STATIC,
+    ];
+
+    /**
+     * List of tokens which represent "closed" scopes.
+     *
+     * I.e. anything declared within that scope - except for other closed scopes - is
+     * outside of the global namespace.
+     *
+     * This list doesn't contain the `T_NAMESPACE` token on purpose as variables declared
+     * within a namespace scope are still global and not limited to that namespace.
+     *
+     * @since 1.0.0
+     *
+     * @var array <int|string> => <int|string>
+     */
+    public static $closedScopes = [
+        \T_CLASS      => \T_CLASS,
+        \T_ANON_CLASS => \T_ANON_CLASS,
+        \T_INTERFACE  => \T_INTERFACE,
+        \T_TRAIT      => \T_TRAIT,
+        \T_FUNCTION   => \T_FUNCTION,
+        \T_CLOSURE    => \T_CLOSURE,
+    ];
+
+    /**
+     * OO structures which can use the "extends" keyword.
+     *
+     * @since 1.0.0
+     *
+     * @var array <int|string> => <int|string>
+     */
+    public static $OOCanExtend = [
+        \T_CLASS      => \T_CLASS,
+        \T_ANON_CLASS => \T_ANON_CLASS,
+        \T_INTERFACE  => \T_INTERFACE,
+    ];
+
+    /**
+     * Tokens which can start a - potentially multi-line - text string.
+     *
+     * @since 1.0.0
+     *
+     * @var array <int|string> => <int|string>
+     */
+    public static $textStingStartTokens = [
+        \T_START_HEREDOC            => \T_START_HEREDOC,
+        \T_START_NOWDOC             => \T_START_NOWDOC,
+        \T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
+        \T_DOUBLE_QUOTED_STRING     => \T_DOUBLE_QUOTED_STRING,
+    ];
+
+    /**
+     * Tokens which can represent the arrow function keyword.
+     *
+     * Note: this is a method, not a property as the `T_FN` token for arrow functions may not exist.
+     *
+     * @since 1.0.0-alpha2
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function arrowFunctionTokensBC()
+    {
+        $tokens = [
+            \T_STRING => \T_STRING,
+        ];
+
+        if (\defined('T_FN') === true) {
+            // PHP 7.4 or PHPCS 3.5.3+.
+            $tokens[\T_FN] = \T_FN;
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Tokens which can represent a keyword which starts a function declaration.
+     *
+     * Note: this is a method, not a property as the `T_FN` token for arrow functions may not exist.
+     *
+     * Sister-method to the {@see Collections::functionDeclarationTokensBC()} method.
+     * This  method supports PHPCS 3.5.3 and up.
+     * The {@see Collections::functionDeclarationTokensBC()} method supports PHPCS 2.6.0 and up.
+     *
+     * @see \PHPCSUtils\Tokens\Collections::functionDeclarationTokensBC() Related method (PHPCS 2.6.0+).
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function functionDeclarationTokens()
+    {
+        $tokens = [
+            \T_FUNCTION => \T_FUNCTION,
+            \T_CLOSURE  => \T_CLOSURE,
+        ];
+
+        if (\defined('T_FN') === true) {
+            // PHP 7.4 or PHPCS 3.5.3+.
+            $tokens[\T_FN] = \T_FN;
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Tokens which can represent a keyword which starts a function declaration.
+     *
+     * Note: this is a method, not a property as the `T_FN` token for arrow functions may not exist.
+     *
+     * Sister-method to the {@see Collections::functionDeclarationTokens()} method.
+     * The {@see Collections::functionDeclarationTokens()} method supports PHPCS 3.5.3 and up.
+     * This method supports PHPCS 2.6.0 and up.
+     *
+     * Notable difference:
+     * - This method accounts for when the `T_FN` token doesn't exist.
+     *
+     * Note: if this method is used, the {@see \PHPCSUtils\Utils\FunctionDeclarations::isArrowFunction()}
+     * method needs to be used on arrow function tokens to verify whether it really is an arrow function
+     * declaration or not.
+     *
+     * It is recommended to use the {@see Collections::functionDeclarationTokens()} method instead of
+     * this method if a standard supports does not need to support PHPCS < 3.5.3.
+     *
+     * @see \PHPCSUtils\Tokens\Collections::functionDeclarationTokens() Related method (PHPCS 3.5.3+).
+     * @see \PHPCSUtils\Utils\FunctionDeclarations::isArrowFunction()   Arrow function verification.
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function functionDeclarationTokensBC()
+    {
+        $tokens = [
+            \T_FUNCTION => \T_FUNCTION,
+            \T_CLOSURE  => \T_CLOSURE,
+        ];
+
+        $tokens += self::arrowFunctionTokensBC();
+
+        return $tokens;
+    }
+
+    /**
+     * The tokens used for "names", be it namespace, OO, function or constant names.
+     *
+     * Includes the tokens introduced in PHP 8.0 for "Namespaced names as single token" when available.
+     *
+     * Note: this is a method, not a property as the PHP 8.0 identifier name tokens may not exist.
+     *
+     * @link https://wiki.php.net/rfc/namespaced_names_as_token
+     *
+     * @since 1.0.0-alpha4
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function nameTokens()
+    {
+        $tokens = [
+            \T_STRING => \T_STRING,
+        ];
+
+        /*
+         * PHP >= 8.0 in combination with PHPCS < 3.5.7 and all PHP versions in combination
+         * with PHPCS >= 3.5.7, though when using PHPCS 3.5.7 < 4.0.0, these tokens are
+         * not yet in use, i.e. the PHP 8.0 change is "undone" for PHPCS 3.x.
+         */
+        if (\defined('T_NAME_QUALIFIED') === true) {
+            $tokens[\T_NAME_QUALIFIED] = \T_NAME_QUALIFIED;
+        }
+
+        if (\defined('T_NAME_FULLY_QUALIFIED') === true) {
+            $tokens[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;
+        }
+
+        if (\defined('T_NAME_RELATIVE') === true) {
+            $tokens[\T_NAME_RELATIVE] = \T_NAME_RELATIVE;
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Tokens types which can be encountered in a fully, partially or unqualified name.
+     *
+     * Example:
+     * ```php
+     * echo namespace\Sub\ClassName::method();
+     * ```
+     *
+     * @since 1.0.0-alpha4
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function namespacedNameTokens()
+    {
+        $tokens = [
+            \T_NS_SEPARATOR => \T_NS_SEPARATOR,
+            \T_NAMESPACE    => \T_NAMESPACE,
+        ];
+
+        $tokens += self::nameTokens();
+
+        return $tokens;
+    }
+    /**
+     * Token types which can be encountered in a return type declaration.
+     *
+     * Note: this is a method, not a property as the `T_TYPE_UNION` token for PHP 8.0 union types may not exist.
+     *
+     * Sister-method to the {@see Collections::returnTypeTokensBC()} method.
+     * This method supports PHPCS 3.3.0 and up.
+     * The {@see Collections::returnTypeTokensBC()} method supports PHPCS 2.6.0 and up.
+     *
+     * Notable differences:
+     * - The {@see Collections::returnTypeTokensBC()} method will include the `T_ARRAY_HINT`
+     *   and the `T_RETURN_TYPE` tokens when used with PHPCS 2.x and 3.x.
+     *   These token constants will no longer exist in PHPCS 4.x.
+     *
+     * It is recommended to use this method instead of the {@see Collections::returnTypeTokensBC()}
+     * method if a standard does not need to support PHPCS < 3.3.0.
+     *
+     * @see \PHPCSUtils\Tokens\Collections::returnTypeTokensBC() Related method (cross-version).
+     *
+     * @since 1.0.0-alpha4 This method replaces the {@see Collections::$returnTypeTokens} property.
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 identifier name tokens.
+     * @since 1.0.0-alpha4 Added the T_TYPE_UNION token for union type support in PHPCS > 3.6.0.
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function returnTypeTokens()
+    {
+        $tokens = [
+            \T_CALLABLE   => \T_CALLABLE,
+            \T_SELF       => \T_SELF,
+            \T_PARENT     => \T_PARENT,
+            \T_STATIC     => \T_STATIC,
+            \T_FALSE      => \T_FALSE,      // Union types only.
+            \T_NULL       => \T_NULL,       // Union types only.
+            \T_ARRAY      => \T_ARRAY,      // Arrow functions PHPCS < 3.5.4 + union types.
+            \T_BITWISE_OR => \T_BITWISE_OR, // Union types for PHPCS < 3.6.0.
+        ];
+
+        $tokens += self::namespacedNameTokens();
+
+        // PHPCS > 3.6.0: a new token was introduced for the union type separator.
+        if (\defined('T_TYPE_UNION') === true) {
+            $tokens[\T_TYPE_UNION] = \T_TYPE_UNION;
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Token types which can be encountered in a return type declaration (cross-version).
+     *
+     * Sister-method to the {@see Collections::returnTypeTokens()} method.
+     * The {@see Collections::returnTypeTokens()} method supports PHPCS 3.3.0 and up.
+     * This method supports PHPCS 2.6.0 and up.
+     *
+     * Notable differences:
+     * - This method will include the `T_ARRAY_HINT` and the `T_RETURN_TYPE` tokens when
+     *   used with PHPCS 2.x and 3.x.
+     *   These token constants will no longer exist in PHPCS 4.x.
+     *
+     * It is recommended to use the {@see Collections::returnTypeTokens()} method instead of
+     * this method if a standard does not need to support PHPCS < 3.3.0.
+     *
+     * @see \PHPCSUtils\Tokens\Collections::returnTypeTokens() Related method (PHPCS 3.3.0+).
+     *
+     * @since 1.0.0-alpha3
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 identifier name tokens.
+     *
+     * @return array <int|string> => <int|string>
+     */
+    public static function returnTypeTokensBC()
+    {
+        $tokens = self::returnTypeTokens();
+
+        /*
+         * PHPCS < 4.0. Needed for support of PHPCS 2.4.0 < 3.3.0.
+         * For PHPCS 3.3.0+ the constant is no longer used.
+         */
+        if (\defined('T_RETURN_TYPE') === true) {
+            $tokens[\T_RETURN_TYPE] = \T_RETURN_TYPE;
+        }
+
+        /*
+         * PHPCS < 4.0. Needed for support of PHPCS < 2.8.0 / PHPCS < 3.5.3 for arrow functions.
+         * For PHPCS 3.5.3+ the constant is no longer used.
+         */
+        if (\defined('T_ARRAY_HINT') === true) {
+            $tokens[\T_ARRAY_HINT] = \T_ARRAY_HINT;
+        }
+
+        return $tokens;
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/Conditions.php b/Magento2/Helpers/PHPCSUtils/Utils/Conditions.php
new file mode 100644
index 00000000..4d34ed92
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/Conditions.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Utility functions for use when examining token conditions.
+ *
+ * @since 1.0.0 The `Conditions::getCondition()` and `Conditions::hasCondition()`
+ *              methods are based on and inspired by the methods of the same name in the
+ *              PHPCS native `PHP_CodeSniffer\Files\File` class.
+ *              Also see {@see \PHPCSUtils\BackCompat\BCFile}.
+ */
+class Conditions
+{
+
+    /**
+     * Retrieve the position of a condition for the passed token.
+     *
+     * If no types are specified, the first condition for the token - or if `$first=false`,
+     * the last condition - will be returned.
+     *
+     * Main differences with the PHPCS version:
+     * - The singular `$type` parameter has become the more flexible `$types` parameter allowing to
+     *   search for several types of conditions in one go.
+     * - The `$types` parameter is now optional.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getCondition()   Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::getCondition() Cross-version compatible version of the original.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha2 The `$reverse` parameter has been renamed to `$first` and the meaning of the
+     *                     boolean reversed (`true` = first, `false` = last, was: `true` = last, `false` = first)
+     *                     to be in line with PHPCS itself which added the `$first` parameter in v 3.5.4
+     *                     to allow for the same/similar functionality as `$reverse` already offered.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the token we are checking.
+     * @param int|string|array            $types     Optional. The type(s) of tokens to search for.
+     * @param bool                        $first     Optional. Whether to search for the first (outermost)
+     *                                               (`true`) or the last (innermost) condition (`false`) of
+     *                                               the specified type(s).
+     *
+     * @return int|false Integer stack pointer to the condition; or `FALSE` if the token
+     *                   does not have the condition or has no conditions at all.
+     */
+    public static function getCondition(File $phpcsFile, $stackPtr, $types = [], $first = true)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Check for the existence of the token.
+        if (isset($tokens[$stackPtr]) === false) {
+            return false;
+        }
+
+        // Make sure the token has conditions.
+        if (empty($tokens[$stackPtr]['conditions'])) {
+            return false;
+        }
+
+        $types      = (array) $types;
+        $conditions = $tokens[$stackPtr]['conditions'];
+
+        if (empty($types) === true) {
+            // No types specified, just return the first/last condition pointer.
+            if ($first === false) {
+                \end($conditions);
+            } else {
+                \reset($conditions);
+            }
+
+            return \key($conditions);
+        }
+
+        if ($first === false) {
+            $conditions = \array_reverse($conditions, true);
+        }
+
+        foreach ($conditions as $ptr => $type) {
+            if (isset($tokens[$ptr]) === true
+                && \in_array($type, $types, true) === true
+            ) {
+                // We found a token with the required type.
+                return $ptr;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the position of the last (innermost) condition of a certain type for the passed token.
+     *
+     * If no types are specified, the last condition for the token, independently of type,
+     * will be returned.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The position of the token we are checking.
+     * @param int|string|array            $types     Optional. The type(s) of tokens to search for.
+     *
+     * @return int|false Integer stack pointer to the condition; or `FALSE` if the token
+     *                   does not have the condition or has no conditions at all.
+     */
+    public static function getLastCondition(File $phpcsFile, $stackPtr, $types = [])
+    {
+        return self::getCondition($phpcsFile, $stackPtr, $types, false);
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php b/Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php
new file mode 100644
index 00000000..94641d48
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php
@@ -0,0 +1,754 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+
+/**
+ * Utility functions for use when examining function declaration statements.
+ *
+ * @since 1.0.0 The `FunctionDeclarations::getProperties()` and the
+ *              `FunctionDeclarations::getParameters()` methods are based on and
+ *              inspired by respectively the `getMethodProperties()`
+ *              and `getMethodParameters()` methods in the PHPCS native
+ *              `PHP_CodeSniffer\Files\File` class.
+ *              Also see {@see \PHPCSUtils\BackCompat\BCFile}.
+ */
+class FunctionDeclarations
+{
+
+    /**
+     * Retrieves the visibility and implementation properties of a method.
+     *
+     * Main differences with the PHPCS version:
+     * - Bugs fixed:
+     *   - Handling of PHPCS annotations.
+     *   - `"has_body"` index could be set to `true` for functions without body in the case of
+     *      parse errors or live coding.
+     * - Defensive coding against incorrect calls to this method.
+     * - More efficient checking whether a function has a body.
+     * - New `"return_type_end_token"` (int|false) array index.
+     * - To allow for backward compatible handling of arrow functions, this method will also accept
+     *   `T_STRING` tokens and examine them to check if these are arrow functions.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getMethodProperties()   Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::getMethodProperties() Cross-version compatible version of the original.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
+     * @since 1.0.0-alpha3 Added support for PHP 8.0 static return type.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position in the stack of the function token to
+     *                                               acquire the properties for.
+     *
+     * @return array Array with information about a function declaration.
+     *               The format of the return value is:
+     *               ```php
+     *               array(
+     *                 'scope'                 => 'public', // Public, private, or protected
+     *                 'scope_specified'       => true,     // TRUE if the scope keyword was found.
+     *                 'return_type'           => '',       // The return type of the method.
+     *                 'return_type_token'     => integer,  // The stack pointer to the start of the return type
+     *                                                      // or FALSE if there is no return type.
+     *                 'return_type_end_token' => integer,  // The stack pointer to the end of the return type
+     *                                                      // or FALSE if there is no return type.
+     *                 'nullable_return_type'  => false,    // TRUE if the return type is nullable.
+     *                 'is_abstract'           => false,    // TRUE if the abstract keyword was found.
+     *                 'is_final'              => false,    // TRUE if the final keyword was found.
+     *                 'is_static'             => false,    // TRUE if the static keyword was found.
+     *                 'has_body'              => false,    // TRUE if the method has a body
+     *               );
+     *               ```
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a T_FUNCTION
+     *                                                      or T_CLOSURE token, nor an arrow function.
+     */
+    public static function getProperties(File $phpcsFile, $stackPtr)
+    {
+        $tokens         = $phpcsFile->getTokens();
+        $arrowOpenClose = self::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
+
+        if (isset($tokens[$stackPtr]) === false
+            || ($tokens[$stackPtr]['code'] !== \T_FUNCTION
+                && $tokens[$stackPtr]['code'] !== \T_CLOSURE
+                && $arrowOpenClose === false)
+        ) {
+            throw new RuntimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or an arrow function');
+        }
+
+        if ($tokens[$stackPtr]['code'] === \T_FUNCTION) {
+            $valid = Tokens::$methodPrefixes;
+        } else {
+            $valid = [\T_STATIC => \T_STATIC];
+        }
+
+        $valid += Tokens::$emptyTokens;
+
+        $scope          = 'public';
+        $scopeSpecified = false;
+        $isAbstract     = false;
+        $isFinal        = false;
+        $isStatic       = false;
+
+        for ($i = ($stackPtr - 1); $i > 0; $i--) {
+            if (isset($valid[$tokens[$i]['code']]) === false) {
+                break;
+            }
+
+            switch ($tokens[$i]['code']) {
+                case \T_PUBLIC:
+                    $scope          = 'public';
+                    $scopeSpecified = true;
+                    break;
+                case \T_PRIVATE:
+                    $scope          = 'private';
+                    $scopeSpecified = true;
+                    break;
+                case \T_PROTECTED:
+                    $scope          = 'protected';
+                    $scopeSpecified = true;
+                    break;
+                case \T_ABSTRACT:
+                    $isAbstract = true;
+                    break;
+                case \T_FINAL:
+                    $isFinal = true;
+                    break;
+                case \T_STATIC:
+                    $isStatic = true;
+                    break;
+            }
+        }
+
+        $returnType         = '';
+        $returnTypeToken    = false;
+        $returnTypeEndToken = false;
+        $nullableReturnType = false;
+        $hasBody            = false;
+        $returnTypeTokens   = Collections::returnTypeTokensBC();
+
+        $parenthesisCloser = null;
+        if (isset($tokens[$stackPtr]['parenthesis_closer']) === true) {
+            $parenthesisCloser = $tokens[$stackPtr]['parenthesis_closer'];
+        } elseif ($arrowOpenClose !== false) {
+            // Arrow function in combination with PHP < 7.4 or PHPCS < 3.5.3.
+            $parenthesisCloser = $arrowOpenClose['parenthesis_closer'];
+        }
+
+        if (isset($parenthesisCloser) === true) {
+            $scopeOpener = null;
+            if (isset($tokens[$stackPtr]['scope_opener']) === true) {
+                $scopeOpener = $tokens[$stackPtr]['scope_opener'];
+            } elseif ($arrowOpenClose !== false) {
+                // Arrow function in combination with PHP < 7.4 or PHPCS < 3.5.3.
+                $scopeOpener = $arrowOpenClose['scope_opener'];
+            }
+
+            for ($i = $parenthesisCloser; $i < $phpcsFile->numTokens; $i++) {
+                if ($i === $scopeOpener) {
+                    // End of function definition.
+                    $hasBody = true;
+                    break;
+                }
+
+                if ($scopeOpener === null && $tokens[$i]['code'] === \T_SEMICOLON) {
+                    // End of abstract/interface function definition.
+                    break;
+                }
+
+                if ($tokens[$i]['type'] === 'T_NULLABLE'
+                    // Handle nullable tokens in PHPCS < 2.8.0.
+                    || (\defined('T_NULLABLE') === false && $tokens[$i]['code'] === \T_INLINE_THEN)
+                    // Handle nullable tokens with arrow functions in PHPCS 2.8.0 - 2.9.0.
+                    || ($arrowOpenClose !== false && $tokens[$i]['code'] === \T_INLINE_THEN
+                        && \version_compare(Helper::getVersion(), '2.9.1', '<') === true)
+                ) {
+                    $nullableReturnType = true;
+                }
+
+                if (isset($returnTypeTokens[$tokens[$i]['code']]) === true) {
+                    if ($returnTypeToken === false) {
+                        $returnTypeToken = $i;
+                    }
+
+                    $returnType        .= $tokens[$i]['content'];
+                    $returnTypeEndToken = $i;
+                }
+            }
+        }
+
+        if ($returnType !== '' && $nullableReturnType === true) {
+            $returnType = '?' . $returnType;
+        }
+
+        return [
+            'scope'                 => $scope,
+            'scope_specified'       => $scopeSpecified,
+            'return_type'           => $returnType,
+            'return_type_token'     => $returnTypeToken,
+            'return_type_end_token' => $returnTypeEndToken,
+            'nullable_return_type'  => $nullableReturnType,
+            'is_abstract'           => $isAbstract,
+            'is_final'              => $isFinal,
+            'is_static'             => $isStatic,
+            'has_body'              => $hasBody,
+        ];
+    }
+
+    /**
+     * Retrieve the parenthesis opener, parenthesis closer, the scope opener and the scope closer
+     * for an arrow function.
+     *
+     * Helper function for cross-version compatibility with both PHP as well as PHPCS.
+     * In PHPCS versions prior to PHPCS 3.5.3/3.5.4, the `T_FN` token is not yet backfilled
+     * and does not have parenthesis opener/closer nor scope opener/closer indexes assigned
+     * in the `$tokens` array.
+     *
+     * @see \PHPCSUtils\Utils\FunctionDeclarations::isArrowFunction() Related function.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha4 Handling of PHP 8.0 identifier name tokens in return types, cross-version PHP & PHPCS.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The token to retrieve the openers/closers for.
+     *                                               Typically a `T_FN` or `T_STRING` token as those are the
+     *                                               only two tokens which can be the arrow function keyword.
+     *
+     * @return array|false An array with the token pointers or `FALSE` if this is not an arrow function.
+     *                     The format of the return value is:
+     *                     ```php
+     *                     array(
+     *                       'parenthesis_opener' => integer, // Stack pointer to the parenthesis opener.
+     *                       'parenthesis_closer' => integer, // Stack pointer to the parenthesis closer.
+     *                       'scope_opener'       => integer, // Stack pointer to the scope opener (arrow).
+     *                       'scope_closer'       => integer, // Stack pointer to the scope closer.
+     *                     )
+     *                     ```
+     */
+    public static function getArrowFunctionOpenClose(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false
+            || isset(Collections::arrowFunctionTokensBC()[$tokens[$stackPtr]['code']]) === false
+            || \strtolower($tokens[$stackPtr]['content']) !== 'fn'
+        ) {
+            return false;
+        }
+
+        if ($tokens[$stackPtr]['type'] === 'T_FN'
+            && isset($tokens[$stackPtr]['scope_closer']) === true
+            && \version_compare(Helper::getVersion(), '3.5.4', '>') === true
+        ) {
+            // The keys will either all be set or none will be set, so no additional checks needed.
+            return [
+                'parenthesis_opener' => $tokens[$stackPtr]['parenthesis_opener'],
+                'parenthesis_closer' => $tokens[$stackPtr]['parenthesis_closer'],
+                'scope_opener'       => $tokens[$stackPtr]['scope_opener'],
+                'scope_closer'       => $tokens[$stackPtr]['scope_closer'],
+            ];
+        }
+
+        /*
+         * This is either a T_STRING token pre-PHP 7.4, or T_FN on PHP 7.4 in combination
+         * with PHPCS < 3.5.3/4/5.
+         *
+         * Now see about finding the relevant arrow function tokens.
+         */
+        $returnValue = [];
+
+        $nextNonEmpty = $phpcsFile->findNext(
+            (Tokens::$emptyTokens + [\T_BITWISE_AND]),
+            ($stackPtr + 1),
+            null,
+            true
+        );
+        if ($nextNonEmpty === false || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
+            return false;
+        }
+
+        $returnValue['parenthesis_opener'] = $nextNonEmpty;
+        if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
+            return false;
+        }
+
+        $returnValue['parenthesis_closer'] = $tokens[$nextNonEmpty]['parenthesis_closer'];
+
+        $ignore                 = Tokens::$emptyTokens;
+        $ignore                += Collections::returnTypeTokensBC();
+        $ignore[\T_COLON]       = \T_COLON;
+        $ignore[\T_INLINE_ELSE] = \T_INLINE_ELSE; // Return type colon on PHPCS < 2.9.1.
+        $ignore[\T_INLINE_THEN] = \T_INLINE_THEN; // Nullable type indicator on PHPCS < 2.9.1.
+
+        if (\defined('T_NULLABLE') === true) {
+            $ignore[\T_NULLABLE] = \T_NULLABLE;
+        }
+
+        $arrow = $phpcsFile->findNext(
+            $ignore,
+            ($tokens[$nextNonEmpty]['parenthesis_closer'] + 1),
+            null,
+            true
+        );
+
+        if ($arrow === false
+            || ($tokens[$arrow]['code'] !== \T_DOUBLE_ARROW && $tokens[$arrow]['type'] !== 'T_FN_ARROW')
+        ) {
+            return false;
+        }
+
+        $returnValue['scope_opener'] = $arrow;
+        $inTernary                   = false;
+        $lastEndToken                = null;
+
+        for ($scopeCloser = ($arrow + 1); $scopeCloser < $phpcsFile->numTokens; $scopeCloser++) {
+            if (isset(self::$arrowFunctionEndTokens[$tokens[$scopeCloser]['code']]) === true
+                // BC for misidentified ternary else in some PHPCS versions.
+                && ($tokens[$scopeCloser]['code'] !== \T_COLON || $inTernary === false)
+            ) {
+                if ($lastEndToken !== null
+                    && $tokens[$scopeCloser]['code'] === \T_CLOSE_PARENTHESIS
+                    && $tokens[$scopeCloser]['parenthesis_opener'] < $arrow
+                ) {
+                    $scopeCloser = $lastEndToken;
+                }
+
+                break;
+            }
+
+            if (isset(Collections::arrowFunctionTokensBC()[$tokens[$scopeCloser]['code']]) === true) {
+                $nested = self::getArrowFunctionOpenClose($phpcsFile, $scopeCloser);
+                if ($nested !== false && isset($nested['scope_closer'])) {
+                    // We minus 1 here in case the closer can be shared with us.
+                    $scopeCloser = ($nested['scope_closer'] - 1);
+                    continue;
+                }
+            }
+
+            if (isset($tokens[$scopeCloser]['scope_closer']) === true
+                && $tokens[$scopeCloser]['code'] !== \T_INLINE_ELSE
+                && $tokens[$scopeCloser]['code'] !== \T_END_HEREDOC
+                && $tokens[$scopeCloser]['code'] !== \T_END_NOWDOC
+            ) {
+                // We minus 1 here in case the closer can be shared with us.
+                $scopeCloser = ($tokens[$scopeCloser]['scope_closer'] - 1);
+                continue;
+            }
+
+            if (isset($tokens[$scopeCloser]['parenthesis_closer']) === true) {
+                $scopeCloser  = $tokens[$scopeCloser]['parenthesis_closer'];
+                $lastEndToken = $scopeCloser;
+                continue;
+            }
+
+            if (isset($tokens[$scopeCloser]['bracket_closer']) === true) {
+                $scopeCloser  = $tokens[$scopeCloser]['bracket_closer'];
+                $lastEndToken = $scopeCloser;
+                continue;
+            }
+
+            if ($tokens[$scopeCloser]['code'] === \T_INLINE_THEN) {
+                $inTernary = true;
+                continue;
+            }
+
+            if ($tokens[$scopeCloser]['code'] === \T_INLINE_ELSE) {
+                if ($inTernary === false) {
+                    break;
+                }
+
+                $inTernary = false;
+            }
+        }
+
+        if ($scopeCloser === $phpcsFile->numTokens) {
+            return false;
+        }
+
+        $returnValue['scope_closer'] = $scopeCloser;
+
+        return $returnValue;
+    }
+
+    /**
+     * Returns the declaration name for a function.
+     *
+     * Alias for the {@see \PHPCSUtils\Utils\ObjectDeclarations::getName()} method.
+     *
+     * @see \PHPCSUtils\BackCompat\BCFile::getDeclarationName() Original function.
+     * @see \PHPCSUtils\Utils\ObjectDeclarations::getName()     PHPCSUtils native improved version.
+     *
+     * @since 1.0.0
+     *
+     * @codeCoverageIgnore
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the function keyword token.
+     *
+     * @return string|null The name of the function; or `NULL` if the passed token doesn't exist,
+     *                     the function is anonymous or in case of a parse error/live coding.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
+     *                                                      `T_FUNCTION`.
+     */
+    public static function getName(File $phpcsFile, $stackPtr)
+    {
+        return ObjectDeclarations::getName($phpcsFile, $stackPtr);
+    }
+
+
+    /**
+     * Retrieves the method parameters for the specified function token.
+     *
+     * Also supports passing in a `T_USE` token for a closure use group.
+     *
+     * The returned array will contain the following information for each parameter:
+     *
+     * ```php
+     * 0 => array(
+     *   'name'                => '$var',  // The variable name.
+     *   'token'               => integer, // The stack pointer to the variable name.
+     *   'content'             => string,  // The full content of the variable definition.
+     *   'pass_by_reference'   => boolean, // Is the variable passed by reference?
+     *   'reference_token'     => integer, // The stack pointer to the reference operator
+     *                                     // or FALSE if the param is not passed by reference.
+     *   'variable_length'     => boolean, // Is the param of variable length through use of `...` ?
+     *   'variadic_token'      => integer, // The stack pointer to the ... operator
+     *                                     // or FALSE if the param is not variable length.
+     *   'type_hint'           => string,  // The type hint for the variable.
+     *   'type_hint_token'     => integer, // The stack pointer to the start of the type hint
+     *                                     // or FALSE if there is no type hint.
+     *   'type_hint_end_token' => integer, // The stack pointer to the end of the type hint
+     *                                     // or FALSE if there is no type hint.
+     *   'nullable_type'       => boolean, // TRUE if the var type is preceded by the nullability
+     *                                     // operator.
+     *   'comma_token'         => integer, // The stack pointer to the comma after the param
+     *                                     // or FALSE if this is the last param.
+     * )
+     * ```
+     *
+     * Parameters with default values have the following additional array indexes:
+     * ```php
+     *   'default'             => string,  // The full content of the default value.
+     *   'default_token'       => integer, // The stack pointer to the start of the default value.
+     *   'default_equal_token' => integer, // The stack pointer to the equals sign.
+     * ```
+     *
+     * Parameters declared using PHP 8 constructor property promotion, have these additional array indexes:
+     * ```php
+     *   'property_visibility' => string,  // The property visibility as declared.
+     *   'visibility_token'    => integer, // The stack pointer to the visibility modifier token.
+     * ```
+     *
+     * Main differences with the PHPCS version:
+     * - Defensive coding against incorrect calls to this method.
+     * - More efficient and more stable checking whether a `T_USE` token is a closure use.
+     * - More efficient and more stable looping of the default value.
+     * - Clearer exception message when a non-closure use token was passed to the function.
+     * - To allow for backward compatible handling of arrow functions, this method will also accept
+     *   `T_STRING` tokens and examine them to check if these are arrow functions.
+     * - Support for PHP 8.0 identifier name tokens in parameter types, cross-version PHP & PHPCS.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getMethodParameters()   Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::getMethodParameters() Cross-version compatible version of the original.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 constructor property promotion.
+     * @since 1.0.0-alpha4 Added support for PHP 8.0 identifier name tokenization.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position in the stack of the function token
+     *                                               to acquire the parameters for.
+     *
+     * @return array
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified $stackPtr is not of
+     *                                                      type `T_FUNCTION`, `T_CLOSURE` or `T_USE`,
+     *                                                      nor an arrow function.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a passed `T_USE` token is not a closure
+     *                                                      use token.
+     */
+    public static function getParameters(File $phpcsFile, $stackPtr)
+    {
+        $tokens         = $phpcsFile->getTokens();
+        $arrowOpenClose = self::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
+
+        if (isset($tokens[$stackPtr]) === false
+            || ($tokens[$stackPtr]['code'] !== \T_FUNCTION
+                && $tokens[$stackPtr]['code'] !== \T_CLOSURE
+                && $tokens[$stackPtr]['code'] !== \T_USE
+                && $arrowOpenClose === false)
+        ) {
+            throw new RuntimeException('$stackPtr must be of type T_FUNCTION, T_CLOSURE or T_USE or an arrow function');
+        }
+
+        if ($tokens[$stackPtr]['code'] === \T_USE) {
+            // This will work PHPCS 3.x/4.x cross-version without much overhead.
+            $opener = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+            if ($opener === false
+                || $tokens[$opener]['code'] !== \T_OPEN_PARENTHESIS
+                || UseStatements::isClosureUse($phpcsFile, $stackPtr) === false
+            ) {
+                throw new RuntimeException('$stackPtr was not a valid closure T_USE');
+            }
+        } elseif ($arrowOpenClose !== false) {
+            // Arrow function in combination with PHP < 7.4 or PHPCS < 3.5.3/4/5.
+            $opener = $arrowOpenClose['parenthesis_opener'];
+        } else {
+            if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
+                // Live coding or syntax error, so no params to find.
+                return [];
+            }
+
+            $opener = $tokens[$stackPtr]['parenthesis_opener'];
+        }
+
+        if (isset($tokens[$opener]['parenthesis_closer']) === false) {
+            // Live coding or syntax error, so no params to find.
+            return [];
+        }
+
+        $closer = $tokens[$opener]['parenthesis_closer'];
+
+        $vars             = [];
+        $currVar          = null;
+        $paramStart       = ($opener + 1);
+        $defaultStart     = null;
+        $equalToken       = null;
+        $paramCount       = 0;
+        $passByReference  = false;
+        $referenceToken   = false;
+        $variableLength   = false;
+        $variadicToken    = false;
+        $typeHint         = '';
+        $typeHintToken    = false;
+        $typeHintEndToken = false;
+        $nullableType     = false;
+        $visibilityToken  = null;
+
+        for ($i = $paramStart; $i <= $closer; $i++) {
+            // Changed from checking 'code' to 'type' to allow for T_NULLABLE not existing in PHPCS < 2.8.0.
+            switch ($tokens[$i]['type']) {
+                case 'T_BITWISE_AND':
+                    $passByReference = true;
+                    $referenceToken  = $i;
+                    break;
+
+                case 'T_VARIABLE':
+                    $currVar = $i;
+                    break;
+
+                case 'T_ELLIPSIS':
+                    $variableLength = true;
+                    $variadicToken  = $i;
+                    break;
+
+                case 'T_ARRAY_HINT': // PHPCS < 3.3.0.
+                case 'T_CALLABLE':
+                case 'T_SELF':
+                case 'T_PARENT':
+                case 'T_STATIC': // Self and parent are valid, static invalid, but was probably intended as type hint.
+                case 'T_FALSE': // Union types.
+                case 'T_NULL': // Union types.
+                case 'T_STRING':
+                case 'T_NAMESPACE':
+                case 'T_NS_SEPARATOR':
+                case 'T_NAME_QUALIFIED':
+                case 'T_NAME_FULLY_QUALIFIED':
+                case 'T_NAME_RELATIVE':
+                case 'T_BITWISE_OR': // Union type separator PHPCS < 3.6.0.
+                case 'T_TYPE_UNION': // Union type separator PHPCS >= 3.6.0.
+                    if ($typeHintToken === false) {
+                        $typeHintToken = $i;
+                    }
+
+                    $typeHint        .= $tokens[$i]['content'];
+                    $typeHintEndToken = $i;
+                    break;
+
+                case 'T_NULLABLE':
+                case 'T_INLINE_THEN': // PHPCS < 2.8.0.
+                    $nullableType     = true;
+                    $typeHint        .= $tokens[$i]['content'];
+                    $typeHintEndToken = $i;
+                    break;
+
+                case 'T_PUBLIC':
+                case 'T_PROTECTED':
+                case 'T_PRIVATE':
+                    $visibilityToken = $i;
+                    break;
+
+                case 'T_CLOSE_PARENTHESIS':
+                case 'T_COMMA':
+                    // If it's null, then there must be no parameters for this
+                    // method.
+                    if ($currVar === null) {
+                        continue 2;
+                    }
+
+                    $vars[$paramCount]            = [];
+                    $vars[$paramCount]['token']   = $currVar;
+                    $vars[$paramCount]['name']    = $tokens[$currVar]['content'];
+                    $vars[$paramCount]['content'] = \trim(
+                        GetTokensAsString::normal($phpcsFile, $paramStart, ($i - 1))
+                    );
+
+                    if ($defaultStart !== null) {
+                        $vars[$paramCount]['default']             = \trim(
+                            GetTokensAsString::normal($phpcsFile, $defaultStart, ($i - 1))
+                        );
+                        $vars[$paramCount]['default_token']       = $defaultStart;
+                        $vars[$paramCount]['default_equal_token'] = $equalToken;
+                    }
+
+                    $vars[$paramCount]['pass_by_reference']   = $passByReference;
+                    $vars[$paramCount]['reference_token']     = $referenceToken;
+                    $vars[$paramCount]['variable_length']     = $variableLength;
+                    $vars[$paramCount]['variadic_token']      = $variadicToken;
+                    $vars[$paramCount]['type_hint']           = $typeHint;
+                    $vars[$paramCount]['type_hint_token']     = $typeHintToken;
+                    $vars[$paramCount]['type_hint_end_token'] = $typeHintEndToken;
+                    $vars[$paramCount]['nullable_type']       = $nullableType;
+
+                    if ($visibilityToken !== null) {
+                        $vars[$paramCount]['property_visibility'] = $tokens[$visibilityToken]['content'];
+                        $vars[$paramCount]['visibility_token']    = $visibilityToken;
+                    }
+
+                    if ($tokens[$i]['code'] === \T_COMMA) {
+                        $vars[$paramCount]['comma_token'] = $i;
+                    } else {
+                        $vars[$paramCount]['comma_token'] = false;
+                    }
+
+                    // Reset the vars, as we are about to process the next parameter.
+                    $currVar          = null;
+                    $paramStart       = ($i + 1);
+                    $defaultStart     = null;
+                    $equalToken       = null;
+                    $passByReference  = false;
+                    $referenceToken   = false;
+                    $variableLength   = false;
+                    $variadicToken    = false;
+                    $typeHint         = '';
+                    $typeHintToken    = false;
+                    $typeHintEndToken = false;
+                    $nullableType     = false;
+                    $visibilityToken  = null;
+
+                    $paramCount++;
+                    break;
+
+                case 'T_EQUAL':
+                    $defaultStart = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+                    $equalToken   = $i;
+
+                    // Skip past everything in the default value before going into the next switch loop.
+                    for ($j = ($i + 1); $j <= $closer; $j++) {
+                        // Skip past array()'s et al as default values.
+                        if (isset($tokens[$j]['parenthesis_opener'], $tokens[$j]['parenthesis_closer'])) {
+                            $j = $tokens[$j]['parenthesis_closer'];
+
+                            if ($j === $closer) {
+                                // Found the end of the parameter.
+                                break;
+                            }
+
+                            continue;
+                        }
+
+                        // Skip past short arrays et al as default values.
+                        if (isset($tokens[$j]['bracket_opener'])) {
+                            $j = $tokens[$j]['bracket_closer'];
+                            continue;
+                        }
+
+                        if ($tokens[$j]['code'] === \T_COMMA) {
+                            break;
+                        }
+                    }
+
+                    $i = ($j - 1);
+                    break;
+            }
+        }
+
+        return $vars;
+    }
+
+    /**
+     * Check if an arbitrary token is the "fn" keyword for a PHP 7.4 arrow function.
+     *
+     * Helper function for cross-version compatibility with both PHP as well as PHPCS.
+     * - PHP 7.4+ will tokenize most tokens with the content "fn" as `T_FN`, even when it isn't an arrow function.
+     * - PHPCS < 3.5.3 will tokenize arrow functions keywords as `T_STRING`.
+     * - PHPCS 3.5.3/3.5.4 will tokenize the keyword differently depending on which PHP version is used
+     *   and similar to PHP will tokenize most tokens with the content "fn" as `T_FN`, even when it's not an
+     *   arrow function.
+     *   > Note: the tokens tokenized by PHPCS 3.5.3 - 3.5.4 as `T_FN` are not 100% the same as those tokenized
+     *   by PHP 7.4+ as `T_FN`.
+     *
+     * Either way, the `T_FN` token is not a reliable search vector for finding or examining
+     * arrow functions, at least not until PHPCS 3.5.5.
+     * This function solves that and will give reliable results in the same way as this is now
+     * solved in PHPCS 3.5.5.
+     *
+     * > Note: Bugs are still being found and reported about how PHPCS tokenizes the arrow functions.
+     * This method will keep up with upstream changes and backport them, in as far possible, to allow
+     * for sniffing arrow functions in PHPCS < current.
+     *
+     * @see \PHPCSUtils\Utils\FunctionDeclarations::getArrowFunctionOpenClose() Related function.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The token to check. Typically a T_FN or
+     *                                               T_STRING token as those are the only two
+     *                                               tokens which can be the arrow function keyword.
+     *
+     * @return bool `TRUE` if the token is the "fn" keyword for an arrow function. `FALSE` when it's not
+     *              or in case of live coding/parse error.
+     */
+    public static function isArrowFunction(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$stackPtr]) === false) {
+            return false;
+        }
+
+        if ($tokens[$stackPtr]['type'] === 'T_FN'
+            && isset($tokens[$stackPtr]['scope_closer']) === true
+        ) {
+            return true;
+        }
+
+        if (isset(Collections::arrowFunctionTokensBC()[$tokens[$stackPtr]['code']]) === false
+            || \strtolower($tokens[$stackPtr]['content']) !== 'fn'
+        ) {
+            return false;
+        }
+
+        $openClose = self::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
+        if ($openClose !== false && isset($openClose['scope_closer'])) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php b/Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php
new file mode 100644
index 00000000..c7267f5c
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Utility functions to retrieve the content of a set of tokens as a string.
+ *
+ * In contrast to the PHPCS native {@see \PHP_CodeSniffer\Files\File::getTokensAsString()} method,
+ * which has `$length` as the third parameter, all methods in this class expect a stack pointer to
+ * an `$end` token (inclusive) as the third parameter.
+ *
+ * @since 1.0.0 The principle of this class is loosely based on and inspired by the
+ *              {@see \PHP_CodeSniffer\Files\File::getTokensAsString()} method in the
+ *              PHPCS native `File` class.
+ *              Also see {@see \PHPCSUtils\BackCompat\BCFile::getTokensAsString()}.
+ */
+class GetTokensAsString
+{
+    /**
+     * Retrieve the tab-replaced content of the tokens from the specified start position in
+     * the token stack to the specified end position (inclusive).
+     *
+     * This is the default behaviour for PHPCS.
+     *
+     * If the `tabWidth` is set, either via a (custom) ruleset, the config file or by passing it
+     * on the command-line, PHPCS will automatically replace tabs with spaces.
+     * The `'content'` index key in the `$tokens` array will contain the tab-replaced content.
+     * The `'orig_content'` index key in the `$tokens` array will contain the original content.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getTokensAsString()   Similar length-based function.
+     * @see \PHPCSUtils\BackCompat\BCFile::getTokensAsString() Cross-version compatible version of the original.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $start     The position to start from in the token stack.
+     * @param int                         $end       The position to end at in the token stack (inclusive).
+     *
+     * @return string The token contents.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
+     */
+    public static function normal(File $phpcsFile, $start, $end)
+    {
+        return self::getString($phpcsFile, $start, $end);
+    }
+
+    /**
+     * Retrieve the content of the tokens from the specified start position in the token
+     * stack to the specified end position (inclusive) with all consecutive whitespace tokens - tabs,
+     * new lines, multiple spaces - replaced by a single space and optionally without comments.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getTokensAsString() Loosely related function.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile     The file being scanned.
+     * @param int                         $start         The position to start from in the token stack.
+     * @param int                         $end           The position to end at in the token stack (inclusive).
+     * @param bool                        $stripComments Whether comments should be stripped from the contents.
+     *                                                   Defaults to `false`.
+     *
+     * @return string The token contents with compacted whitespace and optionally stripped off comments.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
+     */
+    public static function compact(File $phpcsFile, $start, $end, $stripComments = false)
+    {
+        return self::getString($phpcsFile, $start, $end, false, $stripComments, false, true);
+    }
+
+    /**
+     * Retrieve the content of the tokens from the specified start position in the token stack
+     * to the specified end position (inclusive).
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile       The file being scanned.
+     * @param int                         $start           The position to start from in the token stack.
+     * @param int                         $end             The position to end at in the token stack (inclusive).
+     * @param bool                        $origContent     Whether the original content or the tab replaced
+     *                                                     content should be used.
+     *                                                     Defaults to `false` (= tabs replaced with spaces).
+     * @param bool                        $stripComments   Whether comments should be stripped from the contents.
+     *                                                     Defaults to `false`.
+     * @param bool                        $stripWhitespace Whether whitespace should be stripped from the contents.
+     *                                                     Defaults to `false`.
+     * @param bool                        $compact         Whether all consecutive whitespace tokens should be
+     *                                                     replaced with a single space. Defaults to `false`.
+     *
+     * @return string The token contents.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
+     */
+    protected static function getString(
+        File $phpcsFile,
+        $start,
+        $end,
+        $origContent = false,
+        $stripComments = false,
+        $stripWhitespace = false,
+        $compact = false
+    ) {
+        $tokens = $phpcsFile->getTokens();
+
+        if (\is_int($start) === false || isset($tokens[$start]) === false) {
+            throw new RuntimeException(
+                'The $start position for GetTokensAsString methods must exist in the token stack'
+            );
+        }
+
+        if (\is_int($end) === false || $end < $start) {
+            return '';
+        }
+
+        $str = '';
+        if ($end >= $phpcsFile->numTokens) {
+            $end = ($phpcsFile->numTokens - 1);
+        }
+
+        $lastAdded = null;
+        for ($i = $start; $i <= $end; $i++) {
+            if ($stripComments === true && isset(Tokens::$commentTokens[$tokens[$i]['code']])) {
+                continue;
+            }
+
+            if ($stripWhitespace === true && $tokens[$i]['code'] === \T_WHITESPACE) {
+                continue;
+            }
+
+            if ($compact === true && $tokens[$i]['code'] === \T_WHITESPACE) {
+                if (isset($lastAdded) === false || $tokens[$lastAdded]['code'] !== \T_WHITESPACE) {
+                    $str      .= ' ';
+                    $lastAdded = $i;
+                }
+                continue;
+            }
+
+            // If tabs are being converted to spaces by the tokenizer, the
+            // original content should be used instead of the converted content.
+            if ($origContent === true && isset($tokens[$i]['orig_content']) === true) {
+                $str .= $tokens[$i]['orig_content'];
+            } else {
+                $str .= $tokens[$i]['content'];
+            }
+
+            $lastAdded = $i;
+        }
+
+        return $str;
+    }
+
+    /**
+     * Retrieve the code-tokens only content of the tokens from the specified start position
+     * in the token stack to the specified end position (inclusive) without whitespace or comments.
+     *
+     * This is, for instance, useful to retrieve a namespace name without stray whitespace or comments.
+     * Use this function selectively and with care!
+     *
+     * @see \PHP_CodeSniffer\Files\File::getTokensAsString() Loosely related function.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $start     The position to start from in the token stack.
+     * @param int                         $end       The position to end at in the token stack (inclusive).
+     *
+     * @return string The token contents stripped off comments and whitespace.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
+     */
+    public static function noEmpties(File $phpcsFile, $start, $end)
+    {
+        return self::getString($phpcsFile, $start, $end, false, true, true);
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php b/Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php
new file mode 100644
index 00000000..fdb46adb
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+
+/**
+ * Utility functions for use when examining object declaration statements.
+ *
+ * @since 1.0.0 The `ObjectDeclarations::get(Declaration)Name()`,
+ *              `ObjectDeclarations::getClassProperties()`, `ObjectDeclarations::findExtendedClassName()`
+ *              and `ObjectDeclarations::findImplementedInterfaceNames()` methods are based on and
+ *              inspired by the methods of the same name in the PHPCS native
+ *              `PHP_CodeSniffer\Files\File` class.
+ *              Also see {@see \PHPCSUtils\BackCompat\BCFile}.
+ */
+class ObjectDeclarations
+{
+
+    /**
+     * Retrieves the declaration name for classes, interfaces, traits, and functions.
+     *
+     * Main differences with the PHPCS version:
+     * - Defensive coding against incorrect calls to this method.
+     * - Improved handling of invalid names, like names starting with a number.
+     *   This allows sniffs to report on invalid names instead of ignoring them.
+     * - Bug fix: improved handling of parse errors.
+     *   Using the original method, a parse error due to an invalid name could cause the method
+     *   to return the name of the *next* construct, a partial name and/or the name of a class
+     *   being extended/interface being implemented.
+     *   Using this version of the utility method, either the complete name (invalid or not) will
+     *   be returned or `null` in case of no name (parse error).
+     *
+     * Note:
+     * - For ES6 classes in combination with PHPCS 2.x, passing a `T_STRING` token to
+     *   this method will be accepted for JS files.
+     * - Support for JS ES6 method syntax has not been back-filled for PHPCS < 3.0.0.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getDeclarationName()   Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::getDeclarationName() Cross-version compatible version of the original.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the declaration token
+     *                                               which declared the class, interface,
+     *                                               trait, or function.
+     *
+     * @return string|null The name of the class, interface, trait, or function;
+     *                     or `NULL` if the passed token doesn't exist, the function or
+     *                     class is anonymous or in case of a parse error/live coding.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
+     *                                                      `T_FUNCTION`, `T_CLASS`, `T_TRAIT`, or `T_INTERFACE`.
+     */
+    public static function getName(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false
+            || ($tokens[$stackPtr]['code'] === \T_ANON_CLASS || $tokens[$stackPtr]['code'] === \T_CLOSURE)
+        ) {
+            return null;
+        }
+
+        $tokenCode = $tokens[$stackPtr]['code'];
+
+        /*
+         * BC: Work-around JS ES6 classes not being tokenized as T_CLASS in PHPCS < 3.0.0.
+         */
+        if (isset($phpcsFile->tokenizerType)
+            && $phpcsFile->tokenizerType === 'JS'
+            && $tokenCode === \T_STRING
+            && $tokens[$stackPtr]['content'] === 'class'
+        ) {
+            $tokenCode = \T_CLASS;
+        }
+
+        if ($tokenCode !== \T_FUNCTION
+            && $tokenCode !== \T_CLASS
+            && $tokenCode !== \T_INTERFACE
+            && $tokenCode !== \T_TRAIT
+        ) {
+            throw new RuntimeException(
+                'Token type "' . $tokens[$stackPtr]['type'] . '" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT'
+            );
+        }
+
+        if ($tokenCode === \T_FUNCTION
+            && \strtolower($tokens[$stackPtr]['content']) !== 'function'
+        ) {
+            // This is a function declared without the "function" keyword.
+            // So this token is the function name.
+            return $tokens[$stackPtr]['content'];
+        }
+
+        /*
+         * Determine the name. Note that we cannot simply look for the first T_STRING
+         * because an (invalid) class name starting with a number will be multiple tokens.
+         * Whitespace or comment are however not allowed within a name.
+         */
+
+        $stopPoint = $phpcsFile->numTokens;
+        if ($tokenCode === \T_FUNCTION && isset($tokens[$stackPtr]['parenthesis_opener']) === true) {
+            $stopPoint = $tokens[$stackPtr]['parenthesis_opener'];
+        } elseif (isset($tokens[$stackPtr]['scope_opener']) === true) {
+            $stopPoint = $tokens[$stackPtr]['scope_opener'];
+        }
+
+        $exclude   = Tokens::$emptyTokens;
+        $exclude[] = \T_OPEN_PARENTHESIS;
+        $exclude[] = \T_OPEN_CURLY_BRACKET;
+        $exclude[] = \T_BITWISE_AND;
+
+        $nameStart = $phpcsFile->findNext($exclude, ($stackPtr + 1), $stopPoint, true);
+        if ($nameStart === false) {
+            // Live coding or parse error.
+            return null;
+        }
+
+        $tokenAfterNameEnd = $phpcsFile->findNext($exclude, $nameStart, $stopPoint);
+
+        if ($tokenAfterNameEnd === false) {
+            $content = null;
+
+            /*
+             * BC: In PHPCS 2.6.0, in case of live coding, the last token in a file will be tokenized
+             * as T_STRING, but won't have the `content` index set.
+             */
+            if (isset($tokens[$nameStart]['content'])) {
+                $content = $tokens[$nameStart]['content'];
+            }
+
+            return $content;
+        }
+
+        // Name starts with number, so is composed of multiple tokens.
+        return GetTokensAsString::noEmpties($phpcsFile, $nameStart, ($tokenAfterNameEnd - 1));
+    }
+
+    /**
+     * Retrieves the implementation properties of a class.
+     *
+     * Main differences with the PHPCS version:
+     * - Bugs fixed:
+     *   - Handling of PHPCS annotations.
+     *   - Handling of unorthodox docblock placement.
+     *   - A class cannot both be abstract as well as final, so this utility should not allow for that.
+     * - Defensive coding against incorrect calls to this method.
+     *
+     * @see \PHP_CodeSniffer\Files\File::getClassProperties()   Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::getClassProperties() Cross-version compatible version of the original.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position in the stack of the `T_CLASS`
+     *                                               token to acquire the properties for.
+     *
+     * @return array Array with implementation properties of a class.
+     *               The format of the return value is:
+     *               ```php
+     *               array(
+     *                 'is_abstract' => false, // TRUE if the abstract keyword was found.
+     *                 'is_final'    => false, // TRUE if the final keyword was found.
+     *               );
+     *               ```
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      `T_CLASS` token.
+     */
+    public static function getClassProperties(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_CLASS) {
+            throw new RuntimeException('$stackPtr must be of type T_CLASS');
+        }
+
+        $valid      = Collections::$classModifierKeywords + Tokens::$emptyTokens;
+        $properties = [
+            'is_abstract' => false,
+            'is_final'    => false,
+        ];
+
+        for ($i = ($stackPtr - 1); $i > 0; $i--) {
+            if (isset($valid[$tokens[$i]['code']]) === false) {
+                break;
+            }
+
+            switch ($tokens[$i]['code']) {
+                case \T_ABSTRACT:
+                    $properties['is_abstract'] = true;
+                    break 2;
+
+                case \T_FINAL:
+                    $properties['is_final'] = true;
+                    break 2;
+            }
+        }
+
+        return $properties;
+    }
+
+    /**
+     * Retrieves the name of the class that the specified class extends.
+     *
+     * Works for classes, anonymous classes and interfaces, though it is strongly recommended
+     * to use the {@see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedInterfaceNames()}
+     * method to examine interfaces instead. Interfaces can extend multiple parent interfaces,
+     * and that use-case is not handled by this method.
+     *
+     * Main differences with the PHPCS version:
+     * - Bugs fixed:
+     *   - Handling of PHPCS annotations.
+     *   - Handling of comments.
+     * - Improved handling of parse errors.
+     * - The returned name will be clean of superfluous whitespace and/or comments.
+     *
+     * @see \PHP_CodeSniffer\Files\File::findExtendedClassName()               Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::findExtendedClassName()             Cross-version compatible version of
+     *                                                                         the original.
+     * @see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedInterfaceNames() Similar method for extended interfaces.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The stack position of the class or interface.
+     *
+     * @return string|false The extended class name or `FALSE` on error or if there
+     *                      is no extended class name.
+     */
+    public static function findExtendedClassName(File $phpcsFile, $stackPtr)
+    {
+        $names = self::findNames($phpcsFile, $stackPtr, \T_EXTENDS, Collections::$OOCanExtend);
+        if ($names === false) {
+            return false;
+        }
+
+        // Classes can only extend one parent class.
+        return \array_shift($names);
+    }
+
+    /**
+     * Retrieves the names of the interfaces that the specified class implements.
+     *
+     * Main differences with the PHPCS version:
+     * - Bugs fixed:
+     *   - Handling of PHPCS annotations.
+     *   - Handling of comments.
+     * - Improved handling of parse errors.
+     * - The returned name(s) will be clean of superfluous whitespace and/or comments.
+     *
+     * @see \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames()   Original source.
+     * @see \PHPCSUtils\BackCompat\BCFile::findImplementedInterfaceNames() Cross-version compatible version of
+     *                                                                     the original.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The stack position of the class.
+     *
+     * @return array|false Array with names of the implemented interfaces or `FALSE` on
+     *                     error or if there are no implemented interface names.
+     */
+    public static function findImplementedInterfaceNames(File $phpcsFile, $stackPtr)
+    {
+        return self::findNames($phpcsFile, $stackPtr, \T_IMPLEMENTS, Collections::$OOCanImplement);
+    }
+
+    /**
+     * Retrieves the names of the interfaces that the specified interface extends.
+     *
+     * @see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedClassName() Similar method for extended classes.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The stack position of the interface keyword.
+     *
+     * @return array|false Array with names of the extended interfaces or `FALSE` on
+     *                     error or if there are no extended interface names.
+     */
+    public static function findExtendedInterfaceNames(File $phpcsFile, $stackPtr)
+    {
+        return self::findNames(
+            $phpcsFile,
+            $stackPtr,
+            \T_EXTENDS,
+            [\T_INTERFACE => \T_INTERFACE]
+        );
+    }
+
+    /**
+     * Retrieves the names of the extended classes or interfaces or the implemented
+     * interfaces that the specific class/interface declaration extends/implements.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile  The file where this token was found.
+     * @param int                         $stackPtr   The stack position of the
+     *                                                class/interface declaration keyword.
+     * @param int                         $keyword    The token constant for the keyword to examine.
+     *                                                Either `T_EXTENDS` or `T_IMPLEMENTS`.
+     * @param array                       $allowedFor Array of OO types for which use of the keyword
+     *                                                is allowed.
+     *
+     * @return array|false Returns an array of names or `FALSE` on error or when the object
+     *                     being declared does not extend/implement another object.
+     */
+    private static function findNames(File $phpcsFile, $stackPtr, $keyword, $allowedFor)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false
+            || isset($allowedFor[$tokens[$stackPtr]['code']]) === false
+            || isset($tokens[$stackPtr]['scope_opener']) === false
+        ) {
+            return false;
+        }
+
+        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
+        $keywordPtr  = $phpcsFile->findNext($keyword, ($stackPtr + 1), $scopeOpener);
+        if ($keywordPtr === false) {
+            return false;
+        }
+
+        $find  = [
+            \T_NS_SEPARATOR,
+            \T_STRING,
+        ];
+        $find += Tokens::$emptyTokens;
+
+        $names = [];
+        $end   = $keywordPtr;
+        do {
+            $start = ($end + 1);
+            $end   = $phpcsFile->findNext($find, $start, ($scopeOpener + 1), true);
+            $name  = GetTokensAsString::noEmpties($phpcsFile, $start, ($end - 1));
+
+            if (\trim($name) !== '') {
+                $names[] = $name;
+            }
+        } while ($tokens[$end]['code'] === \T_COMMA);
+
+        if (empty($names)) {
+            return false;
+        }
+
+        return $names;
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php b/Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php
new file mode 100644
index 00000000..26ba1fd2
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
+
+/**
+ * Utility functions for use when examining parenthesis tokens and arbitrary tokens wrapped
+ * in parentheses.
+ *
+ * In contrast to PHPCS natively, `isset()`, `unset()`, `empty()`, `exit()`, `die()` and `eval()`
+ * will be considered parentheses owners by the functions in this class.
+ *
+ * @since 1.0.0
+ * @since 1.0.0-alpha4 Added support for `isset()`, `unset()`, `empty()`, `exit()`, `die()`
+ *                     and `eval()`` as parentheses owners to all applicable functions.
+ */
+class Parentheses
+{
+
+    /**
+     * Extra tokens which should be considered parentheses owners.
+     *
+     * - `T_LIST` and `T_ANON_CLASS` only became parentheses owners in PHPCS 3.5.0.
+     * - `T_ISSET`, `T_UNSET`, `T_EMPTY`, `T_EXIT` and `T_EVAL` are not PHPCS native parentheses,
+     *    owners, but are considered such for the purposes of this class.
+     *    Also {@see https://github.com/squizlabs/PHP_CodeSniffer/issues/3118}.
+     *
+     * @since 1.0.0-alpha4
+     *
+     * @var array <int|string> => <int|string>
+     */
+    private static $extraParenthesesOwners = [
+        \T_LIST       => \T_LIST,
+        \T_ISSET      => \T_ISSET,
+        \T_UNSET      => \T_UNSET,
+        \T_EMPTY      => \T_EMPTY,
+        \T_EXIT       => \T_EXIT,
+        \T_EVAL       => \T_EVAL,
+        \T_ANON_CLASS => \T_ANON_CLASS,
+        // Work-around: anon classes were, in certain circumstances, tokenized as T_CLASS prior to PHPCS 3.4.0.
+        \T_CLASS      => \T_CLASS,
+    ];
+
+    /**
+     * Get the stack pointer to the parentheses owner of an open/close parenthesis.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The position of `T_OPEN/CLOSE_PARENTHESIS` token.
+     *
+     * @return int|false Integer stack pointer to the parentheses owner; or `FALSE` if the
+     *                   parenthesis does not have a (direct) owner or if the token passed
+     *                   was not a parenthesis.
+     */
+    public static function getOwner(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]['parenthesis_owner'])) {
+            return $tokens[$stackPtr]['parenthesis_owner'];
+        }
+
+        /*
+         * - `T_FN` was only backfilled in PHPCS 3.5.3/4/5.
+         *    - On PHP 7.4 with PHPCS < 3.5.3, T_FN will not yet be a parentheses owner.
+         *    - On PHP < 7.4 with PHPCS < 3.5.3, T_FN will be tokenized as T_STRING and not yet be a parentheses owner.
+         *
+         * {@internal As the 'parenthesis_owner' index is only set on parentheses, we didn't need to do any
+         * input validation before, but now we do.}
+         */
+        if (isset($tokens[$stackPtr]) === false
+            || ($tokens[$stackPtr]['code'] !== \T_OPEN_PARENTHESIS
+                && $tokens[$stackPtr]['code'] !== \T_CLOSE_PARENTHESIS)
+        ) {
+            return false;
+        }
+
+        if ($tokens[$stackPtr]['code'] === \T_CLOSE_PARENTHESIS) {
+            $stackPtr = $tokens[$stackPtr]['parenthesis_opener'];
+        }
+
+        $skip                 = Tokens::$emptyTokens;
+        $skip[\T_BITWISE_AND] = \T_BITWISE_AND;
+
+        $prevNonEmpty = $phpcsFile->findPrevious($skip, ($stackPtr - 1), null, true);
+        if ($prevNonEmpty !== false
+            && (isset(self::$extraParenthesesOwners[$tokens[$prevNonEmpty]['code']])
+                // Possibly an arrow function.
+                || FunctionDeclarations::isArrowFunction($phpcsFile, $prevNonEmpty) === true)
+        ) {
+            return $prevNonEmpty;
+        }
+
+        return false;
+    }
+
+    /**
+     * Check whether the parenthesis owner of an open/close parenthesis is within a limited
+     * set of valid owners.
+     *
+     * @since 1.0.0
+     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file where this token was found.
+     * @param int                         $stackPtr    The position of `T_OPEN/CLOSE_PARENTHESIS` token.
+     * @param int|string|array            $validOwners Array of token constants for the owners
+     *                                                 which should be considered valid.
+     *
+     * @return bool `TRUE` if the owner is within the list of `$validOwners`; `FALSE` if not and
+     *              if the parenthesis does not have a (direct) owner.
+     */
+    public static function isOwnerIn(File $phpcsFile, $stackPtr, $validOwners)
+    {
+        $owner = self::getOwner($phpcsFile, $stackPtr);
+        if ($owner === false) {
+            return false;
+        }
+
+        $tokens      = $phpcsFile->getTokens();
+        $validOwners = (array) $validOwners;
+
+        /*
+         * Work around tokenizer bug where anon classes were, in certain circumstances, tokenized
+         * as `T_CLASS` prior to PHPCS 3.4.0.
+         * As `T_CLASS` is normally not an parenthesis owner, we can safely add it to the array
+         * without doing a version check.
+         */
+        if (\in_array(\T_ANON_CLASS, $validOwners, true)) {
+            $validOwners[] = \T_CLASS;
+        }
+
+        /*
+         * Allow for T_FN token being tokenized as T_STRING before PHPCS 3.5.3.
+         */
+        if (\defined('T_FN') && \in_array(\T_FN, $validOwners, true)) {
+            $validOwners += Collections::arrowFunctionTokensBC();
+        }
+
+        return \in_array($tokens[$owner]['code'], $validOwners, true);
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/Scopes.php b/Magento2/Helpers/PHPCSUtils/Utils/Scopes.php
new file mode 100644
index 00000000..3975a6b3
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/Scopes.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Utility functions for use when examining token scopes.
+ *
+ * @since 1.0.0
+ */
+class Scopes
+{
+
+    /**
+     * Check whether the direct wrapping scope of a token is within a limited set of
+     * acceptable tokens.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file where this token was found.
+     * @param int                         $stackPtr    The position in the stack of the
+     *                                                 token to verify.
+     * @param int|string|array            $validScopes Array of token constants representing
+     *                                                 the scopes considered valid.
+     *
+     * @return int|false Integer stack pointer to the valid direct scope; or `FALSE` if
+     *                   no valid direct scope was found.
+     */
+    public static function validDirectScope(File $phpcsFile, $stackPtr, $validScopes)
+    {
+        $ptr = Conditions::getLastCondition($phpcsFile, $stackPtr);
+
+        if ($ptr !== false) {
+            $tokens      = $phpcsFile->getTokens();
+            $validScopes = (array) $validScopes;
+
+            if (\in_array($tokens[$ptr]['code'], $validScopes, true) === true) {
+                return $ptr;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check whether a T_FUNCTION token is a class/interface/trait method declaration.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The position in the stack of the
+     *                                               `T_FUNCTION` token to verify.
+     *
+     * @return bool
+     */
+    public static function isOOMethod(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_FUNCTION) {
+            return false;
+        }
+
+        if (self::validDirectScope($phpcsFile, $stackPtr, BCTokens::ooScopeTokens()) !== false) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php b/Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php
new file mode 100644
index 00000000..aca9ce09
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+
+/**
+ * Utility functions for working with text string tokens.
+ *
+ * @since 1.0.0
+ */
+class TextStrings
+{
+
+    /**
+     * Get the complete contents of a - potentially multi-line - text string.
+     *
+     * PHPCS tokenizes multi-line text strings with a single token for each line.
+     * This method can be used to retrieve the text string as it would be received and
+     * processed in PHP itself.
+     *
+     * This method is particularly useful for sniffs which examine the contents of text strings,
+     * where the content matching might result in false positives/false negatives if the text
+     * were to be examined line by line.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file where this token was found.
+     * @param int                         $stackPtr    Pointer to the first text string token
+     *                                                 of a - potentially multi-line - text string
+     *                                                 or to a Nowdoc/Heredoc opener.
+     * @param bool                        $stripQuotes Optional. Whether to strip text delimiter
+     *                                                 quotes off the resulting text string.
+     *                                                 Defaults to `true`.
+     *
+     * @return string The complete text string.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      valid text string token.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not the _first_
+     *                                                      token in a text string.
+     */
+    public static function getCompleteTextString(File $phpcsFile, $stackPtr, $stripQuotes = true)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Must be the start of a text string token.
+        if (isset($tokens[$stackPtr], Collections::$textStingStartTokens[$tokens[$stackPtr]['code']]) === false) {
+            throw new RuntimeException(
+                '$stackPtr must be of type T_START_HEREDOC, T_START_NOWDOC, T_CONSTANT_ENCAPSED_STRING'
+                . ' or T_DOUBLE_QUOTED_STRING'
+            );
+        }
+
+        if ($tokens[$stackPtr]['code'] === \T_CONSTANT_ENCAPSED_STRING
+            || $tokens[$stackPtr]['code'] === \T_DOUBLE_QUOTED_STRING
+        ) {
+            $prev = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
+            if ($tokens[$stackPtr]['code'] === $tokens[$prev]['code']) {
+                throw new RuntimeException('$stackPtr must be the start of the text string');
+            }
+        }
+
+        $stripNewline = false;
+
+        switch ($tokens[$stackPtr]['code']) {
+            case \T_START_HEREDOC:
+                $stripQuotes  = false;
+                $stripNewline = true;
+                $targetType   = \T_HEREDOC;
+                $current      = ($stackPtr + 1);
+                break;
+
+            case \T_START_NOWDOC:
+                $stripQuotes  = false;
+                $stripNewline = true;
+                $targetType   = \T_NOWDOC;
+                $current      = ($stackPtr + 1);
+                break;
+
+            default:
+                $targetType = $tokens[$stackPtr]['code'];
+                $current    = $stackPtr;
+                break;
+        }
+
+        $string = '';
+        do {
+            $string .= $tokens[$current]['content'];
+            ++$current;
+        } while (isset($tokens[$current]) && $tokens[$current]['code'] === $targetType);
+
+        if ($stripNewline === true) {
+            // Heredoc/nowdoc: strip the new line at the end of the string to emulate how PHP sees the string.
+            $string = \rtrim($string, "\r\n");
+        }
+
+        if ($stripQuotes === true) {
+            return self::stripQuotes($string);
+        }
+
+        return $string;
+    }
+
+    /**
+     * Strip text delimiter quotes from an arbitrary string.
+     *
+     * Intended for use with the "contents" of a `T_CONSTANT_ENCAPSED_STRING` / `T_DOUBLE_QUOTED_STRING`.
+     *
+     * - Prevents stripping mis-matched quotes.
+     * - Prevents stripping quotes from the textual content of the string.
+     *
+     * @since 1.0.0
+     *
+     * @param string $string The raw string.
+     *
+     * @return string String without quotes around it.
+     */
+    public static function stripQuotes($string)
+    {
+        return \preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $string);
+    }
+}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php b/Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php
new file mode 100644
index 00000000..5e965d33
--- /dev/null
+++ b/Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php
@@ -0,0 +1,412 @@
+<?php
+/**
+ * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
+ *
+ * @package   PHPCSUtils
+ * @copyright 2019-2020 PHPCSUtils Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCSStandards/PHPCSUtils
+ */
+
+namespace Magento2\Helpers\PHPCSUtils\Utils;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
+
+use Magento2\Helpers\PHPCSUtils\Utils\Parentheses;
+
+/**
+ * Utility functions for examining use statements.
+ *
+ * @since 1.0.0
+ */
+class UseStatements
+{
+
+    /**
+     * Determine what a T_USE token is used for.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the `T_USE` token.
+     *
+     * @return string Either `'closure'`, `'import'` or `'trait'`.
+     *                An empty string will be returned if the token is used in an
+     *                invalid context or if it couldn't be reliably determined what
+     *                the `T_USE` token is used for. An empty string being returned will
+     *                normally mean the code being examined contains a parse error.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      `T_USE` token.
+     */
+    public static function getType(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false
+            || $tokens[$stackPtr]['code'] !== \T_USE
+        ) {
+            throw new RuntimeException('$stackPtr must be of type T_USE');
+        }
+
+        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($next === false) {
+            // Live coding or parse error.
+            return '';
+        }
+
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        if ($prev !== false && $tokens[$prev]['code'] === \T_CLOSE_PARENTHESIS
+            && Parentheses::isOwnerIn($phpcsFile, $prev, \T_CLOSURE) === true
+        ) {
+            return 'closure';
+        }
+
+        $lastCondition = Conditions::getLastCondition($phpcsFile, $stackPtr);
+        if ($lastCondition === false || $tokens[$lastCondition]['code'] === \T_NAMESPACE) {
+            // Global or scoped namespace and not a closure use statement.
+            return 'import';
+        }
+
+        $traitScopes = BCTokens::ooScopeTokens();
+        // Only classes and traits can import traits.
+        unset($traitScopes[\T_INTERFACE]);
+
+        if (isset($traitScopes[$tokens[$lastCondition]['code']]) === true) {
+            return 'trait';
+        }
+
+        return '';
+    }
+
+    /**
+     * Determine whether a T_USE token represents a closure use statement.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the `T_USE` token.
+     *
+     * @return bool `TRUE` if the token passed is a closure use statement.
+     *              `FALSE` if it's not.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      `T_USE` token.
+     */
+    public static function isClosureUse(File $phpcsFile, $stackPtr)
+    {
+        return (self::getType($phpcsFile, $stackPtr) === 'closure');
+    }
+
+    /**
+     * Determine whether a T_USE token represents a class/function/constant import use statement.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the `T_USE` token.
+     *
+     * @return bool `TRUE` if the token passed is an import use statement.
+     *              `FALSE` if it's not.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      `T_USE` token.
+     */
+    public static function isImportUse(File $phpcsFile, $stackPtr)
+    {
+        return (self::getType($phpcsFile, $stackPtr) === 'import');
+    }
+
+    /**
+     * Determine whether a T_USE token represents a trait use statement.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the `T_USE` token.
+     *
+     * @return bool `TRUE` if the token passed is a trait use statement.
+     *              `FALSE` if it's not.
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      `T_USE` token.
+     */
+    public static function isTraitUse(File $phpcsFile, $stackPtr)
+    {
+        return (self::getType($phpcsFile, $stackPtr) === 'trait');
+    }
+
+    /**
+     * Split an import use statement into individual imports.
+     *
+     * Handles single import, multi-import and group-import use statements.
+     *
+     * @since 1.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The position in the stack of the `T_USE` token.
+     *
+     * @return array A multi-level array containing information about the use statement.
+     *               The first level is `'name'`, `'function'` and `'const'`. These keys will always exist.
+     *               If any statements are found for any of these categories, the second level
+     *               will contain the alias/name as the key and the full original use name as the
+     *               value for each of the found imports or an empty array if no imports were found
+     *               in this use statement for a particular category.
+     *
+     *               For example, for this function group use statement:
+     *               ```php
+     *               use function Vendor\Package\{
+     *                   LevelA\Name as Alias,
+     *                   LevelB\Another_Name,
+     *               };
+     *               ```
+     *               the return value would look like this:
+     *               ```php
+     *               array(
+     *                 'name'     => array(),
+     *                 'function' => array(
+     *                   'Alias'        => 'Vendor\Package\LevelA\Name',
+     *                   'Another_Name' => 'Vendor\Package\LevelB\Another_Name',
+     *                 ),
+     *                 'const'    => array(),
+     *               )
+     *               ```
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      `T_USE` token.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the `T_USE` token is not for an import
+     *                                                      use statement.
+     */
+    public static function splitImportUseStatement(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_USE) {
+            throw new RuntimeException('$stackPtr must be of type T_USE');
+        }
+
+        if (self::isImportUse($phpcsFile, $stackPtr) === false) {
+            throw new RuntimeException('$stackPtr must be an import use statement');
+        }
+
+        $statements = [
+            'name'     => [],
+            'function' => [],
+            'const'    => [],
+        ];
+
+        $endOfStatement = $phpcsFile->findNext([\T_SEMICOLON, \T_CLOSE_TAG], ($stackPtr + 1));
+        if ($endOfStatement === false) {
+            // Live coding or parse error.
+            return $statements;
+        }
+
+        $endOfStatement++;
+
+        $start     = true;
+        $useGroup  = false;
+        $hasAlias  = false;
+        $baseName  = '';
+        $name      = '';
+        $type      = '';
+        $fixedType = false;
+        $alias     = '';
+
+        for ($i = ($stackPtr + 1); $i < $endOfStatement; $i++) {
+            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
+                continue;
+            }
+
+            $tokenCode = $tokens[$i]['code'];
+
+            /*
+             * BC: Work round a tokenizer bug related to a parse error.
+             *
+             * If `function` or `const` is used as the alias, the semi-colon after it would
+             * be tokenized as T_STRING.
+             * For `function` this was fixed in PHPCS 2.8.0. For `const` the issue still exists
+             * in PHPCS 3.5.2.
+             *
+             * Along the same lines, the `}` T_CLOSE_USE_GROUP would also be tokenized as T_STRING.
+             */
+            if ($tokenCode === \T_STRING) {
+                if ($tokens[$i]['content'] === ';') {
+                    $tokenCode = \T_SEMICOLON;
+                } elseif ($tokens[$i]['content'] === '}') {
+                    $tokenCode = \T_CLOSE_USE_GROUP;
+                }
+            }
+
+            switch ($tokenCode) {
+                case \T_STRING:
+                    // Only when either at the start of the statement or at the start of a new sub within a group.
+                    if ($start === true && $fixedType === false) {
+                        $content = \strtolower($tokens[$i]['content']);
+                        if ($content === 'function'
+                            || $content === 'const'
+                        ) {
+                            $type  = $content;
+                            $start = false;
+                            if ($useGroup === false) {
+                                $fixedType = true;
+                            }
+
+                            break;
+                        } else {
+                            $type = 'name';
+                        }
+                    }
+
+                    $start = false;
+
+                    if ($hasAlias === false) {
+                        $name .= $tokens[$i]['content'];
+                    }
+
+                    $alias = $tokens[$i]['content'];
+                    break;
+
+                case \T_AS:
+                    $hasAlias = true;
+                    break;
+
+                case \T_OPEN_USE_GROUP:
+                    $start    = true;
+                    $useGroup = true;
+                    $baseName = $name;
+                    $name     = '';
+                    break;
+
+                case \T_SEMICOLON:
+                case \T_CLOSE_TAG:
+                case \T_CLOSE_USE_GROUP:
+                case \T_COMMA:
+                    if ($name !== '') {
+                        if ($useGroup === true) {
+                            $statements[$type][$alias] = $baseName . $name;
+                        } else {
+                            $statements[$type][$alias] = $name;
+                        }
+                    }
+
+                    if ($tokenCode !== \T_COMMA) {
+                        break 2;
+                    }
+
+                    // Reset.
+                    $start    = true;
+                    $name     = '';
+                    $hasAlias = false;
+                    if ($fixedType === false) {
+                        $type = '';
+                    }
+                    break;
+
+                case \T_NS_SEPARATOR:
+                    $name .= $tokens[$i]['content'];
+                    break;
+
+                case \T_FUNCTION:
+                case \T_CONST:
+                    /*
+                     * BC: Work around tokenizer bug in PHPCS < 3.4.1.
+                     *
+                     * `function`/`const` in `use function`/`use const` tokenized as T_FUNCTION/T_CONST
+                     * instead of T_STRING when there is a comment between the keywords.
+                     *
+                     * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/2431
+                     */
+                    if ($start === true && $fixedType === false) {
+                        $type  = \strtolower($tokens[$i]['content']);
+                        $start = false;
+                        if ($useGroup === false) {
+                            $fixedType = true;
+                        }
+
+                        break;
+                    }
+
+                    $start = false;
+
+                    if ($hasAlias === false) {
+                        $name .= $tokens[$i]['content'];
+                    }
+
+                    $alias = $tokens[$i]['content'];
+                    break;
+
+                /*
+                 * Fall back in case reserved keyword is (illegally) used in name.
+                 * Parse error, but not our concern.
+                 */
+                default:
+                    if ($hasAlias === false) {
+                        $name .= $tokens[$i]['content'];
+                    }
+
+                    $alias = $tokens[$i]['content'];
+                    break;
+            }
+        }
+
+        return $statements;
+    }
+
+    /**
+     * Split an import use statement into individual imports and merge it with an array of previously
+     * seen import use statements.
+     *
+     * Beware: this method should only be used to combine the import use statements found in *one* file.
+     * Do NOT combine the statements of multiple files as the result will be inaccurate and unreliable.
+     *
+     * In most cases when tempted to use this method, the {@see \PHPCSUtils\AbstractSniffs\AbstractFileContextSniff}
+     * (upcoming) should be used instead.
+     *
+     * @see \PHPCSUtils\AbstractSniffs\AbstractFileContextSniff
+     * @see \PHPCSUtils\Utils\UseStatements::splitImportUseStatement()
+     *
+     * @since 1.0.0-alpha3
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile             The file where this token was found.
+     * @param int                         $stackPtr              The position in the stack of the `T_USE` token.
+     * @param array                       $previousUseStatements The import `use` statements collected so far.
+     *                                                           This should be either the output of a
+     *                                                           previous call to this method or the output of
+     *                                                           an earlier call to the
+     *                                                           {@see UseStatements::splitImportUseStatement()}
+     *                                                           method.
+     *
+     * @return array A multi-level array containing information about the current `use` statement combined with
+     *               the previously collected `use` statement information.
+     *               See {@see UseStatements::splitImportUseStatement()} for more details about the array format.
+     */
+    public static function splitAndMergeImportUseStatement(File $phpcsFile, $stackPtr, $previousUseStatements)
+    {
+        try {
+            $useStatements = self::splitImportUseStatement($phpcsFile, $stackPtr);
+
+            if (isset($previousUseStatements['name']) === false) {
+                $previousUseStatements['name'] = $useStatements['name'];
+            } else {
+                $previousUseStatements['name'] += $useStatements['name'];
+            }
+            if (isset($previousUseStatements['function']) === false) {
+                $previousUseStatements['function'] = $useStatements['function'];
+            } else {
+                $previousUseStatements['function'] += $useStatements['function'];
+            }
+            if (isset($previousUseStatements['const']) === false) {
+                $previousUseStatements['const'] = $useStatements['const'];
+            } else {
+                $previousUseStatements['const'] += $useStatements['const'];
+            }
+        } catch (RuntimeException $e) {
+            // Not an import use statement.
+        }
+
+        return $previousUseStatements;
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
index b96672e0..4972a87e 100644
--- a/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
@@ -12,9 +12,9 @@
 
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\BackCompat\BCTokens;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\Scopes;
+use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
+use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
+use Magento2\Helpers\PHPCSUtils\Utils\Scopes;
 
 /**
  * Abstract private methods are not allowed since PHP 5.1, though they are allowed in traits since PHP 8.0.
diff --git a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
index f01be4f6..673a0fe7 100644
--- a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
@@ -13,7 +13,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHPCSUtils\BackCompat\BCTokens;
+use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
 
 /**
  * Detect calls to functions where the expected type of a parameter has been changed from integer to boolean.
diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
index 8b33ee99..51fa3d69 100644
--- a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
@@ -12,8 +12,8 @@
 
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\Scopes;
+use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
+use Magento2\Helpers\PHPCSUtils\Utils\Scopes;
 
 /**
  * Applying the final modifier on a private method will produce a warning since PHP 8.0
diff --git a/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php b/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
index 70f08521..f1904a0e 100644
--- a/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
@@ -12,7 +12,7 @@
 
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\GetTokensAsString;
+use Magento2\Helpers\PHPCSUtils\Utils\GetTokensAsString;
 
 /**
  * Attributes as a form of structured, syntactic metadata to declarations of classes, properties,
diff --git a/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php b/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
index 86a65127..ded7b819 100644
--- a/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
@@ -11,7 +11,7 @@
 namespace Magento2\Sniffs\PHPCompatibility;
 
 use PHPCompatibility\Sniff;
-use PHPCSUtils\Utils\TextStrings;
+use Magento2\Helpers\PHPCSUtils\Utils\TextStrings;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 
diff --git a/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php b/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
index 34fe976f..b3bcc3be 100644
--- a/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
@@ -13,7 +13,7 @@
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
 
 /**
  * Detect usage of the magic `::class` constant introduced in PHP 5.5.
diff --git a/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php b/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
index 92b223c5..ef767157 100644
--- a/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
@@ -13,8 +13,8 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCompatibility\Sniff;
-use PHPCSUtils\BackCompat\BCTokens;
-use PHPCSUtils\Tokens\Collections;
+use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
 
 /**
  * Detect dereferencing of magic constants as allowed per PHP 8.0.
diff --git a/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php b/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
index 8d925c00..1239c10b 100644
--- a/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
@@ -13,8 +13,8 @@
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
 
 /**
  * Detect trailing comma's in function declarations and closure use lists as allowed since PHP 8.
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
index fa0e7919..8782039d 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
@@ -13,11 +13,11 @@
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\ObjectDeclarations;
-use PHPCSUtils\Utils\Scopes;
-use PHPCSUtils\Utils\UseStatements;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
+use Magento2\Helpers\PHPCSUtils\Utils\ObjectDeclarations;
+use Magento2\Helpers\PHPCSUtils\Utils\Scopes;
+use Magento2\Helpers\PHPCSUtils\Utils\UseStatements;
 
 /**
  * As of PHP 8.0, when an object constructor exit()s, the destructor will no longer be called.
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
index 39a574c1..588ff7d2 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
@@ -14,8 +14,8 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCompatibility\Sniff;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
+use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
+use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
 
 /**
  * Declaring a required function parameter after an optional parameter is deprecated since PHP 8.0.
diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
index 29cc22ef..e4d799ea 100644
--- a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
+++ b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
@@ -12,7 +12,7 @@
 
 use PHPUnit\Framework\TestCase;
 use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\BackCompat\Helper;
+use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
 
 /**
  * Base sniff test class file.
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
index 6983b2a8..477e7acc 100644
--- a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
@@ -10,7 +10,7 @@
 
 namespace Magento2\Tests\PHPCompatibility;
 
-use PHPCSUtils\BackCompat\Helper;
+use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
 
 /**
  * Test the NewAttributes sniff.
diff --git a/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php b/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
index c908d409..e4441380 100644
--- a/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
+++ b/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
@@ -10,7 +10,7 @@
 
 namespace Magento2\Tests\PHPCompatibility\Util;
 
-use PHPCSUtils\TestUtils\UtilityMethodTestCase;
+use Magento2\Helpers\PHPCSUtils\TestUtils\UtilityMethodTestCase;
 
 /**
  * Base class to use when testing utility methods.
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index d85452b3..a8162477 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -26,6 +26,7 @@
         <type>error</type>
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*\.xml$</exclude-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.Syntax">
         <severity>10</severity>
@@ -220,6 +221,7 @@
     <rule ref="Magento2.Exceptions.ThrowCatch">
         <severity>8</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Exceptions.TryProcessSystemResources">
         <severity>8</severity>
@@ -239,6 +241,7 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Functions.StaticFunction">
         <severity>8</severity>
@@ -250,11 +253,13 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Functions.FunctionsDeprecatedWithoutArgument">
         <severity>7</severity>
         <type>warning</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
         <severity>8</severity>
@@ -372,6 +377,7 @@
     <rule ref="Generic.Metrics.NestingLevel">
         <severity>7</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.DisallowShortOpenTag">
         <exclude-pattern>*\.xml$</exclude-pattern>
@@ -389,6 +395,7 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.LiteralNamespaces">
         <severity>7</severity>
@@ -537,6 +544,7 @@
     <rule ref="Magento2.Whitespace.MultipleEmptyLines">
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="PEAR.ControlStructures.ControlSignature">
         <severity>6</severity>
@@ -580,6 +588,7 @@
     <rule ref="PSR2.Files.EndFileNewline">
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="PSR2.Methods.FunctionCallSignature">
         <severity>6</severity>
@@ -705,6 +714,7 @@
     <rule ref="PSR12.Properties.ConstantVisibility">
         <severity>6</severity>
         <type>warning</type>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
 
     <!-- Severity 5 warnings: PHPDoc formatting and commenting issues. -->
@@ -738,6 +748,7 @@
         <exclude-pattern>*/_files/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
diff --git a/Magento2Framework/ruleset.xml b/Magento2Framework/ruleset.xml
index 879ce559..5e16e7a1 100644
--- a/Magento2Framework/ruleset.xml
+++ b/Magento2Framework/ruleset.xml
@@ -21,6 +21,7 @@
         <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
+        <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
     <rule ref="Magento2Framework.Header.CopyrightGraphQL">
         <severity>5</severity>
diff --git a/composer.json b/composer.json
index 2533bf43..168dd8be 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6",
-        "phpcsstandards/phpcsutils": "^1.0@alpha",
         "rector/rector": "^0.12.4"
     },
     "require-dev": {
@@ -37,7 +36,5 @@
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility",
         "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility"
-    },
-    "minimum-stability": "alpha",
-    "prefer-stable": true
+    }
 }
diff --git a/composer.lock b/composer.lock
index 1ba34e0f..477af2cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,78 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "60d3c6d032137be43c4740222c2bc6d1",
+    "content-hash": "20e40c8c33e9c2fc21cae5999414b4c0",
     "packages": [
-        {
-            "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "fe390591e0241955f22eb9ba327d137e501c771c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c",
-                "reference": "fe390591e0241955f22eb9ba327d137e501c771c",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0 || ^2.0",
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "composer/composer": "*",
-                "phpcompatibility/php-compatibility": "^9.0",
-                "sensiolabs/security-checker": "^4.1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Franck Nijhof",
-                    "email": "franck.nijhof@dealerdirect.com",
-                    "homepage": "http://www.frenck.nl",
-                    "role": "Developer / IT Manager"
-                }
-            ],
-            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://www.dealerdirect.com",
-            "keywords": [
-                "PHPCodeSniffer",
-                "PHP_CodeSniffer",
-                "code quality",
-                "codesniffer",
-                "composer",
-                "installer",
-                "phpcs",
-                "plugin",
-                "qa",
-                "quality",
-                "standard",
-                "standards",
-                "style guide",
-                "stylecheck",
-                "tests"
-            ],
-            "support": {
-                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
-                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
-            },
-            "time": "2020-12-07T18:04:37+00:00"
-        },
         {
             "name": "phpcompatibility/php-compatibility",
             "version": "9.3.5",
@@ -138,74 +68,6 @@
             },
             "time": "2019-12-27T09:44:58+00:00"
         },
-        {
-            "name": "phpcsstandards/phpcsutils",
-            "version": "1.0.0-alpha3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
-                "reference": "a16c989b8421e29c336ece5c4099b48585994673"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/a16c989b8421e29c336ece5c4099b48585994673",
-                "reference": "a16c989b8421e29c336ece5c4099b48585994673",
-                "shasum": ""
-            },
-            "require": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7",
-                "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^2.6.0 || ^3.1.0 || 4.0.x-dev@dev"
-            },
-            "conflict": {
-                "squizlabs/php_codesniffer": "3.5.3"
-            },
-            "require-dev": {
-                "php-parallel-lint/php-console-highlighter": "^0.5",
-                "php-parallel-lint/php-parallel-lint": "^1.2.0",
-                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
-            },
-            "type": "phpcodesniffer-standard",
-            "autoload": {
-                "classmap": [
-                    "PHPCSUtils/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Juliette Reinders Folmer",
-                    "homepage": "https://github.com/jrfnl",
-                    "role": "lead"
-                },
-                {
-                    "name": "Contributors",
-                    "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors"
-                }
-            ],
-            "description": "A suite of utility functions for use with PHP_CodeSniffer",
-            "homepage": "https://phpcsutils.com/",
-            "keywords": [
-                "PHP_CodeSniffer",
-                "phpcbf",
-                "phpcodesniffer-standard",
-                "phpcs",
-                "phpcs2",
-                "phpcs3",
-                "standards",
-                "tokens",
-                "utility"
-            ],
-            "support": {
-                "docs": "https://phpcsutils.com/",
-                "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
-                "source": "https://github.com/PHPCSStandards/PHPCSUtils"
-            },
-            "time": "2020-06-28T21:57:33+00:00"
-        },
         {
             "name": "phpstan/phpstan",
             "version": "1.2.0",
@@ -2550,11 +2412,9 @@
         }
     ],
     "aliases": [],
-    "minimum-stability": "alpha",
-    "stability-flags": {
-        "phpcsstandards/phpcsutils": 15
-    },
-    "prefer-stable": true,
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.3",

From 7edcf2654da6da520010b4df70f33300e6d31343 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 15 Dec 2021 03:03:30 -0600
Subject: [PATCH 430/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Remove accidental detection of $$ identifier from prototype.js in
  magento
---
 eslint/rules/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index 8df4c7a3..91f9bb34 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -40,7 +40,7 @@ function isjQuery(node) {
 
     var id = traverse(node);
 
-    return id && (id.name.startsWith('$') || id.name.toLowerCase() === 'jquery');
+    return id && (id.name === '$' || id.name.toLowerCase() === 'jquery');
 }
 
 module.exports = {

From 88f0e6d070b925458e8436830a17b011a97b6200 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 15 Dec 2021 06:23:51 -0600
Subject: [PATCH 431/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fix detection of jQuery ids
---
 Magento2/Tests/Eslint/AndSelfTest.js          | 10 ++-
 Magento2/Tests/Eslint/BindUnbindTest.js       | 10 ++-
 .../Tests/Eslint/DelegateUndelegateTest.js    | 12 ++-
 Magento2/Tests/Eslint/DeprecatedExprTest.js   | 12 ++-
 Magento2/Tests/Eslint/EventShorthandTest.js   | 11 ++-
 .../Tests/Eslint/InputEventShorthandTest.js   | 13 ++-
 .../Eslint/MiscDeprecatedFunctionsTest.js     | 16 ++--
 Magento2/Tests/Eslint/SizeTest.js             | 10 ++-
 Magento2/Tests/Eslint/TrimTest.js             | 10 ++-
 eslint/rules/utils.js                         | 80 +++++++++++++++++--
 10 files changed, 146 insertions(+), 38 deletions(-)

diff --git a/Magento2/Tests/Eslint/AndSelfTest.js b/Magento2/Tests/Eslint/AndSelfTest.js
index 1cd6f278..6c98a8eb 100644
--- a/Magento2/Tests/Eslint/AndSelfTest.js
+++ b/Magento2/Tests/Eslint/AndSelfTest.js
@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('div').find('p').andSelf().addClass('border');
+        $('div').find('p').andSelf().addClass('border');
+    });
 });
diff --git a/Magento2/Tests/Eslint/BindUnbindTest.js b/Magento2/Tests/Eslint/BindUnbindTest.js
index 1fa50a2f..83f40e8f 100644
--- a/Magento2/Tests/Eslint/BindUnbindTest.js
+++ b/Magento2/Tests/Eslint/BindUnbindTest.js
@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('.btn1').bind('click');
+        $('.btn1').bind('click');
+    });
 });
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.js b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
index 57b2b262..53111823 100644
--- a/Magento2/Tests/Eslint/DelegateUndelegateTest.js
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.js
@@ -1,7 +1,11 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('table').delegate('td', 'click', function () {
-        $(this).toggleClass('chosen');
+        $('table').delegate('td', 'click', function () {
+            $(this).toggleClass('chosen');
+        });
     });
 });
diff --git a/Magento2/Tests/Eslint/DeprecatedExprTest.js b/Magento2/Tests/Eslint/DeprecatedExprTest.js
index 20b6c7df..897f08bc 100644
--- a/Magento2/Tests/Eslint/DeprecatedExprTest.js
+++ b/Magento2/Tests/Eslint/DeprecatedExprTest.js
@@ -1,6 +1,10 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function (jQuery) {
+    $(function () {
+        'use strict';
 
-    $.extend($.expr[':'], {});
-    jQuery.extend($.expr.filters, {});
+        jQuery.extend(jQuery.expr[':'], {});
+        jQuery.extend(jQuery.expr.filters, {});
+    });
 });
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.js b/Magento2/Tests/Eslint/EventShorthandTest.js
index d10428fc..0074e883 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.js
+++ b/Magento2/Tests/Eslint/EventShorthandTest.js
@@ -1,5 +1,10 @@
-$(document).ready(function () {
-    'use strict';
-    $('#result').unload(function () {});
+define([
+    'jquery',
+], function (jQuery) {
+    jQuery(document).ready(function () {
+        'use strict';
+        jQuery('#result').unload(function () {
+        });
+    });
 });
 
diff --git a/Magento2/Tests/Eslint/InputEventShorthandTest.js b/Magento2/Tests/Eslint/InputEventShorthandTest.js
index 586dfce8..e22900e0 100644
--- a/Magento2/Tests/Eslint/InputEventShorthandTest.js
+++ b/Magento2/Tests/Eslint/InputEventShorthandTest.js
@@ -1,6 +1,11 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('#result').blur();
-    $.fn.focus(function () {});
+        $('#result').blur();
+        $.fn.focus(function () {
+        });
+    });
 });
diff --git a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
index 8cebe90e..38cb5d81 100644
--- a/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
+++ b/Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js
@@ -1,8 +1,12 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $.parseJSON('');
-    jQuery.type({});
-    $.isArray({});
-    $.isFunction({});
+        $.parseJSON('');
+        $.type({});
+        $.isArray({});
+        $.isFunction({});
+    });
 });
diff --git a/Magento2/Tests/Eslint/SizeTest.js b/Magento2/Tests/Eslint/SizeTest.js
index c78cd48e..acd8386b 100644
--- a/Magento2/Tests/Eslint/SizeTest.js
+++ b/Magento2/Tests/Eslint/SizeTest.js
@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('div').size();
+        $('div').size();
+    });
 });
diff --git a/Magento2/Tests/Eslint/TrimTest.js b/Magento2/Tests/Eslint/TrimTest.js
index 4793aa7d..14cb7c55 100644
--- a/Magento2/Tests/Eslint/TrimTest.js
+++ b/Magento2/Tests/Eslint/TrimTest.js
@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $.trim('    hello, how are you?    ');
+        $.trim('    hello, how are you?    ');
+    });
 });
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index 91f9bb34..fdf90593 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -1,10 +1,74 @@
 /**
- * Traverses the node to identify its type
+ * Get representation of define object
+ * @param node
+ * @returns object
+ */
+function define(node) {
+    'use strict';
+    var defineStmt, args;
+    defineStmt = node.body.find(function (stmt) {
+        return (
+            stmt.type === 'ExpressionStatement' &&
+            stmt.expression.type === 'CallExpression' &&
+            stmt.expression.callee.type === 'Identifier' &&
+            stmt.expression.callee.name === 'define' &&
+            stmt.expression.arguments.length > 0 &&
+            stmt.expression.arguments[0].type === 'ArrayExpression'
+        );
+    });
+    if (!defineStmt) {
+        return;
+    }
+
+    args = defineStmt.expression.arguments;
+
+    return {
+        func: defineStmt.expression,
+        modulePaths: args[0].elements,
+        moduleNames: args.length > 1 && args[1].params || []
+    };
+}
+
+/**
+ * Get jQueryName from define
+ * @param defineObject
+ * @returns {null|*}
+ */
+function getJqueryName(defineObject) {
+    var jQueryPathIndex;
+    if (!defineObject.modulePaths || !defineObject.moduleNames) {
+        return null;
+    }
+    jQueryPathIndex = defineObject.modulePaths.findIndex(function (paths) {
+        return paths.value.toLowerCase() === 'jquery';
+    });
+    if (jQueryPathIndex === -1 || jQueryPathIndex >= defineObject.moduleNames.length) {
+        return null;
+    }
+    return defineObject.moduleNames[jQueryPathIndex];
+
+}
+
+/**
+ * Get Root Program node
+ */
+function getProgramNode(node) {
+    'use strict';
+    if (!node.parent) {
+        return node;
+    }
+    return getProgramNode(node.parent);
+}
+
+
+
+/**
+ * Traverses the node to identify its id
  *
  * @param {Object} node - The node to check
  * @returns {Object|Null}
  */
-function traverse(node) {
+function getExpressionId(node) {
     'use strict';
 
     while (node) {
@@ -37,13 +101,19 @@ function traverse(node) {
 
 function isjQuery(node) {
     'use strict';
+    var parentNode = getProgramNode(node);
+    var defineNode = define(parentNode);
+    if (!defineNode) {
+        return false;
+    }
+    var jQueryID = getJqueryName(defineNode);
 
-    var id = traverse(node);
+    var id = getExpressionId(node);
 
-    return id && (id.name === '$' || id.name.toLowerCase() === 'jquery');
+    return id && jQueryID && id.name === jQueryID.name;
 }
 
 module.exports = {
-    traverse: traverse,
+    traverse: getExpressionId,
     isjQuery: isjQuery
 };

From 53d688e9798acd6ae4ef1cb1b030acb20a06ab54 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 15 Dec 2021 06:27:52 -0600
Subject: [PATCH 432/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fix styling issues
---
 eslint/rules/utils.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index fdf90593..ae181210 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -6,6 +6,7 @@
 function define(node) {
     'use strict';
     var defineStmt, args;
+
     defineStmt = node.body.find(function (stmt) {
         return (
             stmt.type === 'ExpressionStatement' &&
@@ -35,7 +36,10 @@ function define(node) {
  * @returns {null|*}
  */
 function getJqueryName(defineObject) {
+    'use strict';
+
     var jQueryPathIndex;
+
     if (!defineObject.modulePaths || !defineObject.moduleNames) {
         return null;
     }
@@ -60,8 +64,6 @@ function getProgramNode(node) {
     return getProgramNode(node.parent);
 }
 
-
-
 /**
  * Traverses the node to identify its id
  *
@@ -101,16 +103,17 @@ function getExpressionId(node) {
 
 function isjQuery(node) {
     'use strict';
-    var parentNode = getProgramNode(node);
-    var defineNode = define(parentNode);
+    var parentNode, defineNode, jQueryId, id;
+
+    parentNode = getProgramNode(node);
+    defineNode = define(parentNode);
     if (!defineNode) {
         return false;
     }
-    var jQueryID = getJqueryName(defineNode);
-
-    var id = getExpressionId(node);
+    jQueryId = getJqueryName(defineNode);
+    id = getExpressionId(node);
 
-    return id && jQueryID && id.name === jQueryID.name;
+    return id && jQueryId && id.name === jQueryId.name;
 }
 
 module.exports = {

From 38b331988e275bb6fad480aa2b882ec324b7aef1 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Wed, 15 Dec 2021 09:02:59 -0600
Subject: [PATCH 433/630] AC-391: Static test to cover "deprecated" jQuery
 methods

- Fixed trim jquery check
---
 eslint/rules/jquery-no-trim.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eslint/rules/jquery-no-trim.js b/eslint/rules/jquery-no-trim.js
index 599c1b72..cd122294 100644
--- a/eslint/rules/jquery-no-trim.js
+++ b/eslint/rules/jquery-no-trim.js
@@ -22,6 +22,8 @@ module.exports = {
     create: function (context) {
         'use strict';
 
+        var utils = require('./utils.js');
+
         return {
             /**
              * Checks if trim method is used and reports it.
@@ -31,14 +33,14 @@ module.exports = {
             CallExpression: function (node) {
                 if (node.callee.type !== 'MemberExpression') {return;}
 
-                if (node.callee.object.name !== '$') {return;}
-
                 if (node.callee.property.name !== 'trim') {return;}
 
-                context.report({
-                    node: node,
-                    messageId: 'trim'
-                });
+                if (utils.isjQuery(node)) {
+                    context.report({
+                        node: node,
+                        messageId: 'trim'
+                    });
+                }
             }
         };
     }

From 9dc35793276cccdb6589e3bf99bf6e4a7184b652 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 15 Dec 2021 17:27:58 +0100
Subject: [PATCH 434/630] Run phpcbf

---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php         | 2 +-
 Magento2/Tests/Eslint/ClickEventShorthandTest.php        | 2 +-
 Magento2/Tests/Eslint/DelegateUndelegateTest.php         | 2 +-
 Magento2/Tests/Eslint/EventShorthandTest.php             | 2 +-
 Magento2/Tests/Eslint/SizeTest.php                       | 2 +-
 Magento2/Tests/Eslint/TrimTest.php                       | 2 +-
 Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php          | 3 +--
 .../Magento/Framework/Model/ResourceModel/Iterator.php   | 9 ++++++---
 .../NewInterpolatedStringDereferencingUnitTest.php       | 1 -
 .../PHPCompatibility/NewMagicClassConstantUnitTest.php   | 1 -
 .../NewMagicConstantDereferencingUnitTest.php            | 1 -
 ...emovedCallingDestructAfterConstructorExitUnitTest.php | 1 -
 12 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index dc4b6b86..992a988e 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -28,7 +28,7 @@ protected function assertFileContainsError(string $testFile, array $expectedMess
         );
 
         foreach ($expectedMessages as $message) {
-            $this->assertStringContainsString($message, implode(' ',$output));
+            $this->assertStringContainsString($message, implode(' ', $output));
         }
     }
 }
diff --git a/Magento2/Tests/Eslint/ClickEventShorthandTest.php b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
index 2f5fe0bc..26ef7c71 100644
--- a/Magento2/Tests/Eslint/ClickEventShorthandTest.php
+++ b/Magento2/Tests/Eslint/ClickEventShorthandTest.php
@@ -21,4 +21,4 @@ public function testExecute(): void
             ['Instead of .blur(fn) use .on("blur", fn). Instead of .blur() use .trigger("blur")']
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Eslint/DelegateUndelegateTest.php b/Magento2/Tests/Eslint/DelegateUndelegateTest.php
index 857610bc..25b509fa 100644
--- a/Magento2/Tests/Eslint/DelegateUndelegateTest.php
+++ b/Magento2/Tests/Eslint/DelegateUndelegateTest.php
@@ -21,4 +21,4 @@ public function testExecute(): void
             ['jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead']
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Eslint/EventShorthandTest.php b/Magento2/Tests/Eslint/EventShorthandTest.php
index f79eebd2..87b8b163 100644
--- a/Magento2/Tests/Eslint/EventShorthandTest.php
+++ b/Magento2/Tests/Eslint/EventShorthandTest.php
@@ -21,4 +21,4 @@ public function testExecute(): void
             ['jQuery.load() was removed, use .on("load", fn) instead']
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Eslint/SizeTest.php b/Magento2/Tests/Eslint/SizeTest.php
index 03f21230..c02b7079 100644
--- a/Magento2/Tests/Eslint/SizeTest.php
+++ b/Magento2/Tests/Eslint/SizeTest.php
@@ -21,4 +21,4 @@ public function testExecute(): void
             ['jQuery.size() removed, use jQuery.length']
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Eslint/TrimTest.php b/Magento2/Tests/Eslint/TrimTest.php
index 754ebc47..657fa935 100644
--- a/Magento2/Tests/Eslint/TrimTest.php
+++ b/Magento2/Tests/Eslint/TrimTest.php
@@ -21,4 +21,4 @@ public function testExecute(): void
             ['jQuery.trim is deprecated; use String.prototype.trim']
         );
     }
-}
\ No newline at end of file
+}
diff --git a/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php b/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
index 46417690..6624ad3c 100644
--- a/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
+++ b/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
@@ -67,8 +67,7 @@ public function getWarningList($testFile = '')
                 39 => 1
             ];
         }
-        if ($testFile === 'PhtmlTemplateUnitTest.3.phtml')
-        {
+        if ($testFile === 'PhtmlTemplateUnitTest.3.phtml') {
             return [
                 9 => 1,
                 20 => 1,
diff --git a/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
index 5a375f56..fc652f05 100644
--- a/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
+++ b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
@@ -20,15 +20,18 @@ protected function shouldSkipTest()
         return true;
     }
 
-    protected function getErrorList() {
+    protected function getErrorList()
+    {
         return [];
     }
 
-    protected function getWarningList() {
+    protected function getWarningList()
+    {
         return [];
     }
 
-    private function withProtectedClass() {
+    private function withProtectedClass()
+    {
         return new \Zend_Db_Expr();
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
index da8b6817..d2ab258d 100644
--- a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
@@ -10,7 +10,6 @@
 
 namespace Magento2\Tests\PHPCompatibility;
 
-
 /**
  * Test the NewInterpolatedStringDereferencing sniff.
  *
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
index de7d47b8..b921469f 100644
--- a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
@@ -10,7 +10,6 @@
 
 namespace Magento2\Tests\PHPCompatibility;
 
-
 /**
  * Test the NewMagicClassConstant sniff.
  *
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
index 718487ff..d9e4c951 100644
--- a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
@@ -10,7 +10,6 @@
 
 namespace Magento2\Tests\PHPCompatibility;
 
-
 /**
  * Test the NewMagicConstantDereferencing sniff.
  *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
index 25d97718..f2348a3e 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
@@ -10,7 +10,6 @@
 
 namespace Magento2\Tests\PHPCompatibility;
 
-
 /**
  * Test the RemovedCallingDestructAfterConstructorExit sniff.
  *

From e2b6076a3f0e3d5109dffe6767a287b8a7db6439 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 16 Dec 2021 10:47:17 +0200
Subject: [PATCH 435/630] Run tests on php 8.1

---
 .github/workflows/php.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index d8e87bc9..2186b76d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,6 +16,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         dependencies:
           - "lowest"
           - "highest"

From 84eb986b5d0ff99e1f7d20a13c622ce878977c86 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 16 Dec 2021 09:10:21 +0000
Subject: [PATCH 436/630] Run tests on php 8.1

Update minimum phpcs version
---
 composer.json |  2 +-
 composer.lock | 75 +++++++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/composer.json b/composer.json
index 168dd8be..beb7236b 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "ext-simplexml": "*",
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
-        "squizlabs/php_codesniffer": "^3.6",
+        "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.12.4"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 477af2cd..7ccb2b1e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "20e40c8c33e9c2fc21cae5999414b4c0",
+    "content-hash": "c8d914f8664fb2324d9792d8e7b19325",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -134,16 +134,16 @@
         },
         {
             "name": "rector/rector",
-            "version": "0.12.4",
+            "version": "0.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48"
+                "reference": "dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
-                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b",
+                "reference": "dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b",
                 "shasum": ""
             },
             "require": {
@@ -182,7 +182,7 @@
             "description": "Prefixed and PHP 7.1 downgraded version of rector/rector",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.4"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.8"
             },
             "funding": [
                 {
@@ -190,20 +190,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-15T14:06:50+00:00"
+            "time": "2021-12-13T23:55:00+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.1",
+            "version": "3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e"
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
             "require": {
@@ -246,7 +246,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-10-11T04:00:11+00:00"
+            "time": "2021-12-12T21:44:58+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -445,16 +445,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.1",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
-                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
@@ -495,9 +495,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
             },
-            "time": "2021-11-03T20:52:16+00:00"
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -772,16 +772,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.14.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "shasum": ""
             },
             "require": {
@@ -833,22 +833,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
             },
-            "time": "2021-09-10T09:02:12+00:00"
+            "time": "2021-12-08T12:19:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.9",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
                 "shasum": ""
             },
             "require": {
@@ -904,7 +904,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
             },
             "funding": [
                 {
@@ -912,20 +912,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-19T15:21:02+00:00"
+            "time": "2021-12-05T09:12:13+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -964,7 +964,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -972,7 +972,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -2111,7 +2111,6 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -2422,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.0.0"
 }

From d4631408d070b2263193e910bdb4889c3d8ef39a Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 16 Dec 2021 10:58:48 +0100
Subject: [PATCH 437/630] Run phpcbf - Fix extra lines

---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php               | 2 ++
 .../Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php  | 3 ---
 Magento2/Tests/PHPCompatibility/BaseSniffTest.php              | 2 +-
 .../PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php     | 2 --
 .../PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php  | 2 --
 Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php      | 2 --
 .../Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php   | 3 ---
 .../PHPCompatibility/NewMagicConstantDereferencingUnitTest.php | 2 --
 .../Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php   | 3 ---
 .../Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php    | 2 --
 Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php   | 3 ---
 .../PHPCompatibility/RemovedAssertStringAssertionUnitTest.php  | 1 -
 .../RemovedCallingDestructAfterConstructorExitUnitTest.php     | 2 --
 .../RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php | 2 --
 .../RemovedOptionalBeforeRequiredParamUnitTest.php             | 2 --
 .../RemovedSplAutoloadRegisterThrowFalseUnitTest.php           | 2 --
 16 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index 992a988e..f4a53a70 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -17,6 +17,8 @@
 abstract class AbstractEslintTestCase extends TestCase
 {
     /**
+     * Assert that file contains a specific error.
+     *
      * @param string $testFile
      * @param array $expectedMessages
      */
diff --git a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
index e256c785..598de668 100644
--- a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
@@ -56,7 +56,6 @@ public function dataForbiddenAbstractPrivateMethods()
         ];
     }
 
-
     /**
      * Verify that the sniff throws an error for abstract private methods in traits for PHP 7.4
      * and doesn't for PHP 8.0.
@@ -91,7 +90,6 @@ public function dataNewTraitAbstractPrivateMethods()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -128,7 +126,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
index e4d799ea..27ad0ea8 100644
--- a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
+++ b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
@@ -39,7 +39,7 @@ class BaseSniffTest extends TestCase
      *
      * @var string
      */
-    const STANDARD_NAME = 'Magento2';
+    private const STANDARD_NAME = 'Magento2';
 
     /**
      * The PHP_CodeSniffer object used for testing.
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
index 2c19c355..a346b649 100644
--- a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
@@ -63,7 +63,6 @@ public function dataChangedIntToBoolParamType()
         ];
     }
 
-
     /**
      * Verify no false positives are thrown for valid code.
      *
@@ -98,7 +97,6 @@ public function dataNoFalsePositives()
         return $data;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
index 5b7afd91..d82486b2 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -57,7 +57,6 @@ public function dataForbiddenFinalPrivateMethods()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -91,7 +90,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
index 477e7acc..2b288c29 100644
--- a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
@@ -107,7 +107,6 @@ public function dataNewAttributes()
         return $data;
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -142,7 +141,6 @@ public function dataNoFalsePositives()
         return $data;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
index b921469f..d4aa8e21 100644
--- a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
@@ -62,7 +62,6 @@ public function dataNewMagicClassConstant()
         ];
     }
 
-
     /**
      * Verify that no false positives are thrown for valid code.
      *
@@ -95,7 +94,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Test correctly identifying the magic class constant when used on instantiated objects.
      *
@@ -135,7 +133,6 @@ public function dataNewMagicClassConstantOnObject()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
index d9e4c951..527845c4 100644
--- a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
@@ -59,7 +59,6 @@ public function dataNewMagicConstantDereferencing()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code, nor for code which is still invalid.
      *
@@ -98,7 +97,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
index e34ffd30..22650e6b 100644
--- a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
@@ -69,7 +69,6 @@ public function dataNestedStaticAccess()
         ];
     }
 
-
     /**
      * Verify that class constant dereferencing emits an error in PHP 7.4.
      *
@@ -100,7 +99,6 @@ public function dataClassConstantDereferencing()
         ];
     }
 
-
     /**
      * Verify the sniff doesn't throw false positives.
      *
@@ -133,7 +131,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
index 2c90e229..97ee69e0 100644
--- a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
@@ -56,7 +56,6 @@ public function dataNewNonCapturingCatch()
         ];
     }
 
-
     /**
      * Verify no false positives are thrown for valid code.
      *
@@ -89,7 +88,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
index 50e2c081..0d3e93fd 100644
--- a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
@@ -58,7 +58,6 @@ public function dataTrailingComma()
         ];
     }
 
-
     /**
      * Test correctly identifying trailing comma's in closure use lists.
      *
@@ -90,7 +89,6 @@ public function dataTrailingCommaClosureUse()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -127,7 +125,6 @@ public function dataNoFalsePositives()
         return $data;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
index 4e5708f7..abb322c3 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
@@ -60,7 +60,6 @@ public function dataRemovedAssertStringAssertion()
         ];
     }
 
-
     /**
      * Verify there are no false positives on code this sniff should ignore.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
index f2348a3e..e22ff211 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
@@ -65,7 +65,6 @@ public function dataRemovedCallingDestructAfterConstructorExit()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -106,7 +105,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
index 43390cb3..bedde7fb 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
@@ -52,7 +52,6 @@ public function dataRemovedGetDefinedFunctionsExcludeDisabledFalse()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -68,7 +67,6 @@ public function testNoFalsePositives()
         }
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
index e219a916..3f558fdb 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
@@ -58,7 +58,6 @@ public function dataRemovedOptionalBeforeRequiredParam()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -103,7 +102,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
index b78e2a4b..40c60766 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
@@ -52,7 +52,6 @@ public function dataRemovedSplAutoloadRegisterThrowFalse()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -68,7 +67,6 @@ public function testNoFalsePositives()
         }
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *

From 3230fbb6f23d6388d2b5504860980c8820a5e379 Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Thu, 16 Dec 2021 02:58:40 -0800
Subject: [PATCH 438/630] =?UTF-8?q?[Imported]=20AC-1717:=20Passing=20null?=
 =?UTF-8?q?=20to=20non-nullable=20internal=20function=20parameters=20is?=
 =?UTF-8?q?=E2=80=A6=20(#136)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* AC-1717: Passing null to non-nullable internal function parameters is deprecated
---
 .../Rector/Src/ReplaceMbStrposNullLimit.php   | 60 ++++++++++++++++
 .../Rector/Src/ReplaceNewDateTimeNull.php     | 60 ++++++++++++++++
 .../Rector/Src/ReplacePregSplitNullLimit.php  | 60 ++++++++++++++++
 .../Fixture/replace_null.php.inc              | 11 +++
 .../ReplaceMbStrposNullLimitTest.php          | 36 ++++++++++
 .../config/configured_rule.php                | 14 ++++
 .../Fixture/replace_null.php.inc              | 17 +++++
 .../ReplaceNewDateTimeNullTest.php            | 36 ++++++++++
 .../config/configured_rule.php                | 14 ++++
 .../Fixture/replace_null.php.inc              | 11 +++
 .../ReplacePregSplitNullLimitTest.php         | 36 ++++++++++
 .../config/configured_rule.php                | 14 ++++
 composer.lock                                 | 71 +++++++++----------
 phpunit.xml.dist                              |  3 +
 rector.php                                    |  6 ++
 15 files changed, 413 insertions(+), 36 deletions(-)
 create mode 100644 Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
 create mode 100644 Magento2/Rector/Src/ReplaceNewDateTimeNull.php
 create mode 100644 Magento2/Rector/Src/ReplacePregSplitNullLimit.php
 create mode 100644 Magento2/Rector/Tests/ReplaceMbStrposNullLimit/Fixture/replace_null.php.inc
 create mode 100644 Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
 create mode 100644 Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php
 create mode 100644 Magento2/Rector/Tests/ReplaceNewDateTimeNull/Fixture/replace_null.php.inc
 create mode 100644 Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
 create mode 100644 Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php
 create mode 100644 Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc
 create mode 100644 Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
 create mode 100644 Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php

diff --git a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
new file mode 100644
index 00000000..e64be23e
--- /dev/null
+++ b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Src;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Scalar\LNumber;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+final class ReplaceMbStrposNullLimit extends AbstractRector
+{
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [FuncCall::class];
+    }
+
+    /**
+     * @param FuncCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (!$this->isName($node->name, 'mb_strpos')) {
+            return null;
+        }
+
+        if ($node->args[2] !== LNumber::class) {
+            $node->args[2] = $this->nodeFactory->createArg(0);
+            return $node;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return RuleDefinition
+     * @throws PoorDocumentationException
+     */
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Change mb_strpos offset from null to 0', [
+                new CodeSample(
+                    'mb_strpos("pattern", "subject", null, "encoding");',
+                    'mb_strpos("pattern", "subject", 0, "encoding");'
+                ),
+            ]
+        );
+    }
+}
diff --git a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
new file mode 100644
index 00000000..7469c460
--- /dev/null
+++ b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Src;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\New_;
+use PhpParser\Node\Scalar\String_;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+final class ReplaceNewDateTimeNull extends AbstractRector
+{
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [New_::class];
+    }
+
+    /**
+     * @param New_ $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (!$this->isName($node->class, 'DateTime')) {
+            return null;
+        }
+
+        if ($node->args[0] !== String_::class) {
+            $node->args[0] = $this->nodeFactory->createArg('now');
+            return $node;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return RuleDefinition
+     * @throws PoorDocumentationException
+     */
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Change DateTime datetime input from null to "now"', [
+                new CodeSample(
+                    'new DateTime(null, new DateTimeZone("GMT"));',
+                    'new DateTime("now", new DateTimeZone("GMT"));'
+                ),
+            ]
+        );
+    }
+}
diff --git a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
new file mode 100644
index 00000000..418d43cf
--- /dev/null
+++ b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Src;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Scalar\LNumber;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+final class ReplacePregSplitNullLimit extends AbstractRector
+{
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [FuncCall::class];
+    }
+
+    /**
+     * @param FuncCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (!$this->isName($node->name, 'preg_split')) {
+            return null;
+        }
+
+        if ($node->args[2] !== LNumber::class) {
+            $node->args[2] = $this->nodeFactory->createArg(-1);
+            return $node;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return RuleDefinition
+     * @throws PoorDocumentationException
+     */
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Change preg_split limit from null to -1', [
+                new CodeSample(
+                    'preg_split("pattern", "subject", null, 0);',
+                    'preg_split("pattern", "subject", -1, 0);'
+                ),
+            ]
+        );
+    }
+}
diff --git a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/Fixture/replace_null.php.inc b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/Fixture/replace_null.php.inc
new file mode 100644
index 00000000..39d438b5
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/Fixture/replace_null.php.inc
@@ -0,0 +1,11 @@
+<?php
+
+mb_strpos('haystack with needle', 'needle', null, 'utf-8')
+
+?>
+-----
+<?php
+
+mb_strpos('haystack with needle', 'needle', 0, 'utf-8')
+
+?>
diff --git a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
new file mode 100644
index 00000000..4ad6574c
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Tests\ReplaceMbStrposNullLimit;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class ReplaceMbStrposNullLimitTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php
new file mode 100644
index 00000000..a08979ca
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(ReplaceMbStrposNullLimit::class);
+};
diff --git a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/Fixture/replace_null.php.inc b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/Fixture/replace_null.php.inc
new file mode 100644
index 00000000..79cdc9dd
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/Fixture/replace_null.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+use DateTime;
+use DateTimeZone;
+
+new DateTime(null, new DateTimeZone('GMT'));
+
+?>
+-----
+<?php
+
+use DateTime;
+use DateTimeZone;
+
+new DateTime('now', new DateTimeZone('GMT'));
+
+?>
diff --git a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
new file mode 100644
index 00000000..7970bd7b
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Tests\ReplaceNewDateTimeNull;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class ReplaceNewDateTimeNullTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php
new file mode 100644
index 00000000..83f8e100
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento2\Rector\Src\ReplaceNewDateTimeNull;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(ReplaceNewDateTimeNull::class);
+};
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc
new file mode 100644
index 00000000..f0efbcf9
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc
@@ -0,0 +1,11 @@
+<?php
+
+preg_split('pattern', 'subject', null, 0)
+
+?>
+-----
+<?php
+
+preg_split('pattern', 'subject', -1, 0)
+
+?>
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
new file mode 100644
index 00000000..2648e974
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Tests\ReplacePregSplitNullLimit;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class ReplacePregSplitNullLimitTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php
new file mode 100644
index 00000000..d6f7f7cd
--- /dev/null
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento2\Rector\Src\ReplacePregSplitNullLimit;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(ReplacePregSplitNullLimit::class);
+};
diff --git a/composer.lock b/composer.lock
index 477af2cd..363d1f36 100644
--- a/composer.lock
+++ b/composer.lock
@@ -134,16 +134,16 @@
         },
         {
             "name": "rector/rector",
-            "version": "0.12.4",
+            "version": "0.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48"
+                "reference": "dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
-                "reference": "d7d4659acae85a9ba5b8b75d4dadb998ffed2a48",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b",
+                "reference": "dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b",
                 "shasum": ""
             },
             "require": {
@@ -182,7 +182,7 @@
             "description": "Prefixed and PHP 7.1 downgraded version of rector/rector",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.4"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.8"
             },
             "funding": [
                 {
@@ -190,20 +190,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-15T14:06:50+00:00"
+            "time": "2021-12-13T23:55:00+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.1",
+            "version": "3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e"
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
             "require": {
@@ -246,7 +246,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-10-11T04:00:11+00:00"
+            "time": "2021-12-12T21:44:58+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -445,16 +445,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.1",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
-                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
@@ -495,9 +495,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
             },
-            "time": "2021-11-03T20:52:16+00:00"
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -772,16 +772,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.14.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "shasum": ""
             },
             "require": {
@@ -833,22 +833,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
             },
-            "time": "2021-09-10T09:02:12+00:00"
+            "time": "2021-12-08T12:19:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.9",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
                 "shasum": ""
             },
             "require": {
@@ -904,7 +904,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
             },
             "funding": [
                 {
@@ -912,20 +912,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-19T15:21:02+00:00"
+            "time": "2021-12-05T09:12:13+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -964,7 +964,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -972,7 +972,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -2111,7 +2111,6 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c79afe8a..9bb851ae 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,6 +4,9 @@
         <testsuite name="PHP_CodeSniffer Test Suite">
             <file>vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>
         </testsuite>
+        <testsuite name="Rector">
+            <directory>Magento2/Rector/Tests</directory>
+        </testsuite>
     </testsuites>
     <php>
         <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,Squiz,Zend"/>
diff --git a/rector.php b/rector.php
index 502f7744..559d5b54 100644
--- a/rector.php
+++ b/rector.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
+use Magento2\Rector\Src\ReplaceNewDateTimeNull;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
@@ -9,6 +11,7 @@
 use Rector\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
 use Rector\Php80\Rector\ClassMethod\SetStateToStaticRector;
 use Rector\Php81\Rector\FuncCall\Php81ResourceReturnToObjectRector;
+use Magento2\Rector\Src\ReplacePregSplitNullLimit;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -27,4 +30,7 @@
     $services->set(SetStateToStaticRector::class);
     $services->set(StringableForToStringRector::class);
     $services->set(Php81ResourceReturnToObjectRector::class);
+    $services->set(ReplacePregSplitNullLimit::class);
+    $services->set(ReplaceMbStrposNullLimit::class);
+    $services->set(ReplaceNewDateTimeNull::class);
 };

From 8bc679be3fac7fabf65420f9c9298e0c59978c49 Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Thu, 16 Dec 2021 04:06:48 -0800
Subject: [PATCH 439/630] [Imported] Fix DirectThrowSniff false positive (#137)

* Fix DirectThrowSniff false positive

* fix custom exception gives false positive with DirectThrowSniff

* fix coding standard

* Apply suggestions from code review

Co-authored-by: Sergio Vera <sergio.vera@gmail.com>

* Fix error

Co-authored-by: MeenakshiSundaram <msundara@adobe.com>
Co-authored-by: Sergio Vera <sergio.vera@gmail.com>
---
 .../Sniffs/Exceptions/DirectThrowSniff.php    | 54 ++++++++++++++++++-
 ...UnitTest.inc => DirectThrowUnitTest.1.inc} |  0
 .../Exceptions/DirectThrowUnitTest.2.inc      | 31 +++++++++++
 .../Tests/Exceptions/DirectThrowUnitTest.php  | 19 ++++---
 4 files changed, 97 insertions(+), 7 deletions(-)
 rename Magento2/Tests/Exceptions/{DirectThrowUnitTest.inc => DirectThrowUnitTest.1.inc} (100%)
 create mode 100644 Magento2/Tests/Exceptions/DirectThrowUnitTest.2.inc

diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 622644bf..576d2066 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -44,7 +44,30 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
         $endOfStatement = $phpcsFile->findEndOfStatement($stackPtr);
         $posOfException = $phpcsFile->findNext(T_STRING, $stackPtr, $endOfStatement);
-        if ($tokens[$posOfException]['content'] === 'Exception') {
+
+        $fullExceptionString = $this->getFullClassNameAndAlias($tokens, $stackPtr, $endOfStatement);
+        $exceptionString = 'Exception';
+        $customExceptionFound = false;
+        foreach ($tokens as $key => $token) {
+            if ($token['code'] !== T_USE) {
+                continue;
+            }
+            $endOfUse = $phpcsFile->findEndOfStatement($key);
+            $useStatementValue = $this->getFullClassNameAndAlias($tokens, $key, $endOfUse);
+            //we safely consider use statement has alias will not be a direct exception class
+            if (empty($useStatementValue['alias'])) {
+                if (substr($useStatementValue['name'], 0, strlen($exceptionString)) !== $exceptionString
+                    && substr($useStatementValue['name'], -strlen($exceptionString)) === $exceptionString
+                    && $useStatementValue['name'] !== $exceptionString
+                ) {
+                    $customExceptionFound = true;
+                    break;
+                }
+            }
+        }
+        if (($tokens[$posOfException]['content'] === 'Exception' && !$customExceptionFound)
+            || $fullExceptionString['name'] === '\Exception'
+        ) {
             $phpcsFile->addWarning(
                 $this->warningMessage,
                 $stackPtr,
@@ -53,4 +76,33 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
     }
+
+    /**
+     * Get full class name and alias
+     *
+     * @param array $tokens
+     * @param int $start
+     * @param int $end
+     * @return array
+     */
+    private function getFullClassNameAndAlias($tokens, $start, $end): array
+    {
+        $fullName = $alias = '';
+        $foundAlias = false;
+        for ($i = $start; $i <= $end; $i++) {
+            $type = $tokens[$i]['code'];
+            if ($type === T_AS) {
+                $foundAlias = true;
+                continue;
+            }
+            if ($type === T_STRING || $type === T_NS_SEPARATOR) {
+                if (!$foundAlias) {
+                    $fullName .= $tokens[$i]['content'];
+                } else {
+                    $alias = $tokens[$i]['content'];
+                }
+            }
+        }
+        return ['name' => $fullName, 'alias' => $alias];
+    }
 }
diff --git a/Magento2/Tests/Exceptions/DirectThrowUnitTest.inc b/Magento2/Tests/Exceptions/DirectThrowUnitTest.1.inc
similarity index 100%
rename from Magento2/Tests/Exceptions/DirectThrowUnitTest.inc
rename to Magento2/Tests/Exceptions/DirectThrowUnitTest.1.inc
diff --git a/Magento2/Tests/Exceptions/DirectThrowUnitTest.2.inc b/Magento2/Tests/Exceptions/DirectThrowUnitTest.2.inc
new file mode 100644
index 00000000..ea319647
--- /dev/null
+++ b/Magento2/Tests/Exceptions/DirectThrowUnitTest.2.inc
@@ -0,0 +1,31 @@
+<?php
+namespace Vendor\Module\Anyname;
+
+use Vendor\Module\Anyname\Exception;
+
+class Foo
+{
+    protected $isEnabled = true;
+
+    public function go()
+    {
+        if (!$this->isEnabled) {
+            throw new Exception('Action disabled.');
+        }
+    }
+
+    public function exceptionTest()
+    {
+        if (!$this->isEnabled) {
+            throw new \Exception('Action disabled.');
+        }
+    }
+
+    public function localizedExceptionTest()
+    {
+
+        if (!$this->isEnabled) {
+            throw new LocalizedException('Localized exception.');
+        }
+    }
+}
diff --git a/Magento2/Tests/Exceptions/DirectThrowUnitTest.php b/Magento2/Tests/Exceptions/DirectThrowUnitTest.php
index dee9d504..906f92c5 100644
--- a/Magento2/Tests/Exceptions/DirectThrowUnitTest.php
+++ b/Magento2/Tests/Exceptions/DirectThrowUnitTest.php
@@ -12,7 +12,7 @@ class DirectThrowUnitTest extends AbstractSniffUnitTest
     /**
      * @inheritdoc
      */
-    public function getErrorList()
+    protected function getErrorList()
     {
         return [];
     }
@@ -20,11 +20,18 @@ public function getErrorList()
     /**
      * @inheritdoc
      */
-    public function getWarningList()
+    protected function getWarningList($testFile = '')
     {
-        return [
-            10 => 1,
-            17 => 1,
-        ];
+        if ($testFile === 'DirectThrowUnitTest.1.inc') {
+            return [
+                10 => 1,
+                17 => 1,
+            ];
+        } elseif ($testFile === 'DirectThrowUnitTest.2.inc') {
+            return [
+                20 => 1
+            ];
+        }
+        return [];
     }
 }

From 6987325aa8323d2b9973f6f3fd08025b8cf01905 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 16 Dec 2021 13:36:27 +0100
Subject: [PATCH 440/630] Fix remaining phpcs issues

---
 Magento2/Tests/Eslint/AbstractEslintTestCase.php   |  1 +
 Magento2/Tests/Legacy/InstallUpgradeUnitTest.php   |  3 +++
 .../Framework/Model/ResourceModel/Iterator.php     | 14 +++++++-------
 .../Util/TestHelperPHPCompatibility.php            |  2 ++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
index f4a53a70..5e1f4fc1 100644
--- a/Magento2/Tests/Eslint/AbstractEslintTestCase.php
+++ b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -24,6 +24,7 @@ abstract class AbstractEslintTestCase extends TestCase
      */
     protected function assertFileContainsError(string $testFile, array $expectedMessages): void
     {
+        // phpcs:disable
         exec(
             'npm run eslint -- Magento2/Tests/Eslint/' . $testFile,
             $output
diff --git a/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php b/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
index e8ccc2d3..8ab09810 100644
--- a/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
+++ b/Magento2/Tests/Legacy/InstallUpgradeUnitTest.php
@@ -12,6 +12,9 @@
 
 class InstallUpgradeUnitTest extends AbstractSniffUnitTest
 {
+    /**
+     * @var string[]
+     */
     private $wrongFileNames = [
         'data-install-.inc',
         'data-upgrade-.inc',
diff --git a/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
index fc652f05..e257d9e0 100644
--- a/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
+++ b/Magento2/Tests/Legacy/_files/RestrictedCodeUnitTest/Magento/Framework/Model/ResourceModel/Iterator.php
@@ -1,11 +1,11 @@
 <?php
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento2\Tests\Legacy\_files\RestrictedCodeUnitTest\Magento\Framework\Model\ResourceModel;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
 /**
  * This is NOT actually a test, but a file that must be ignored by RestrictedCodeSniff
@@ -15,22 +15,22 @@
  */
 class IteratorDummyFile extends AbstractSniffUnitTest
 {
-    protected function shouldSkipTest()
+    protected function shouldSkipTest(): bool
     {
         return true;
     }
 
-    protected function getErrorList()
+    protected function getErrorList(): array
     {
         return [];
     }
 
-    protected function getWarningList()
+    protected function getWarningList(): array
     {
         return [];
     }
 
-    private function withProtectedClass()
+    private function withProtectedClass(): Zend_Db_Expr
     {
         return new \Zend_Db_Expr();
     }
diff --git a/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php b/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
index a7e389ad..827eded9 100644
--- a/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
+++ b/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
@@ -47,6 +47,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
     }
 
+    /* phpcs:disable */
     /**
      * Wrapper to make the protected parent::isNumber() method testable.
      *
@@ -87,4 +88,5 @@ public function isNumericCalculation(File $phpcsFile, $start, $end)
     {
         return parent::isNumericCalculation($phpcsFile, $start, $end);
     }
+    /* phpcs:enable */
 }

From 1be74dc062a66603b0dd310755bf456c3430e818 Mon Sep 17 00:00:00 2001
From: m2-github-services
 <87783418+m2-github-services@users.noreply.github.com>
Date: Thu, 16 Dec 2021 06:18:14 -0800
Subject: [PATCH 441/630] [Imported] AC-1718 return types for arrayaccess
 methods (#138)

* AC-1717: Passing null to non-nullable internal function parameters is deprecated
---
 .../AddArrayAccessInterfaceReturnTypes.php    | 69 +++++++++++++++++++
 ...AddArrayAccessInterfaceReturnTypesTest.php | 36 ++++++++++
 .../Fixture/addReturnTypes.php.inc            | 39 +++++++++++
 .../config/configured_rule.php                | 14 ++++
 4 files changed, 158 insertions(+)
 create mode 100644 Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
 create mode 100644 Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
 create mode 100644 Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/Fixture/addReturnTypes.php.inc
 create mode 100644 Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php

diff --git a/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
new file mode 100644
index 00000000..7857548c
--- /dev/null
+++ b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Src;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Class_;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+final class AddArrayAccessInterfaceReturnTypes extends AbstractRector
+{
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [Class_::class];
+    }
+
+    /**
+     * @param Class_ $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        foreach ($node->implements as $implement) {
+            if ($this->isName($implement, 'ArrayAccess')) {
+                break;
+            }
+            return null;
+        }
+
+        foreach ($node->getMethods() as $method) {
+            if ($this->isName($method, 'offsetExists') && empty($method->getReturnType())) {
+                $method->returnType = new \PhpParser\Node\Name('bool');
+            }
+            if ($this->isName($method, 'offsetSet') && empty($method->getReturnType())) {
+                $method->returnType = new \PhpParser\Node\Name('void');
+            }
+            if ($this->isName($method, 'offsetUnset') && empty($method->getReturnType())) {
+                $method->returnType = new \PhpParser\Node\Name('void');
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return RuleDefinition
+     * @throws PoorDocumentationException
+     */
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Add return types specified by ArrayAccess interface', [
+                new CodeSample(
+                    'public function offsetSet($offset, $value)',
+                    'public function offsetSet($offset, $value): void'
+                ),
+            ]
+        );
+    }
+}
diff --git a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
new file mode 100644
index 00000000..bf6d9b64
--- /dev/null
+++ b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Rector\Tests\AddArrayAccessInterfaceReturnTypes;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class AddArrayAccessInterfaceReturnTypesTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/Fixture/addReturnTypes.php.inc b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/Fixture/addReturnTypes.php.inc
new file mode 100644
index 00000000..cedf2b64
--- /dev/null
+++ b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/Fixture/addReturnTypes.php.inc
@@ -0,0 +1,39 @@
+<?php
+
+class MyExampleClass implements \ArrayAccess
+{
+    public function offsetExists($offset)
+    {
+    }
+    public function offsetGet($offset)
+    {
+    }
+    public function offsetSet($offset, $value)
+    {
+    }
+    public function offsetUnset($offset)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+class MyExampleClass implements \ArrayAccess
+{
+    public function offsetExists($offset): bool
+    {
+    }
+    public function offsetGet($offset)
+    {
+    }
+    public function offsetSet($offset, $value): void
+    {
+    }
+    public function offsetUnset($offset): void
+    {
+    }
+}
+
+?>
diff --git a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php
new file mode 100644
index 00000000..13e377ff
--- /dev/null
+++ b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento2\Rector\Src\AddArrayAccessInterfaceReturnTypes;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(AddArrayAccessInterfaceReturnTypes::class);
+};

From 9392d02c45852178c91d7f8bc369b3a52119bb96 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 16 Dec 2021 15:20:55 +0100
Subject: [PATCH 442/630] Run phpcbf

---
 Magento2/Rector/Src/ReplaceMbStrposNullLimit.php  | 3 ++-
 Magento2/Rector/Src/ReplaceNewDateTimeNull.php    | 3 ++-
 Magento2/Rector/Src/ReplacePregSplitNullLimit.php | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
index e64be23e..a93d1cc5 100644
--- a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
+++ b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
@@ -49,7 +49,8 @@ public function refactor(Node $node): ?Node
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Change mb_strpos offset from null to 0', [
+            'Change mb_strpos offset from null to 0',
+            [
                 new CodeSample(
                     'mb_strpos("pattern", "subject", null, "encoding");',
                     'mb_strpos("pattern", "subject", 0, "encoding");'
diff --git a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
index 7469c460..59820e17 100644
--- a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
+++ b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
@@ -49,7 +49,8 @@ public function refactor(Node $node): ?Node
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Change DateTime datetime input from null to "now"', [
+            'Change DateTime datetime input from null to "now"',
+            [
                 new CodeSample(
                     'new DateTime(null, new DateTimeZone("GMT"));',
                     'new DateTime("now", new DateTimeZone("GMT"));'
diff --git a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
index 418d43cf..0e4922b9 100644
--- a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
+++ b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
@@ -49,7 +49,8 @@ public function refactor(Node $node): ?Node
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Change preg_split limit from null to -1', [
+            'Change preg_split limit from null to -1',
+            [
                 new CodeSample(
                     'preg_split("pattern", "subject", null, 0);',
                     'preg_split("pattern", "subject", -1, 0);'

From 4c0e6fc71f5df7804987de51bfd4d7a72004878f Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 16 Dec 2021 15:41:16 +0100
Subject: [PATCH 443/630] Fix remaining phpcs issues on Magento2/Rector

---
 .github/workflows/php.yml                              |  4 ++--
 Magento2/Rector/Src/ReplaceMbStrposNullLimit.php       | 10 ++++------
 Magento2/Rector/Src/ReplaceNewDateTimeNull.php         | 10 ++++------
 Magento2/Rector/Src/ReplacePregSplitNullLimit.php      | 10 ++++------
 .../ReplaceMbStrposNullLimitTest.php                   |  5 ++++-
 .../ReplaceNewDateTimeNullTest.php                     |  2 +-
 .../ReplacePregSplitNullLimitTest.php                  |  2 +-
 7 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index d8e87bc9..44e0e920 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -54,10 +54,10 @@ jobs:
       run: vendor/bin/phpunit
 
     - name: Run code style suite
-      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers Magento2/Sniffs Magento2/Rector Magento2Framework/Sniffs
 
     - name: Run framework suite
-      run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+      run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2/Rector Magento2Framework/Sniffs
   js:
     runs-on: ubuntu-latest
     name: Javascript tests
diff --git a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
index a93d1cc5..06ffaf25 100644
--- a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
+++ b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
@@ -11,14 +11,13 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Scalar\LNumber;
 use Rector\Core\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
-final class ReplaceMbStrposNullLimit extends AbstractRector
+class ReplaceMbStrposNullLimit extends AbstractRector
 {
     /**
-     * @return array<class-string<Node>>
+     * @inheritDoc
      */
     public function getNodeTypes(): array
     {
@@ -26,7 +25,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param FuncCall $node
+     * @inheritDoc
      */
     public function refactor(Node $node): ?Node
     {
@@ -43,8 +42,7 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @return RuleDefinition
-     * @throws PoorDocumentationException
+     * @inheritDoc
      */
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
index 59820e17..1bf54f0a 100644
--- a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
+++ b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
@@ -11,14 +11,13 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Scalar\String_;
 use Rector\Core\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
-final class ReplaceNewDateTimeNull extends AbstractRector
+class ReplaceNewDateTimeNull extends AbstractRector
 {
     /**
-     * @return array<class-string<Node>>
+     * @inheritDoc
      */
     public function getNodeTypes(): array
     {
@@ -26,7 +25,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param New_ $node
+     * @inheritDoc
      */
     public function refactor(Node $node): ?Node
     {
@@ -43,8 +42,7 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @return RuleDefinition
-     * @throws PoorDocumentationException
+     * @inheritDoc
      */
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
index 0e4922b9..f8e6cb3d 100644
--- a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
+++ b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
@@ -11,14 +11,13 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Scalar\LNumber;
 use Rector\Core\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
-final class ReplacePregSplitNullLimit extends AbstractRector
+class ReplacePregSplitNullLimit extends AbstractRector
 {
     /**
-     * @return array<class-string<Node>>
+     * @inheritDoc
      */
     public function getNodeTypes(): array
     {
@@ -26,7 +25,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param FuncCall $node
+     * @inheritDoc
      */
     public function refactor(Node $node): ?Node
     {
@@ -43,8 +42,7 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @return RuleDefinition
-     * @throws PoorDocumentationException
+     * @inheritDoc
      */
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
index 4ad6574c..77a15b75 100644
--- a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
+++ b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
@@ -11,7 +11,7 @@
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class ReplaceMbStrposNullLimitTest extends AbstractRectorTestCase
+class ReplaceMbStrposNullLimitTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideData()
@@ -29,6 +29,9 @@ public function provideData(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
+    /**
+     * @return string
+     */
     public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/configured_rule.php';
diff --git a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
index 7970bd7b..fe3c6028 100644
--- a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
+++ b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
@@ -11,7 +11,7 @@
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class ReplaceNewDateTimeNullTest extends AbstractRectorTestCase
+class ReplaceNewDateTimeNullTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideData()
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
index 2648e974..5db48332 100644
--- a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
@@ -11,7 +11,7 @@
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class ReplacePregSplitNullLimitTest extends AbstractRectorTestCase
+class ReplacePregSplitNullLimitTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideData()

From 20acb9bb0bd38b8eb62bc0cafbe150f3153cec83 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 16 Dec 2021 15:45:51 +0100
Subject: [PATCH 444/630] Fix remaining phpcs issues on Magento2/Rector

---
 .../Src/AddArrayAccessInterfaceReturnTypes.php      | 13 ++++++-------
 .../AddArrayAccessInterfaceReturnTypesTest.php      |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
index 7857548c..a09fd34a 100644
--- a/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
+++ b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
@@ -10,14 +10,13 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Core\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
-final class AddArrayAccessInterfaceReturnTypes extends AbstractRector
+class AddArrayAccessInterfaceReturnTypes extends AbstractRector
 {
     /**
-     * @return array<class-string<Node>>
+     * @inheritDoc
      */
     public function getNodeTypes(): array
     {
@@ -25,7 +24,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param Class_ $node
+     * @inheritDoc
      */
     public function refactor(Node $node): ?Node
     {
@@ -52,13 +51,13 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @return RuleDefinition
-     * @throws PoorDocumentationException
+     * @inheritDoc
      */
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Add return types specified by ArrayAccess interface', [
+            'Add return types specified by ArrayAccess interface',
+            [
                 new CodeSample(
                     'public function offsetSet($offset, $value)',
                     'public function offsetSet($offset, $value): void'
diff --git a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
index bf6d9b64..3d53d5aa 100644
--- a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
+++ b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
@@ -11,7 +11,7 @@
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class AddArrayAccessInterfaceReturnTypesTest extends AbstractRectorTestCase
+class AddArrayAccessInterfaceReturnTypesTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideData()

From c066a0dc3b5af783a1a509093efc9ec57e064bba Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 17 Dec 2021 13:48:47 -0600
Subject: [PATCH 445/630] AC-99: Update Third Party library: jquery.tabs

---
 .../Html/HtmlCollapsibleAttributeSniff.php    | 56 +++++++++++++++++++
 .../HtmlCollapsibleAttributeUnitTest.1.inc    | 35 ++++++++++++
 .../Html/HtmlCollapsibleAttributeUnitTest.php | 27 +++++++++
 Magento2/ruleset.xml                          |  7 +++
 4 files changed, 125 insertions(+)
 create mode 100644 Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
 create mode 100644 Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.1.inc
 create mode 100644 Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.php

diff --git a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
new file mode 100644
index 00000000..710e3f3e
--- /dev/null
+++ b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Html;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniffing improper HTML bindings.
+ */
+class HtmlCollapsibleAttributeSniff implements Sniff
+{
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Detect use of data attributes used by older version of bootstrap collapse
+     * Use new attributes in https://getbootstrap.com/docs/5.0/components/collapse/
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr !== 0) {
+            return;
+        }
+        $html = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+
+        if (empty($html)) {
+            return;
+        }
+
+        if (preg_match_all('$<\w+.*?\s*(?=.*?\s*data-toggle="collapse")[^>]*?>.*?$', $html, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $phpcsFile->addError(
+                    'Collapsible attributes data-toggle and data-target need to be updated to ' .
+                    'data-bs-toogle and data-bs-target'
+                    . ' - "' . $match[0]  . PHP_EOL,
+                    null,
+                    'HtmlCollapsibleAttribute'
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.1.inc b/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.1.inc
new file mode 100644
index 00000000..657b4645
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.1.inc
@@ -0,0 +1,35 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<html>
+    <head>
+        <base/>
+        <link/>
+    </head>
+    <body>
+        <div class="action-dropdown">
+            <button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
+                <span>Test</span>
+            </button>
+        </div>
+        <div class="fieldset-wrapper-title">
+            <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
+                <span data-bind="text: title"></span>
+            </strong>
+        </div>
+        <div class="admin__collapsible-title"
+            data-toggle="collapse"
+            data-target="#id-content">
+            <span>Test</span>
+        </div>
+        <strong <?= /* @noEscape */ $isCollapsable ?
+            'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
+            'class="title"'; ?>>
+            <span><?= $block->escapeHtml($element->getLegend()) ?></span>
+        </strong>
+    </body>
+</html>
diff --git a/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.php b/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.php
new file mode 100644
index 00000000..3000cd2a
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlCollapsibleAttributeUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [1 => 3];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index a8162477..1a5eb188 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -143,6 +143,13 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Html.HtmlCollapsibleAttribute">
+        <include-pattern>*\.html$</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <rule ref="Magento2.Legacy.Layout">
         <severity>10</severity>
         <type>error</type>

From 3a9d1d60b460b87e1ce3755729d510ea397b62f9 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 17 Dec 2021 14:14:04 -0600
Subject: [PATCH 446/630] AC-99: Update Third Party library: jquery.tabs

---
 Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
index 710e3f3e..369a90d3 100644
--- a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
+++ b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
@@ -24,6 +24,7 @@ public function register()
 
     /**
      * Detect use of data attributes used by older version of bootstrap collapse
+     *
      * Use new attributes in https://getbootstrap.com/docs/5.0/components/collapse/
      *
      * @param File $phpcsFile
@@ -41,7 +42,8 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        if (preg_match_all('$<\w+.*?\s*(?=.*?\s*data-toggle="collapse")[^>]*?>.*?$', $html, $matches, PREG_SET_ORDER)) {
+        $pattern = '$<\w+.*?\s*(?=.*?\s*data-toggle="collapse")[^>]*?>.*?$';
+        if (preg_match_all($pattern , $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 $phpcsFile->addError(
                     'Collapsible attributes data-toggle and data-target need to be updated to ' .

From b755ed6f42d3de5bb969dc7965d267089cb3a639 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 17 Dec 2021 14:19:31 -0600
Subject: [PATCH 447/630] AC-99: Update Third Party library: jquery.tabs

---
 Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
index 369a90d3..d9d5226c 100644
--- a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
+++ b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
@@ -43,7 +43,7 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $pattern = '$<\w+.*?\s*(?=.*?\s*data-toggle="collapse")[^>]*?>.*?$';
-        if (preg_match_all($pattern , $html, $matches, PREG_SET_ORDER)) {
+        if (preg_match_all($pattern, $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 $phpcsFile->addError(
                     'Collapsible attributes data-toggle and data-target need to be updated to ' .

From 84b8b0640ebd9e63e561c7569efc5ceb021d6b80 Mon Sep 17 00:00:00 2001
From: Sergey Nezbritskiy <sergey.nezbritskiy@gmail.com>
Date: Sat, 18 Dec 2021 20:12:40 +0200
Subject: [PATCH 448/630] disable phpunit testing of PSR12 sniffers

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 9bb851ae..ab957cc8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,6 +9,6 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,Squiz,Zend"/>
+        <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,PSR12,Squiz,Zend"/>
     </php>
 </phpunit>

From 8b32c9938941d66cb41100a2cac39ca181e772cf Mon Sep 17 00:00:00 2001
From: Sergey Nezbritskiy <sergey.nezbritskiy@gmail.com>
Date: Sat, 18 Dec 2021 20:13:02 +0200
Subject: [PATCH 449/630] fix syntax error highlighting

---
 .../Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index e001393d..d4cfcf54 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -134,5 +134,5 @@ class correctlyFormattedClassMemberDocBlock
     /**
      * @var string
      */
-    protected string $test;
+    protected string $test1;
 }

From 816605b51fc7d91b80c57c40e3c60e8a2b26c84f Mon Sep 17 00:00:00 2001
From: Sergey Nezbritskiy <sergey.nezbritskiy@gmail.com>
Date: Sat, 18 Dec 2021 22:16:54 +0200
Subject: [PATCH 450/630] Fix nullable properties validation

---
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php      | 3 ++-
 .../Commenting/ClassPropertyPHPDocFormattingUnitTest.inc   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index b1404e32..1d381bdc 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -28,7 +28,8 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_WHITESPACE,
         T_NS_SEPARATOR,
         T_STRING,
-        T_COMMENT
+        T_COMMENT,
+        T_NULLABLE
     ];
 
     /**
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index d4cfcf54..6e0000bf 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -135,4 +135,11 @@ class correctlyFormattedClassMemberDocBlock
      * @var string
      */
     protected string $test1;
+
+    /**
+     * Ensure that nullable sign in the property type hint declaration is interpreted correctly
+     *
+     * @var string|null
+     */
+    protected ?string $test2;
 }

From b0683344e01a4f5c935eea5b287f754972cb352b Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Mon, 20 Dec 2021 10:46:55 -0600
Subject: [PATCH 451/630] AC-99: Update Third Party library: jquery.tabs

- Fixed spelling error
---
 Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
index d9d5226c..8798c416 100644
--- a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
+++ b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
@@ -47,7 +47,7 @@ public function process(File $phpcsFile, $stackPtr)
             foreach ($matches as $match) {
                 $phpcsFile->addError(
                     'Collapsible attributes data-toggle and data-target need to be updated to ' .
-                    'data-bs-toogle and data-bs-target'
+                    'data-bs-toggle and data-bs-target'
                     . ' - "' . $match[0]  . PHP_EOL,
                     null,
                     'HtmlCollapsibleAttribute'

From 2a61ec9a71866516fc49f46387c04f3cd9f91a1a Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 23 Dec 2021 22:30:25 +0000
Subject: [PATCH 452/630] Allow use of ES6 syntax

---
 eslint/.eslintrc-magento | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 3e984418..6991c748 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -2,6 +2,7 @@
     "env": {
         "amd": true,
         "browser": true,
+        "es6": true,
         "jasmine": true,
         "jquery": true,
         "prototypejs": true,

From 491084ef5da385b29540ea809c388986ed67c078 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 23 Dec 2021 22:39:20 +0000
Subject: [PATCH 453/630] Simplify file structure for ESLint ruleset

There are no changes to the rule definitions here.
---
 eslint/.eslintrc         |  3 +-
 eslint/.eslintrc-jscs    | 64 ----------------------------------------
 eslint/.eslintrc-magento | 16 ++++++++++
 3 files changed, 17 insertions(+), 66 deletions(-)
 delete mode 100644 eslint/.eslintrc-jscs

diff --git a/eslint/.eslintrc b/eslint/.eslintrc
index 88aa88c7..8f800d85 100644
--- a/eslint/.eslintrc
+++ b/eslint/.eslintrc
@@ -3,7 +3,6 @@
     	"./.eslintrc-reset",
     	"./.eslintrc-magento",
     	"./.eslintrc-jquery",
-    	"./.eslintrc-misc",
-    	"./.eslintrc-jscs"
+    	"./.eslintrc-misc"
     ]
 }
diff --git a/eslint/.eslintrc-jscs b/eslint/.eslintrc-jscs
deleted file mode 100644
index 728e7dca..00000000
--- a/eslint/.eslintrc-jscs
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "rules": {
-    "no-with": 2,
-    "space-before-function-paren": [
-      2,
-      {
-        "anonymous": "always",
-        "named": "never",
-        "asyncArrow": "always"
-      }
-    ],
-    "curly": [
-      2,
-      "all"
-    ],
-    "keyword-spacing": [
-      2,
-      {}
-    ],
-    "no-empty": [
-      2,
-      {
-        "allowEmptyCatch": true
-      }
-    ],
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multiple-empty-lines": 2,
-    "no-multi-str": 2,
-    "space-unary-ops": [
-      2,
-      {
-        "words": false,
-        "nonwords": false
-      }
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
-    "comma-dangle": [
-      2,
-      "never"
-    ],
-    "no-trailing-spaces": 2,
-    "comma-style": [
-      2,
-      "last"
-    ],
-    "eol-last": 2,
-    "one-var": [
-      2,
-      "always"
-    ],
-    "space-infix-ops": 2,
-    "space-before-blocks": [
-      2,
-      "always"
-    ],
-    "quotes": [
-      2,
-      "single"
-    ]
-  }
-}
diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 3e984418..066499cf 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -8,8 +8,13 @@
         "node": true
     },
     "rules": {
+        "comma-dangle": [2, "never"],
+        "comma-style": [2, "last"],
+        "curly": [2, "all"],
+        "eol-last": 2,
         "eqeqeq": [2, "smart"],
         "guard-for-in": 2,
+        "keyword-spacing": [2, {}],
         "lines-around-comment": [
             2,
             {
@@ -30,6 +35,7 @@
         "no-constant-condition": 2,
         "no-debugger": 2,
         "no-else-return": 2,
+        "no-empty": [2, {"allowEmptyCatch": true}],
         "no-eval": 2,
         "no-ex-assign": 2,
         "no-extend-native": 2,
@@ -46,7 +52,9 @@
         "no-lone-blocks": 2,
         "no-lonely-if": 2,
         "no-loop-func": 2,
+        "no-mixed-spaces-and-tabs": 2,
         "no-multi-str": 2,
+        "no-multiple-empty-lines": 2,
         "no-native-reassign": 2,
         "no-negated-in-lhs": 2,
         "no-new-object": 2,
@@ -56,6 +64,7 @@
         "no-return-assign": 2,
         "no-self-compare": 2,
         "no-shadow": 2,
+        "no-trailing-spaces": 2,
         "no-undef": 2,
         "no-undef-init": 2,
         "no-unreachable": 2,
@@ -69,10 +78,17 @@
         ],
         "no-use-before-define": 2,
         "no-with": 2,
+        "one-var": [2, "always"],
         "operator-assignment": [2, "always"],
+        "quotes": [2, "single"],
         "radix": 2,
         "semi": [2, "always"],
         "semi-spacing": 2,
+        "space-before-blocks": [2, "always"],
+        "space-before-function-paren": [2, {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
+        "space-in-parens": [2, "never"],
+        "space-infix-ops": 2,
+        "space-unary-ops": [2, {"words": false, "nonwords": false}],
         "strict": ["error", "function"],
         "use-isnan": 2,
         "valid-typeof": 2,

From 424185ca3fb1d5f4f3ffde38c83e4c285c15b7c2 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 23 Dec 2021 22:42:23 +0000
Subject: [PATCH 454/630] Disallow Yoda Conditions

---
 eslint/.eslintrc-magento | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 3e984418..5cc362ca 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -76,6 +76,7 @@
         "strict": ["error", "function"],
         "use-isnan": 2,
         "valid-typeof": 2,
-        "vars-on-top": 2
+        "vars-on-top": 2,
+        "yoda": [2, "never"]
     }
 }

From 18c9c11b19366bea8d7a8c5910127ae85a3c22ff Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 28 Dec 2021 10:59:13 +0000
Subject: [PATCH 455/630] Also allow more modern syntax & objects

---
 eslint/.eslintrc-magento | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 6991c748..ca0121d5 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -3,6 +3,9 @@
         "amd": true,
         "browser": true,
         "es6": true,
+        "es2017": true,
+        "es2020": true,
+        "es2021": true,
         "jasmine": true,
         "jquery": true,
         "prototypejs": true,

From b50b7b6e841eb8e536cb9f7035e170eafa49342e Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 11 Jan 2022 11:12:34 +0100
Subject: [PATCH 456/630] Version 17

---
 composer.json | 2 +-
 composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index beb7236b..daca0913 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "16",
+    "version": "17",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 7ccb2b1e..0faa142e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c8d914f8664fb2324d9792d8e7b19325",
+    "content-hash": "b9428716b782d315462d1db75b983993",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -2421,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }

From 83ddd30fe644168d59be0f958574ea88b17c18a8 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 11 Jan 2022 22:20:58 +0000
Subject: [PATCH 457/630] Enforce consistent indentation

---
 eslint/.eslintrc-magento |  1 +
 eslint/rules/utils.js    | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 5d403da3..0ae1f657 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -18,6 +18,7 @@
         "eol-last": 2,
         "eqeqeq": [2, "smart"],
         "guard-for-in": 2,
+        "indent": [2, 4],
         "keyword-spacing": [2, {}],
         "lines-around-comment": [
             2,
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index ae181210..398e2b86 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -75,18 +75,18 @@ function getExpressionId(node) {
 
     while (node) {
         switch (node.type) {
-            case 'CallExpression':
-                node = node.callee;
-                break;
-
-            case 'MemberExpression':
-                node = node.object;
-                break;
-
-            case 'Identifier':
-                return node;
-            default:
-                return null;
+        case 'CallExpression':
+            node = node.callee;
+            break;
+
+        case 'MemberExpression':
+            node = node.object;
+            break;
+
+        case 'Identifier':
+            return node;
+        default:
+            return null;
         }
     }
 }

From 0f1c1f195aa12117e80b7e9026338ce4528ea19e Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 11 Jan 2022 22:27:50 +0000
Subject: [PATCH 458/630] Forbid overriding built-in objects

---
 eslint/.eslintrc-magento | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 5d403da3..f84ff61c 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -50,6 +50,7 @@
         "no-fallthrough": 2,
         "no-floating-decimal": 2,
         "no-func-assign": 2,
+        "no-global-assign": 2,
         "no-implied-eval": 2,
         "no-inner-declarations": 2,
         "no-invalid-regexp": 2,

From 241f932a0324776cee6f451a9dbd8b3ba1064152 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 11 Jan 2022 22:37:45 +0000
Subject: [PATCH 459/630] Disallow useless constructs

---
 eslint/.eslintrc-magento | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 5d403da3..7283333c 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -81,6 +81,12 @@
             }
         ],
         "no-use-before-define": 2,
+        "no-useless-call": 2,
+        "no-useless-computed-key": 2,
+        "no-useless-constructor": 2,
+        "no-useless-escape": 2,
+        "no-useless-rename": 2,
+        "no-useless-return": 2,
         "no-with": 2,
         "one-var": [2, "always"],
         "operator-assignment": [2, "always"],

From 3dabc252e880782950d40a97c7c00c53f35b054a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 14 Jan 2022 10:13:18 +0100
Subject: [PATCH 460/630] AC-1895: Avoid having duplicated issues in
 magento-coding-standard

---
 Magento2/ruleset.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1a5eb188..94079c3d 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -16,11 +16,6 @@
         <exclude-pattern>*\.phtml$</exclude-pattern>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
-    <rule ref="Generic.PHP.DeprecatedFunctions">
-        <severity>10</severity>
-        <type>error</type>
-        <exclude-pattern>*\.xml$</exclude-pattern>
-    </rule>
     <rule ref="Generic.PHP.NoSilencedErrors">
         <severity>10</severity>
         <type>error</type>
@@ -762,9 +757,12 @@
     </rule>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
-        <!-- Following sniffs has been updated or renamed in PHPCompatibility 10 -->
-        <exclude name="PHPCompatibility.Constants.NewMagicClassConstant" />
-        <exclude name="PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods" />
+        <!-- Following sniffs have been updated or renamed in PHPCompatibility 10 -->
+        <exclude name="PHPCompatibility.Constants.NewMagicClassConstant.Found" />
+        <exclude name="PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods.Found" />
+        <!-- Following sniffs have an equivalent in PHPCS -->
+        <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference.Deprecated" />
+        <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference.NotAllowed" />
         <!-- Check for cross-version support for stated PHP version and higher. -->
         <config name="testVersion" value="7.4-"/>
     </rule>

From 72be356f4e5cf07dc553fd5a0768763601cd7fdf Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 19 Jan 2022 19:17:13 +0000
Subject: [PATCH 461/630] magento/magento-coding-standard#362: Configuration
 corrections

---
 Magento2/ruleset.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 94079c3d..be698f54 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -164,6 +164,10 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions">
+        <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>
@@ -761,8 +765,7 @@
         <exclude name="PHPCompatibility.Constants.NewMagicClassConstant.Found" />
         <exclude name="PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods.Found" />
         <!-- Following sniffs have an equivalent in PHPCS -->
-        <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference.Deprecated" />
-        <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference.NotAllowed" />
+        <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <!-- Check for cross-version support for stated PHP version and higher. -->
         <config name="testVersion" value="7.4-"/>
     </rule>

From e34145508a53a2cbf66f7616bf3cc453db2be15b Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Tue, 25 Jan 2022 12:11:18 +0200
Subject: [PATCH 462/630] AC-1999: Static test to check void closing tags

---
 .../Sniffs/Html/HtmlClosingVoidTagsSniff.php  | 96 +++++++++++++++++++
 .../Html/HtmlClosingVoidTagsUnitTest.inc      | 35 +++++++
 .../Html/HtmlClosingVoidTagsUnitTest.php      | 27 ++++++
 Magento2/ruleset.xml                          |  5 +
 4 files changed, 163 insertions(+)
 create mode 100644 Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
 create mode 100644 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
 create mode 100644 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
new file mode 100644
index 00000000..5ce7c20d
--- /dev/null
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\Html;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff for void closing tags.
+ */
+class HtmlClosingVoidTagsSniff implements Sniff
+{
+    /**
+     * String representation of warning.
+     *
+     * @var string
+     */
+    private const WARNING_MESSAGE =
+        'Avoid using closing slash with void tags, this can lead to unexpected behavior - "%s"';
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    private const WARNING_CODE = 'HtmlClosingVoidElements';
+
+    /**
+     * List of void elements.
+     *
+     * https://html.spec.whatwg.org/multipage/syntax.html#void-elements
+     *
+     * @var string[]
+     */
+    private const HTML_VOID_ELEMENTS = [
+        'area',
+        'base',
+        'br',
+        'col',
+        'embed',
+        'hr',
+        'input',
+        'keygen',
+        'link',
+        'menuitem',
+        'meta',
+        'param',
+        'source',
+        'track',
+        'wbr'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Detect use of self-closing tag with void html element.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr): void
+    {
+        if ($stackPtr !== 0) {
+            return;
+        }
+        $html = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+
+        if (empty($html)) {
+            return;
+        }
+
+        if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                if (in_array($match[1], self::HTML_VOID_ELEMENTS)) {
+                    $phpcsFile->addWarning(
+                        sprintf(self::WARNING_MESSAGE, $match[0]),
+                        null,
+                        self::WARNING_CODE
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
new file mode 100644
index 00000000..dd701d03
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
@@ -0,0 +1,35 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<html>
+<head>
+    <base/>
+    <link/>
+</head>
+<body>
+    <area alt=""/>
+    <br/>
+    <table>
+        <colgroup>
+            <col/>
+        </colgroup>
+    </table>
+    <embed/>
+    <hr/>
+    <img src="" alt=""/>
+    <input type="text" id="test_input"/>
+    <keygen/>
+    <link/>
+    <meta/>
+    <param name="" value=""/>
+    <video>
+        <source/>
+        <track src=""/>
+    </video>
+    <wbr/>
+</body>
+</html>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
new file mode 100644
index 00000000..db95dd69
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlClosingVoidTagsUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [1 => 15];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index be698f54..72036193 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -138,6 +138,11 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Html.HtmlClosingVoidTags">
+        <severity>10</severity>
+        <type>warning</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <rule ref="Magento2.Html.HtmlCollapsibleAttribute">
         <include-pattern>*\.html$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>

From 784a702a0923366be28ed62f1d2feb2efc27ae98 Mon Sep 17 00:00:00 2001
From: Kiel Pykett <pykettk@gmail.com>
Date: Tue, 25 Jan 2022 10:18:06 +0000
Subject: [PATCH 463/630] Allow Template Literals

---
 eslint/.eslintrc-magento | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 5d403da3..a25fcf5c 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -84,7 +84,7 @@
         "no-with": 2,
         "one-var": [2, "always"],
         "operator-assignment": [2, "always"],
-        "quotes": [2, "single"],
+        "quotes": [2, "single", {"allowTemplateLiterals": true}],
         "radix": 2,
         "semi": [2, "always"],
         "semi-spacing": 2,

From cb23b9569ef221f926273bb723722d7f5b46600c Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Tue, 25 Jan 2022 11:28:21 +0100
Subject: [PATCH 464/630] AC-1895: Exclude sniff that is duplicated

---
 Magento2/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index be698f54..b509750a 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -766,6 +766,7 @@
         <exclude name="PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods.Found" />
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
+        <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
         <!-- Check for cross-version support for stated PHP version and higher. -->
         <config name="testVersion" value="7.4-"/>
     </rule>

From 69356eb71914f81c21b2f84d0f4d52034f4f5101 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 8 Feb 2022 14:55:30 +0000
Subject: [PATCH 465/630] PHP 8.1 Compatibility

---
 Magento2/ruleset.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 2edd2c9c..d3c7c43b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -761,9 +761,13 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
+
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+
+    <!-- PHPCompatibility configuration. -->
+    <config name="testVersion" value="7.4-"/>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
         <!-- Following sniffs have been updated or renamed in PHPCompatibility 10 -->
@@ -772,8 +776,6 @@
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
-        <!-- Check for cross-version support for stated PHP version and higher. -->
-        <config name="testVersion" value="7.4-"/>
     </rule>
     <!--
      All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is

From f2b9588164bc868c846f2b825229a0e1c404df95 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 8 Feb 2022 18:48:58 +0000
Subject: [PATCH 466/630] Use development php configuration for tests

---
 .github/workflows/php.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index aa112f66..5ae04f43 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -36,6 +36,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-version }}
+        ini-file: development
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

From e397b3d22980d650017735a4c0767a9f2ed13b0c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 9 Feb 2022 12:09:56 +0100
Subject: [PATCH 467/630] Update ruleset.xml

---
 Magento2/ruleset.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 2edd2c9c..3e5bb36e 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -6,10 +6,6 @@
     <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
-    <rule ref="Generic.Functions.CallTimePassByReference">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
         <severity>10</severity>
         <type>error</type>
@@ -779,19 +775,11 @@
      All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is
      updated to version 10
      -->
-    <rule ref="Magento2.PHPCompatibility.NewAttributes" />
-    <rule ref="Magento2.PHPCompatibility.NewMagicClassConstant" />
-    <rule ref="Magento2.PHPCompatibility.NewNonCapturingCatch" />
-    <rule ref="Magento2.PHPCompatibility.AbstractPrivateMethods" />
     <rule ref="Magento2.PHPCompatibility.ForbiddenFinalPrivateMethods" />
-    <rule ref="Magento2.PHPCompatibility.NewTrailingComma" />
     <rule ref="Magento2.PHPCompatibility.RemovedCallingDestructAfterConstructorExit" />
     <rule ref="Magento2.PHPCompatibility.RemovedOptionalBeforeRequiredParam" />
     <rule ref="Magento2.PHPCompatibility.ChangedIntToBoolParamType" />
     <rule ref="Magento2.PHPCompatibility.RemovedAssertStringAssertion" />
     <rule ref="Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse" />
     <rule ref="Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse" />
-    <rule ref="Magento2.PHPCompatibility.NewInterpolatedStringDereferencing" />
-    <rule ref="Magento2.PHPCompatibility.NewMagicConstantDereferencing" />
-    <rule ref="Magento2.PHPCompatibility.NewNestedStaticAccess" />
 </ruleset>

From c5e039d3ece0d2319606367c52d733ec030cdc87 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 9 Feb 2022 12:26:24 +0100
Subject: [PATCH 468/630] Remove checks on PhtmlTemplate

---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php | 70 -------------------
 .../Tests/Legacy/PhtmlTemplateUnitTest.php    |  8 +--
 2 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index 4217ecda..fa5eb70e 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -13,23 +13,7 @@
 class PhtmlTemplateSniff implements Sniff
 {
     private const WARNING_CODE_TEXT_JAVASCRIPT = 'TextJavascriptTypeFound';
-    private const WARNING_CODE_THIS_USAGE = 'ThisUsageObsolete';
     private const WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS = 'ProtectedPrivateBlockAccess';
-
-    private const OBSOLETE_REGEX = [
-        'FoundJQueryUI' => [
-            'pattern' => '/(["\'])jquery\/ui\1/',
-            'message' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ui widget instead'
-        ],
-        'FoundDataMageInit' => [
-            'pattern' => '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/',
-            'message' => 'Please do not initialize JS component in php. Do it in template'
-        ],
-        'FoundXMagentoInit' => [
-            'pattern' => '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i',
-            'message' => 'Please do not initialize JS component in php. Do it in template'
-        ],
-    ];
     
     /**
      * @inheritdoc
@@ -51,18 +35,9 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
         if ($tokens[$stackPtr]['code'] === T_OBJECT_OPERATOR) {
             $this->checkBlockVariable($phpcsFile, $stackPtr, $tokens);
-            $this->checkThisVariable($phpcsFile, $stackPtr, $tokens);
         }
         if ($tokens[$stackPtr]['code'] === T_INLINE_HTML || $tokens[$stackPtr]['code'] === T_HEREDOC) {
             $this->checkHtml($phpcsFile, $stackPtr);
-            
-            $file = $phpcsFile->getFilename();
-
-            if (strpos($file, '/view/frontend/templates/') !== false
-                || strpos($file, '/view/base/templates/') !== false
-            ) {
-                $this->checkHtmlSpecificFiles($phpcsFile, $stackPtr);
-            }
         }
     }
     
@@ -90,30 +65,6 @@ private function checkBlockVariable(File $phpcsFile, int $stackPtr, array $token
         }
     }
 
-    /**
-     * Check access to members and methods of Block class through $this
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @param array $tokens
-     */
-    private function checkThisVariable(File $phpcsFile, int $stackPtr, array $tokens): void
-    {
-        $varPos = $phpcsFile->findPrevious(T_VARIABLE, $stackPtr - 1);
-        if ($tokens[$varPos]['content'] !== '$this') {
-            return;
-        }
-        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-        if (strpos($tokens[$stringPos]['content'], 'helper') === false) {
-            $phpcsFile->addWarning(
-                'Access to members and methods of Block class through $this is ' .
-                'obsolete in phtml templates. Use only $block instead of $this.',
-                $stringPos,
-                self::WARNING_CODE_THIS_USAGE
-            );
-        }
-    }
-
     /**
      * Check use of "text/javascript" type
      *
@@ -132,25 +83,4 @@ private function checkHtml(File $phpcsFile, int $stackPtr): void
             );
         }
     }
-
-    /**
-     * Check of some obsoletes uses in specific files
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     */
-    private function checkHtmlSpecificFiles(File $phpcsFile, int $stackPtr): void
-    {
-        $content = $phpcsFile->getTokensAsString($stackPtr, 1);
-        
-        foreach (self::OBSOLETE_REGEX as $code => $data) {
-            if (preg_match($data['pattern'], $content)) {
-                $phpcsFile->addWarning(
-                    $data['message'],
-                    $stackPtr,
-                    $code
-                );
-            }
-        }
-    }
 }
diff --git a/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php b/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
index 6624ad3c..129229a3 100644
--- a/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
+++ b/Magento2/Tests/Legacy/PhtmlTemplateUnitTest.php
@@ -56,22 +56,16 @@ public function getWarningList($testFile = '')
     {
         if ($testFile === 'PhtmlTemplateUnitTest.1.phtml' || $testFile === 'PhtmlTemplateUnitTest.2.phtml') {
             return [
-                7 => 1,
                 9 => 1,
-                13 => 1,
                 20 => 1,
-                22 => 1,
                 23 => 1,
-                27 => 1,
-                33 => 1,
-                39 => 1
+                27 => 1
             ];
         }
         if ($testFile === 'PhtmlTemplateUnitTest.3.phtml') {
             return [
                 9 => 1,
                 20 => 1,
-                22 => 1,
                 23 => 1,
                 27 => 1,
             ];

From 8b2f031f43db5a74808c198ea4c2902544c8f7d6 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 9 Feb 2022 12:32:44 +0100
Subject: [PATCH 469/630] Remove Sniffs

---
 .../AbstractPrivateMethodsSniff.php           | 104 --------
 .../PHPCompatibility/NewAttributesSniff.php   | 234 ------------------
 ...ewInterpolatedStringDereferencingSniff.php |  93 -------
 .../NewMagicClassConstantSniff.php            | 124 ----------
 .../NewMagicConstantDereferencingSniff.php    | 126 ----------
 .../NewNestedStaticAccessSniff.php            | 153 ------------
 .../NewNonCapturingCatchSniff.php             |  84 -------
 .../NewTrailingCommaSniff.php                 | 128 ----------
 8 files changed, 1046 deletions(-)
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php

diff --git a/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
deleted file mode 100644
index 4972a87e..00000000
--- a/Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
-use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
-use Magento2\Helpers\PHPCSUtils\Utils\Scopes;
-
-/**
- * Abstract private methods are not allowed since PHP 5.1, though they are allowed in traits since PHP 8.0.
- *
- * Abstract private methods were supported between PHP 5.0.0 and PHP 5.0.4, but
- * were then disallowed on the grounds that the behaviours of `private` and `abstract`
- * are mutually exclusive.
- *
- * As of PHP 8.0, traits are allowed to declare abstract private methods.
- *
- * PHP version 5.1
- * PHP version 8.0
- *
- * @link https://www.php.net/manual/en/migration51.oop.php#migration51.oop-methods
- * @link https://wiki.php.net/rfc/abstract_trait_method_validation
- *
- * @since 9.2.0
- * @since 10.0.0 The sniff has been renamed from `PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods`
- *               to `PHPCompatibility.FunctionDeclarations.AbstractPrivateMethods` and now
- *               includes detection of the PHP 8 change.
- */
-class AbstractPrivateMethodsSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_FUNCTION];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 9.2.0
-     * @since 10.0.0 New error message for abstract private methods in traits.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('5.1') === false) {
-            return;
-        }
-
-        $tokens   = $phpcsFile->getTokens();
-        $scopePtr = Scopes::validDirectScope($phpcsFile, $stackPtr, BCTokens::ooScopeTokens());
-        if ($scopePtr === false) {
-            // Function, not method.
-            return;
-        }
-
-        $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
-        if ($properties['scope'] !== 'private' || $properties['is_abstract'] !== true) {
-            // Not an abstract private method.
-            return;
-        }
-
-        if ($tokens[$scopePtr]['code'] === \T_TRAIT) {
-            if ($this->supportsBelow('7.4') === true) {
-                $phpcsFile->addError(
-                    'Traits cannot declare "abstract private" methods in PHP 7.4 or below',
-                    $stackPtr,
-                    'InTrait'
-                );
-            }
-
-            return;
-        }
-
-        // Not a trait.
-        $phpcsFile->addError(
-            'Abstract methods cannot be declared as private since PHP 5.1',
-            $stackPtr,
-            'Found'
-        );
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php b/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
deleted file mode 100644
index f1904a0e..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use Magento2\Helpers\PHPCSUtils\Utils\GetTokensAsString;
-
-/**
- * Attributes as a form of structured, syntactic metadata to declarations of classes, properties,
- * functions, methods, parameters and constants is supported as of PHP 8.0.
- *
- * {@internal This sniff does not check whether attributes are used correctly and in
- * combination with syntaxes for which attributes are valid.
- * If that's not the case, PHP 8.0 would throw a parse error anyway.}
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/attributes_v2
- * @link https://wiki.php.net/rfc/attribute_amendments
- * @link https://wiki.php.net/rfc/shorter_attribute_syntax
- * @link https://wiki.php.net/rfc/shorter_attribute_syntax_change
- * @link https://www.php.net/manual/en/language.attributes.php
- *
- * @since 10.0.0
- */
-class NewAttributesSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $targets = [\T_COMMENT];
-
-        if (\defined('T_ATTRIBUTE') === true) {
-            // PHP 8.0 or PHPCS >= 3.6.0.
-            $targets[] = \T_ATTRIBUTE;
-
-        }
-
-        return $targets;
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[$stackPtr]['type'] === 'T_ATTRIBUTE') {
-            /*
-             * Either PHP 8.0 or PHPCS 3.6.0+.
-             * PHP 8.0 tokenizes the start marker of the attribute as `T_ATTRIBUTE` and the
-             * end marker as `T_CLOSE_SQUARE_BRACKET.
-             * In PHPCS 3.6.0+ the end marker will be tokenized as `T_ATTRIBUTE_END` and
-             * the start marker will have an 'attribute_closer' token array index.
-             */
-            if (isset($tokens[$stackPtr]['attribute_closer']) === true) {
-                // This is PHPCS >= 3.6.0.
-                $this->throwError(
-                    $phpcsFile,
-                    $stackPtr,
-                    GetTokensAsString::compact($phpcsFile, $stackPtr, $tokens[$stackPtr]['attribute_closer'], true)
-                );
-                return;
-            }
-
-            // This must be PHP 8.0 in combination with PHPCS < 3.6.0.
-            $nestedBrackets = 1;
-            for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-                if ($tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET) {
-                    ++$nestedBrackets;
-                    continue;
-                }
-
-                if ($tokens[$i]['code'] === \T_CLOSE_SQUARE_BRACKET) {
-                    --$nestedBrackets;
-
-                    if ($nestedBrackets === 0) {
-                        // Found the end of the attribute.
-                        break;
-                    }
-                }
-
-                if ($tokens[$i]['code'] === \T_CLOSE_TAG) {
-                    /*
-                     * Prevent looping to the end of the file for a particular edge case which
-                     * breaks the tokenizer 8.0.
-                     */
-                    break;
-                }
-            }
-
-            $this->throwError($phpcsFile, $stackPtr, GetTokensAsString::compact($phpcsFile, $stackPtr, $i, true));
-            return;
-        }
-
-        /*
-         * PHP < 8.0 in combination with PHPCS < 3.6.0 will tokenize attributes as comments.
-         * This comment can contain multiple attributes on the same line or can be followed
-         * by actual code.
-         * The attribute closer can also be on a later line.
-         */
-        $contents = $tokens[$stackPtr]['content'];
-
-        if (\substr($contents, 0, 2) !== '#[') {
-            // Bow out early if we already know this is not an attribute.
-            return;
-        }
-
-        $expectedErrors = \substr_count($contents, '#[');
-        $actualErrors   = 0;
-
-        while (empty($contents) === false && \substr($contents, 0, 2) === '#[') {
-            $length         = \strlen($contents);
-            $nestedBrackets = 1;
-
-            for ($i = 2; $i < $length; $i++) {
-                if ($contents[$i] === '[') {
-                    ++$nestedBrackets;
-                    continue;
-                }
-
-                if ($contents[$i] === ']') {
-                    --$nestedBrackets;
-
-                    if ($nestedBrackets === 0) {
-                        // Found the end of the attribute.
-                        $this->throwError($phpcsFile, $stackPtr, \substr($contents, 0, ($i + 1)));
-                        ++$actualErrors;
-
-                        if (($i + 1) === $length) {
-                            $contents = '';
-                        } else {
-                            $contents = \trim(\substr($contents, ($i + 1)));
-                        }
-                        break;
-                    }
-                }
-            }
-
-            if ($i === $length) {
-                // Reached the end of the content without finding a closing bracket.
-                break;
-            }
-        }
-
-        if ($expectedErrors === $actualErrors) {
-            // This was a single-line attribute, closer found.
-            return;
-        }
-
-        // This must be a multi-line attribute.
-        $nestedBrackets = 1;
-        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-            if ($tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET) {
-                ++$nestedBrackets;
-                continue;
-            }
-
-            if ($tokens[$i]['code'] === \T_CLOSE_SQUARE_BRACKET) {
-                --$nestedBrackets;
-
-                if ($nestedBrackets === 0) {
-                    // Found the end of the attribute.
-                    break;
-                }
-            }
-
-            if ($tokens[$i]['code'] === \T_CLOSE_TAG) {
-                /*
-                 * Prevent looping to the end of the file for a particular edge case which
-                 * breaks the tokenizer on PHP < 8.0.
-                 */
-                break;
-            }
-        }
-
-        $this->throwError(
-            $phpcsFile,
-            $stackPtr,
-            \rtrim($contents, "\r\n") . GetTokensAsString::compact($phpcsFile, $stackPtr, $i, true)
-        );
-    }
-
-    /**
-     * Throw an error when an attribute is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     * @param string                      $content   Attribute content for use in the error message.
-     *
-     * @return void
-     */
-    protected function throwError($phpcsFile, $stackPtr, $content)
-    {
-        $phpcsFile->addError(
-            'Attributes are not supported in PHP 7.4 or earlier. Found: %s',
-            $stackPtr,
-            'Found',
-            [$content]
-        );
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php b/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
deleted file mode 100644
index ded7b819..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewInterpolatedStringDereferencingSniff.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2009-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use Magento2\Helpers\PHPCSUtils\Utils\TextStrings;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Detect dereferencing of interpolated strings.
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/variable_syntax_tweaks#interpolated_and_non-interpolated_strings
- * @link https://www.php.net/manual/en/language.types.string.php#language.types.string.parsing
- *
- * @since 10.0.0
- */
-class NewInterpolatedStringDereferencingSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            \T_DOUBLE_QUOTED_STRING,
-        ];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // PHP 8.0 supports dereferencing interpolated strings
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Check whether the text string uses interpolation.
-        $string     = TextStrings::getCompleteTextString($phpcsFile, $stackPtr, true);
-        $endOfQuote = $phpcsFile->findNext([\T_DOUBLE_QUOTED_STRING], $stackPtr + 1, null, true);
-        if ($this->stripVariables($string) === $string) {
-            return $endOfQuote;
-        }
-
-        // Check whether the string is being dereferenced.
-        $nextNonEmpty     = $phpcsFile->findNext(Tokens::$emptyTokens, $endOfQuote, null, true);
-        $nextNonEmptyCode = $tokens[$nextNonEmpty]['code'];
-        if ($nextNonEmptyCode !== \T_OPEN_SQUARE_BRACKET
-            && $nextNonEmptyCode !== \T_OBJECT_OPERATOR
-            // Work-around for a bug in PHPCS < 3.6.0.
-            // @link https://github.com/squizlabs/PHP_CodeSniffer/pull/3172
-            && $nextNonEmptyCode !== \T_OPEN_SHORT_ARRAY
-        ) {
-            return $endOfQuote;
-        }
-
-        $phpcsFile->addError(
-            'Dereferencing of interpolated strings is not supported in PHP 7.4 or earlier',
-            $stackPtr,
-            'Found'
-        );
-
-        return $endOfQuote;
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php b/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
deleted file mode 100644
index b3bcc3be..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewMagicClassConstantSniff.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-
-/**
- * Detect usage of the magic `::class` constant introduced in PHP 5.5.
- *
- * The special `ClassName::class` constant is available as of PHP 5.5.0, and allows
- * for fully qualified class name resolution at compile time.
- *
- * As of PHP 8.0, `::class` can also be used on objects.
- *
- * PHP version 5.5
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/class_name_scalars
- * @link https://www.php.net/manual/en/language.oop5.constants.php#example-186
- * @link https://wiki.php.net/rfc/class_name_literal_on_object
- *
- * @since 7.1.4
- * @since 7.1.5  Removed the incorrect checks against invalid usage of the constant.
- * @since 10.0.0 Now differentiates between Name::class (PHP 5.5+) and $obj::class (PHP 8.0+).
- */
-class NewMagicClassConstantSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 7.1.4
-     *
-     * @return array
-     */
-    public function register()
-    {
-        /*
-         * In PHPCS < 3.4.1, the class keyword after a double colon + comment may be tokenized as
-         * `T_CLASS` instead of as `T_STRING`, so registering both.
-         *
-         * @link https://github.com/squizlabs/php_codesniffer/issues/2431
-         */
-        return [
-            \T_STRING,
-            \T_CLASS,
-        ];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 7.1.4
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if (\strtolower($tokens[$stackPtr]['content']) !== 'class') {
-            return;
-        }
-
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-        if ($prevToken === false || $tokens[$prevToken]['code'] !== \T_DOUBLE_COLON) {
-            return;
-        }
-
-        $subjectPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true, null, true);
-        if ($subjectPtr === false) {
-            // Shouldn't be possible.
-            return;
-        }
-
-        $preSubjectPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($subjectPtr - 1), null, true, null, true);
-        if (isset(Collections::$OOHierarchyKeywords[$tokens[$subjectPtr]['code']]) === true
-            || ($tokens[$subjectPtr]['code'] === \T_STRING
-                && isset(Collections::$objectOperators[$tokens[$preSubjectPtr]['code']]) === false)
-        ) {
-            // This is a syntax which is supported on PHP 5.5 and higher.
-            if ($this->supportsBelow('5.4') === true) {
-                $phpcsFile->addError(
-                    'The magic class constant ClassName::class was not available in PHP 5.4 or earlier',
-                    $stackPtr,
-                    'Found'
-                );
-            }
-
-            return;
-        }
-
-        /*
-         * This syntax was not supported until PHP 8.0.
-         *
-         * Includes throwing an error for syntaxes which are still not supported, as differentiating
-         * between them would be hard, if not impossible, and cause more overhead than it's worth.
-         */
-        $phpcsFile->addError(
-            'Using the magic class constant ::class with dynamic class names is not supported in PHP 7.4 or earlier',
-            $stackPtr,
-            'UsedOnObject'
-        );
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php b/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
deleted file mode 100644
index ef767157..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewMagicConstantDereferencingSniff.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\Sniff;
-use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-
-/**
- * Detect dereferencing of magic constants as allowed per PHP 8.0.
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/variable_syntax_tweaks#constants_and_magic_constants
- *
- * @since 10.0.0
- */
-class NewMagicConstantDereferencingSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return Collections::$magicConstants;
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens       = $phpcsFile->getTokens();
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($nextNonEmpty === false) {
-            return;
-        }
-
-        if ($tokens[$nextNonEmpty]['code'] !== \T_OPEN_SQUARE_BRACKET
-            // Work around bug #3013 in PHPCS 3.5.5 and lower.
-            && $tokens[$nextNonEmpty]['code'] !== \T_OPEN_SHORT_ARRAY
-        ) {
-            return;
-        }
-
-        if (isset($tokens[$nextNonEmpty]['bracket_closer']) === false) {
-            // Live coding or parse error.
-            return;
-        }
-
-        $hasContent = $phpcsFile->findNext(
-            Tokens::$emptyTokens,
-            ($nextNonEmpty + 1),
-            $tokens[$nextNonEmpty]['bracket_closer'],
-            true
-        );
-
-        if ($hasContent === false) {
-            /*
-             * Attempt to assign to the magic constant as if it were an array.
-             * Not allowed now, nor prior to PHP 8, so not our concern.
-             */
-            return;
-        }
-
-        // Make sure this isn't an array assignment. That would be illegal, i.e. a parse error.
-        $nextNext = $tokens[$nextNonEmpty]['bracket_closer'];
-        do {
-            $nextNext = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNext + 1), null, true);
-            if ($nextNext === false) {
-                break;
-            }
-
-            // If the next token is an assignment, that's all we need to know.
-            if (isset(BCTokens::assignmentTokens()[$tokens[$nextNext]['code']]) === true) {
-                return;
-            }
-
-            // Check if this is an multi-access array assignment, e.g., `__FILE__[1][2] = 'val';` .
-            if (($tokens[$nextNext]['code'] === \T_OPEN_SQUARE_BRACKET
-                // Work around for nested array access being incorrectly tokenized in PHPCS 2.8.x.
-                || $tokens[$nextNext]['code'] === \T_OPEN_SHORT_ARRAY)
-                && isset($tokens[$nextNext]['bracket_closer']) === true
-            ) {
-                $nextNext = $tokens[$nextNext]['bracket_closer'];
-                continue;
-            }
-
-            break;
-        } while (true);
-
-        $phpcsFile->addError(
-            'Dereferencing of magic constants is not present in PHP version 7.4 or earlier. Found dereferencing of: %s',
-            $nextNonEmpty,
-            'Found',
-            [$tokens[$stackPtr]['content']]
-        );
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php b/Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php
deleted file mode 100644
index 1e4c6b12..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewNestedStaticAccessSniff.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * (Nested) Static property and constant fetches as well as method calls can be applied to
- * any dereferencable expression since PHP 7.0.
- *
- * Class constants can be dereferenced since PHP 8.0.
- *
- * PHP version 7.0
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/uniform_variable_syntax
- * @link https://wiki.php.net/rfc/variable_syntax_tweaks#class_constant_dereferencability
- *
- * @since 10.0.0
- */
-class NewNestedStaticAccessSniff extends Sniff
-{
-
-    /**
-     * Access operators.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    private $accessOperators = [
-        \T_OBJECT_OPERATOR => true,
-        \T_DOUBLE_COLON    => true,
-    ];
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_DOUBLE_COLON];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // PHP 8.0 supports both nested static access and class constant dereferencing
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens       = $phpcsFile->getTokens();
-        $prev         = $stackPtr;
-        $seenBrackets = false;
-        $prevOperator = false;
-
-        do {
-            $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
-
-            if ($prev === false) {
-                return;
-            }
-
-            if ($tokens[$prev]['code'] === \T_CLOSE_SQUARE_BRACKET
-                || $tokens[$prev]['code'] === \T_CLOSE_CURLY_BRACKET
-            ) {
-                if (isset($tokens[$prev]['bracket_opener']) === false) {
-                    // Parse error.
-                    return;
-                }
-
-                $prev         = $tokens[$prev]['bracket_opener'];
-                $seenBrackets = true;
-                continue;
-            }
-
-            if ($tokens[$prev]['code'] === \T_CLOSE_PARENTHESIS) {
-                if (isset($tokens[$prev]['parenthesis_opener']) === false) {
-                    // Parse error.
-                    return;
-                }
-
-                $prev         = $tokens[$prev]['parenthesis_opener'];
-                $seenBrackets = true;
-                continue;
-            }
-
-            // Now this should either be a T_STRING or a T_VARIABLE.
-            if ($tokens[$prev]['code'] !== \T_STRING && $tokens[$prev]['code'] !== \T_VARIABLE) {
-                // Not sure what's happening, but this is outside the scope of this sniff.
-                return;
-            }
-
-            // OK, we have the start of the access, let see if it's nested.
-            $prevOperator = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
-            break;
-
-        } while (true);
-
-        if ($prevOperator === false
-            || isset($this->accessOperators[$tokens[$prevOperator]['code']]) === false
-        ) {
-            return;
-        }
-
-        // Class constants cannot be dereferenced before PHP 8.0.
-        if ($seenBrackets === false
-            && $tokens[$prev]['code'] === \T_STRING
-            && $tokens[$prevOperator]['code'] === \T_DOUBLE_COLON
-            && $this->supportsBelow('7.4') === true
-        ) {
-            $phpcsFile->addError(
-                'Dereferencing class constants was not supported in PHP 7.4 or earlier.',
-                $stackPtr,
-                'ClassConstantDereferenced'
-            );
-            return;
-        }
-
-        // This is nested static access.
-        if ($this->supportsBelow('5.6') === true) {
-            $phpcsFile->addError(
-                'Nested access to static properties, constants and methods was not supported in PHP 5.6 or earlier.',
-                $stackPtr,
-                'NestedStaticAccess'
-            );
-        }
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php b/Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php
deleted file mode 100644
index b9fc74e6..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewNonCapturingCatchSniff.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\Sniff;
-
-/**
- * Catching exceptions without capturing them to a variable is allowed since PHP 8.0.
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/non-capturing_catches
- * @link https://www.php.net/manual/en/language.exceptions.php#language.exceptions.catch
- *
- * @since 10.0.0
- */
-class NewNonCapturingCatchSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_CATCH];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
-
-        // Bow out during live coding.
-        if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
-            return;
-        }
-
-        $lastNonEmptyToken = $phpcsFile->findPrevious(
-            Tokens::$emptyTokens,
-            ($token['parenthesis_closer'] - 1),
-            $token['parenthesis_opener'],
-            true
-        );
-
-        if ($tokens[$lastNonEmptyToken]['code'] === \T_VARIABLE) {
-            return;
-        }
-
-        $phpcsFile->addError(
-            'Catching exceptions without capturing them to a variable is not supported in PHP 7.4 or earlier.',
-            $stackPtr,
-            'Found'
-        );
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php b/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
deleted file mode 100644
index 1239c10b..00000000
--- a/Magento2/Sniffs/PHPCompatibility/NewTrailingCommaSniff.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
-
-/**
- * Detect trailing comma's in function declarations and closure use lists as allowed since PHP 8.
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/trailing_comma_in_parameter_list
- * @link https://wiki.php.net/rfc/trailing_comma_in_closure_use_list
- *
- * @since 10.0.0
- */
-class NewTrailingCommaSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return Collections::functionDeclarationTokensBC();
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsBelow('7.4') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset(Collections::arrowFunctionTokensBC()[$tokens[$stackPtr]['code']]) === true) {
-            $arrowInfo = FunctionDeclarations::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
-            if ($arrowInfo === false) {
-                // Not an arrow function.
-                return;
-            }
-
-            $closer = $arrowInfo['parenthesis_closer'];
-        } else {
-            if (isset($tokens[$stackPtr]['parenthesis_closer']) === false) {
-                // Live coding or parse error.
-                return;
-            }
-
-            $closer = $tokens[$stackPtr]['parenthesis_closer'];
-        }
-
-        /*
-         * Check for trailing comma's in a function declaration parameter list.
-         */
-        $lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), null, true);
-
-        if ($tokens[$lastInParenthesis]['code'] === \T_COMMA) {
-            $phpcsFile->addError(
-                'Trailing comma\'s are not allowed in function declaration parameter lists in PHP 7.4 or earlier',
-                $lastInParenthesis,
-                'InParameterList'
-            );
-        }
-
-        /*
-         * From this point forward, we're only interested in closures to check for
-         * trailing comma's in closure use lists.
-         * Bow out for any of the other tokens.
-         */
-        if ($tokens[$stackPtr]['code'] !== \T_CLOSURE) {
-            return;
-        }
-
-        $usePtr = $phpcsFile->findNext(Tokens::$emptyTokens, ($closer + 1), null, true);
-        if ($usePtr === false || $tokens[$usePtr]['code'] !== \T_USE) {
-            // Closure without use list or live coding/parse error.
-            return;
-        }
-
-        $openParens = $phpcsFile->findNext(Tokens::$emptyTokens, ($usePtr + 1), null, true);
-        if ($openParens === false
-            || $tokens[$openParens]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$openParens]['parenthesis_closer']) === false
-        ) {
-            // Live coding/parse error.
-            return;
-        }
-
-        $closer            = $tokens[$openParens]['parenthesis_closer'];
-        $lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), null, true);
-
-        if ($tokens[$lastInParenthesis]['code'] === \T_COMMA) {
-            $phpcsFile->addError(
-                'Trailing comma\'s are not allowed in closure use lists in PHP 7.4 or earlier',
-                $lastInParenthesis,
-                'InClosureUseList'
-            );
-        }
-    }
-}

From 7bc37f1b4b0ef68d0263b759ba69e87162b25124 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 9 Feb 2022 12:34:37 +0100
Subject: [PATCH 470/630] Remove Tests for sniffs

---
 .../AbstractPrivateMethodsUnitTest.inc        |  44 -----
 .../AbstractPrivateMethodsUnitTest.php        | 139 ----------------
 .../NewAttributesUnitTest.inc                 | 112 -------------
 .../NewAttributesUnitTest.php                 | 154 ------------------
 ...nterpolatedStringDereferencingUnitTest.inc |  30 ----
 ...nterpolatedStringDereferencingUnitTest.php | 112 -------------
 .../NewMagicClassConstantUnitTest.inc         |  52 ------
 .../NewMagicClassConstantUnitTest.php         | 146 -----------------
 .../NewMagicConstantDereferencingUnitTest.inc |  40 -----
 .../NewMagicConstantDereferencingUnitTest.php | 110 -------------
 .../NewNestedStaticAccessUnitTest.inc         |  38 -----
 .../NewNestedStaticAccessUnitTest.php         | 144 ----------------
 .../NewNonCapturingCatchUnitTest.inc          |  34 ----
 .../NewNonCapturingCatchUnitTest.php          | 101 ------------
 .../NewTrailingCommaUnitTest.inc              | 101 ------------
 .../NewTrailingCommaUnitTest.php              | 138 ----------------
 16 files changed, 1495 deletions(-)
 delete mode 100644 Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php

diff --git a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc
deleted file mode 100644
index 216e8c62..00000000
--- a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-abstract class CrossVersionValid
-{
-    abstract public function publicOverload();
-    abstract protected static function protectedOverload();
-    private function privateNonOverloadable() {}
-}
-
-trait CrossVersionValidTrait
-{
-    abstract public static function publicOverload();
-    abstract protected function protectedOverload();
-    private function privateNonOverloadable() {}
-}
-
-// Abstract methods can not be declared in an anonymous class as the abstract keyword
-// will not be accepted for the class, but that is not our concern.
-$anon = new class() {
-    abstract public static function publicOverload();
-    abstract protected function protectedOverload();
-    private function privateNonOverloadable() {}
-};
-
-// PHP 5.1: abstract functions can not be private.
-abstract class CrossVersionInValid
-{
-    abstract private function privateOverload();
-    static private abstract function privateStaticOverload();
-}
-
-$anon = new class() {
-    abstract private function privateOverload();
-    static private abstract function privateStaticOverload();
-};
-
-/*
- * PHP 8.0: abstract private methods in traits.
- */
-trait CrossVersionInValidTrait
-{
-    abstract private function privateOverload();
-    static private abstract function privateStaticOverload();
-}
diff --git a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
deleted file mode 100644
index 598de668..00000000
--- a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the AbstractPrivateMethods sniff.
- *
- * @group abstractPrivateMethods
- * @group functiondeclarations
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\AbstractPrivateMethodsSniff
- *
- * @since 9.2.0
- * @since 10.0.0 Moved from `Classes` to `FunctionDeclarations`.
- */
-class AbstractPrivateMethodsUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Verify that the sniff throws an error for non-trait abstract private methods for PHP 5.1+.
-     *
-     * @dataProvider dataForbiddenAbstractPrivateMethods
-     *
-     * @param int $line The line number where an error is expected.
-     *
-     * @return void
-     */
-    public function testForbiddenAbstractPrivateMethods($line)
-    {
-        $file = $this->sniffFile(__FILE__, '5.1');
-        $this->assertError($file, $line, 'Abstract methods cannot be declared as private since PHP 5.1');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testForbiddenAbstractPrivateMethods()
-     *
-     * @return array
-     */
-    public function dataForbiddenAbstractPrivateMethods()
-    {
-        return [
-            [28],
-            [29],
-            [33],
-            [34],
-        ];
-    }
-
-    /**
-     * Verify that the sniff throws an error for abstract private methods in traits for PHP 7.4
-     * and doesn't for PHP 8.0.
-     *
-     * @dataProvider dataNewTraitAbstractPrivateMethods
-     *
-     * @param int $line The line number where a warning is expected.
-     *
-     * @return void
-     */
-    public function testNewTraitAbstractPrivateMethods($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, 'Traits cannot declare "abstract private" methods in PHP 7.4 or below');
-
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNewTraitAbstractPrivateMethods()
-     *
-     * @return array
-     */
-    public function dataNewTraitAbstractPrivateMethods()
-    {
-        return [
-            [42],
-            [43],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '5.1');
-        $this->assertNoViolation($file, $line);
-
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $cases = [];
-        // No errors expected on the first 24 lines.
-        for ($line = 1; $line <= 24; $line++) {
-            $cases[] = [$line];
-        }
-
-        return $cases;
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '5.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc
deleted file mode 100644
index 1817c84c..00000000
--- a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * Not attributes.
- */
-
-/*[StarComment*/
-//[SlashComment]
-# [HashComment]
-
-$var = 10; # Hash comment
-
-/*
- * PHP 8.0: Attributes.
- */
-
-#[Attribute]
-class MyAttribute {}
-
-#[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_FUNCTION)]
-class MyOtherAttribute {}
-
-#[MyAttribute]
-#[\MyExample\MyAttribute]
-#[MyAttribute(1234)]
-#[MyAttribute(value: 1234)]
-/**
- * docblock
- */
-#[MyAttribute(MyAttribute::VALUE)]
-#[MyAttribute(array("key" => "value"))]
-#[MyAttribute(100 + 200)]
-class Thing {}
-
-#[MyAttribute(1234), MyAttribute(5678)]
-class MultipleAttributesGrouped {}
-
-$object = new #[ExampleAttribute] class () { };
-
-#[WithoutArgument]
-#[Another\SingleArgument(0)]
-#[FewArguments('Hello', 'World')]
-#[\My\Attributes\FewArguments("foo", "bar")]
-function multipleAttributesMultipleLines() {}
-
-$f2 = #[ExampleAttribute] function () { };
-
-$f3 = #[ExampleAttribute] fn () => 1;
-
-#[WithoutArgument]#[SingleArgument(0)]#[FewArguments('Hello', 'World')]
-function multipleAttributesSingleLines() {}
-
-#[ORM\Entity]
-class User
-{
-    #[ORM\Id]#[ORM\Column("integer")]   #[ORM\GeneratedValue]
-    private $id;
-
-    #[Assert\Range(["min" => 120, "max" => 180, "minMessage" => "You must be at least {{ limit }}cm tall to enter"])]
-    #[ORM\Column(ORM\Column::T_INTEGER)]
-    protected $height;
-}
-
-#[Attr1, Attr2]
-class MultilineAttributeExamples
-{
-    #[Attr2("foo"),
-      Attr2("bar")]
-    public function testMultiLine()
-    {
-    }
-
-    #[
-      Attr1("foo"),
-      Attr2("bar"),
-    ]
-    public function testMultiLineDifferentFormatAndTrailingComma()
-    {
-    }
-}
-
-function attributeUsedForTypedParameter(
-    #[MyAttr([1, 2])] Type $myParam,
-) {}
-
-#[
-  ORM\Entity,
-  ORM\Table("user")
-]
-class AnotherMultilineAttributeTest
-{
-    #[ORM\Id, ORM\Column("integer"), ORM\GeneratedValue]
-    private $id;
-
-    #[ORM\Column("string", ORM\Column::UNIQUE)]
-    #[Assert\Email(["message" => "text"])] #[Assert\Text(["message" => "text"]),
-        Assert\Domain(["message" => "text"]),
-        Assert\Id(Assert\Id::REGEX[10]),
-    ]
-    private $email;
-}
-
-// This code will cause a tokenizer error in PHP < 8.0. This must be the last test in the file!
-#[DeprecationReason('reason: <https://some-website/reason?>')]
-function attribute_containing_text_looking_like_close_tag() {}
-const APP_SECRET = 'app-secret';
-echo "Test\n";
-
-#[DeprecationReason(
-    'reason: <https://some-website/reason?>'
-)]
-function attribute_containing_mulitline_text_looking_like_close_tag() {}
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
deleted file mode 100644
index 2b288c29..00000000
--- a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
-
-/**
- * Test the NewAttributes sniff.
- *
- * @group newAttributes
- * @group attributes
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewAttributesSniff
- *
- * @since 10.0.0
- */
-class NewAttributesUnitTest extends BaseSniffTest
-{
-
-    /**
-     * testNewAttributes
-     *
-     * @dataProvider dataNewAttributes
-     *
-     * @param int    $line  The line number.
-     * @param string $found Optional. Found attribute contents.
-     *
-     * @return void
-     */
-    public function testNewAttributes($line, $found = '')
-    {
-        $file  = $this->sniffFile(__FILE__, '7.4');
-        $error = 'Attributes are not supported in PHP 7.4 or earlier.';
-        if ($found !== '') {
-            $error .= ' Found: ' . $found;
-        }
-
-        $this->assertError($file, $line, $error);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNewAttributes()
-     *
-     * @return array
-     */
-    public function dataNewAttributes()
-    {
-        $data = [
-            [17],
-            [20],
-            [23],
-            [24],
-            [25],
-            [26],
-            [30],
-            [31],
-            [32],
-            [35],
-            [38],
-            [40],
-            [41],
-            [42],
-            [43],
-            [46],
-            [48],
-            [50, '#[WithoutArgument]'],
-            [50, '#[SingleArgument(0)]'],
-            [50, "#[FewArguments('Hello', 'World')]"],
-            [53],
-            [56, '#[ORM\Id]'],
-            [56, '#[ORM\Column("integer")]'],
-            [56, '#[ORM\GeneratedValue]'],
-            [59],
-            [60],
-            [64],
-            [67, '#[Attr2("foo"), Attr2("bar")]'],
-            [73, '#[ Attr1("foo"), Attr2("bar"), ]'],
-            [83, '#[MyAttr([1, 2])]'],
-            [86, '#[ ORM\Entity, ORM\Table("user") ]'],
-            [92],
-            [95],
-            [96, '#[Assert\Email(["message" => "text"])]'],
-            [96, '#[Assert\Text(["message" => "text"]), Assert\Domain(["message" => "text"]), Assert\Id(Assert\Id::REGEX[10]), ]'],
-            [104],
-        ];
-
-        /*
-         * In PHP < 8.0 in combination with PHPCS < 3.6.1, anything after the test case on
-         * line 104 will be tokenized as `T_INLINE_HTML` and undetectable.
-         */
-        if (version_compare(Helper::getVersion(), '3.6.1', '>=') === true
-            || version_compare(PHP_VERSION_ID, '80000', '>=') === true
-        ) {
-            $data[] = [109];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $data = [];
-
-        // No errors expected on the first 12 lines.
-        for ($line = 1; $line <= 12; $line++) {
-            $data[] = [$line];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc
deleted file mode 100644
index 17d50363..00000000
--- a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-// OK: strings that don't use interpolation or dereferencing.
-$a = 'foo';
-$a = "foo";
-$a = "foo
-bar";
-
-// OK: strings that use interpolation, but not dereferencing.
-$a = "$bar";
-$a = "foo$bar";
-$a = "foo
-$bar";
-
-// OK: strings that use dereferencing, but not interpolation.
-$a = 'foo'[0];
-$a = "foo"[0];
-$a = 'foo'->baz();
-$a = "foo"->baz();
-$a = "foo
-bar"->baz();
-
-// PHP 8.0: strings that use interpolation and dereferencing.
-$a = "foo$bar"[0];
-$a = "foo$bar"->baz();
-$a = "foo
-$bar"->baz();
-$a = "foo $lines
-$bar
-more foo"[10];
diff --git a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
deleted file mode 100644
index d2ab258d..00000000
--- a/Magento2/Tests/PHPCompatibility/NewInterpolatedStringDereferencingUnitTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the NewInterpolatedStringDereferencing sniff.
- *
- * @group newInterpolatedStringDereferencing
- * @group syntax
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewInterpolatedStringDereferencingSniff
- *
- * @since 10.0.0
- */
-class NewInterpolatedStringDereferencingUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Test that an error is thrown for interpolated string dereferencing prior to PHP 8.0.
-     *
-     * @dataProvider dataInterpolatedStringDereferencing
-     *
-     * @param int $line Line number where the error should occur.
-     *
-     * @return void
-     */
-    public function testInterpolatedStringDereferencing($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, 'Dereferencing of interpolated strings is not supported in PHP 7.4 or earlier');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testInterpolatedStringDereferencing
-     *
-     * @return array
-     */
-    public function dataInterpolatedStringDereferencing()
-    {
-        return [
-            [24],
-            [25],
-            [26],
-            [28],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            // No interpolation, no dereferencing.
-            [4],
-            [5],
-            [6],
-
-            // Interpolation, no dereferencing.
-            [10],
-            [11],
-            [12],
-
-            // Dereferencing, no interpolation.
-            [16],
-            [17],
-            [18],
-            [19],
-            [20],
-        ];
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc
deleted file mode 100644
index 5708f7af..00000000
--- a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace foo {
-    class bar {}
-
-    echo bar::class; // foo\bar
-}
-
-namespace MyNameSpace {
-    class xyz {}
-
-    remove_filter('theme_filter', [\MyNameSpace\xyz:: /* comment */ class, 'methodName'], 30);
-}
-
-/*
- * False positives check.
- */
-echo bar::classProp; // Not the keyword.
-$anon = new class {}; // Anonymous class, not the keyword.
-
-/*
- * Differentiate between Name::class (PHP 5.5) and $obj::class (PHP 8.0)
- */
-class Foo {
-    public function test() {
-        // PHP 5.5+.
-        if (class_exists(Name::class)) {}
-        if (class_exists(Vendor\Name::CLASS)) {}
-        if (class_exists(namespace\Name::class)) {}
-        if (class_exists(self::class)) {}
-        if (class_exists(parent::class)) {}
-        if (class_exists(static::class)) {}
-
-        // PHP 8.0+, but only if the result of the expression is an object.
-        if (class_exists($obj::class)) {}
-        var_dump((new stdClass)::Class);
-        var_dump((new MyClass($paramA, $paramB))::class);
-        if (class_exists($array['object']::class)) {}
-        if (class_exists($obj->otherObjectSavedAsProperty::class)) {}
-    }
-}
-
-/*
- * Syntaxes which are not supported in any version.
- * PHPCompatibility shouldn't throw an error for these, but it's darn hard to figure out if it's
- * a supported or non-supported syntax.
- * As it would be a fatal error anyway, don't bother differentiating for now.
- */
-$name = ($string = 'text')::class; // Using ::class on a string literal.
-$name = (1+1)::class; // Using ::class on a literal.
-const A = [0]::class; // Using ::class on a literal.
-$name = ClassName::CONSTANT_NAME::class; // Objects can not be set as the value for a constant.
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
deleted file mode 100644
index d4aa8e21..00000000
--- a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the NewMagicClassConstant sniff.
- *
- * @group newMagicClassConstant
- * @group constants
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewMagicClassConstantSniff
- *
- * @since 7.1.4
- */
-class NewMagicClassConstantUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Test correctly identifying the magic class constant.
-     *
-     * @dataProvider dataNewMagicClassConstant
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNewMagicClassConstant($line)
-    {
-        $file = $this->sniffFile(__FILE__, '5.4');
-        $this->assertError($file, $line, 'The magic class constant ClassName::class was not available in PHP 5.4 or earlier');
-
-        $file = $this->sniffFile(__FILE__, '5.5');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNewMagicClassConstant()
-     *
-     * @return array
-     */
-    public function dataNewMagicClassConstant()
-    {
-        return [
-            [6],
-            [12],
-            [27],
-            [28],
-            [29],
-            [30],
-            [31],
-            [32],
-        ];
-    }
-
-    /**
-     * Verify that no false positives are thrown for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '5.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            [4],
-            [10],
-            [18],
-            [19],
-        ];
-    }
-
-    /**
-     * Test correctly identifying the magic class constant when used on instantiated objects.
-     *
-     * @dataProvider dataNewMagicClassConstantOnObject
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNewMagicClassConstantOnObject($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, 'Using the magic class constant ::class with dynamic class names is not supported in PHP 7.4 or earlier');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNewMagicClassConstantOnObject()
-     *
-     * @return array
-     */
-    public function dataNewMagicClassConstantOnObject()
-    {
-        return [
-            [35],
-            [36],
-            [37],
-            [38],
-            [39],
-
-            // Still not supported, but throwing an error anyhow.
-            [49],
-            [50],
-            [51],
-            [52],
-        ];
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc
deleted file mode 100644
index 5c5ef295..00000000
--- a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * OK - normal use of magic constants.
- */
-require __DIR__ . '/filename.php';
-expectsCallback([__CLASS__, 'method']);
-
-// Not a magic constant.
-echo __MAGIC__;
-
-/*
- * PHP 8.0: Magic constant dereferencing.
- */
-echo __FUNCTION__[0];
-$a = array(__trait__[$i]);
-$b = __NAMESPACE__[$x][$y];
-expectsCallback([__CLASS__[strlen(__CLASS__) - 1], 'method']);
-$var = functionCall(__METHOD__[++$i]);
-echo __LINE__[0][1];
-echo __file__[strlen(__FILE__) - 1];
-require __DIR__[0];
-
-/*
- * Check against false positives.
- */
-
-// Array assignments to magic constants is not possible.
-__NAMESPACE__[] = 'x';
-__Dir__[ /* comment */ ] += 'x';
-__line__[0] -= 'x';
-__METHOD__[0][1] .= 'x';
-__namespace__[0][1][2] *= 'x';
-
-// Dereferencing using curly braces is not supported.
-echo __LINE__{0};
-
-// Live coding.
-// Intentional parse error, this has to be the last test case in the file.
-echo __METHOD__[
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
deleted file mode 100644
index 527845c4..00000000
--- a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the NewMagicConstantDereferencing sniff.
- *
- * @group newMagicConstantDereferencing
- * @group syntax
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewMagicConstantDereferencingSniff
- *
- * @since 10.0.0
- */
-class NewMagicConstantDereferencingUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Test that an error is thrown for magic constant dereferencing prior to PHP 8.
-     *
-     * @dataProvider dataNewMagicConstantDereferencing
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNewMagicConstantDereferencing($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, 'Dereferencing of magic constants is not present in PHP version 7.4 or earlier');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNewMagicConstantDereferencing()
-     *
-     * @return array
-     */
-    public function dataNewMagicConstantDereferencing()
-    {
-        return [
-            [15],
-            [16],
-            [17],
-            [18],
-            [19],
-            [20],
-            [21],
-            [22],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code, nor for code which is still invalid.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            [6],
-            [7],
-            [10],
-            [29],
-            [30],
-            [31],
-            [32],
-            [33],
-            [36],
-            [40],
-        ];
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc
deleted file mode 100644
index da51bbe5..00000000
--- a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-// Non-nested static access is valid cross version.
-echo $foo['bar']::$baz;
-
-// PHP 7.0: new nested static access to properties, constants and method calls.
-echo $foo::$bar::$baz;
-echo $foo::$bar::BAZ;
-echo $foo->bar()::baz();
-echo $instance->prop::MY_CONSTANT;
-echo $bar::$foo['bar']::$baz;
-echo $bar::$foo{'bar'}::$baz;
-echo $bar::foo()['bar']::$baz;
-echo $bar::foo(){'bar'}::$baz;
-echo Foo::$boo::$baz;
-echo self::$boo::$baz;
-echo self::MY_CONSTANT[0]::$baz;
-echo Foo::MY_CONSTANT[0]::$baz;
-echo Bar::$bar::BAZ;
-
-// Test code style independent sniffing.
-echo $obj  ->   /* comment */ $var()
-	 :: $bar; // Bad.
-
-// PHP 7.0 change, but outside the scope of this sniff
-// (dereferencing operations can now be applied to arbitrary parenthesis-expressions).
-echo ($foo::$bar)::$baz;
-echo ($foo->bar())::baz();
-
-// Parse error in any PHP version. Outside the scope of this sniff.
-echo $bar::($foo['bar'])::$baz;
-
-// PHP 8.0: class constant dereferencing.
-self::MY_CONSTANT::$baz;
-Foo::MY_CONSTANT::$baz;
-
-// Issue #1016.
-echo Foo::bar()::baz();
diff --git a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
deleted file mode 100644
index 22650e6b..00000000
--- a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the NewNestedStaticAccess sniff.
- *
- * @group newNestedStaticAccess
- * @group syntax
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewNestedStaticAccessSniff
- *
- * @since 10.0.0
- */
-class NewNestedStaticAccessUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Verify that nested static access emits an error in PHP 5.6, but not in PHP 7.0.
-     *
-     * @dataProvider dataNestedStaticAccess
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNestedStaticAccess($line)
-    {
-        $file = $this->sniffFile(__FILE__, '5.6');
-        $this->assertError($file, $line, 'Nested access to static properties, constants and methods was not supported in PHP 5.6 or earlier.');
-
-        $file = $this->sniffFile(__FILE__, '7.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNestedStaticAccess()
-     *
-     * @return array
-     */
-    public function dataNestedStaticAccess()
-    {
-        return [
-            [7],
-            [8],
-            [9],
-            [10],
-            [11],
-            [12],
-            [13],
-            [14],
-            [15],
-            [16],
-            [17],
-            [18],
-            [19],
-            [23],
-            [38],
-        ];
-    }
-
-    /**
-     * Verify that class constant dereferencing emits an error in PHP 7.4.
-     *
-     * @dataProvider dataClassConstantDereferencing
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testClassConstantDereferencing($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, 'Dereferencing class constants was not supported in PHP 7.4 or earlier.');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testClassConstantDereferencing()
-     *
-     * @return array
-     */
-    public function dataClassConstantDereferencing()
-    {
-        return [
-            [34],
-            [35],
-        ];
-    }
-
-    /**
-     * Verify the sniff doesn't throw false positives.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '5.6');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            [4],
-            [27],
-            [28],
-            [31],
-        ];
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc
deleted file mode 100644
index a8a9881f..00000000
--- a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Valid pre-PHP 8.0.
- */
-try {
-    foo();
-} catch (SomeException $ex) {
-    die($ex->getMessage());
-} catch (ExceptionType1 | ExceptionType2 $e) {
-    die($e->getMessage());
-} catch (CustomException::class $e) {
-   // ...
-}
-
-/**
- * Non-capturing catch - only valid in PHP 8.0+.
- */
-try {
-   // Some code...
-} catch (ExceptionType1 | ExceptionType2) {
-   // Code to handle the exception.
-} catch (CustomException::class) {
-   // ...
-} catch ($exceptionObject::class) { // PHP 8 syntax - using ::class on objects.
-   // ...
-} catch (\Exception) {
-   // ...
-}
-
-// Don't throw errors during live code review.
-try {
-   // Some code...
-} catch (
diff --git a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
deleted file mode 100644
index 97ee69e0..00000000
--- a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the NewNonCapturingCatch sniff.
- *
- * @group newNonCapturingCatch
- * @group controlStructures
- * @group exceptions
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewNonCapturingCatchSniff
- *
- * @since 10.0.0
- */
-class NewNonCapturingCatchUnitTest extends BaseSniffTest
-{
-
-    /**
-     * testNewNonCapturingCatch
-     *
-     * @dataProvider dataNewNonCapturingCatch
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNewNonCapturingCatch($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, 'Catching exceptions without capturing them to a variable is not supported in PHP 7.4 or earlier.');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNewNonCapturingCatch()
-     *
-     * @return array
-     */
-    public function dataNewNonCapturingCatch()
-    {
-        return [
-            [21],
-            [23],
-            [25],
-            [27],
-        ];
-    }
-
-    /**
-     * Verify no false positives are thrown for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            [8],
-            [10],
-            [12],
-            [34], // Live coding.
-        ];
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc
deleted file mode 100644
index 4ee5f21f..00000000
--- a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/*
- * Allowed pre-PHP 8.0.
- */
-function Foo7(
-    $foo,
-    $bar
-) {
-    return $foo + $bar;
-}
-
-$closure = function ($foo, $bar) use ($baz, $booboo) {
-    return ($foo + $bar) * $baz / $booboo;
-};
-
-$arrow = fn($foo, $bar) => $foo + $bar;
-
-class LotsOfParams7 {
-    private function __construct(
-        ?string $scheme,
-        ?string $user,
-        ?string $pass,
-        ?string $host,
-        ?int $port,
-        string $path,
-        ?string $query,
-        ?string $fragment // <-- ARGH!
-    ) {
-        // Do something.
-    }
-}
-
-/*
- * PHP 8.0 trailing comma's in function declarations.
- */
-function Foo8(
-    $foo,
-    $bar,
-) {
-    return $foo + $bar;
-}
-
-$closure = function ($foo, $bar,) {
-    return $foo + $bar;
-};
-
-$arrow = fn($foo, $bar,) => $foo + $bar;
-
-class LotsOfParams8 {
-    private function __construct(
-        ?string $scheme,
-        ?string $user,
-        ?string $pass,
-        ?string $host,
-        ?int $port,
-        string $path,
-        ?string $query,
-        ?string $fragment, // Trailing comment.
-    ) {
-        // Do something.
-    }
-}
-
-/*
- * PHP 8.0 trailing comma's in closure use lists.
- */
-$closure = function ($foo, $bar) use ($baz, $booboo,) {
-    return ($foo + $bar) * $baz / $booboo;
-};
-
-$longArgs_longVars = function (
-    $longArgument,
-    $longerArgument,
-    $muchLongerArgument,
-) use (
-    $longVar1,
-    $longerVar2,
-    $muchLongerVar3,
-) {
-   // body
-};
-
-/*
- * Still not allowed.
- */
-
-// Free-standing comma.
-$c = function(,) {}; // Parse error, but throw an error anyway.
-
-$c = function($foo) use(,) {}; // Parse error, but throw an error anyway.
-
-// Multiple trailing comma's.
-$a = fn($foo, $bar,,) => $bar; // Parse error, but throw an error anyway.
-
-// Leading comma.
-function Leading(, $foo, $bar) {} // Parse error, but not our concern.
-
-// Live coding.
-// Intentional parse error. This has to be the last test in the file.
-function Unfinished( $foo, $bar,
diff --git a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
deleted file mode 100644
index 0d3e93fd..00000000
--- a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the NewTrailingComma sniff.
- *
- * @group newTrailingComma
- * @group syntax
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\NewTrailingCommaSniff
- *
- * @since 10.0.0
- */
-class NewTrailingCommaUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Test correctly identifying trailing comma's in function declarations.
-     *
-     * @dataProvider dataTrailingComma
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testTrailingComma($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, "Trailing comma's are not allowed in function declaration parameter lists in PHP 7.4 or earlier");
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testTrailingComma()
-     *
-     * @return array
-     */
-    public function dataTrailingComma()
-    {
-        return [
-            [39],
-            [44],
-            [48],
-            [59],
-            [75],
-            [89],
-            [94],
-        ];
-    }
-
-    /**
-     * Test correctly identifying trailing comma's in closure use lists.
-     *
-     * @dataProvider dataTrailingCommaClosureUse
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testTrailingCommaClosureUse($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertError($file, $line, "Trailing comma's are not allowed in closure use lists in PHP 7.4 or earlier");
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testTrailingCommaClosureUse()
-     *
-     * @return array
-     */
-    public function dataTrailingCommaClosureUse()
-    {
-        return [
-            [68],
-            [79],
-            [91],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        // No errors expected on the first 33 lines.
-        $data = [];
-        for ($line = 1; $line <= 33; $line++) {
-            $data[] = [$line];
-        }
-
-        $data[] = [97];
-        $data[] = [101];
-
-        return $data;
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file);
-    }
-}

From caf7bae770eb3e1a8e3bd2fcd9b4469e51d1cdb5 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 9 Feb 2022 15:49:04 +0000
Subject: [PATCH 471/630] Excluded lowest composer dependencies for PHP 8.1

---
 .github/workflows/php.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5ae04f43..e579cf3c 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,8 +20,9 @@ jobs:
         dependencies:
           - "lowest"
           - "highest"
-        experimental:
-          - false
+        exclude:
+          - php-version: "8.1"
+            dependencies: "lowest"
     name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:

From 89c8442bcc62ceaaee3eeb7562d88b6cc877e92b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 9 Feb 2022 17:20:20 +0000
Subject: [PATCH 472/630] AC-2221: Autofix for ThisInTemplate Sniff

---
 .../Sniffs/Templates/ThisInTemplateSniff.php  | 48 +++++--------------
 .../ThisInTemplateUnitTest.inc.fixed          |  5 ++
 .../Templates/ThisInTemplateUnitTest.php      |  2 +-
 3 files changed, 19 insertions(+), 36 deletions(-)
 create mode 100644 Magento2/Tests/Templates/ThisInTemplateUnitTest.inc.fixed

diff --git a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
index 9b5e5358..74c27a6e 100644
--- a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+++ b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
@@ -13,33 +13,8 @@
  */
 class ThisInTemplateSniff implements Sniff
 {
-    /**
-     * Warning violation code.
-     *
-     * @var string
-     */
-    protected $warningCodeFoundHelper = 'FoundHelper';
-
-    /**
-     * String representation of warning.
-     *
-     * @var string
-     */
-    protected $warningMessageFoundHelper = 'The use of helpers in templates is discouraged. Use ViewModel instead.';
-
-    /**
-     * Warning violation code.
-     *
-     * @var string
-     */
-    protected $warningCodeFoundThis = 'FoundThis';
-
-    /**
-     * String representation of warning.
-     *
-     * @var string
-     */
-    protected $warningMessageFoundThis = 'The use of $this in templates is deprecated. Use $block instead.';
+    private const MESSAGE_THIS = 'The use of $this in templates is deprecated. Use $block instead.';
+    private const MESSAGE_HELPER = 'The use of helpers in templates is discouraged. Use ViewModel instead.';
 
     /**
      * @inheritdoc
@@ -54,14 +29,17 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[$stackPtr]['content'] === '$this') {
-            $position = $phpcsFile->findNext(T_STRING, $stackPtr, null, false, 'helper', true);
-            if ($position !== false) {
-                $phpcsFile->addWarning($this->warningMessageFoundHelper, $position, $this->warningCodeFoundHelper);
-            } else {
-                $phpcsFile->addWarning($this->warningMessageFoundThis, $stackPtr, $this->warningCodeFoundThis);
-            }
+        if ($phpcsFile->getTokensAsString($stackPtr, 1) !== '$this') {
+            return;
+        }
+        $isHelperCall = $phpcsFile->findNext(T_STRING, $stackPtr, null, false, 'helper', true);
+        if ($isHelperCall) {
+            $phpcsFile->addWarning(self::MESSAGE_HELPER, $stackPtr, 'FoundHelper');
+        }
+        if ($phpcsFile->addFixableWarning(self::MESSAGE_THIS, $stackPtr, 'FoundThis') === true) {
+            $phpcsFile->fixer->beginChangeset();
+            $phpcsFile->fixer->replaceToken($stackPtr, '$block');
+            $phpcsFile->fixer->endChangeset();
         }
     }
 }
diff --git a/Magento2/Tests/Templates/ThisInTemplateUnitTest.inc.fixed b/Magento2/Tests/Templates/ThisInTemplateUnitTest.inc.fixed
new file mode 100644
index 00000000..04e0ae31
--- /dev/null
+++ b/Magento2/Tests/Templates/ThisInTemplateUnitTest.inc.fixed
@@ -0,0 +1,5 @@
+<?php
+echo $block->escapeHtml($block->getGroupCode());
+echo $block->escapeHtml($block->getGroupCode());
+$block->foo();
+$block->helper();
diff --git a/Magento2/Tests/Templates/ThisInTemplateUnitTest.php b/Magento2/Tests/Templates/ThisInTemplateUnitTest.php
index 96d8661f..d2bed803 100644
--- a/Magento2/Tests/Templates/ThisInTemplateUnitTest.php
+++ b/Magento2/Tests/Templates/ThisInTemplateUnitTest.php
@@ -25,7 +25,7 @@ public function getWarningList()
         return [
             3 => 2,
             4 => 1,
-            5 => 1,
+            5 => 2,
         ];
     }
 }

From df01d64ace85ac653b803e98b835c572d0dd497e Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 9 Feb 2022 18:18:28 +0000
Subject: [PATCH 473/630] AC-2220: Removed obsolete layout check

---
 Magento2/Sniffs/Legacy/LayoutSniff.php   | 33 +-----------------------
 Magento2/Tests/Legacy/LayoutUnitTest.php |  1 -
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 78b67b21..4b2fe240 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -18,7 +18,6 @@
 class LayoutSniff implements Sniff
 {
     private const ERROR_CODE_XML = 'WrongXML';
-    private const ERROR_CODE_NOT_ALLOWED = 'NotAllowed';
     private const ERROR_CODE_OBSOLETE_BLOCK = 'ObsoleteBlock';
     private const ERROR_CODE_OBSOLETE_CLASS = 'ObsoleteClass';
     private const ERROR_CODE_OBSOLETE_TOHTML_ATTRIBUTE = 'ObsoleteToHtmlAttribute';
@@ -230,7 +229,6 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $this->testObsoleteReferences($layout, $phpcsFile);
-        $this->testHeadBlocks($layout, $phpcsFile);
         $this->testOutputAttribute($layout, $phpcsFile);
         $this->testHelperAttribute($layout, $phpcsFile);
         $this->testListText($layout, $phpcsFile);
@@ -276,35 +274,6 @@ private function getFormattedXML(File $phpcsFile)
         return $doc->saveXML();
     }
 
-    /**
-     * Check that CSS, Link and Script blocks are inside a head block
-     *
-     * @param SimpleXMLElement $layout
-     * @param File $phpcsFile
-     */
-    private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile): void
-    {
-        $selectorHeadBlock = '(name()="block" or name()="referenceBlock") and ' .
-            '(@name="head" or @name="convert_root_head" or @name="vde_head")';
-        $elements = $layout->xpath(
-            '//block[@class="Magento\Theme\Block\Html\Head\Css" ' .
-            'or @class="Magento\Theme\Block\Html\Head\Link" ' .
-            'or @class="Magento\Theme\Block\Html\Head\Script"]' .
-            '/parent::*[not(' .
-            $selectorHeadBlock .
-            ')]'
-        );
-        if (!empty($elements)) {
-            $phpcsFile->addError(
-                'Blocks \Magento\Theme\Block\Html\Head\{Css,Link,Script} ' .
-                'are allowed within the "head" block only. ' .
-                'Verify integrity of the nodes nesting.',
-                dom_import_simplexml($elements[0])->getLineNo(),
-                self::ERROR_CODE_NOT_ALLOWED
-            );
-        };
-    }
-
     /**
      * Check that the output attribute has the right value
      *
@@ -378,7 +347,7 @@ private function testListText(SimpleXMLElement $layout, File $phpcsFile): void
                 dom_import_simplexml($elements[0])->getLineNo()-1,
                 self::ERROR_CODE_OBSOLETE_CLASS
             );
-        };
+        }
     }
 
     /**
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.php b/Magento2/Tests/Legacy/LayoutUnitTest.php
index 8e7a6551..b793159e 100644
--- a/Magento2/Tests/Legacy/LayoutUnitTest.php
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.php
@@ -18,7 +18,6 @@ public function getErrorList($testFile = '')
             return [
                 13 => 1,
                 22 => 1,
-                23 => 1,
                 145 => 1,
                 148 => 1,
             ];

From 3fbc03f4b96db214edfc2bf82cab8745be52cb92 Mon Sep 17 00:00:00 2001
From: Eduard Muradov <eduard.muradov@amasty.com>
Date: Thu, 10 Feb 2022 18:08:22 +0300
Subject: [PATCH 474/630] Exclude minified JS files.

---
 Magento2/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 0217d113..5efe99f5 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -5,6 +5,9 @@
     <!-- File extensions to be checked. -->
     <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>
 
+    <!-- Exclude minified JS files. -->
+    <exclude-pattern>*\.min\.js$</exclude-pattern>
+
     <!-- Severity 10 errors: Critical code issues. -->
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
         <severity>10</severity>

From 4216638b0584a56b840ae2602f4ebc0b4217fe89 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 11 Feb 2022 10:35:45 +0100
Subject: [PATCH 475/630] AC-2222: [UCT Autofixing]
 PHPCompatibility.ForbiddenFinalPrivateMethods

---
 .../ForbiddenFinalPrivateMethodsSniff.php     | 23 ++---
 .../ForbiddenFinalPrivateMethodsUnitTest.inc  | 32 +------
 ...iddenFinalPrivateMethodsUnitTest.inc.fixed | 21 +++++
 .../ForbiddenFinalPrivateMethodsUnitTest.php  | 84 ++++---------------
 4 files changed, 51 insertions(+), 109 deletions(-)
 create mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed

diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
index 51fa3d69..ab8c289a 100644
--- a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
@@ -35,6 +35,7 @@
  */
 class ForbiddenFinalPrivateMethodsSniff extends Sniff
 {
+    private const MESSAGE_FINAL = 'Private methods should not be declared as final since PHP 8.0';
 
     /**
      * Returns an array of tokens this test wants to listen for.
@@ -61,10 +62,6 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        if ($this->supportsAbove('8.0') === false) {
-            return;
-        }
-
         if (Scopes::isOOMethod($phpcsFile, $stackPtr) === false) {
             // Function, not method.
             return;
@@ -83,14 +80,18 @@ public function process(File $phpcsFile, $stackPtr)
 
         $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
         if ($properties['scope'] !== 'private' || $properties['is_final'] === false) {
-            // Not an private final method.
+            // Not a private final method.
             return;
         }
-
-        $phpcsFile->addWarning(
-            'Private methods should not be declared as final since PHP 8.0',
-            $stackPtr,
-            'Found'
-        );
+        $phpcsFile->fixer->enabled = true;
+        if ($phpcsFile->addFixableWarning(self::MESSAGE_FINAL, $stackPtr, 'Found') === true) {
+            $phpcsFile->fixer->beginChangeset();
+            $prev = $phpcsFile->findPrevious(\T_FINAL, ($stackPtr - 1));
+            $phpcsFile->fixer->replaceToken($prev, null);
+            // Remove extra space left out by previous replacement
+            $next = $phpcsFile->findNext(\T_WHITESPACE, $prev);
+            $phpcsFile->fixer->replaceToken($next, null);
+            $phpcsFile->fixer->endChangeset();
+        }
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
index 486d0584..803c0033 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
@@ -1,47 +1,21 @@
 <?php
 
-/*
- * OK cross version.
- */
-class CrossVersionValid
-{
-    private final function __construct() {}
-    final public function publicFinal() {}
-    final protected static function protectedFinal() {}
-    private function privateNonOverloadable() {}
-}
-
-trait CrossVersionValidTrait
-{
-    final private function __CONSTRUCT() {}
-    final public static function publicFinal() {}
-    final protected function protectedFinal() {}
-    private function privateStillOverloadable() {} // Open question in RFC PR https://github.com/php/php-src/pull/5401
-}
-
-$anon = new class() {
-    final private function __Construct() {}
-    final public static function publicFinal();
-    final protected function protectedFinal();
-    private function privateNonOverloadable() {}
-};
-
-/*
- * PHP 8.0: private methods cannot be final as they are never overridden by other classes.
- */
 class CrossVersionInValid
 {
+    private final function __construct() {}
     final private function privateFinal();
     static private final function privateStaticFinal();
 }
 
 $anon = new class() {
+    private final function __construct() {}
     final private function privateFinal();
     static final private function privateStaticFinal();
 };
 
 trait CrossVersionInValidTrait
 {
+    private final function __construct() {}
     final private function privateFinal();
     static private final function privateStaticFinal();
 }
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
new file mode 100644
index 00000000..46457ab4
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
@@ -0,0 +1,21 @@
+<?php
+
+class CrossVersionInValid
+{
+    private final function __construct() {}
+    private function privateFinal();
+    static private function privateStaticFinal();
+}
+
+$anon = new class() {
+    private final function __construct() {}
+    private function privateFinal();
+    static private function privateStaticFinal();
+};
+
+trait CrossVersionInValidTrait
+{
+    private final function __construct() {}
+    private function privateFinal();
+    static private function privateStaticFinal();
+}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
index d82486b2..d8261c21 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -10,6 +10,8 @@
 
 namespace Magento2\Tests\PHPCompatibility;
 
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
 /**
  * Test the ForbiddenFinalPrivateMethods sniff.
  *
@@ -20,84 +22,28 @@
  *
  * @since 10.0.0
  */
-class ForbiddenFinalPrivateMethodsUnitTest extends BaseSniffTest
+class ForbiddenFinalPrivateMethodsUnitTest extends AbstractSniffUnitTest
 {
-
     /**
-     * Verify that the sniff throws a warning for non-construct final private methods for PHP 8.0+.
-     *
-     * @dataProvider dataForbiddenFinalPrivateMethods
-     *
-     * @param int $line The line number where a warning is expected.
-     *
-     * @return void
+     * @inheritdoc
      */
-    public function testForbiddenFinalPrivateMethods($line)
+    public function getErrorList()
     {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Private methods should not be declared as final since PHP 8.0');
+        return [];
     }
 
     /**
-     * Data provider.
-     *
-     * @see testForbiddenFinalPrivateMethods()
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function dataForbiddenFinalPrivateMethods()
+    public function getWarningList()
     {
-        return [
-            [34],
-            [35],
-            [39],
-            [40],
-            [45],
-            [46],
+       return [
+            6 => 1,
+            7 => 1,
+            12 => 1,
+            13 => 1,
+            19 => 1,
+            20 => 1,
         ];
     }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $cases = [];
-        // No errors expected on the first 28 lines.
-        for ($line = 1; $line <= 28; $line++) {
-            $cases[] = [$line];
-        }
-
-        return $cases;
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
-    }
 }

From 56fcc1ae02fcdf82111785bc82e56a1313bbcaad Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 11 Feb 2022 11:06:29 +0100
Subject: [PATCH 476/630] AC-2222: [UCT Autofixing]
 PHPCompatibility.ForbiddenFinalPrivateMethods

---
 .../PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
index ab8c289a..85b2fe11 100644
--- a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
@@ -83,7 +83,7 @@ public function process(File $phpcsFile, $stackPtr)
             // Not a private final method.
             return;
         }
-        $phpcsFile->fixer->enabled = true;
+
         if ($phpcsFile->addFixableWarning(self::MESSAGE_FINAL, $stackPtr, 'Found') === true) {
             $phpcsFile->fixer->beginChangeset();
             $prev = $phpcsFile->findPrevious(\T_FINAL, ($stackPtr - 1));

From 6d9a5c9ece98f854bc35d587c31c79bfb76a86e9 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 11 Feb 2022 12:52:41 +0100
Subject: [PATCH 477/630] AC-2222: [UCT Autofixing]
 PHPCompatibility.ForbiddenFinalPrivateMethods

---
 .../ForbiddenFinalPrivateMethodsUnitTest.inc              | 8 +++++++-
 .../ForbiddenFinalPrivateMethodsUnitTest.inc.fixed        | 8 +++++++-
 .../ForbiddenFinalPrivateMethodsUnitTest.php              | 8 ++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
index 803c0033..660c6b57 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
@@ -1,21 +1,27 @@
 <?php
 
-class CrossVersionInValid
+final class CrossVersionInValid
 {
     private final function __construct() {}
     final private function privateFinal();
     static private final function privateStaticFinal();
+    static protected final function protectedStaticFinal();
+    final protected function protectedFinal();
 }
 
 $anon = new class() {
     private final function __construct() {}
     final private function privateFinal();
     static final private function privateStaticFinal();
+    final protected function protectedFinal();
+    static final protected function protectedStaticFinal();
 };
 
 trait CrossVersionInValidTrait
 {
     private final function __construct() {}
     final private function privateFinal();
+    final protected function protectedFinal();
     static private final function privateStaticFinal();
+    static protected final function protectedStaticFinal();
 }
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
index 46457ab4..6fdca790 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
@@ -1,21 +1,27 @@
 <?php
 
-class CrossVersionInValid
+final class CrossVersionInValid
 {
     private final function __construct() {}
     private function privateFinal();
     static private function privateStaticFinal();
+    static protected final function protectedStaticFinal();
+    final protected function protectedFinal();
 }
 
 $anon = new class() {
     private final function __construct() {}
     private function privateFinal();
     static private function privateStaticFinal();
+    final protected function protectedFinal();
+    static final protected function protectedStaticFinal();
 };
 
 trait CrossVersionInValidTrait
 {
     private final function __construct() {}
     private function privateFinal();
+    final protected function protectedFinal();
     static private function privateStaticFinal();
+    static protected final function protectedStaticFinal();
 }
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
index d8261c21..272487d3 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -40,10 +40,10 @@ public function getWarningList()
        return [
             6 => 1,
             7 => 1,
-            12 => 1,
-            13 => 1,
-            19 => 1,
-            20 => 1,
+            14 => 1,
+            15 => 1,
+            23 => 1,
+            25 => 1,
         ];
     }
 }

From feea2ea7d462b3625745f5f83caee64abb3a2205 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Mon, 14 Feb 2022 16:44:17 +0100
Subject: [PATCH 478/630] Add autofixing

---
 ...unctionsDeprecatedWithoutArgumentSniff.php | 25 +++++++++-----
 ...eprecatedWithoutArgumentUnitTest.inc.fixed | 33 +++++++++++++++++++
 2 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 331e918e..9c2ab62d 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -31,15 +31,15 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
     private const WARNING_CODE = 'FunctionsDeprecatedWithoutArgument';
 
     /**
-     * Deprecated functions without argument.
+     * Deprecated functions without argument
      *
      * @var array
      */
-    private const FUNCTIONS_LIST = [
-        'mb_check_encoding',
-        'get_class',
-        'get_parent_class',
-        'get_called_class'
+    private const DEPRECATED_FUNCTIONS_AND_FIXES = [
+        'mb_check_encoding' => 'null',
+        'get_class' => '$this',
+        'get_parent_class' => '$this',
+        'get_called_class' => '$this'
     ];
 
     /**
@@ -66,8 +66,17 @@ public function process(File $phpcsFile, $stackPtr): void
 
         $functionName = $phpcsFile->getTokensAsString($phpcsFile->findPrevious(T_STRING, $stackPtr), 1);
 
-        if (in_array($functionName, self::FUNCTIONS_LIST)) {
-            $phpcsFile->addWarning(sprintf(self::WARNING_MESSAGE, $functionName), $stackPtr, self::WARNING_CODE);
+        if (in_array($functionName, array_keys(self::DEPRECATED_FUNCTIONS_AND_FIXES))) {
+            if ($phpcsFile->addFixableWarning(
+                sprintf(self::WARNING_MESSAGE, $functionName),
+                $stackPtr,
+                self::WARNING_CODE
+            ) === true) {
+                $content = self::DEPRECATED_FUNCTIONS_AND_FIXES[$functionName];
+                $phpcsFile->fixer->beginChangeset();
+                $phpcsFile->fixer->addContentBefore($phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr), $content);
+                $phpcsFile->fixer->endChangeset();
+            }
         }
     }
 }
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
new file mode 100644
index 00000000..ba3b20bd
--- /dev/null
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Tests\Functions;
+
+/**
+ * Class to test validate PHP functions usage of which without passing arguments.
+ */
+class FunctionsDeprecatedWithoutArgument
+{
+    /**
+     * Test deprecation function.
+     *
+     * @return array
+     */
+    public function testDeprecatedMethod(): array
+    {
+        return [
+            mb_check_encoding(null), // Calling without argument is deprecated.
+            mb_check_encoding('test-argument', null),
+            get_class($this), // Calling without argument is deprecated.
+            get_class(new FunctionsDeprecatedWithoutArgument()),
+            get_parent_class($this), // Calling without argument is deprecated.
+            get_parent_class('test-argument'),
+            get_called_class($this), // Calling without argument is deprecated.
+            get_called_class('test-argument')
+        ];
+    }
+}

From f251190f161e8ee680287c055bb13b1d139da507 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <loginesta@gmail.com>
Date: Tue, 15 Feb 2022 10:41:22 +0100
Subject: [PATCH 479/630] Update
 Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php

Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
---
 .../Functions/FunctionsDeprecatedWithoutArgumentSniff.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 9c2ab62d..54bd273c 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -31,7 +31,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
     private const WARNING_CODE = 'FunctionsDeprecatedWithoutArgument';
 
     /**
-     * Deprecated functions without argument
+     * Deprecated functions without argument https://wiki.php.net/rfc/deprecations_php_8_1
      *
      * @var array
      */

From d82d35ef5b5ccc12cb028788414e033d8801ec5b Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 15 Feb 2022 10:44:20 +0100
Subject: [PATCH 480/630] Remove get_called_class

---
 .../Functions/FunctionsDeprecatedWithoutArgumentSniff.php     | 3 +--
 .../Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc  | 4 +---
 .../FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed      | 4 +---
 .../Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php  | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 9c2ab62d..31759f46 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -38,8 +38,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
     private const DEPRECATED_FUNCTIONS_AND_FIXES = [
         'mb_check_encoding' => 'null',
         'get_class' => '$this',
-        'get_parent_class' => '$this',
-        'get_called_class' => '$this'
+        'get_parent_class' => '$this'
     ];
 
     /**
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
index 63b449b9..44b305d1 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
@@ -25,9 +25,7 @@ class FunctionsDeprecatedWithoutArgument
             get_class(), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),
             get_parent_class(), // Calling without argument is deprecated.
-            get_parent_class('test-argument'),
-            get_called_class(), // Calling without argument is deprecated.
-            get_called_class('test-argument')
+            get_parent_class('test-argument')
         ];
     }
 }
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
index ba3b20bd..37e4035f 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
@@ -25,9 +25,7 @@ class FunctionsDeprecatedWithoutArgument
             get_class($this), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),
             get_parent_class($this), // Calling without argument is deprecated.
-            get_parent_class('test-argument'),
-            get_called_class($this), // Calling without argument is deprecated.
-            get_called_class('test-argument')
+            get_parent_class('test-argument')
         ];
     }
 }
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php
index 691dd43a..1b397629 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.php
@@ -30,8 +30,7 @@ public function getWarningList(): array
         return [
             23 => 1,
             25 => 1,
-            27 => 1,
-            29 => 1
+            27 => 1
         ];
     }
 }

From 47f114d857e86cfbc9a304a2508da598c78c6640 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 15 Feb 2022 12:11:08 +0100
Subject: [PATCH 481/630] Update mb_check_encoding fix

---
 .../Functions/FunctionsDeprecatedWithoutArgumentSniff.php       | 2 +-
 .../FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 4fb1831c..f11efd72 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -36,7 +36,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
      * @var array
      */
     private const DEPRECATED_FUNCTIONS_AND_FIXES = [
-        'mb_check_encoding' => 'null',
+        'mb_check_encoding' => '\'\'',
         'get_class' => '$this',
         'get_parent_class' => '$this'
     ];
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
index 37e4035f..870c413a 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
@@ -20,7 +20,7 @@ class FunctionsDeprecatedWithoutArgument
     public function testDeprecatedMethod(): array
     {
         return [
-            mb_check_encoding(null), // Calling without argument is deprecated.
+            mb_check_encoding(''), // Calling without argument is deprecated.
             mb_check_encoding('test-argument', null),
             get_class($this), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),

From 1365386cf82982cd15efff059619ca2b9dacfebd Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 15 Feb 2022 15:04:29 +0100
Subject: [PATCH 482/630] Refactor

---
 .../Functions/FunctionsDeprecatedWithoutArgumentSniff.php   | 2 +-
 .../FunctionsDeprecatedWithoutArgumentUnitTest.inc          | 4 ++--
 .../FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index f11efd72..42e6ed70 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -36,7 +36,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
      * @var array
      */
     private const DEPRECATED_FUNCTIONS_AND_FIXES = [
-        'mb_check_encoding' => '\'\'',
+        'mb_check_encoding' => '[]',
         'get_class' => '$this',
         'get_parent_class' => '$this'
     ];
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
index 44b305d1..7bdfeb89 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc
@@ -21,11 +21,11 @@ class FunctionsDeprecatedWithoutArgument
     {
         return [
             mb_check_encoding(), // Calling without argument is deprecated.
-            mb_check_encoding('test-argument', null),
+            mb_check_encoding('test-argument'),
             get_class(), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),
             get_parent_class(), // Calling without argument is deprecated.
-            get_parent_class('test-argument')
+            get_parent_class(new FunctionsDeprecatedWithoutArgument())
         ];
     }
 }
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
index 870c413a..7addc89b 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
@@ -20,12 +20,12 @@ class FunctionsDeprecatedWithoutArgument
     public function testDeprecatedMethod(): array
     {
         return [
-            mb_check_encoding(''), // Calling without argument is deprecated.
-            mb_check_encoding('test-argument', null),
+            mb_check_encoding([]), // Calling without argument is deprecated.
+            mb_check_encoding('test-argument'),
             get_class($this), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),
             get_parent_class($this), // Calling without argument is deprecated.
-            get_parent_class('test-argument')
+            get_parent_class(new FunctionsDeprecatedWithoutArgument())
         ];
     }
 }

From a87126577ab10391665fba1f347cebd554021f83 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 15 Feb 2022 17:11:03 +0100
Subject: [PATCH 483/630] Version 18

---
 composer.json |   2 +-
 composer.lock | 132 +++++++++++++++++++++++++-------------------------
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/composer.json b/composer.json
index daca0913..aa896857 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "17",
+    "version": "18",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 0faa142e..d38bc239 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b9428716b782d315462d1db75b983993",
+    "content-hash": "d7ee7044cc0bf8d83a035a641253afac",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.2.0",
+            "version": "1.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee"
+                "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
-                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8a7761f1c520e0dad6e04d862fdc697445457cfe",
+                "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe",
                 "shasum": ""
             },
             "require": {
@@ -95,7 +95,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
@@ -110,7 +110,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.2.0"
+                "source": "https://github.com/phpstan/phpstan/tree/1.4.6"
             },
             "funding": [
                 {
@@ -130,25 +130,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-18T14:09:01+00:00"
+            "time": "2022-02-06T12:56:13+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.12.8",
+            "version": "0.12.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b"
+                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b",
-                "reference": "dd40e9e1971b1fdb5fb8d818e3ee691a31ac638b",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/13412efd0dfda2e2c310dd24397281804441cf7a",
+                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1|^8.0",
-                "phpstan/phpstan": "^1.1.1"
+                "phpstan/phpstan": "^1.4.2"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -179,10 +179,10 @@
             "license": [
                 "MIT"
             ],
-            "description": "Prefixed and PHP 7.1 downgraded version of rector/rector",
+            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.8"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.16"
             },
             "funding": [
                 {
@@ -190,7 +190,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-13T23:55:00+00:00"
+            "time": "2022-02-09T14:50:55+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -250,28 +250,28 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.3",
+            "version": "v14.11.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "a7192e7a2b0487dc5e185feb4f4df1fc24d35d86"
+                "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/a7192e7a2b0487dc5e185feb4f4df1fc24d35d86",
-                "reference": "a7192e7a2b0487dc5e185feb4f4df1fc24d35d86",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/ffa431c0821821839370a68dab3c2597c06bf7f0",
+                "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "php": "^7.1 || ^8.0"
+                "php": "^7.1 || ^8"
             },
             "require-dev": {
                 "amphp/amp": "^2.3",
                 "doctrine/coding-standard": "^6.0",
                 "nyholm/psr7": "^1.2",
-                "phpbench/phpbench": "^0.16.10",
+                "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "0.12.82",
                 "phpstan/phpstan-phpunit": "0.12.18",
@@ -304,7 +304,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.3"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.5"
             },
             "funding": [
                 {
@@ -312,7 +312,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-11-19T09:42:02+00:00"
+            "time": "2022-01-24T11:13:31+00:00"
         }
     ],
     "packages-dev": [
@@ -402,9 +402,6 @@
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
@@ -412,12 +409,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -561,16 +558,16 @@
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
+                "reference": "15a90844ad40f127afd244c0cad228de2a80052a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/15a90844ad40f127afd244c0cad228de2a80052a",
+                "reference": "15a90844ad40f127afd244c0cad228de2a80052a",
                 "shasum": ""
             },
             "require": {
@@ -606,9 +603,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
+                "source": "https://github.com/phar-io/version/tree/3.1.1"
             },
-            "time": "2021-02-23T14:00:09+00:00"
+            "time": "2022-02-07T21:56:48+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -722,16 +719,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.5.1",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
                 "shasum": ""
             },
             "require": {
@@ -766,9 +763,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
             },
-            "time": "2021-10-02T14:08:47+00:00"
+            "time": "2022-01-04T19:58:01+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -1157,16 +1154,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.10",
+            "version": "9.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a"
+                "reference": "597cb647654ede35e43b137926dfdfef0fb11743"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
-                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743",
+                "reference": "597cb647654ede35e43b137926dfdfef0fb11743",
                 "shasum": ""
             },
             "require": {
@@ -1217,11 +1214,11 @@
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ],
                 "files": [
                     "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1244,11 +1241,11 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/donate.html",
+                    "url": "https://phpunit.de/sponsors.html",
                     "type": "custom"
                 },
                 {
@@ -1256,7 +1253,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-09-25T07:38:51+00:00"
+            "time": "2022-01-24T07:33:35+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1764,16 +1761,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.3",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
@@ -1816,7 +1813,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
             },
             "funding": [
                 {
@@ -1824,7 +1821,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-11T13:31:12+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -2224,21 +2221,24 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
@@ -2283,7 +2283,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
             },
             "funding": [
                 {
@@ -2299,7 +2299,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -2421,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }

From 480fa8147905bf0b4cf29a0698244598c906c137 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Fri, 18 Feb 2022 17:40:33 +0100
Subject: [PATCH 484/630] Use STDIN

---
 .../Functions/FunctionsDeprecatedWithoutArgumentSniff.php       | 2 +-
 .../FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 42e6ed70..b4a33ab3 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -36,7 +36,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
      * @var array
      */
     private const DEPRECATED_FUNCTIONS_AND_FIXES = [
-        'mb_check_encoding' => '[]',
+        'mb_check_encoding' => 'STDIN',
         'get_class' => '$this',
         'get_parent_class' => '$this'
     ];
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
index 7addc89b..9b5cf724 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
@@ -20,7 +20,7 @@ class FunctionsDeprecatedWithoutArgument
     public function testDeprecatedMethod(): array
     {
         return [
-            mb_check_encoding([]), // Calling without argument is deprecated.
+            mb_check_encoding(STDIN), // Calling without argument is deprecated.
             mb_check_encoding('test-argument'),
             get_class($this), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),

From 2e02cb966199b59e5556ca6760ad5046f730de2b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 21 Feb 2022 18:10:04 +0000
Subject: [PATCH 485/630] AC-2219: Removed autofixing suggestion for
 mb_check_encoding

---
 ...unctionsDeprecatedWithoutArgumentSniff.php | 26 +++++++++++++------
 ...eprecatedWithoutArgumentUnitTest.inc.fixed |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index b4a33ab3..85dd53cb 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -36,7 +36,7 @@ class FunctionsDeprecatedWithoutArgumentSniff implements Sniff
      * @var array
      */
     private const DEPRECATED_FUNCTIONS_AND_FIXES = [
-        'mb_check_encoding' => 'STDIN',
+        'mb_check_encoding' => false,
         'get_class' => '$this',
         'get_parent_class' => '$this'
     ];
@@ -65,17 +65,27 @@ public function process(File $phpcsFile, $stackPtr): void
 
         $functionName = $phpcsFile->getTokensAsString($phpcsFile->findPrevious(T_STRING, $stackPtr), 1);
 
-        if (in_array($functionName, array_keys(self::DEPRECATED_FUNCTIONS_AND_FIXES))) {
-            if ($phpcsFile->addFixableWarning(
+        if (!isset(self::DEPRECATED_FUNCTIONS_AND_FIXES[$functionName])) {
+            return;
+        }
+
+        if (self::DEPRECATED_FUNCTIONS_AND_FIXES[$functionName] === false) {
+            $phpcsFile->addWarning(
+                sprintf(self::WARNING_MESSAGE, $functionName),
+                $stackPtr,
+                self::WARNING_CODE
+            );
+        }
+
+        if ($phpcsFile->addFixableWarning(
                 sprintf(self::WARNING_MESSAGE, $functionName),
                 $stackPtr,
                 self::WARNING_CODE
             ) === true) {
-                $content = self::DEPRECATED_FUNCTIONS_AND_FIXES[$functionName];
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContentBefore($phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr), $content);
-                $phpcsFile->fixer->endChangeset();
-            }
+            $content = self::DEPRECATED_FUNCTIONS_AND_FIXES[$functionName];
+            $phpcsFile->fixer->beginChangeset();
+            $phpcsFile->fixer->addContentBefore($phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr), $content);
+            $phpcsFile->fixer->endChangeset();
         }
     }
 }
diff --git a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
index 9b5cf724..1f4f20d9 100644
--- a/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
+++ b/Magento2/Tests/Functions/FunctionsDeprecatedWithoutArgumentUnitTest.inc.fixed
@@ -20,7 +20,7 @@ class FunctionsDeprecatedWithoutArgument
     public function testDeprecatedMethod(): array
     {
         return [
-            mb_check_encoding(STDIN), // Calling without argument is deprecated.
+            mb_check_encoding(), // Calling without argument is deprecated.
             mb_check_encoding('test-argument'),
             get_class($this), // Calling without argument is deprecated.
             get_class(new FunctionsDeprecatedWithoutArgument()),

From 30bbe19741f2484358b0779d0c24c366c2d296f9 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 21 Feb 2022 18:12:32 +0000
Subject: [PATCH 486/630] AC-2219: Prevented double warning for
 mb_check_encoding

---
 .../Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 85dd53cb..4190dfb8 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -75,6 +75,7 @@ public function process(File $phpcsFile, $stackPtr): void
                 $stackPtr,
                 self::WARNING_CODE
             );
+            return;
         }
 
         if ($phpcsFile->addFixableWarning(

From 0e0c5a13dc731ba9125ca7279805be81cd7b09ec Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 21 Feb 2022 18:15:26 +0000
Subject: [PATCH 487/630] AC-2219: Fixed static tests

---
 .../FunctionsDeprecatedWithoutArgumentSniff.php      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index 4190dfb8..e410c4d9 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -77,12 +77,14 @@ public function process(File $phpcsFile, $stackPtr): void
             );
             return;
         }
+        
+        $fix = $phpcsFile->addFixableWarning(
+            sprintf(self::WARNING_MESSAGE, $functionName),
+            $stackPtr,
+            self::WARNING_CODE
+        );
 
-        if ($phpcsFile->addFixableWarning(
-                sprintf(self::WARNING_MESSAGE, $functionName),
-                $stackPtr,
-                self::WARNING_CODE
-            ) === true) {
+        if ($fix === true) {
             $content = self::DEPRECATED_FUNCTIONS_AND_FIXES[$functionName];
             $phpcsFile->fixer->beginChangeset();
             $phpcsFile->fixer->addContentBefore($phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr), $content);

From 557b1d99dbbdedd3e11587a0fdc8ad7901061126 Mon Sep 17 00:00:00 2001
From: Aad Mathijssen <aad.mathijssen@isaac.nl>
Date: Fri, 4 Mar 2022 19:54:37 +0100
Subject: [PATCH 488/630] Resolve incorrect violation code by resetting the
 hasDisallowedAnnotation property at then end of processing

---
 Magento2/Sniffs/Security/XssTemplateSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index 3b4385e8..2ba8e8c0 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -135,6 +135,7 @@ public function process(File $phpcsFile, $stackPtr)
             $statement = array_shift($this->statements);
             $this->detectUnescapedString($statement);
         }
+        $this->hasDisallowedAnnotation = false;
     }
 
     /**

From 21db43236599f62bc161b1fdb35c7daa9559acac Mon Sep 17 00:00:00 2001
From: Aad Mathijssen <aad.mathijssen@isaac.nl>
Date: Fri, 4 Mar 2022 20:27:46 +0100
Subject: [PATCH 489/630] Add semicolon as statement separator in the special
 annotation check of the `Magento2.Security.XssTemplate` sniff

---
 Magento2/Sniffs/Security/XssTemplateSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index 3b4385e8..c7067d20 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -146,11 +146,11 @@ public function process(File $phpcsFile, $stackPtr)
     private function findSpecialAnnotation($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] === T_ECHO) {
-            $startOfStatement = $this->file->findPrevious(T_OPEN_TAG, $stackPtr);
+            $startOfStatement = $this->file->findPrevious([T_OPEN_TAG, T_SEMICOLON], $stackPtr);
             return $this->file->findPrevious(T_COMMENT, $stackPtr, $startOfStatement);
         }
         if ($this->tokens[$stackPtr]['code'] === T_OPEN_TAG_WITH_ECHO) {
-            $endOfStatement = $this->file->findNext(T_CLOSE_TAG, $stackPtr);
+            $endOfStatement = $this->file->findNext([T_CLOSE_TAG, T_SEMICOLON], $stackPtr);
             return $this->file->findNext(T_COMMENT, $stackPtr, $endOfStatement);
         }
         return false;

From 9aa07875608534a4f9325bce79171fa9da6969b6 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 8 Mar 2022 10:52:50 +0100
Subject: [PATCH 490/630] Bumped to v19

---
 composer.json |  2 +-
 composer.lock | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index aa896857..b1bb3527 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "18",
+    "version": "19",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index d38bc239..a6150286 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d7ee7044cc0bf8d83a035a641253afac",
+    "content-hash": "aa79ce9c9f280386c7881e40e49a59e4",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -402,6 +402,9 @@
             "require": {
                 "php": "^7.1 || ^8.0"
             },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
@@ -2253,12 +2256,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2421,5 +2424,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.1.0"
 }

From b879e5b94c4619286a574586a9d4ae60465a50fa Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 17 Mar 2022 10:31:21 +0100
Subject: [PATCH 491/630] Update eslint: 8.8.0

---
 package-lock.json | 953 +++++++++-------------------------------------
 package.json      |   2 +-
 2 files changed, 172 insertions(+), 783 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ddb1aab8..614d29c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,139 +9,36 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "eslint": "^7.32.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "eslint": "^8.8.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
+      "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
+        "debug": "^4.3.2",
+        "espree": "^9.3.1",
         "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
         "minimatch": "^3.0.4",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
+        "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.4"
       },
@@ -150,15 +47,15 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -192,15 +89,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -226,22 +114,10 @@
       }
     },
     "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
@@ -323,9 +199,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -357,24 +233,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -388,49 +246,44 @@
       }
     },
     "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
+      "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
+        "@eslint/eslintrc": "^1.2.1",
+        "@humanwhocodes/config-array": "^0.9.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
+        "debug": "^4.3.2",
         "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
+        "glob-parent": "^6.0.1",
         "globals": "^13.6.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -438,50 +291,44 @@
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
+        "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
       }
     },
     "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
@@ -490,40 +337,27 @@
         "node": ">=10"
       }
     },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "node_modules/espree": {
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
+      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
       "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/esquery": {
@@ -538,15 +372,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -559,7 +384,7 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/esrecurse/node_modules/estraverse": {
+    "node_modules/estraverse": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
@@ -568,15 +393,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -630,9 +446,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -668,21 +484,21 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
+      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -704,9 +520,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -762,15 +578,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -789,20 +596,13 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
@@ -833,40 +633,16 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -952,15 +728,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -982,15 +749,6 @@
         "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -1015,21 +773,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -1051,43 +794,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -1124,45 +830,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/table": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
-      "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -1237,137 +904,47 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
     }
   },
   "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-      "dev": true
-    },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
+      "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
+        "debug": "^4.3.2",
+        "espree": "^9.3.1",
         "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
         "minimatch": "^3.0.4",
         "strip-json-comments": "^3.1.1"
       }
     },
     "@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
       "dev": true,
       "requires": {
-        "@humanwhocodes/object-schema": "^1.2.0",
+        "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.4"
       }
     },
     "@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
     "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
       "dev": true
     },
     "acorn-jsx": {
@@ -1389,12 +966,6 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -1411,18 +982,9 @@
       }
     },
     "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
     "balanced-match": {
@@ -1490,9 +1052,9 @@
       }
     },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -1513,21 +1075,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
     "escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1535,111 +1082,92 @@
       "dev": true
     },
     "eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
+      "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
+        "@eslint/eslintrc": "^1.2.1",
+        "@humanwhocodes/config-array": "^0.9.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
+        "debug": "^4.3.2",
         "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
+        "glob-parent": "^6.0.1",
         "globals": "^13.6.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       }
     },
     "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "estraverse": "^5.2.0"
       }
     },
     "eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
       "requires": {
-        "eslint-visitor-keys": "^1.1.0"
+        "eslint-visitor-keys": "^2.0.0"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
           "dev": true
         }
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
       "dev": true
     },
     "espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
+      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
       "dev": true,
       "requires": {
-        "acorn": "^7.4.0",
+        "acorn": "^8.7.0",
         "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        }
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -1647,14 +1175,6 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
       }
     },
     "esrecurse": {
@@ -1664,20 +1184,12 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
       }
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true
     },
     "esutils": {
@@ -1724,9 +1236,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
       "dev": true
     },
     "fs.realpath": {
@@ -1756,18 +1268,18 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "requires": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^4.0.3"
       }
     },
     "globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
+      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -1780,9 +1292,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true
     },
     "import-fresh": {
@@ -1823,12 +1335,6 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
     "is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -1844,20 +1350,13 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
     "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       }
     },
     "json-schema-traverse": {
@@ -1882,37 +1381,16 @@
         "type-check": "~0.4.0"
       }
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
@@ -1980,12 +1458,6 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -1998,12 +1470,6 @@
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -2019,15 +1485,6 @@
         "glob": "^7.1.3"
       }
     },
-    "semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2043,34 +1500,6 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -2095,40 +1524,6 @@
         "has-flag": "^4.0.0"
       }
     },
-    "table": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
-      "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.6.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        }
-      }
-    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -2185,12 +1580,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
     }
   }
 }
diff --git a/package.json b/package.json
index 4aeec6d0..c3a1d9dd 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "^7.32.0"
+    "eslint": "^8.8.0"
   }
 }

From dbc974e1097997057a0269f32d31701b02ff042f Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 29 Mar 2022 15:35:19 +0200
Subject: [PATCH 492/630] Release v20

---
 composer.json |   2 +-
 composer.lock | 155 +++++++++++++++++++++++++-------------------------
 2 files changed, 77 insertions(+), 80 deletions(-)

diff --git a/composer.json b/composer.json
index b1bb3527..43ee6fa5 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "19",
+    "version": "20",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index a6150286..4adbe1ff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "aa79ce9c9f280386c7881e40e49a59e4",
+    "content-hash": "2f22dfd8f4e924bd1f30de81149e9b9a",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,20 +70,20 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.4.6",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe"
+                "reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8a7761f1c520e0dad6e04d862fdc697445457cfe",
-                "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f32e95f571c9587b4e14be05253ae56fedd00b2c",
+                "reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8.0"
+                "php": "^7.2|^8.0"
             },
             "conflict": {
                 "phpstan/phpstan-shim": "*"
@@ -93,11 +93,6 @@
                 "phpstan.phar"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -110,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.4.6"
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.2"
             },
             "funding": [
                 {
@@ -130,25 +125,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-06T12:56:13+00:00"
+            "time": "2022-03-29T07:34:36+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.12.16",
+            "version": "0.12.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a"
+                "reference": "ed06366a1d56bf5709ddc854d0fea043513ac5ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/13412efd0dfda2e2c310dd24397281804441cf7a",
-                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/ed06366a1d56bf5709ddc854d0fea043513ac5ac",
+                "reference": "ed06366a1d56bf5709ddc854d0fea043513ac5ac",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1|^8.0",
-                "phpstan/phpstan": "^1.4.2"
+                "phpstan/phpstan": "^1.4.8"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -182,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.16"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.19"
             },
             "funding": [
                 {
@@ -190,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-09T14:50:55+00:00"
+            "time": "2022-03-23T14:22:44+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -318,29 +313,30 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -367,7 +363,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
             },
             "funding": [
                 {
@@ -383,32 +379,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.2",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
@@ -433,7 +430,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -441,7 +438,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -561,16 +558,16 @@
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.1",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "15a90844ad40f127afd244c0cad228de2a80052a"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/15a90844ad40f127afd244c0cad228de2a80052a",
-                "reference": "15a90844ad40f127afd244c0cad228de2a80052a",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
@@ -606,9 +603,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.1"
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "time": "2022-02-07T21:56:48+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -722,16 +719,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -766,9 +763,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
-            "time": "2022-01-04T19:58:01+00:00"
+            "time": "2022-03-15T21:29:03+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -839,16 +836,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.10",
+            "version": "9.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
-                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
                 "shasum": ""
             },
             "require": {
@@ -904,7 +901,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
             },
             "funding": [
                 {
@@ -912,7 +909,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-05T09:12:13+00:00"
+            "time": "2022-03-07T09:28:20+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1157,16 +1154,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.13",
+            "version": "9.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "597cb647654ede35e43b137926dfdfef0fb11743"
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743",
-                "reference": "597cb647654ede35e43b137926dfdfef0fb11743",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
                 "shasum": ""
             },
             "require": {
@@ -1182,7 +1179,7 @@
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.7",
+                "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
@@ -1196,7 +1193,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "sebastian/type": "^3.0",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -1244,7 +1241,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
             },
             "funding": [
                 {
@@ -1256,7 +1253,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-24T07:33:35+00:00"
+            "time": "2022-03-15T09:57:31+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2115,28 +2112,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2159,7 +2156,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
             },
             "funding": [
                 {
@@ -2167,7 +2164,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2022-03-15T09:54:48+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2224,7 +2221,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -2286,7 +2283,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -2424,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }

From 0c456cafeaad25f364d0362b94cc966a2c343750 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 29 Mar 2022 15:45:27 +0200
Subject: [PATCH 493/630] Using rector 0.12.16

---
 composer.json |  2 +-
 composer.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 43ee6fa5..009fe4fa 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.12.4"
+        "rector/rector": "0.12.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 4adbe1ff..3b732496 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2f22dfd8f4e924bd1f30de81149e9b9a",
+    "content-hash": "e9f4dcb6341d6fd83a25eafe7c73e782",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -129,21 +129,21 @@
         },
         {
             "name": "rector/rector",
-            "version": "0.12.19",
+            "version": "0.12.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "ed06366a1d56bf5709ddc854d0fea043513ac5ac"
+                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/ed06366a1d56bf5709ddc854d0fea043513ac5ac",
-                "reference": "ed06366a1d56bf5709ddc854d0fea043513ac5ac",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/13412efd0dfda2e2c310dd24397281804441cf7a",
+                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1|^8.0",
-                "phpstan/phpstan": "^1.4.8"
+                "phpstan/phpstan": "^1.4.2"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.19"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.16"
             },
             "funding": [
                 {
@@ -185,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-23T14:22:44+00:00"
+            "time": "2022-02-09T14:50:55+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From 69478b8383e430986d7d218747554ed1e3fee105 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 29 Mar 2022 17:34:31 +0200
Subject: [PATCH 494/630] Update composer for correct rector versions

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 009fe4fa..35a53d8d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "0.12.16"
+        "rector/rector": ">=0.12.4 <=0.12.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 3b732496..4edf4c7c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e9f4dcb6341d6fd83a25eafe7c73e782",
+    "content-hash": "0a15aa1d2650ff371b45d8b12ed84f40",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",

From aed7b4409889968c0910ff8a224e6fab66968783 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 30 Mar 2022 13:37:29 +0200
Subject: [PATCH 495/630] Fixed obsolete attributes not detected

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php     | 44 +++++--------------
 Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml | 11 +++++
 Magento2/Tests/Legacy/ModuleXMLUnitTest.php   |  5 +++
 3 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index da25de0d..6dcf3c2f 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -18,7 +18,7 @@ class ModuleXMLSniff implements Sniff
 {
     private const WARNING_CODE = 'FoundObsoleteAttribute';
     private const ERROR_CODE = 'WrongXML';
-    
+
     /**
      * @inheritdoc
      */
@@ -34,8 +34,7 @@ public function register(): array
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $line = $phpcsFile->getTokens()[$stackPtr]['content'];
-        if (strpos(trim($line), '<module') === false) {
+        if ($stackPtr > 0) {
             return;
         }
 
@@ -54,51 +53,30 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        $foundElements = $xml->xpath('/config/module');
-        if ($foundElements === false) {
-            return;
-        }
-        
-        foreach ($foundElements as $element) {
-            if (!$this->elementIsCurrentlySniffedLine($element, $stackPtr)) {
-                continue;
-            }
-            
-            if (property_exists($element->attributes(), 'version')) {
+        $foundElements = $xml->xpath('/config/module[@version]');
+        if ($foundElements !== false) {
+            foreach ($foundElements as $element) {
                 $phpcsFile->addWarning(
                     'The "version" attribute is obsolete. Use "setup_version" instead.',
-                    $stackPtr,
+                    dom_import_simplexml($element)->getLineNo()-1,
                     self::WARNING_CODE
                 );
             }
+        }
 
-            if (property_exists($element->attributes(), 'active')) {
+        $foundElements = $xml->xpath('/config/module[@active]');
+        if ($foundElements !== false) {
+            foreach ($foundElements as $element) {
                 $phpcsFile->addWarning(
                     'The "active" attribute is obsolete. The list of active modules '.
                     'is defined in deployment configuration.',
-                    $stackPtr,
+                    dom_import_simplexml($element)->getLineNo()-1,
                     self::WARNING_CODE
                 );
             }
         }
     }
 
-    /**
-     * Check if the element passed is in the currently sniffed line
-     *
-     * @param SimpleXMLElement $element
-     * @param int $stackPtr
-     * @return bool
-     */
-    private function elementIsCurrentlySniffedLine(SimpleXMLElement $element, int $stackPtr): bool
-    {
-        $node = dom_import_simplexml($element);
-        if ($node->getLineNo() === $stackPtr+1) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Format the incoming XML to avoid tags split into several lines.
      *
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml
new file mode 100644
index 00000000..794da9bd
--- /dev/null
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Training_Backend" active="true" version="1" />
+</config>
\ No newline at end of file
diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
index c16d1e8b..4b2a2cde 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.php
@@ -35,6 +35,11 @@ public function getWarningList($testFile = '')
         if ($testFile === 'ModuleXMLUnitTest.3.xml') {
             return [];
         }
+        if ($testFile === 'ModuleXMLUnitTest.4.xml') {
+            return [
+                9 => 2,
+            ];
+        }
         return [];
     }
 }

From 19344bdf4a40a79becd510c6351461c783748bd0 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Wed, 30 Mar 2022 13:39:27 +0200
Subject: [PATCH 496/630] Added newline

---
 Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml b/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml
index 794da9bd..cbeb6c9b 100644
--- a/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml
+++ b/Magento2/Tests/Legacy/ModuleXMLUnitTest.4.xml
@@ -8,4 +8,4 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Training_Backend" active="true" version="1" />
-</config>
\ No newline at end of file
+</config>

From 2f6052fe4bd9be7e7cf1646850de91518dd46a7a Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Fri, 1 Apr 2022 10:46:37 +0200
Subject: [PATCH 497/630] AC-1655: Added return if not XML

---
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index 6dcf3c2f..338834a8 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -51,6 +51,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $stackPtr,
                 self::ERROR_CODE
             );
+            return;
         }
 
         $foundElements = $xml->xpath('/config/module[@version]');

From 7a61e5d575c761a06b7232aea59e342076e76155 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Mon, 4 Apr 2022 17:01:44 +0200
Subject: [PATCH 498/630] Release v21

---
 composer.json |  2 +-
 composer.lock | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 35a53d8d..3369e514 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "20",
+    "version": "21",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 4edf4c7c..020fbaa6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0a15aa1d2650ff371b45d8b12ed84f40",
+    "content-hash": "a99a1a61cd8522f9c564620fb2142113",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.5.2",
+            "version": "1.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c"
+                "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f32e95f571c9587b4e14be05253ae56fedd00b2c",
-                "reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
+                "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
                 "shasum": ""
             },
             "require": {
@@ -105,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.5.2"
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.4"
             },
             "funding": [
                 {
@@ -125,7 +125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-29T07:34:36+00:00"
+            "time": "2022-04-03T12:39:00+00:00"
         },
         {
             "name": "rector/rector",
@@ -1154,16 +1154,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.19",
+            "version": "9.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
                 "shasum": ""
             },
             "require": {
@@ -1241,7 +1241,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
             },
             "funding": [
                 {
@@ -1253,7 +1253,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:57:31+00:00"
+            "time": "2022-04-01T12:37:26+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1621,16 +1621,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -1672,7 +1672,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -1680,7 +1680,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -2421,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 7c702e0b668036273309fc6cd78f970c452d1999 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 5 Apr 2022 09:48:28 +0100
Subject: [PATCH 499/630] Add @author to forbidden tag list

Ref https://devdocs.magento.com/guides/v2.4/coding-standards/docblock-standard-general.html#documentation-space
---
 .../Commenting/ClassAndInterfacePHPDocFormattingSniff.php       | 1 +
 .../Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc  | 2 +-
 .../Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc  | 2 +-
 .../Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index 2d715c50..20c12851 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -24,6 +24,7 @@ class ClassAndInterfacePHPDocFormattingSniff implements Sniff
      * @var string[] List of tags that can not be used in comments
      */
     public $forbiddenTags = [
+        '@author',
         '@category',
         '@package',
         '@subpackage'
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index e5895e32..e2727967 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -60,7 +60,7 @@ class EmptyHandler
  * @api is ok here
  * @deprecated can be used in this context
  * @see is ok here
- * @author is actually ok
+ * @author is not ment to be used
  * @category is irrelevant
  * @package is not ment to be used
  * @subpackage does not belong here
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
index 96900de2..e45e15ff 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
@@ -60,7 +60,7 @@ interface EmptyHandler
  * @api is ok here
  * @deprecated can be used in this context
  * @see is ok here
- * @author is actually ok
+ * @author is not ment to be used
  * @category is irrelevant
  * @package is not ment to be used
  * @subpackage does not belong here
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
index 9b5b2f85..b6a1c206 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
@@ -29,6 +29,7 @@ public function getWarningList($testFile = '')
             35 => 1,
             44 => 1,
             52 => 1,
+            63 => 1,
             64 => 1,
             65 => 1,
             66 => 1,

From 0ebb01918feb8dff7251793722662cf54e96466b Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 5 Apr 2022 10:08:07 +0100
Subject: [PATCH 500/630] Fix errors detected by phpcs & phpunit

---
 Magento2/Tests/PHPCompatibility/BaseSniffTest.php               | 2 +-
 .../PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
index 27ad0ea8..f6554540 100644
--- a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
+++ b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
@@ -29,7 +29,7 @@
  * @since 9.0.0  Dropped support for PHP_CodeSniffer 1.x.
  * @since 10.0.0 Updated for preliminary support of PHP_CodeSniffer 4.
  */
-class BaseSniffTest extends TestCase
+abstract class BaseSniffTest extends TestCase
 {
 
     /**
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
index 272487d3..2024685f 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
      */
     public function getWarningList()
     {
-       return [
+        return [
             6 => 1,
             7 => 1,
             14 => 1,

From 17f27db9859e6e103dffd040c4153f67409ddf73 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 7 Apr 2022 10:10:12 +0200
Subject: [PATCH 501/630] AC-2724: Update rector dependency to the latest
 version

---
 composer.json |  2 +-
 composer.lock | 18 +++++++++---------
 rector.php    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 3369e514..525ce99e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": ">=0.12.4 <=0.12.16"
+        "rector/rector": "^0.12.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 020fbaa6..b6a05896 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a99a1a61cd8522f9c564620fb2142113",
+    "content-hash": "92914ebd924e2b13e3884ccb974a0185",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -129,21 +129,21 @@
         },
         {
             "name": "rector/rector",
-            "version": "0.12.16",
+            "version": "0.12.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a"
+                "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/13412efd0dfda2e2c310dd24397281804441cf7a",
-                "reference": "13412efd0dfda2e2c310dd24397281804441cf7a",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
+                "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8.0",
-                "phpstan/phpstan": "^1.4.2"
+                "php": "^7.2|^8.0",
+                "phpstan/phpstan": "^1.5"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.16"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.20"
             },
             "funding": [
                 {
@@ -185,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-09T14:50:55+00:00"
+            "time": "2022-04-06T12:55:14+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
diff --git a/rector.php b/rector.php
index 559d5b54..afe7adc8 100644
--- a/rector.php
+++ b/rector.php
@@ -8,7 +8,7 @@
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
 use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
-use Rector\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
+use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
 use Rector\Php80\Rector\ClassMethod\SetStateToStaticRector;
 use Rector\Php81\Rector\FuncCall\Php81ResourceReturnToObjectRector;
 use Magento2\Rector\Src\ReplacePregSplitNullLimit;

From 418f970d3a611230454ee6cb60129ef444cbded1 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 7 Apr 2022 16:34:12 +0200
Subject: [PATCH 502/630] AC-2724: Update rector dependency to the latest
 version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 525ce99e..e54d07f5 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.12.4"
+        "rector/rector": "^0.12.17"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"

From ab1aa3c87bc5c1e0c8460d15715661068abdf241 Mon Sep 17 00:00:00 2001
From: Elisea Cornejo <ecornejo@magento.com>
Date: Thu, 7 Apr 2022 16:57:57 +0200
Subject: [PATCH 503/630] AC-2724: Update rector dependency to the latest
 version

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index b6a05896..3742d05c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "92914ebd924e2b13e3884ccb974a0185",
+    "content-hash": "f7fc6bebe57a5ad3379a7192ac17047e",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",

From 4786d22cc58bc4c59085c1d7c0f21d3d0fbb2f5d Mon Sep 17 00:00:00 2001
From: Rafal Janicki <rjanicki@adobe.com>
Date: Tue, 19 Apr 2022 13:06:30 +0100
Subject: [PATCH 504/630] AC-1879:
 Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php issue

---
 .gitignore                                    |  1 +
 .../Sniffs/Legacy/ObsoleteResponseSniff.php   | 76 -------------------
 Magento2/ruleset.xml                          |  6 +-
 composer.lock                                 | 40 +++++-----
 4 files changed, 22 insertions(+), 101 deletions(-)
 delete mode 100644 Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php

diff --git a/.gitignore b/.gitignore
index 98860b5c..422a08ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 .vscode/
 
 .phpunit.result.cache
+.DS_Store
diff --git a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
deleted file mode 100644
index 765ae5f1..00000000
--- a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types = 1);
-
-namespace Magento2\Sniffs\Legacy;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-class ObsoleteResponseSniff implements Sniff
-{
-    /**
-     * @var string[]
-     */
-    private $obsoleteResponseMethods = [
-        'loadLayout' => 'Please use \Magento\Framework\View\Layout\Builder::build instead.',
-        'renderLayout' => 'Please use \Magento\Framework\Controller\ResultInterface::renderResult instead.',
-        '_redirect' => 'Please use \Magento\Backend\Model\View\Result\Redirect::render instead.',
-        '_forward' => 'Please use \Magento\Backend\Model\View\Result\Forward::forward instead.',
-        '_setActiveMenu' => 'Please use \Magento\Backend\Model\View\Result\Page::setActiveMenu instead.',
-        '_addBreadcrumb' => 'Please use \Magento\Backend\Model\View\Result\Page::addBreadcrumb instead.',
-        '_addContent' => 'Please use \Magento\Backend\Model\View\Result\Page::addContent instead.',
-        '_addLeft' => 'Please use \Magento\Backend\Model\View\Result\Page::addLeft instead.',
-        '_addJs' => 'Please use \Magento\Backend\Model\View\Result\Page::addJs instead.',
-        '_moveBlockToContainer' => 'Please use \Magento\Backend\Model\View\Result\Page::moveBlockToContainer instead.',
-    ];
-
-    /**
-     * @var string[]
-     */
-    private $obsoleteResponseWarningCodes = [
-        'loadLayout' => 'LoadLayoutResponseMethodFound',
-        'renderLayout' => 'RenderLayoutResponseMethodFound',
-        '_redirect' => 'RedirectResponseMethodFound',
-        '_forward' => 'ForwardResponseMethodFound',
-        '_setActiveMenu' => 'SetActiveMenuResponseMethodFound',
-        '_addBreadcrumb' => 'AddBreadcrumbResponseMethodFound',
-        '_addContent' => 'AddContentResponseMethodFound',
-        '_addLeft' => 'AddLeftResponseMethodFound',
-        '_addJs' => 'AddJsResponseMethodFound',
-        '_moveBlockToContainer' => 'MoveBlockToContainerResponseMethodFound',
-    ];
-    
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [
-            T_OBJECT_OPERATOR,
-            T_FUNCTION
-        ];
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-
-        foreach ($this->obsoleteResponseMethods as $method => $errorMessage) {
-            if ($tokens[$stringPos]['content'] === $method) {
-                $phpcsFile->addWarning(
-                    sprintf('%s method is deprecated. %s', $method, $errorMessage),
-                    $stackPtr,
-                    $this->obsoleteResponseWarningCodes[$method]
-                );
-            }
-        }
-    }
-}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5efe99f5..ee171871 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -350,11 +350,7 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Legacy.ObsoleteResponse">
-        <severity>8</severity>
-        <type>warning</type>
-    </rule>
-
+   
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <severity>7</severity>
diff --git a/composer.lock b/composer.lock
index 3742d05c..7820492e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.5.4",
+            "version": "1.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b"
+                "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
-                "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/799dd8c2d2c9c704bb55d2078078cb970cf0f6d1",
+                "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1",
                 "shasum": ""
             },
             "require": {
@@ -105,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.5.4"
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.6"
             },
             "funding": [
                 {
@@ -125,25 +125,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-03T12:39:00+00:00"
+            "time": "2022-04-15T11:13:37+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.12.20",
+            "version": "0.12.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560"
+                "reference": "2fb3b1c1d85e784a55e5806cf50734e5aa872eb4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
-                "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/2fb3b1c1d85e784a55e5806cf50734e5aa872eb4",
+                "reference": "2fb3b1c1d85e784a55e5806cf50734e5aa872eb4",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.5"
+                "phpstan/phpstan": "^1.5.6"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.20"
+                "source": "https://github.com/rectorphp/rector/tree/0.12.21"
             },
             "funding": [
                 {
@@ -185,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-06T12:55:14+00:00"
+            "time": "2022-04-18T12:12:41+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -245,16 +245,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.5",
+            "version": "v14.11.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0"
+                "reference": "6070542725b61fc7d0654a8a9855303e5e157434"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/ffa431c0821821839370a68dab3c2597c06bf7f0",
-                "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6070542725b61fc7d0654a8a9855303e5e157434",
+                "reference": "6070542725b61fc7d0654a8a9855303e5e157434",
                 "shasum": ""
             },
             "require": {
@@ -299,7 +299,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.5"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.6"
             },
             "funding": [
                 {
@@ -307,7 +307,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-01-24T11:13:31+00:00"
+            "time": "2022-04-13T16:25:32+00:00"
         }
     ],
     "packages-dev": [
@@ -2421,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 6ffa74ae09e027e9028d918e418f89c12a1245de Mon Sep 17 00:00:00 2001
From: Rafal Janicki <rjanicki@adobe.com>
Date: Tue, 19 Apr 2022 14:37:27 +0100
Subject: [PATCH 505/630] AC-1879: Remove legacy unit tests for
 ObsoleteResponseSniff class

---
 .../Tests/Legacy/ObsoleteResponseUnitTest.inc | 39 ------------------
 .../Tests/Legacy/ObsoleteResponseUnitTest.php | 40 -------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
 delete mode 100644 Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php

diff --git a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
deleted file mode 100644
index 4e33d0f7..00000000
--- a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-$this->_view->loadLayout(['default', 'test'], true, true, false);
-$this->_view->renderLayout();
-
-protected function _addBreadcrumb($label, $title = null, $link = null)
-{
-    $this->getLayout()->getBlock('test')->addLink($label, $title, $link);
-}
-
-$this->editPost = $objectManagerHelper->getObject(
-    TestClass::class,
-    [
-        '_redirect' => $this->redirect,
-    ]
-);
-
-$this->_redirect('test/path');
-
-$this->_forward('grid');
-
-$this->_initAction()->_setActiveMenu(
-    'Magento_Invitation::report_magento_invitation_order'
-)->_addBreadcrumb(
-    __('Invitation Report by Customers'),
-    __('Invitation Report by Order Conversion Rate')
-)->_addLeft(
-)->_addJs(
-    $this->_view->getLayout()->createBlock(TestBlock::class)->setTemplate('Test::test.phtml')
-);
-
-private function _addContent(AbstractBlock $block)
-{
-    return $this->_moveBlockToContainer($block, 'content');
-}
diff --git a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php
deleted file mode 100644
index b35d43a1..00000000
--- a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\Legacy;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-class ObsoleteResponseUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    public function getErrorList($testFile = '')
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList($testFile = '')
-    {
-        return [
-            7 => 1,
-            8 => 1,
-            10 => 1,
-            22 => 1,
-            24 => 1,
-            26 => 1,
-            28 => 1,
-            31 => 1,
-            32 => 1,
-            36 => 1,
-            38 => 1
-        ];
-    }
-}

From 41d5657e91e6ac36be6ec4aae0a60c08da9898e6 Mon Sep 17 00:00:00 2001
From: Maximilian Fickers <m.fickers@basecom.de>
Date: Tue, 19 Apr 2022 18:22:59 +0200
Subject: [PATCH 506/630] Allow empty constructor function blocks when using
 property promotion

---
 Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php   | 11 +++++++++++
 Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc | 12 ++++++++++++
 Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
index da089029..87c60a62 100644
--- a/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
+++ b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
@@ -37,6 +37,17 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        // Ignore empty constructor function blocks when using property promotion
+        if ($tokens[$stackPtr]['code'] === T_FUNCTION &&
+            strpos($phpcsFile->getDeclarationName($stackPtr), '__construct') === 0 &&
+            count($phpcsFile->getMethodParameters($stackPtr)) > 0 &&
+            array_reduce($phpcsFile->getMethodParameters($stackPtr), static function ($result, $methodParam) {
+                return $result && isset($methodParam['property_visibility']);
+            }, true)) {
+
+            return;
+        }
+
         parent::process($phpcsFile, $stackPtr);
     }//end process()
 }
diff --git a/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc
index 6fb834d8..55b4ab4c 100644
--- a/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc
+++ b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc
@@ -76,3 +76,15 @@ function emptyFunction () { /*Empty function block*/ }
 function nonEmptyFunction () { return true; }
 
 function aroundEmptyFunction ($foo, $bar) { }
+
+class Foo {
+    public function __construct(private $bar) {}
+}
+
+class Foo2 {
+    public function __construct() {}
+}
+
+class Foo3 {
+    public function __construct(private $bar, $baz) {}
+}
diff --git a/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php
index 7959eaa0..e655d79e 100644
--- a/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php
+++ b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php
@@ -29,6 +29,8 @@ public function getErrorList()
             68 => 1,
             72 => 2,
             74 => 1,
+            85 => 1,
+            89 => 1
         ];
     }
 

From f14124eebbd6d10f477fd84ad9c05203132dceef Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Mon, 25 Apr 2022 17:13:47 +0200
Subject: [PATCH 507/630] Update version on composer

---
 composer.json |  2 +-
 composer.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index e54d07f5..5b238f4f 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "21",
+    "version": "22",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 7820492e..d09e8dde 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f7fc6bebe57a5ad3379a7192ac17047e",
+    "content-hash": "63d0aa40cf8f2071a5e7e572eae08f45",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.5.6",
+            "version": "1.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1"
+                "reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/799dd8c2d2c9c704bb55d2078078cb970cf0f6d1",
-                "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
+                "reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
                 "shasum": ""
             },
             "require": {
@@ -105,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.5.6"
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.7"
             },
             "funding": [
                 {
@@ -125,7 +125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-15T11:13:37+00:00"
+            "time": "2022-04-20T12:20:27+00:00"
         },
         {
             "name": "rector/rector",
@@ -2421,5 +2421,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 50e7c2ad3d7110b06527d75a1aa954b7c20f6ea1 Mon Sep 17 00:00:00 2001
From: Karyna Tsymbal <k.tsymbal@atwix.com>
Date: Wed, 18 May 2022 16:57:00 +0300
Subject: [PATCH 508/630] AC-1348 Add match keyword to a Reserved words sniff
 (#177)

---
 Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
index 13109c58..9c6e453a 100644
--- a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
+++ b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
@@ -34,6 +34,7 @@ class ReservedWordsSniff implements Sniff
         'object' => '7',
         'mixed' => '7',
         'numeric' => '7',
+        'match' => '8'
     ];
 
     private const CLASS_ERROR_CODE = 'ForbiddenAsClassName';

From 82723b999e65af38dcd26aa4fd11a25f01878393 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 25 May 2022 11:58:31 +0200
Subject: [PATCH 509/630] Update hasDeprecatedWellFormatted + upgrade rector

---
 .../Commenting/PHPDocFormattingValidator.php  |  8 ++----
 ...ssAndInterfacePHPDocFormattingUnitTest.php |  1 +
 .../ConstantsPHPDocFormattingUnitTest.1.inc   | 10 -------
 .../ConstantsPHPDocFormattingUnitTest.2.inc   | 10 +++++++
 .../ConstantsPHPDocFormattingUnitTest.php     | 12 ++++----
 composer.json                                 |  2 +-
 composer.lock                                 | 28 +++++++++----------
 7 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index 745ec587..9fd42e7f 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -121,15 +121,11 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         if ($deprecatedPtr === -1) {
             return true;
         }
-
-        $seeTagRequired = false;
-        if ($tokens[$deprecatedPtr + 2]['code'] !== T_DOC_COMMENT_STRING) {
-            $seeTagRequired = true;
-        }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            return !$seeTagRequired;
+            return false;
         }
+
         return $tokens[$seePtr + 2]['code'] === T_DOC_COMMENT_STRING;
     }
 
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
index 9b5b2f85..eebae4e8 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
@@ -33,6 +33,7 @@ public function getWarningList($testFile = '')
             65 => 1,
             66 => 1,
             101 => 1,
+            109 => 1,
             118 => 1,
             127 => 1,
         ];
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
index 6e0b16f0..0b402ec2 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.1.inc
@@ -7,11 +7,6 @@ define('DS', DIRECTORY_SEPARATOR);
 
 define('BP', dirname(__FILE__));
 
-/**
- * @deprecated It is a lie
- */
-define('THERE IS', 'cake');
-
 /**
  * @deprecated New implementation available
  * @see \Ascii\Asterisk
@@ -27,11 +22,6 @@ class Profiler
      */
     const NUMBER_TWO = 2;
 
-    /**
-     * @deprecated Why not
-     */
-    const YES = false;
-
     /**
      * @deprecated Unable to identify the question, replaced
      * @see \ComputationalMatrix\Earth
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
index b413bc92..12b89834 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
@@ -13,6 +13,11 @@ define('NUMBER_ONE', 1);
  */
 define('A', 65);
 
+/**
+ * @deprecated It is a lie
+ */
+define('THERE IS', 'cake');
+
 /**
  * @deprecated
  * @see
@@ -42,6 +47,11 @@ class Profiler
      */
     const a = 97;
 
+    /**
+     * @deprecated Why not
+     */
+    const YES = false;
+
     /**
      * @deprecated
      * @see
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
index 16cd4d85..c11be454 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.php
@@ -30,13 +30,15 @@ public function getWarningList($testFile = '')
             6 => 1,
             9 => 1,
             14 => 1,
-            20 => 1,
-            26 => 1,
-            33 => 1,
+            19 => 1,
+            25 => 1,
+            31 => 1,
             38 => 1,
             43 => 1,
-            49 => 1,
-            55 => 1
+            48 => 1,
+            53 => 1,
+            59 => 1,
+            65 => 1
         ];
     }
 }
diff --git a/composer.json b/composer.json
index 5b238f4f..b86022b9 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.12.17"
+        "rector/rector": "^0.13.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index d09e8dde..d182abf8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "63d0aa40cf8f2071a5e7e572eae08f45",
+    "content-hash": "a3c03834eb0c721e9899cf1377029d57",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.5.7",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac"
+                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
-                "reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
+                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
                 "shasum": ""
             },
             "require": {
@@ -105,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.5.7"
+                "source": "https://github.com/phpstan/phpstan/tree/1.7.1"
             },
             "funding": [
                 {
@@ -125,25 +125,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-20T12:20:27+00:00"
+            "time": "2022-05-24T09:05:09+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.12.21",
+            "version": "0.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "2fb3b1c1d85e784a55e5806cf50734e5aa872eb4"
+                "reference": "bb3b32dd590cbd0deb67c2ce8ae32801357ff059"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/2fb3b1c1d85e784a55e5806cf50734e5aa872eb4",
-                "reference": "2fb3b1c1d85e784a55e5806cf50734e5aa872eb4",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/bb3b32dd590cbd0deb67c2ce8ae32801357ff059",
+                "reference": "bb3b32dd590cbd0deb67c2ce8ae32801357ff059",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.5.6"
+                "phpstan/phpstan": "^1.6.8"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.12.21"
+                "source": "https://github.com/rectorphp/rector/tree/0.13.0"
             },
             "funding": [
                 {
@@ -185,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-18T12:12:41+00:00"
+            "time": "2022-05-23T10:26:32+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From e64106ddbdb9ee91ce89bb02b7858082eea21cf8 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 26 May 2022 12:41:20 +0200
Subject: [PATCH 510/630] Use hasDeprecatedWellFormatted for Method Annotations

---
 .../MethodAnnotationStructureSniff.php        | 17 +++++
 .../MethodAnnotationStructureUnitTest.inc     | 63 +++++++++++++++++++
 .../MethodAnnotationStructureUnitTest.php     |  7 ++-
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index fed274a9..a4ff6470 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -7,6 +7,7 @@
 
 namespace Magento2\Sniffs\Annotation;
 
+use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -20,12 +21,18 @@ class MethodAnnotationStructureSniff implements Sniff
      */
     private $annotationFormatValidator;
 
+    /**
+     * @var PHPDocFormattingValidator
+     */
+    private $PHPDocFormattingValidator;
+
     /**
      * AnnotationStructureSniff constructor.
      */
     public function __construct()
     {
         $this->annotationFormatValidator = new AnnotationFormatValidator();
+        $this->PHPDocFormattingValidator = new PHPDocFormattingValidator();
     }
 
     /**
@@ -45,6 +52,16 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
+
+        if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) {
+            $phpcsFile->addWarning(
+                'Motivation behind the added @deprecated tag MUST be explained. '
+                . '@see tag MUST be used with reference to new implementation when code is deprecated '
+                . 'and there is a new alternative.',
+                $stackPtr,
+                'InvalidDeprecatedTagUsage'
+            );
+        }
         $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
         if (!$commentStartPtr) {
             $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
index 8124bc75..4d3e0b7b 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -306,4 +306,67 @@ class MethodAnnotationFixture
     {
         return $start === $length;
     }
+
+    /**
+     * This is a well-formed deprecated function
+     *
+     * @deprecated can be used in this context
+     * @see is ok here
+     */
+    public function deprecated(): bool
+    {
+        return true;
+    }
+
+    /**
+     * This deprecated function is incorrect since it only contains the @deprecated tag
+     *
+     * @deprecated
+     */
+    public function incorrectlyDeprecated()
+    {
+        return false;
+    }
+
+    /**
+     * This deprecated function is incorrect since it only contains the @deprecated tag
+     *
+     * @deprecated Should not be used
+     */
+    public function incorrectAsWell()
+    {
+        return false;
+    }
+
+    /**
+     * This deprecated function is incorrect since the @see tag does not have extra info
+     *
+     * @deprecated
+     * @see
+     */
+    public function anotherOne()
+    {
+        return false;
+    }
+
+    /**
+     * This deprecated function is incorrect since the @see tag does not have extra info
+     *
+     * @deprecated Should not be used
+     * @see
+     */
+    public function yetAnotherOne()
+    {
+        return false;
+    }
+
+    /**
+     * This function is correct since the @see tag can be used without the @deprecated tag
+     *
+     * @see Magento\Framework\NewHandler
+     */
+    public function correctUseOfSee()
+    {
+        return true;
+    }
 }
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
index 8c2ac4a1..b4c80141 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
@@ -46,6 +46,11 @@ public function getErrorList()
      */
     public function getWarningList()
     {
-        return [];
+        return [
+            326 => 1,
+            336 => 1,
+            347 => 1,
+            358 => 1
+        ];
     }
 }

From eea2aced49e09e00577c50c83a62ee024bb5f046 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 26 May 2022 15:28:45 +0200
Subject: [PATCH 511/630] Remove unnecessary ','

---
 .../Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
index eebae4e8..868187c3 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
@@ -35,7 +35,7 @@ public function getWarningList($testFile = '')
             101 => 1,
             109 => 1,
             118 => 1,
-            127 => 1,
+            127 => 1
         ];
     }
 }

From 3be61b1f1eb52d7fec7a73c942d99e38095eda4c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 26 May 2022 15:39:27 +0200
Subject: [PATCH 512/630] Use hasDeprecatedWellFormatted for properties

---
 .../ClassPropertyPHPDocFormattingSniff.php    |  9 ++++
 .../ClassPropertyPHPDocFormattingUnitTest.inc | 52 +++++++++++++++++++
 .../ClassPropertyPHPDocFormattingUnitTest.php |  6 ++-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 1d381bdc..f05cc78b 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -67,6 +67,15 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         }
 
         $commentStart = $tokens[$commentEnd]['comment_opener'];
+        if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStart, $tokens) !== true) {
+            $phpcsFile->addWarning(
+                'Motivation behind the added @deprecated tag MUST be explained. '
+                . '@see tag MUST be used with reference to new implementation when code is deprecated '
+                . 'and there is a new alternative.',
+                $stackPtr,
+                'InvalidDeprecatedTagUsage'
+            );
+        }
         $varAnnotationPosition = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
             if ($tokens[$tag]['content'] === '@var') {
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 6e0000bf..62e9688f 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -142,4 +142,56 @@ class correctlyFormattedClassMemberDocBlock
      * @var string|null
      */
     protected ?string $test2;
+
+    /**
+     * @var string
+     * @deprecated
+     */
+    protected string $badlyDeprecated;
+
+    /**
+     * @var string
+     * @deprecated Why not
+     */
+    protected string $incorrectlyDeprecated;
+
+    /**
+     * @var string
+     * @deprecated
+     * @see
+     */
+    protected string $inaccurately;
+
+    /**
+     * @var string
+     * @deprecated No reference specified
+     * @see
+     */
+    protected string $mistakenly;
+
+    /**
+     * @var string
+     * @deprecated No reference specified
+     * @see Some reference
+     */
+    protected string $correctly;
+
+    /**
+     * @var string
+     * @deprecated
+     * @see Some other reference
+     */
+    protected string $alsoCorrect;
+
+    /**
+     * @var string
+     * @see
+     */
+    protected string $shouldBeCorrect;
+
+    /**
+     * @var string
+     * @see Message with some reference
+     */
+    protected string $itIsCorrect;
 }
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
index 1d6ad272..11acee41 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -34,7 +34,11 @@ public function getWarningList()
             63 => 1,
             68 => 1,
             75 => 1,
-            125 => 1
+            125 => 1,
+            150 => 1,
+            156 => 1,
+            163 => 1,
+            170 => 1
         ];
     }
 }

From afd864c9af508264b3a72e6da332ed7013aac66d Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 31 May 2022 11:35:25 +0100
Subject: [PATCH 513/630] AC-3187: Incorrect message for discouraged functions

---
 .../Functions/DiscouragedFunctionSniff.php    | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index 13acffdc..51730217 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -40,11 +40,11 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^chdir$' => null,
         '^chgrp$' => null,
         '^chmod$' => 'Magento\Framework\Filesystem\DriverInterface::changePermissions() 
-        or Magento\Framework\Filesystem\DriverInterface::changePermissionsRecursively()',
+        or Magento\Framework\Filesystem\DriverInterface::changePermissionsRecursively',
         '^chown$' => null,
         '^chroot$' => null,
         '^com_load_typelib$' => null,
-        '^copy$' => 'Magento\Framework\Filesystem\DriverInterface::copy()',
+        '^copy$' => 'Magento\Framework\Filesystem\DriverInterface::copy',
         '^curl_.*$' => null,
         '^cyrus_connect$' => null,
         '^dba_.*$' => null,
@@ -54,21 +54,21 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^dcngettext$' => null,
         '^dgettext$' => null,
         '^dio_.*$' => null,
-        '^dirname$' => 'Magento\Framework\Filesystem\DriverInterface::getParentDirectory()',
+        '^dirname$' => 'Magento\Framework\Filesystem\DriverInterface::getParentDirectory',
         '^dngettext$' => null,
         '^domxml_.*$' => null,
         '^fbsql_.*$' => null,
         '^fbsql$' => null,
         '^fdf_add_doc_javascript$' => null,
         '^fdf_open$' => null,
-        '^fopen$' => 'Magento\Framework\Filesystem\DriverInterface::fileOpen()',
-        '^fclose$' => 'Magento\Framework\Filesystem\DriverInterface::fileClose()',
-        '^fsockopen$' => 'Magento\Framework\Filesystem\Driver\Http::open()',
+        '^fopen$' => 'Magento\Framework\Filesystem\DriverInterface::fileOpen',
+        '^fclose$' => 'Magento\Framework\Filesystem\DriverInterface::fileClose',
+        '^fsockopen$' => 'Magento\Framework\Filesystem\Driver\Http::open',
         '^ftp_.*$' => null,
-        '^fwrite$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite()',
-        '^fputs$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite()',
-        '^gettext$' => 'Magento\Framework\Translate\AdapterInterface::translate()',
-        '^_$' => 'Magento\Framework\Translate\AdapterInterface::translate()',
+        '^fwrite$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite',
+        '^fputs$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite',
+        '^gettext$' => 'Magento\Framework\Translate\AdapterInterface::translate',
+        '^_$' => 'Magento\Framework\Translate\AdapterInterface::translate',
         '^gz.*$' => null,
         '^header$' => null,
         '^highlight_file$' => null,
@@ -84,7 +84,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^link$' => null,
         '^mail$' => null,
         '^mb_send_mail$' => null,
-        '^mkdir$' => 'Magento\Framework\Filesystem\DriverInterface::createDirectory()',
+        '^mkdir$' => 'Magento\Framework\Filesystem\DriverInterface::createDirectory',
         '^move_uploaded_file$' => null,
         '^msession_.*$' => null,
         '^msg_send$' => null,
@@ -102,7 +102,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^parse_str$' => null,
         '^parse_url$' => null,
         '^parsekit_compile_string$' => null,
-        '^pathinfo$' => 'Magento\Framework\Filesystem\Io\File::getPathInfo()',
+        '^pathinfo$' => 'Magento\Framework\Filesystem\Io\File::getPathInfo',
         '^pcntl_.*$' => null,
         '^posix_.*$' => null,
         '^pfpro_.*$' => null,
@@ -112,14 +112,14 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^print_r$' => null,
         '^printf$' => null,
         '^putenv$' => null,
-        '^readfile$' => 'Magento\Framework\Filesystem\DriverInterface::fileRead()',
+        '^readfile$' => 'Magento\Framework\Filesystem\DriverInterface::fileRead',
         '^readgzfile$' => null,
-        '^readline$' => 'Magento\Framework\Filesystem\DriverInterface::fileReadLine()',
+        '^readline$' => 'Magento\Framework\Filesystem\DriverInterface::fileReadLine',
         '^readlink$' => null,
         '^register_shutdown_function$' => null,
         '^register_tick_function$' => null,
-        '^rename$' => 'Magento\Framework\Filesystem\DriverInterface::rename()',
-        '^rmdir$' => 'Magento\Framework\Filesystem\DriverInterface::deleteDirectory()',
+        '^rename$' => 'Magento\Framework\Filesystem\DriverInterface::rename',
+        '^rmdir$' => 'Magento\Framework\Filesystem\DriverInterface::deleteDirectory',
         '^scandir$' => null,
         '^session_.*$' => null,
         '^set_include_path$' => null,
@@ -127,15 +127,15 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^ini_alter$' => null,
         '^set_time_limit$' => null,
         '^setcookie$' => null,
-        '^setlocale$' => 'Magento\Framework\Translate\AdapterInterface::setlocale()',
+        '^setlocale$' => 'Magento\Framework\Translate\AdapterInterface::setLocale',
         '^setrawcookie$' => null,
         '^sleep$' => null,
         '^socket_.*$' => null,
         '^stream_.*$' => null,
         '^sybase_.*$' => null,
-        '^symlink$' => 'Magento\Framework\Filesystem\DriverInterface::symlink()',
+        '^symlink$' => 'Magento\Framework\Filesystem\DriverInterface::symlink',
         '^syslog$' => null,
-        '^touch$' => 'Magento\Framework\Filesystem\DriverInterface::touch()',
+        '^touch$' => 'Magento\Framework\Filesystem\DriverInterface::touch',
         '^trigger_error$' => null,
         '^unlink$' => null,
         '^vprintf$' => null,
@@ -158,7 +158,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^fdf_.*$' => null,
         '^fget.*$' => null,
         '^fread$' => null,
-        '^fflush$' => 'Magento\Framework\Filesystem\DriverInterface::fileFlush()',
+        '^fflush$' => 'Magento\Framework\Filesystem\DriverInterface::fileFlush',
         '^get_browser$' => null,
         '^get_headers$' => null,
         '^get_meta_tags$' => null,
@@ -204,23 +204,23 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^gettype$' => null,
         '^var_dump$' => null,
         '^tempnam$' => null,
-        '^realpath$' => 'Magento\Framework\Filesystem\DriverInterface::getRealPath()',
+        '^realpath$' => 'Magento\Framework\Filesystem\DriverInterface::getRealPath',
         '^linkinfo$' => null,
-        '^lstat$' => 'Magento\Framework\Filesystem\DriverInterface::stat()',
+        '^lstat$' => 'Magento\Framework\Filesystem\DriverInterface::stat',
         '^stat$' => null,
         '^lchgrp$' => null,
         '^lchown$' => null,
-        '^is_dir$' => 'Magento\Framework\Filesystem\DriverInterface::isDirectory()',
+        '^is_dir$' => 'Magento\Framework\Filesystem\DriverInterface::isDirectory',
         '^is_executable$' => null,
-        '^is_file$' => 'Magento\Framework\Filesystem\DriverInterface::isFile()',
+        '^is_file$' => 'Magento\Framework\Filesystem\DriverInterface::isFile',
         '^is_link$' => null,
-        '^is_readable$' => 'Magento\Framework\Filesystem\DriverInterface::isReadable()',
-        '^is_writable$' => 'Magento\Framework\Filesystem\DriverInterface::isWritable()',
-        '^is_writeable$' => 'Magento\Framework\Filesystem\DriverInterface::isWritable()',
+        '^is_readable$' => 'Magento\Framework\Filesystem\DriverInterface::isReadable',
+        '^is_writable$' => 'Magento\Framework\Filesystem\DriverInterface::isWritable',
+        '^is_writeable$' => 'Magento\Framework\Filesystem\DriverInterface::isWritable',
         '^is_uploaded_file$' => null,
-        '^glob$' => 'Magento\Framework\Filesystem\Glob::glob()',
+        '^glob$' => 'Magento\Framework\Filesystem\Glob::glob',
         '^ssh2_.*$' => null,
-        '^delete$' => 'Magento\Framework\Filesystem\DriverInterface::deleteFile()',
+        '^delete$' => 'Magento\Framework\Filesystem\DriverInterface::deleteFile',
         '^file.*$' => null,
         '^chop$' => 'rtrim()',
         '^sizeof$' => 'count()',
@@ -229,15 +229,15 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^strval$' => '(string) construction',
         '^htmlspecialchars$' => '\Magento\Framework\Escaper->escapeHtml',
         '^getimagesize$' => 'getimagesizefromstring',
-        '^file_exists$' => 'Magento\Framework\Filesystem\DriverInterface::isExists()',
-        '^file_get_contents$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetContents()',
-        '^file_put_contents$' => 'Magento\Framework\Filesystem\DriverInterface::filePutContents()',
-        '^fgetcsv$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetCsv()',
-        '^fputcsv$' => 'Magento\Framework\Filesystem\DriverInterface::filePutCsv()',
-        '^ftell$' => 'Magento\Framework\Filesystem\DriverInterface::fileTell()',
-        '^fseek$' => 'Magento\Framework\Filesystem\DriverInterface::fileSeek()',
-        '^feof$' => 'Magento\Framework\Filesystem\DriverInterface::endOfFile()',
-        '^flock$' => 'Magento\Framework\Filesystem\DriverInterface::fileLock()',
+        '^file_exists$' => 'Magento\Framework\Filesystem\DriverInterface::isExists',
+        '^file_get_contents$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetContents',
+        '^file_put_contents$' => 'Magento\Framework\Filesystem\DriverInterface::filePutContents',
+        '^fgetcsv$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetCsv',
+        '^fputcsv$' => 'Magento\Framework\Filesystem\DriverInterface::filePutCsv',
+        '^ftell$' => 'Magento\Framework\Filesystem\DriverInterface::fileTell',
+        '^fseek$' => 'Magento\Framework\Filesystem\DriverInterface::fileSeek',
+        '^feof$' => 'Magento\Framework\Filesystem\DriverInterface::endOfFile',
+        '^flock$' => 'Magento\Framework\Filesystem\DriverInterface::fileLock',
         '^date_sunrise$' => 'date_sun_info',
         '^date_sunset$' => 'date_sun_info',
         '^strptime$' => 'date_parse_from_format',

From 1bb395b8d5587496ca88b207d4b32322dd162110 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 31 May 2022 15:52:31 +0100
Subject: [PATCH 514/630] Version 23

---
 composer.json |  2 +-
 composer.lock | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index b86022b9..b345fb0a 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "22",
+    "version": "23",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index d182abf8..63cc9b1c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a3c03834eb0c721e9899cf1377029d57",
+    "content-hash": "5929082e101a2921524f8ded269292d8",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.7.1",
+            "version": "1.7.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719"
+                "reference": "cadad14ac63d8a432e01ae89ac5d0ff6fc3b16ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
-                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cadad14ac63d8a432e01ae89ac5d0ff6fc3b16ab",
+                "reference": "cadad14ac63d8a432e01ae89ac5d0ff6fc3b16ab",
                 "shasum": ""
             },
             "require": {
@@ -105,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.7.1"
+                "source": "https://github.com/phpstan/phpstan/tree/1.7.7"
             },
             "funding": [
                 {
@@ -125,25 +125,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T09:05:09+00:00"
+            "time": "2022-05-31T13:58:21+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.13.0",
+            "version": "0.13.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "bb3b32dd590cbd0deb67c2ce8ae32801357ff059"
+                "reference": "38c15a123c19748af5c3c2fd011ba105ce34a9e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/bb3b32dd590cbd0deb67c2ce8ae32801357ff059",
-                "reference": "bb3b32dd590cbd0deb67c2ce8ae32801357ff059",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/38c15a123c19748af5c3c2fd011ba105ce34a9e7",
+                "reference": "38c15a123c19748af5c3c2fd011ba105ce34a9e7",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.6.8"
+                "phpstan/phpstan": "^1.7.6"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -162,7 +162,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.12-dev"
+                    "dev-main": "0.13-dev"
                 }
             },
             "autoload": {
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.13.0"
+                "source": "https://github.com/rectorphp/rector/tree/0.13.3"
             },
             "funding": [
                 {
@@ -185,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-05-23T10:26:32+00:00"
+            "time": "2022-05-31T12:26:36+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From 2f9341a20e0cbfebad29d14f718b37501cc6dbd9 Mon Sep 17 00:00:00 2001
From: Matti Vapa <matti.vapa@piimega.fi>
Date: Thu, 2 Jun 2022 13:30:56 +0300
Subject: [PATCH 515/630] Check @deprecated format only if file has comment

The MethodAnnotationStructureSniff throws an error if the file does
not have a comment ($commentStartPtr is false). This commit moves the
@deprecated format check after we check that the file has a comment.
---
 .../Annotation/MethodAnnotationStructureSniff.php     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index a4ff6470..538f80c9 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -52,6 +52,11 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
+        $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
+        if (!$commentStartPtr) {
+            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
+            return;
+        }
 
         if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) {
             $phpcsFile->addWarning(
@@ -62,11 +67,7 @@ public function process(File $phpcsFile, $stackPtr)
                 'InvalidDeprecatedTagUsage'
             );
         }
-        $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
-        if (!$commentStartPtr) {
-            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
-            return;
-        }
+
         $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
         $functionPtrContent = $tokens[$stackPtr + 2]['content'];
         if (preg_match('/(?i)__construct/', $functionPtrContent)) {

From 1fc3c9de6e84c0577697dd1ff49459a7f01b37ca Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 14 Jun 2022 14:51:20 +0100
Subject: [PATCH 516/630] Version 24 (#185)

---
 composer.json         |   2 +-
 composer.lock         | 148 ++++++++++--------------------------------
 phpunit-bootstrap.php |   7 ++
 rector.php            |  14 ++--
 4 files changed, 46 insertions(+), 125 deletions(-)

diff --git a/composer.json b/composer.json
index b345fb0a..87ce22fe 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "23",
+    "version": "24",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 63cc9b1c..167507c3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5929082e101a2921524f8ded269292d8",
+    "content-hash": "648f4cf3962dc24fb1bdd135071b61bb",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.7.7",
+            "version": "1.7.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cadad14ac63d8a432e01ae89ac5d0ff6fc3b16ab"
+                "reference": "86ffc063bfd8f264c9eba568e84b0225a6090d09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cadad14ac63d8a432e01ae89ac5d0ff6fc3b16ab",
-                "reference": "cadad14ac63d8a432e01ae89ac5d0ff6fc3b16ab",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/86ffc063bfd8f264c9eba568e84b0225a6090d09",
+                "reference": "86ffc063bfd8f264c9eba568e84b0225a6090d09",
                 "shasum": ""
             },
             "require": {
@@ -105,7 +105,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.7.7"
+                "source": "https://github.com/phpstan/phpstan/tree/1.7.13"
             },
             "funding": [
                 {
@@ -125,25 +125,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-31T13:58:21+00:00"
+            "time": "2022-06-13T15:15:39+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.13.3",
+            "version": "0.13.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "38c15a123c19748af5c3c2fd011ba105ce34a9e7"
+                "reference": "4170aad2943b150149ba9594c34539e06ced6c6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/38c15a123c19748af5c3c2fd011ba105ce34a9e7",
-                "reference": "38c15a123c19748af5c3c2fd011ba105ce34a9e7",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/4170aad2943b150149ba9594c34539e06ced6c6b",
+                "reference": "4170aad2943b150149ba9594c34539e06ced6c6b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.7.6"
+                "phpstan/phpstan": "^1.7.10"
             },
             "conflict": {
                 "phpstan/phpdoc-parser": "<1.2",
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.13.3"
+                "source": "https://github.com/rectorphp/rector/tree/0.13.5"
             },
             "funding": [
                 {
@@ -185,20 +185,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-05-31T12:26:36+00:00"
+            "time": "2022-06-09T12:54:02+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.2",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+                "reference": "a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
-                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563",
+                "reference": "a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563",
                 "shasum": ""
             },
             "require": {
@@ -241,7 +241,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-12-12T21:44:58+00:00"
+            "time": "2022-06-13T06:31:38+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -442,16 +442,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v4.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
                 "shasum": ""
             },
             "require": {
@@ -492,9 +492,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2022-05-31T20:59:12+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -2219,88 +2219,6 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-10-20T20:35:02+00:00"
-        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.1",
@@ -2353,21 +2271,21 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.10.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
@@ -2405,9 +2323,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
             },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2022-06-03T18:03:27+00:00"
         }
     ],
     "aliases": [],
diff --git a/phpunit-bootstrap.php b/phpunit-bootstrap.php
index 2cf8c7f6..487e0170 100644
--- a/phpunit-bootstrap.php
+++ b/phpunit-bootstrap.php
@@ -25,6 +25,13 @@
     define('PHP_CODESNIFFER_VERBOSITY', 0);
 }
 
+/**
+ * Define PHP 8.1 tokens
+ */
+if (!defined('T_READONLY')) {
+    define('T_READONLY', 42401);
+}
+
 $ds = DIRECTORY_SEPARATOR;
 
 // Get the PHPCS dir from an environment variable.
diff --git a/rector.php b/rector.php
index afe7adc8..8bc53e56 100644
--- a/rector.php
+++ b/rector.php
@@ -4,7 +4,7 @@
 
 use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
 use Magento2\Rector\Src\ReplaceNewDateTimeNull;
-use Rector\Core\Configuration\Option;
+use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
 use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
@@ -12,17 +12,13 @@
 use Rector\Php80\Rector\ClassMethod\SetStateToStaticRector;
 use Rector\Php81\Rector\FuncCall\Php81ResourceReturnToObjectRector;
 use Magento2\Rector\Src\ReplacePregSplitNullLimit;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    // get parameters
-    $parameters = $containerConfigurator->parameters();
-
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->phpVersion(PhpVersion::PHP_80);
+    $rectorConfig->phpVersion(PhpVersion::PHP_81);
 
     // get services (needed for register a single rule)
-    $services = $containerConfigurator->services();
+    $services = $rectorConfig->services();
 
     // register a single rule
     $services->set(FinalPrivateToPrivateVisibilityRector::class);

From 223a265cbdceba04aae60777077ff02832cf4449 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 20 Jun 2022 16:33:59 +0200
Subject: [PATCH 517/630] AC-3520: Avoid processing less and CSS pseudo-classes

---
 Magento2/Sniffs/Less/ColonSpacingSniff.php    | 11 +++---
 Magento2/Tests/Less/ColonSpacingUnitTest.less | 34 ++++++++++++++++---
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index 505c44fd..73bf661b 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -60,12 +60,15 @@ private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
             return false;
         }
 
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_STYLE) {
-            // The colon is not part of a style definition.
-            return false;
+        // Avoid false positives when parsing pseudo-classes
+        if ($tokens[$stackPtr]['code'] === T_COLON) {
+            $next = $phpcsFile->findNext([T_SEMICOLON, T_OPEN_CURLY_BRACKET], $stackPtr + 1);
+            if ($tokens[$next]['code'] === T_OPEN_CURLY_BRACKET) {
+                return false;
+            }
         }
 
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         if ($tokens[$prev]['content'] === 'progid') {
             // Special case for IE filters.
             return false;
diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.less b/Magento2/Tests/Less/ColonSpacingUnitTest.less
index 37de49e4..d6b76d84 100644
--- a/Magento2/Tests/Less/ColonSpacingUnitTest.less
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.less
@@ -5,22 +5,46 @@
 
 
 div#foo {
-  blah:'abc';
+    blah:'abc';
 }
 
 .my #foo .blah {
-  some:  'stuff';
+    some:  'stuff';
 }
 
 .blah {
-  foo :'jkl';
+    foo :'jkl';
 }
 
 .foo {
-  bar:
+    bar:
           'xyz';
 }
 
 .right {
-  way: 'good'
+    way: 'good';
 }
+
+a:active {
+    color: #000;
+}
+
+@abs-action-button-as-link: {
+    &:not(:focus) {
+        box-shadow: none;
+    }
+}
+
+.actions-toolbar {
+    &:not(:first-child) {
+        &:extend(.abs-add-clearfix all);
+            > .secondary {
+                .action {
+                    &.add {
+                        margin-top: @indent__l;
+                    }
+                }
+            float: left;
+        }
+    }
+}
\ No newline at end of file

From 24dc36774e1b00b223ff7a15dae8710cea59e268 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 20 Jun 2022 16:35:25 +0200
Subject: [PATCH 518/630] AC-3520: Newline

---
 Magento2/Tests/Less/ColonSpacingUnitTest.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Tests/Less/ColonSpacingUnitTest.less b/Magento2/Tests/Less/ColonSpacingUnitTest.less
index d6b76d84..cd6a3fd3 100644
--- a/Magento2/Tests/Less/ColonSpacingUnitTest.less
+++ b/Magento2/Tests/Less/ColonSpacingUnitTest.less
@@ -47,4 +47,4 @@ a:active {
             float: left;
         }
     }
-}
\ No newline at end of file
+}

From 31335a0a1fd54cd5b4de926637ce4fb44d6e2168 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Mon, 20 Jun 2022 16:45:25 +0200
Subject: [PATCH 519/630] AC-3520: Removed unneeded if

---
 Magento2/Sniffs/Less/ColonSpacingSniff.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index 73bf661b..6b68ea65 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -61,11 +61,9 @@ private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
         }
 
         // Avoid false positives when parsing pseudo-classes
-        if ($tokens[$stackPtr]['code'] === T_COLON) {
-            $next = $phpcsFile->findNext([T_SEMICOLON, T_OPEN_CURLY_BRACKET], $stackPtr + 1);
-            if ($tokens[$next]['code'] === T_OPEN_CURLY_BRACKET) {
-                return false;
-            }
+        $next = $phpcsFile->findNext([T_SEMICOLON, T_OPEN_CURLY_BRACKET], $stackPtr + 1);
+        if ($tokens[$next]['code'] === T_OPEN_CURLY_BRACKET) {
+            return false;
         }
 
         $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);

From e1495a5c6662004ef3cf57ca3b1d667750bdba84 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Tue, 21 Jun 2022 12:19:52 +0200
Subject: [PATCH 520/630] Bump to version 25

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 87ce22fe..69f6abaf 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "24",
+    "version": "25",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 167507c3..563cd8b9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "648f4cf3962dc24fb1bdd135071b61bb",
+    "content-hash": "4545f720f14d1d67c1b4684e624da98b",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",

From a05e40f92ccba54548a49f1033c3394666bad3e3 Mon Sep 17 00:00:00 2001
From: Rafal Janicki <rjanicki@adobe.com>
Date: Thu, 30 Jun 2022 11:44:41 +0100
Subject: [PATCH 521/630] Fix Rector tests

---
 .../config/configured_rule.php                           | 9 ++++-----
 .../ReplaceMbStrposNullLimit/config/configured_rule.php  | 9 ++++-----
 .../ReplaceNewDateTimeNull/config/configured_rule.php    | 9 ++++-----
 .../ReplacePregSplitNullLimit/config/configured_rule.php | 9 ++++-----
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php
index 13e377ff..ab2ece4a 100644
--- a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php
+++ b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php
@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\AddArrayAccessInterfaceReturnTypes;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(AddArrayAccessInterfaceReturnTypes::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(AddArrayAccessInterfaceReturnTypes::class);
 };
diff --git a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php
index a08979ca..2e8bacac 100644
--- a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php
+++ b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php
@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ReplaceMbStrposNullLimit::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReplaceMbStrposNullLimit::class);
 };
diff --git a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php
index 83f8e100..5b4f4b1a 100644
--- a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php
+++ b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php
@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\ReplaceNewDateTimeNull;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ReplaceNewDateTimeNull::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReplaceNewDateTimeNull::class);
 };
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php
index d6f7f7cd..502704f4 100644
--- a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php
@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\ReplacePregSplitNullLimit;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ReplacePregSplitNullLimit::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReplacePregSplitNullLimit::class);
 };

From 1f76b15da9af73ee88b41ad2ddedaa0f5ab29a8a Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Wed, 6 Jul 2022 15:51:56 +0100
Subject: [PATCH 522/630] Correct spelling/grammar

---
 .../ClassAndInterfacePHPDocFormattingUnitTest.1.inc           | 4 ++--
 .../ClassAndInterfacePHPDocFormattingUnitTest.2.inc           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index e2727967..146cded2 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -60,9 +60,9 @@ class EmptyHandler
  * @api is ok here
  * @deprecated can be used in this context
  * @see is ok here
- * @author is not ment to be used
+ * @author should not be used
  * @category is irrelevant
- * @package is not ment to be used
+ * @package should not be used
  * @subpackage does not belong here
  */
 class ExampleHandler
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
index e45e15ff..b6decf6c 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
@@ -60,9 +60,9 @@ interface EmptyHandler
  * @api is ok here
  * @deprecated can be used in this context
  * @see is ok here
- * @author is not ment to be used
+ * @author should not be used
  * @category is irrelevant
- * @package is not ment to be used
+ * @package should not be used
  * @subpackage does not belong here
  */
 interface ExampleHandler

From b67b07208b818aa9c3ab74104b1e5454241779a9 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Wed, 13 Jul 2022 11:08:52 +0100
Subject: [PATCH 523/630] Include all Magento2 sniffs in Magento2Framework

---
 Magento2Framework/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento2Framework/ruleset.xml b/Magento2Framework/ruleset.xml
index 5e16e7a1..5c4eef70 100644
--- a/Magento2Framework/ruleset.xml
+++ b/Magento2Framework/ruleset.xml
@@ -4,6 +4,8 @@
 
     <arg name="extensions" value="php,phtml,graphqls/GRAPHQL,less/CSS,html/CSS,css/CSS,xml,js/JS"/>
 
+    <rule ref="Magento2" />
+
     <rule ref="Magento2Framework.Header.License">
         <severity>5</severity>
         <type>warning</type>

From 2cf24b3b14db5d2f45d59c1ab4216313629d5d1d Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 31 Aug 2022 17:18:14 +0200
Subject: [PATCH 524/630] Implement changes approved to @see tag in Dev guild

---
 .../Commenting/PHPDocFormattingValidator.php  |  7 ++++++-
 .../MethodAnnotationStructureUnitTest.inc     | 20 +++++++++++++++++++
 ...AndInterfacePHPDocFormattingUnitTest.1.inc | 17 ++++++++++++++++
 ...AndInterfacePHPDocFormattingUnitTest.2.inc | 16 +++++++++++++++
 .../ClassPropertyPHPDocFormattingUnitTest.inc |  6 ++++++
 .../ConstantsPHPDocFormattingUnitTest.2.inc   | 10 ++++++++++
 6 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index 9fd42e7f..3421b8a1 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -13,6 +13,8 @@
  */
 class PHPDocFormattingValidator
 {
+    private const REMOVED_IN_VERSION = 'removed in version';
+
     /**
      * Finds matching PHPDoc for current pointer
      *
@@ -123,7 +125,10 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            return false;
+            if (!stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0)) {
+                return false;
+            }
+            return true;
         }
 
         return $tokens[$seePtr + 2]['code'] === T_DOC_COMMENT_STRING;
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
index 4d3e0b7b..6b7431c9 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -369,4 +369,24 @@ class MethodAnnotationFixture
     {
         return true;
     }
+
+    /**
+     * This deprecated function is correct even though it only contains the @deprecated tag.
+     *
+     * @deprecated It will be removed in version 1.0.0
+     */
+    public function correctBecauseOfKeywordPhrase()
+    {
+        return false;
+    }
+
+    /**
+     * This deprecated function is correct even though it only contains the @deprecated tag.
+     *
+     * @deprecated WOW! It will be removed in version 1.0.0
+     */
+    public function alsoCorrectBecauseOfKeywordPhrase()
+    {
+        return false;
+    }
 }
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index e5895e32..c9785e18 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -162,3 +162,20 @@ class OldHandler
 {
 
 }
+
+/**
+ * @deprecated It will be removed in version 1.0.0
+ */
+class DeprecatedButHandler
+{
+
+}
+
+/**
+ * @deprecated It's also deprecated, but it will be removed in version 1.0.0
+ */
+class AlsoDeprecatedButHandler
+{
+
+}
+
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
index 96900de2..62935860 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
@@ -153,3 +153,19 @@ interface DoNotCareHandler
 {
 
 }
+
+/**
+ * @deprecated This interface will be removed in version 1.0.0
+ */
+interface DeprecatedButHandler
+{
+
+}
+
+/**
+ * @deprecated Yeah! This interface will be removed in version 1.0.0
+ */
+interface AlsoDeprecatedButHandler
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 62e9688f..1c85b175 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -194,4 +194,10 @@ class correctlyFormattedClassMemberDocBlock
      * @see Message with some reference
      */
     protected string $itIsCorrect;
+
+    /**
+     * @var string
+     * @deprecated This property will be removed in version 1.0.0
+     */
+    protected string $deprecatedWithKeyword;
 }
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
index 12b89834..a75730e6 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
@@ -63,4 +63,14 @@ class Profiler
      * @see
      */
     const d = 100;
+
+    /**
+     * @deprecated This constant will be removed in version 1.0.0
+     */
+    const KEYWORD_PHRASE = false;
+
+    /**
+     * @deprecated It's awesome - This constant will be removed in version 1.0.0
+     */
+    const WITH_KEYWORD_PHRASE = false;
 }

From 922e1080bde3ed1560075fa87fc10720097a3b9a Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 31 Aug 2022 17:57:49 +0200
Subject: [PATCH 525/630] Add without replacement

---
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php | 8 +++++---
 .../Annotation/MethodAnnotationStructureUnitTest.inc      | 4 ++--
 .../ClassAndInterfacePHPDocFormattingUnitTest.1.inc       | 4 ++--
 .../ClassAndInterfacePHPDocFormattingUnitTest.2.inc       | 4 ++--
 .../Commenting/ClassPropertyPHPDocFormattingUnitTest.inc  | 2 +-
 .../Commenting/ConstantsPHPDocFormattingUnitTest.2.inc    | 4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index 3421b8a1..a5f33d8c 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -14,6 +14,7 @@
 class PHPDocFormattingValidator
 {
     private const REMOVED_IN_VERSION = 'removed in version';
+    private const WITHOUT_REPLACEMENT = 'without replacement';
 
     /**
      * Finds matching PHPDoc for current pointer
@@ -125,10 +126,11 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            if (!stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0)) {
-                return false;
+            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) &&
+                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0)) {
+                return true;
             }
-            return true;
+            return false;
         }
 
         return $tokens[$seePtr + 2]['code'] === T_DOC_COMMENT_STRING;
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
index 6b7431c9..4ee0c4fa 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -373,7 +373,7 @@ class MethodAnnotationFixture
     /**
      * This deprecated function is correct even though it only contains the @deprecated tag.
      *
-     * @deprecated It will be removed in version 1.0.0
+     * @deprecated It will be removed in version 1.0.0 without replacement
      */
     public function correctBecauseOfKeywordPhrase()
     {
@@ -383,7 +383,7 @@ class MethodAnnotationFixture
     /**
      * This deprecated function is correct even though it only contains the @deprecated tag.
      *
-     * @deprecated WOW! It will be removed in version 1.0.0
+     * @deprecated WOW! It will be removed in version 1.0.0 without replacement
      */
     public function alsoCorrectBecauseOfKeywordPhrase()
     {
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index c9785e18..0dc9728b 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -164,7 +164,7 @@ class OldHandler
 }
 
 /**
- * @deprecated It will be removed in version 1.0.0
+ * @deprecated It will be removed in version 1.0.0 without replacement
  */
 class DeprecatedButHandler
 {
@@ -172,7 +172,7 @@ class DeprecatedButHandler
 }
 
 /**
- * @deprecated It's also deprecated, but it will be removed in version 1.0.0
+ * @deprecated It's also deprecated, but it will be removed in version 1.0.0 without replacement
  */
 class AlsoDeprecatedButHandler
 {
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
index 62935860..c1c456ed 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
@@ -155,7 +155,7 @@ interface DoNotCareHandler
 }
 
 /**
- * @deprecated This interface will be removed in version 1.0.0
+ * @deprecated This interface will be removed in version 1.0.0 without replacement
  */
 interface DeprecatedButHandler
 {
@@ -163,7 +163,7 @@ interface DeprecatedButHandler
 }
 
 /**
- * @deprecated Yeah! This interface will be removed in version 1.0.0
+ * @deprecated Yeah! This interface will be removed in version 1.0.0 without replacement
  */
 interface AlsoDeprecatedButHandler
 {
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 1c85b175..cde71269 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -197,7 +197,7 @@ class correctlyFormattedClassMemberDocBlock
 
     /**
      * @var string
-     * @deprecated This property will be removed in version 1.0.0
+     * @deprecated This property will be removed in version 1.0.0 without replacement
      */
     protected string $deprecatedWithKeyword;
 }
diff --git a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
index a75730e6..a751d8aa 100644
--- a/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ConstantsPHPDocFormattingUnitTest.2.inc
@@ -65,12 +65,12 @@ class Profiler
     const d = 100;
 
     /**
-     * @deprecated This constant will be removed in version 1.0.0
+     * @deprecated This constant will be removed in version 1.0.0 without replacement
      */
     const KEYWORD_PHRASE = false;
 
     /**
-     * @deprecated It's awesome - This constant will be removed in version 1.0.0
+     * @deprecated It's awesome - This constant will be removed in version 1.0.0 without replacement
      */
     const WITH_KEYWORD_PHRASE = false;
 }

From 30bed9501a88b21f57eb80f0cc2b83496ef5eb1b Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 31 Aug 2022 18:03:37 +0200
Subject: [PATCH 526/630] Update condition for stripos

---
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index a5f33d8c..fc9dc419 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -126,8 +126,8 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) &&
-                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0)) {
+            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) >= 0 &&
+                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0) >= 0) {
                 return true;
             }
             return false;

From 180c5105e13e3323a738d1f205edf26652502f4a Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 31 Aug 2022 18:07:49 +0200
Subject: [PATCH 527/630] Update boolean comparison on condition

---
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index fc9dc419..c8761992 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -126,8 +126,8 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) >= 0 &&
-                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0) >= 0) {
+            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) !== false &&
+                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0) !== false) {
                 return true;
             }
             return false;

From 8ba38f702ef5405fe79e48a8ebae4473c3fd9149 Mon Sep 17 00:00:00 2001
From: Karyna Tsymbal <k.tsymbal@atwix.com>
Date: Wed, 31 Aug 2022 18:23:21 +0200
Subject: [PATCH 528/630] Add eliminated classes to Magento coding standards in
 Legacy\RestrictedCodeSniff

---
 .../Legacy/_files/restricted_classes.php      | 244 ++++++++++++++++++
 1 file changed, 244 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index ed6d2540..3dedf871 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -29,6 +29,250 @@
             'Magento/Framework/DB/Adapter/Pdo/Mysql.php'
         ]
     ],
+    'Zend_Json' => [
+        'warning_code' => 'ZendJsonIsRestricted',
+        'replacement' => 'Magento\Framework\Serialize\Serializer\Json'
+    ],
+    'Zend_Json_Exception' => [
+        'warning_code' => 'ZendJsonIsRestricted',
+        'replacement' => '\InvalidArgumentException'
+    ],
+    'Zend_Acl' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Acl'
+    ],
+    'Zend_Acl_Role' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Role\GenericRole'
+    ],
+    'Zend_Acl_Resource' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Resource\GenericResource'
+    ],
+    'Zend_Acl_Role_Registry' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Role\Registry'
+    ],
+    'Zend_Acl_Role_Registry_Exception' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Exception\InvalidArgumentException'
+    ],
+    'Zend_Acl_Exception' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Exception\InvalidArgumentException'
+    ],
+    'Zend_Acl_Role_Interface' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Laminas\Permissions\Acl\Role\RoleInterface'
+    ],
+    'Zend_Currency' => [
+        'warning_code' => 'ZendAclIsRestricted',
+        'replacement' => 'Magento\Framework\Currency\Data\Currency'
+    ],
+    'Zend_Currency_Exception' => [
+        'warning_code' => 'ZendCurrencyIsRestricted',
+        'replacement' => 'Magento\Framework\Currency\Exception\CurrencyException'
+    ],
+    'Zend_Oauth_Http_Utility' => [
+        'warning_code' => 'ZendOauthIsRestricted',
+        'replacement' => 'Laminas\OAuth\Http\Utility'
+    ],
+    'Zend_Measure_Weight' => [
+        'warning_code' => 'ZendMeasureIsRestricted',
+        'replacement' => 'Magento\Framework\Measure\Weight'
+    ],
+    'Zend_Measure_Length' => [
+        'warning_code' => 'ZendMeasureIsRestricted',
+        'replacement' => 'Magento\Framework\Measure\Length'
+    ],
+    'Zend_Validate' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\ValidatorChain'
+    ],
+    'Zend_Validate_Regex' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\Regex'
+    ],
+    'Zend_Validate_Interface' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\ValidatorInterface'
+    ],
+    'Zend_Validate_EmailAddress' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\EmailAddress'
+    ],
+    'Zend_Validate_StringLength' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\StringLength'
+    ],
+    'Zend_Validate_Exception' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\ValidateException'
+    ],
+    'Zend_Validate_File_ExcludeExtension' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\File\ExcludeExtension'
+    ],
+    'Zend_Validate_File_Extension' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\File\Extension'
+    ],
+    'Zend_Validate_File_ImageSize' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\File\ImageSize'
+    ],
+    'Zend_Validate_File_FilesSize' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\File\FilesSize'
+    ],
+    'Zend_Validate_Alnum' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\Alnum'
+    ],
+    'Zend_Validate_Hostname' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\Hostname'
+    ],
+    'Zend_Validate_Date' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\Date'
+    ],
+    'Zend_Validate_Digits' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\Digits'
+    ],
+    'Zend_Validate_Alpha' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\I18n\Validator\Alpha'
+    ],
+    'Zend_Validate_InArray' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\InArray'
+    ],
+    'Zend_Validate_Abstract' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\AbstractValidator'
+    ],
+    'Zend_Validate_NotEmpty' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Magento\Framework\Validator\NotEmpty'
+    ],
+    'Zend_Validate_Callback' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\Callback'
+    ],
+    'Zend_Validate_Ip' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\Ip'
+    ],
+    'Zend_Validate_Identical' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\Identical'
+    ],
+    'Zend_Validate_File_IsImage' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\File\IsImage'
+    ],
+    'Zend_Validate_File_Size' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\Validator\File\FilesSize'
+    ],
+    'Zend_Validate_Float' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\I18n\Validator\IsFloat'
+    ],
+    'Zend_Validate_Int' => [
+        'warning_code' => 'ZendValidateIsRestricted',
+        'replacement' => 'Laminas\I18n\Validator\IsInt'
+    ],
+    'Magento\Framework\HTTP\ZendClient' => [
+        'warning_code' => 'HttpZendClientIsRestricted',
+        'replacement' => 'Magento\Framework\HTTP\LaminasClient'
+    ],
+    'Magento\Framework\HTTP\ZendClientFactory' => [
+        'warning_code' => 'HttpZendClientFactoryIsRestricted',
+        'replacement' => 'Magento\Framework\HTTP\LaminasClientFactory'
+    ],
+    'Zend_Http_Client' => [
+        'warning_code' => 'ZendHttpIsRestricted',
+        'replacement' => 'Laminas\Http\Request'
+    ],
+    'Zend_Http_Response' => [
+        'warning_code' => 'ZendHttpIsRestricted',
+        'replacement' => 'Laminas\Http\Response'
+    ],
+    'Zend_Http_Exception' => [
+        'warning_code' => 'ZendHttpIsRestricted',
+        'replacement' => 'Laminas\Http\Exception\RuntimeException'
+    ],
+    'Zend_Http_Client_Exception' => [
+        'warning_code' => 'ZendHttpIsRestricted',
+        'replacement' => 'Laminas\Http\Exception\RuntimeException'
+    ],
+    'Zend_Http_Client_Adapter_Interface' => [
+        'warning_code' => 'ZendHttpIsRestricted',
+        'replacement' => 'Laminas\Http\Client\Adapter\AdapterInterface'
+    ],
+    'Zend_Filter_File_Rename' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Laminas\Filter\File\Rename'
+    ],
+    'Zend_Filter' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Magento\Framework\Filter\FilterInput'
+    ],
+    'Zend_Filter_Input' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Magento\Framework\Filter\FilterInput'
+    ],
+    'Zend_Filter_Interface' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Laminas\Filter\FilterInterface'
+    ],
+    'Zend_Filter_LocalizedToNormalized' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Magento\Framework\Filter\LocalizedToNormalized'
+    ],
+    'Zend_Filter_Decrypt' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Laminas\Filter\Decrypt'
+    ],
+    'Zend_Filter_Encrypt' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Laminas\Filter\Encrypt'
+    ],
+    'Zend_Filter_Encrypt_Interface' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Laminas\Filter\Encrypt\EncryptionAlgorithmInterface'
+    ],
+    'Zend_Filter_Alnum' => [
+        'warning_code' => 'ZendFilterIsRestricted',
+        'replacement' => 'Laminas\I18n\Filter\Alnum'
+    ],
+    'Zend_Translate_Adapter' => [
+        'warning_code' => 'ZendTranslateIsRestricted',
+        'replacement' => 'Laminas\I18n\View\Helper\AbstractTranslatorHelper'
+    ],
+    'Zend_File_Transfer_Exception' => [
+        'warning_code' => 'ZendFileIsRestricted',
+        'replacement' => 'Laminas\File\Transfer\Exception\PhpEnvironmentException'
+    ],
+    'Zend_File_Transfer_Adapter_Http' => [
+        'warning_code' => 'ZendFileIsRestricted',
+        'replacement' => 'Magento\Framework\File\Http'
+    ],
+    'Zend_File_Transfer' => [
+        'warning_code' => 'ZendFileIsRestricted',
+        'replacement' => 'Laminas\File\Transfer\Transfer'
+    ],
+    'Zend_Date' => [
+        'warning_code' => 'ZendDateIsRestricted',
+        'replacement' => '\IntlDateFormatter'
+    ],
+    'Zend_Locale_Format' => [
+        'warning_code' => 'ZendLocaleFormatIsRestricted',
+        'replacement' => 'Laminas\I18n\Filter\NumberParse, \NumberFormatter, \IntlDateFormatter'
+    ],
     'Magento\Framework\Serialize\Serializer\Serialize' => [
         'warning_code' => 'SerializerSerializeIsRestricted',
         'replacement' => 'Magento\Framework\Serialize\SerializerInterface',

From 246c67bcf8d75985cad8effce3faa85a5143cae6 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Thu, 1 Sep 2022 12:25:10 +0200
Subject: [PATCH 529/630] Refactor: Use preg_match

---
 .../Helpers/Commenting/PHPDocFormattingValidator.php     | 9 ++++-----
 .../Annotation/MethodAnnotationStructureUnitTest.inc     | 4 ++--
 .../ClassAndInterfacePHPDocFormattingUnitTest.1.inc      | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index c8761992..a87312d5 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -13,9 +13,6 @@
  */
 class PHPDocFormattingValidator
 {
-    private const REMOVED_IN_VERSION = 'removed in version';
-    private const WITHOUT_REPLACEMENT = 'without replacement';
-
     /**
      * Finds matching PHPDoc for current pointer
      *
@@ -126,8 +123,10 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) !== false &&
-                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0) !== false) {
+            if (preg_match(
+                "/This [a-zA-Z]* will be removed in version \d.\d.\d without replacement/",
+                $tokens[$deprecatedPtr + 2]['content']
+            )) {
                 return true;
             }
             return false;
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
index 4ee0c4fa..2e0fdf0e 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -373,7 +373,7 @@ class MethodAnnotationFixture
     /**
      * This deprecated function is correct even though it only contains the @deprecated tag.
      *
-     * @deprecated It will be removed in version 1.0.0 without replacement
+     * @deprecated This method will be removed in version 1.0.0 without replacement
      */
     public function correctBecauseOfKeywordPhrase()
     {
@@ -383,7 +383,7 @@ class MethodAnnotationFixture
     /**
      * This deprecated function is correct even though it only contains the @deprecated tag.
      *
-     * @deprecated WOW! It will be removed in version 1.0.0 without replacement
+     * @deprecated WOW! This method will be removed in version 1.0.0 without replacement
      */
     public function alsoCorrectBecauseOfKeywordPhrase()
     {
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index 0dc9728b..afd4c934 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -164,7 +164,7 @@ class OldHandler
 }
 
 /**
- * @deprecated It will be removed in version 1.0.0 without replacement
+ * @deprecated This class will be removed in version 1.0.0 without replacement
  */
 class DeprecatedButHandler
 {
@@ -172,7 +172,7 @@ class DeprecatedButHandler
 }
 
 /**
- * @deprecated It's also deprecated, but it will be removed in version 1.0.0 without replacement
+ * @deprecated It's also deprecated - This class will be removed in version 1.0.0 without replacement
  */
 class AlsoDeprecatedButHandler
 {

From 10001607376f34388954e7f99ce4aa4d52c06fd7 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@adobe.com>
Date: Tue, 13 Sep 2022 10:52:59 -0500
Subject: [PATCH 530/630]  Add eliminated classes to Magento coding standards
 in Legacy\RestrictedCodeSniff

---
 .../Legacy/_files/restricted_classes.php      | 183 ++++++++++++------
 1 file changed, 122 insertions(+), 61 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index 3dedf871..3269caca 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -31,247 +31,308 @@
     ],
     'Zend_Json' => [
         'warning_code' => 'ZendJsonIsRestricted',
-        'replacement' => 'Magento\Framework\Serialize\Serializer\Json'
+        'replacement' => 'Magento\Framework\Serialize\Serializer\Json',
+        'exclude' => []
     ],
     'Zend_Json_Exception' => [
         'warning_code' => 'ZendJsonIsRestricted',
-        'replacement' => '\InvalidArgumentException'
+        'replacement' => '\InvalidArgumentException',
+        'exclude' => []
     ],
     'Zend_Acl' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Acl'
+        'replacement' => 'Laminas\Permissions\Acl\Acl',
+        'exclude' => []
     ],
     'Zend_Acl_Role' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Role\GenericRole'
+        'replacement' => 'Laminas\Permissions\Acl\Role\GenericRole',
+        'exclude' => []
     ],
     'Zend_Acl_Resource' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Resource\GenericResource'
+        'replacement' => 'Laminas\Permissions\Acl\Resource\GenericResource',
+        'exclude' => []
     ],
     'Zend_Acl_Role_Registry' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Role\Registry'
+        'replacement' => 'Laminas\Permissions\Acl\Role\Registry',
+        'exclude' => []
     ],
     'Zend_Acl_Role_Registry_Exception' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Exception\InvalidArgumentException'
+        'replacement' => 'Laminas\Permissions\Acl\Exception\InvalidArgumentException',
+        'exclude' => []
     ],
     'Zend_Acl_Exception' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Exception\InvalidArgumentException'
+        'replacement' => 'Laminas\Permissions\Acl\Exception\InvalidArgumentException',
+        'exclude' => []
     ],
     'Zend_Acl_Role_Interface' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Laminas\Permissions\Acl\Role\RoleInterface'
+        'replacement' => 'Laminas\Permissions\Acl\Role\RoleInterface',
+        'exclude' => []
     ],
     'Zend_Currency' => [
         'warning_code' => 'ZendAclIsRestricted',
-        'replacement' => 'Magento\Framework\Currency\Data\Currency'
+        'replacement' => 'Magento\Framework\Currency\Data\Currency',
+        'exclude' => []
     ],
     'Zend_Currency_Exception' => [
         'warning_code' => 'ZendCurrencyIsRestricted',
-        'replacement' => 'Magento\Framework\Currency\Exception\CurrencyException'
+        'replacement' => 'Magento\Framework\Currency\Exception\CurrencyException',
+        'exclude' => []
     ],
     'Zend_Oauth_Http_Utility' => [
         'warning_code' => 'ZendOauthIsRestricted',
-        'replacement' => 'Laminas\OAuth\Http\Utility'
+        'replacement' => 'Laminas\OAuth\Http\Utility',
+        'exclude' => []
     ],
     'Zend_Measure_Weight' => [
         'warning_code' => 'ZendMeasureIsRestricted',
-        'replacement' => 'Magento\Framework\Measure\Weight'
+        'replacement' => 'Magento\Framework\Measure\Weight',
+        'exclude' => []
     ],
     'Zend_Measure_Length' => [
         'warning_code' => 'ZendMeasureIsRestricted',
-        'replacement' => 'Magento\Framework\Measure\Length'
+        'replacement' => 'Magento\Framework\Measure\Length',
+        'exclude' => []
     ],
     'Zend_Validate' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\ValidatorChain'
+        'replacement' => 'Magento\Framework\Validator\ValidatorChain',
+        'exclude' => []
     ],
     'Zend_Validate_Regex' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\Regex'
+        'replacement' => 'Laminas\Validator\Regex',
+        'exclude' => []
     ],
     'Zend_Validate_Interface' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\ValidatorInterface'
+        'replacement' => 'Laminas\Validator\ValidatorInterface',
+        'exclude' => []
     ],
     'Zend_Validate_EmailAddress' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\EmailAddress'
+        'replacement' => 'Magento\Framework\Validator\EmailAddress',
+        'exclude' => []
     ],
     'Zend_Validate_StringLength' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\StringLength'
+        'replacement' => 'Magento\Framework\Validator\StringLength',
+        'exclude' => []
     ],
     'Zend_Validate_Exception' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\ValidateException'
+        'replacement' => 'Magento\Framework\Validator\ValidateException',
+        'exclude' => []
     ],
     'Zend_Validate_File_ExcludeExtension' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\File\ExcludeExtension'
+        'replacement' => 'Laminas\Validator\File\ExcludeExtension',
+        'exclude' => []
     ],
     'Zend_Validate_File_Extension' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\File\Extension'
+        'replacement' => 'Laminas\Validator\File\Extension',
+        'exclude' => []
     ],
     'Zend_Validate_File_ImageSize' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\File\ImageSize'
+        'replacement' => 'Laminas\Validator\File\ImageSize',
+        'exclude' => []
     ],
     'Zend_Validate_File_FilesSize' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\File\FilesSize'
+        'replacement' => 'Laminas\Validator\File\FilesSize',
+        'exclude' => []
     ],
     'Zend_Validate_Alnum' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\Alnum'
+        'replacement' => 'Magento\Framework\Validator\Alnum',
+        'exclude' => []
     ],
     'Zend_Validate_Hostname' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\Hostname'
+        'replacement' => 'Magento\Framework\Validator\Hostname',
+        'exclude' => []
     ],
     'Zend_Validate_Date' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\Date'
+        'replacement' => 'Laminas\Validator\Date',
+        'exclude' => []
     ],
     'Zend_Validate_Digits' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\Digits'
+        'replacement' => 'Laminas\Validator\Digits',
+        'exclude' => []
     ],
     'Zend_Validate_Alpha' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\I18n\Validator\Alpha'
+        'replacement' => 'Laminas\I18n\Validator\Alpha',
+        'exclude' => []
     ],
     'Zend_Validate_InArray' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\InArray'
+        'replacement' => 'Laminas\Validator\InArray',
+        'exclude' => []
     ],
     'Zend_Validate_Abstract' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\AbstractValidator'
+        'replacement' => 'Laminas\Validator\AbstractValidator',
+        'exclude' => []
     ],
     'Zend_Validate_NotEmpty' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Magento\Framework\Validator\NotEmpty'
+        'replacement' => 'Magento\Framework\Validator\NotEmpty',
+        'exclude' => []
     ],
     'Zend_Validate_Callback' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\Callback'
+        'replacement' => 'Laminas\Validator\Callback',
+        'exclude' => []
     ],
     'Zend_Validate_Ip' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\Ip'
+        'replacement' => 'Laminas\Validator\Ip',
+        'exclude' => []
     ],
     'Zend_Validate_Identical' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\Identical'
+        'replacement' => 'Laminas\Validator\Identical',
+        'exclude' => []
     ],
     'Zend_Validate_File_IsImage' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\File\IsImage'
+        'replacement' => 'Laminas\Validator\File\IsImage',
+        'exclude' => []
     ],
     'Zend_Validate_File_Size' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\Validator\File\FilesSize'
+        'replacement' => 'Laminas\Validator\File\FilesSize',
+        'exclude' => []
     ],
     'Zend_Validate_Float' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\I18n\Validator\IsFloat'
+        'replacement' => 'Laminas\I18n\Validator\IsFloat',
+        'exclude' => []
     ],
     'Zend_Validate_Int' => [
         'warning_code' => 'ZendValidateIsRestricted',
-        'replacement' => 'Laminas\I18n\Validator\IsInt'
+        'replacement' => 'Laminas\I18n\Validator\IsInt',
+        'exclude' => []
     ],
     'Magento\Framework\HTTP\ZendClient' => [
         'warning_code' => 'HttpZendClientIsRestricted',
-        'replacement' => 'Magento\Framework\HTTP\LaminasClient'
+        'replacement' => 'Magento\Framework\HTTP\LaminasClient',
+        'exclude' => []
     ],
     'Magento\Framework\HTTP\ZendClientFactory' => [
         'warning_code' => 'HttpZendClientFactoryIsRestricted',
-        'replacement' => 'Magento\Framework\HTTP\LaminasClientFactory'
+        'replacement' => 'Magento\Framework\HTTP\LaminasClientFactory',
+        'exclude' => []
     ],
     'Zend_Http_Client' => [
         'warning_code' => 'ZendHttpIsRestricted',
-        'replacement' => 'Laminas\Http\Request'
+        'replacement' => 'Laminas\Http\Request',
+        'exclude' => []
     ],
     'Zend_Http_Response' => [
         'warning_code' => 'ZendHttpIsRestricted',
-        'replacement' => 'Laminas\Http\Response'
+        'replacement' => 'Laminas\Http\Response',
+        'exclude' => []
     ],
     'Zend_Http_Exception' => [
         'warning_code' => 'ZendHttpIsRestricted',
-        'replacement' => 'Laminas\Http\Exception\RuntimeException'
+        'replacement' => 'Laminas\Http\Exception\RuntimeException',
+        'exclude' => []
     ],
     'Zend_Http_Client_Exception' => [
         'warning_code' => 'ZendHttpIsRestricted',
-        'replacement' => 'Laminas\Http\Exception\RuntimeException'
+        'replacement' => 'Laminas\Http\Exception\RuntimeException',
+        'exclude' => []
     ],
     'Zend_Http_Client_Adapter_Interface' => [
         'warning_code' => 'ZendHttpIsRestricted',
-        'replacement' => 'Laminas\Http\Client\Adapter\AdapterInterface'
+        'replacement' => 'Laminas\Http\Client\Adapter\AdapterInterface',
+        'exclude' => []
     ],
     'Zend_Filter_File_Rename' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Laminas\Filter\File\Rename'
+        'replacement' => 'Laminas\Filter\File\Rename',
+        'exclude' => []
     ],
     'Zend_Filter' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Magento\Framework\Filter\FilterInput'
+        'replacement' => 'Magento\Framework\Filter\FilterInput',
+        'exclude' => []
     ],
     'Zend_Filter_Input' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Magento\Framework\Filter\FilterInput'
+        'replacement' => 'Magento\Framework\Filter\FilterInput',
+        'exclude' => []
     ],
     'Zend_Filter_Interface' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Laminas\Filter\FilterInterface'
+        'replacement' => 'Laminas\Filter\FilterInterface',
+        'exclude' => []
     ],
     'Zend_Filter_LocalizedToNormalized' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Magento\Framework\Filter\LocalizedToNormalized'
+        'replacement' => 'Magento\Framework\Filter\LocalizedToNormalized',
+        'exclude' => []
     ],
     'Zend_Filter_Decrypt' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Laminas\Filter\Decrypt'
+        'replacement' => 'Laminas\Filter\Decrypt',
+        'exclude' => []
     ],
     'Zend_Filter_Encrypt' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Laminas\Filter\Encrypt'
+        'replacement' => 'Laminas\Filter\Encrypt',
+        'exclude' => []
     ],
     'Zend_Filter_Encrypt_Interface' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Laminas\Filter\Encrypt\EncryptionAlgorithmInterface'
+        'replacement' => 'Laminas\Filter\Encrypt\EncryptionAlgorithmInterface',
+        'exclude' => []
     ],
     'Zend_Filter_Alnum' => [
         'warning_code' => 'ZendFilterIsRestricted',
-        'replacement' => 'Laminas\I18n\Filter\Alnum'
+        'replacement' => 'Laminas\I18n\Filter\Alnum',
+        'exclude' => []
     ],
     'Zend_Translate_Adapter' => [
         'warning_code' => 'ZendTranslateIsRestricted',
-        'replacement' => 'Laminas\I18n\View\Helper\AbstractTranslatorHelper'
+        'replacement' => 'Laminas\I18n\View\Helper\AbstractTranslatorHelper',
+        'exclude' => []
     ],
     'Zend_File_Transfer_Exception' => [
         'warning_code' => 'ZendFileIsRestricted',
-        'replacement' => 'Laminas\File\Transfer\Exception\PhpEnvironmentException'
+        'replacement' => 'Laminas\File\Transfer\Exception\PhpEnvironmentException',
+        'exclude' => []
     ],
     'Zend_File_Transfer_Adapter_Http' => [
         'warning_code' => 'ZendFileIsRestricted',
-        'replacement' => 'Magento\Framework\File\Http'
+        'replacement' => 'Magento\Framework\File\Http',
+        'exclude' => []
     ],
     'Zend_File_Transfer' => [
         'warning_code' => 'ZendFileIsRestricted',
-        'replacement' => 'Laminas\File\Transfer\Transfer'
+        'replacement' => 'Laminas\File\Transfer\Transfer',
+        'exclude' => []
     ],
     'Zend_Date' => [
         'warning_code' => 'ZendDateIsRestricted',
-        'replacement' => '\IntlDateFormatter'
+        'replacement' => '\IntlDateFormatter',
+        'exclude' => []
     ],
     'Zend_Locale_Format' => [
         'warning_code' => 'ZendLocaleFormatIsRestricted',
-        'replacement' => 'Laminas\I18n\Filter\NumberParse, \NumberFormatter, \IntlDateFormatter'
+        'replacement' => 'Laminas\I18n\Filter\NumberParse, \NumberFormatter, \IntlDateFormatter',
+        'exclude' => []
     ],
     'Magento\Framework\Serialize\Serializer\Serialize' => [
         'warning_code' => 'SerializerSerializeIsRestricted',

From 9b16a9466554c4c10c250bd6642754d8ecce1cf9 Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Fri, 23 Sep 2022 17:55:27 +0530
Subject: [PATCH 531/630] AC-6437:Ensure PHP8.1 support after 7.4 removal -
 Added support for ReflectionIntersection and ReflectionUnion Type variables

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index f05cc78b..3732e2ac 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -29,7 +29,9 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_NS_SEPARATOR,
         T_STRING,
         T_COMMENT,
-        T_NULLABLE
+        T_NULLABLE,
+        T_BITWISE_AND,
+        T_TYPE_UNION,
     ];
 
     /**

From 0397552687706e3fcd66b19caf3aa90389ae9b76 Mon Sep 17 00:00:00 2001
From: Rafal Janicki <rjanicki@adobe.com>
Date: Tue, 4 Oct 2022 11:00:48 +0100
Subject: [PATCH 532/630] Release v26

---
 composer.json |   2 +-
 composer.lock | 436 +++++++++-----------------------------------------
 2 files changed, 76 insertions(+), 362 deletions(-)

diff --git a/composer.json b/composer.json
index 69f6abaf..13e73cce 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "25",
+    "version": "26",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
diff --git a/composer.lock b/composer.lock
index 563cd8b9..17a2656d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4545f720f14d1d67c1b4684e624da98b",
+    "content-hash": "c3fda2a5a3535f9eff0880e5ddc61827",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.7.13",
+            "version": "1.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "86ffc063bfd8f264c9eba568e84b0225a6090d09"
+                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/86ffc063bfd8f264c9eba568e84b0225a6090d09",
-                "reference": "86ffc063bfd8f264c9eba568e84b0225a6090d09",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618",
+                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618",
                 "shasum": ""
             },
             "require": {
@@ -103,9 +103,13 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.7.13"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.6"
             },
             "funding": [
                 {
@@ -116,37 +120,33 @@
                     "url": "https://github.com/phpstan",
                     "type": "github"
                 },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-13T15:15:39+00:00"
+            "time": "2022-09-23T09:54:39+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.13.5",
+            "version": "0.13.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "4170aad2943b150149ba9594c34539e06ced6c6b"
+                "reference": "d1e069db8ad3b4aea2b968248370c21415e4c180"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/4170aad2943b150149ba9594c34539e06ced6c6b",
-                "reference": "4170aad2943b150149ba9594c34539e06ced6c6b",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d1e069db8ad3b4aea2b968248370c21415e4c180",
+                "reference": "d1e069db8ad3b4aea2b968248370c21415e4c180",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.7.10"
+                "phpstan/phpstan": "^1.8.2"
             },
             "conflict": {
-                "phpstan/phpdoc-parser": "<1.2",
+                "phpstan/phpdoc-parser": "<1.6.2",
                 "rector/rector-cakephp": "*",
                 "rector/rector-doctrine": "*",
                 "rector/rector-laravel": "*",
@@ -177,7 +177,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.13.5"
+                "source": "https://github.com/rectorphp/rector/tree/0.13.10"
             },
             "funding": [
                 {
@@ -185,20 +185,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-09T12:54:02+00:00"
+            "time": "2022-08-03T12:48:10+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.0",
+            "version": "3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563"
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563",
-                "reference": "a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
                 "shasum": ""
             },
             "require": {
@@ -241,20 +241,20 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2022-06-13T06:31:38+00:00"
+            "time": "2022-06-18T07:21:10+00:00"
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.6",
+            "version": "v14.11.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "6070542725b61fc7d0654a8a9855303e5e157434"
+                "reference": "04a48693acd785330eefd3b0e4fa67df8dfee7c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6070542725b61fc7d0654a8a9855303e5e157434",
-                "reference": "6070542725b61fc7d0654a8a9855303e5e157434",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/04a48693acd785330eefd3b0e4fa67df8dfee7c3",
+                "reference": "04a48693acd785330eefd3b0e4fa67df8dfee7c3",
                 "shasum": ""
             },
             "require": {
@@ -299,7 +299,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.6"
+                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.8"
             },
             "funding": [
                 {
@@ -307,7 +307,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-04-13T16:25:32+00:00"
+            "time": "2022-09-21T15:35:03+00:00"
         }
     ],
     "packages-dev": [
@@ -442,16 +442,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
@@ -492,9 +492,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
             },
-            "time": "2022-05-31T20:59:12+00:00"
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -607,252 +607,25 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
-            },
-            "time": "2022-03-15T21:29:03+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
-        },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -901,7 +674,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
             },
             "funding": [
                 {
@@ -909,7 +682,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-08-30T12:24:04+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1154,16 +927,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.20",
+            "version": "9.5.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
+                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
                 "shasum": ""
             },
             "require": {
@@ -1178,7 +951,6 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
                 "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
@@ -1186,20 +958,16 @@
                 "phpunit/php-timer": "^5.0.2",
                 "sebastian/cli-parser": "^1.0.1",
                 "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
+                "sebastian/comparator": "^4.0.8",
                 "sebastian/diff": "^4.0.3",
                 "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
+                "sebastian/exporter": "^4.0.5",
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.2",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
                 "ext-soap": "*",
                 "ext-xdebug": "*"
@@ -1241,7 +1009,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
             },
             "funding": [
                 {
@@ -1251,9 +1019,13 @@
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2022-09-25T03:44:45+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1424,16 +1196,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
@@ -1486,7 +1258,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -1494,7 +1266,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -1684,16 +1456,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
@@ -1749,7 +1521,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
             },
             "funding": [
                 {
@@ -1757,7 +1529,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -2112,16 +1884,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
                 "shasum": ""
             },
             "require": {
@@ -2133,7 +1905,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -2156,7 +1928,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
             },
             "funding": [
                 {
@@ -2164,7 +1936,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2022-09-12T14:47:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2268,64 +2040,6 @@
                 }
             ],
             "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
-            },
-            "time": "2022-06-03T18:03:27+00:00"
         }
     ],
     "aliases": [],

From c183421a25aec235cb400fb9260112410a88c404 Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Fri, 14 Oct 2022 18:20:19 +0530
Subject: [PATCH 533/630] AC-6437:Ensure PHP8.1 support after 7.4 removal -
 Release v27

---
 composer.json |  4 ++--
 composer.lock | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 13e73cce..07e01770 100644
--- a/composer.json
+++ b/composer.json
@@ -6,9 +6,9 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "26",
+    "version": "27",
     "require": {
-        "php": ">=7.3",
+        "php": "^8.1||^8.2",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index 17a2656d..b62791c4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c3fda2a5a3535f9eff0880e5ddc61827",
+    "content-hash": "a50d1c346c96a8ad6ecdc3d142d1fc3e",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.6",
+            "version": "1.8.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618"
+                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618",
-                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
+                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
                 "shasum": ""
             },
             "require": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.6"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.9"
             },
             "funding": [
                 {
@@ -125,7 +125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-23T09:54:39+00:00"
+            "time": "2022-10-13T13:40:18+00:00"
         },
         {
             "name": "rector/rector",
@@ -2048,7 +2048,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3",
+        "php": "^8.1||^8.2",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },

From 5fd9e4ced3a9df60d334391101d90fdfca12054f Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Fri, 14 Oct 2022 18:37:32 +0530
Subject: [PATCH 534/630] AC-6437:Ensure PHP8.1 support after 7.4 removal

---
 .github/workflows/php.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index e579cf3c..f4472119 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,9 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
-          - "7.4"
-          - "8.0"
           - "8.1"
         dependencies:
           - "lowest"

From 1798cf49dd752411f373e2fb3e7d028289fc7311 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Sat, 15 Oct 2022 12:02:16 +0100
Subject: [PATCH 535/630] Fix PHP error with short class names

---
 Magento2/Sniffs/Less/ClassNamingSniff.php    | 3 ++-
 Magento2/Tests/Less/ClassNamingUnitTest.less | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
index e684172b..9a2e1dd0 100644
--- a/Magento2/Sniffs/Less/ClassNamingSniff.php
+++ b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -66,7 +66,8 @@ public function process(File $phpcsFile, $stackPtr)
                 [implode("", $matches[0])]
             );
         }
-        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
+
+        if (strlen($className) > 1 && strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
             $phpcsFile->addError(
                 'CSS class names should be separated with "-" (dash) instead of "_" (underscore)',
                 $stackPtr,
diff --git a/Magento2/Tests/Less/ClassNamingUnitTest.less b/Magento2/Tests/Less/ClassNamingUnitTest.less
index ba60c205..f67a938b 100644
--- a/Magento2/Tests/Less/ClassNamingUnitTest.less
+++ b/Magento2/Tests/Less/ClassNamingUnitTest.less
@@ -30,3 +30,8 @@
 .category-title {
   background: green;
 }
+
+// @see https://github.com/magento/magento-coding-standard/issues/425
+.a {
+  text-decoration: none;
+}

From 4e804252838a0516fec4ce5bbf7cb76b904b090b Mon Sep 17 00:00:00 2001
From: Viktor Rad <vrad@adobe.com>
Date: Fri, 2 Dec 2022 10:58:49 -0600
Subject: [PATCH 536/630] AC-7098: Performance issue in TableNameSniff with big
 array - updated rector/rector because its dependency phpstan/phpstan released
 1.9 and caused build to fail

---
 ...AddArrayAccessInterfaceReturnTypesTest.php |  4 +-
 .../ReplaceMbStrposNullLimitTest.php          |  4 +-
 .../ReplaceNewDateTimeNullTest.php            |  4 +-
 .../ReplacePregSplitNullLimitTest.php         |  4 +-
 Magento2/Sniffs/Legacy/TableNameSniff.php     |  6 +-
 Magento2/Tests/Legacy/TableNameUnitTest.inc   |  2 +
 Magento2/Tests/Legacy/TableNameUnitTest.php   |  2 +-
 composer.json                                 |  2 +-
 composer.lock                                 | 73 +++++++++----------
 9 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
index 3d53d5aa..89c9bb05 100644
--- a/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
+++ b/Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php
@@ -16,9 +16,9 @@ class AddArrayAccessInterfaceReturnTypesTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**
diff --git a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
index 77a15b75..eb87d394 100644
--- a/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
+++ b/Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php
@@ -16,9 +16,9 @@ class ReplaceMbStrposNullLimitTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**
diff --git a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
index fe3c6028..49c3491f 100644
--- a/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
+++ b/Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php
@@ -16,9 +16,9 @@ class ReplaceNewDateTimeNullTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
index 5db48332..112bfe0f 100644
--- a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php
@@ -16,9 +16,9 @@ class ReplacePregSplitNullLimitTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**
diff --git a/Magento2/Sniffs/Legacy/TableNameSniff.php b/Magento2/Sniffs/Legacy/TableNameSniff.php
index b9a9081f..4569f7fc 100644
--- a/Magento2/Sniffs/Legacy/TableNameSniff.php
+++ b/Magento2/Sniffs/Legacy/TableNameSniff.php
@@ -189,8 +189,10 @@ private function checkOccurrencesInProperty(File $phpcsFile, int $stackPtr, arra
     private function checkOccurrencesInArray(File $phpcsFile, int $stackPtr, array $tokens): void
     {
         $aliasPos = $phpcsFile->findPrevious(
-            T_CONSTANT_ENCAPSED_STRING,
-            $stackPtr -1
+            T_WHITESPACE,
+            $stackPtr - 1,
+            null,
+            true,
         );
 
         $alias = trim($tokens[$aliasPos]['content'], '\'"');
diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.inc b/Magento2/Tests/Legacy/TableNameUnitTest.inc
index d3b46079..c076adf4 100644
--- a/Magento2/Tests/Legacy/TableNameUnitTest.inc
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.inc
@@ -28,6 +28,8 @@ $select = $connection->select()->from(
     ['main_table' => 'magento_sample_table']
 );
 
+$fooBar=array(0=>array(125,0,875,750),'33' =>array(85,0,194,716), 10 => 100);
+
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collection
 {
     /**
diff --git a/Magento2/Tests/Legacy/TableNameUnitTest.php b/Magento2/Tests/Legacy/TableNameUnitTest.php
index eec07bfe..3d9ccce0 100644
--- a/Magento2/Tests/Legacy/TableNameUnitTest.php
+++ b/Magento2/Tests/Legacy/TableNameUnitTest.php
@@ -19,7 +19,7 @@ public function getErrorList($testFile = '')
             7 => 1,
             16 => 1,
             20 => 1,
-            38 => 1,
+            40 => 1,
         ];
     }
 
diff --git a/composer.json b/composer.json
index 07e01770..680863d5 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.13.0"
+        "rector/rector": "^0.14.8"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index b62791c4..ecfa2b8c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a50d1c346c96a8ad6ecdc3d142d1fc3e",
+    "content-hash": "c101090e4e439fe14f68b90ca3dde531",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.9",
+            "version": "1.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2"
+                "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
-                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d6fdf01c53978b6429f1393ba4afeca39cc68afa",
+                "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa",
                 "shasum": ""
             },
             "require": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.9"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.2"
             },
             "funding": [
                 {
@@ -125,35 +125,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-13T13:40:18+00:00"
+            "time": "2022-11-10T09:56:11+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.13.10",
+            "version": "0.14.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "d1e069db8ad3b4aea2b968248370c21415e4c180"
+                "reference": "46ee9a173a2b2645ca92a75ffc17460139fa226e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d1e069db8ad3b4aea2b968248370c21415e4c180",
-                "reference": "d1e069db8ad3b4aea2b968248370c21415e4c180",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/46ee9a173a2b2645ca92a75ffc17460139fa226e",
+                "reference": "46ee9a173a2b2645ca92a75ffc17460139fa226e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.8.2"
+                "phpstan/phpstan": "^1.9.0"
             },
             "conflict": {
-                "phpstan/phpdoc-parser": "<1.6.2",
-                "rector/rector-cakephp": "*",
                 "rector/rector-doctrine": "*",
-                "rector/rector-laravel": "*",
-                "rector/rector-nette": "*",
+                "rector/rector-downgrade-php": "*",
+                "rector/rector-php-parser": "*",
                 "rector/rector-phpoffice": "*",
                 "rector/rector-phpunit": "*",
-                "rector/rector-prefixed": "*",
                 "rector/rector-symfony": "*"
             },
             "bin": [
@@ -162,7 +159,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.13-dev"
+                    "dev-main": "0.14-dev"
                 }
             },
             "autoload": {
@@ -177,7 +174,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.13.10"
+                "source": "https://github.com/rectorphp/rector/tree/0.14.8"
             },
             "funding": [
                 {
@@ -185,7 +182,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-03T12:48:10+00:00"
+            "time": "2022-11-14T14:09:49+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -442,16 +439,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.1",
+            "version": "v4.15.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
                 "shasum": ""
             },
             "require": {
@@ -492,9 +489,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
             },
-            "time": "2022-09-04T07:30:47+00:00"
+            "time": "2022-11-12T15:38:23+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -609,16 +606,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.17",
+            "version": "9.2.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
+                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
+                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
                 "shasum": ""
             },
             "require": {
@@ -674,7 +671,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
             },
             "funding": [
                 {
@@ -682,7 +679,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-30T12:24:04+00:00"
+            "time": "2022-11-18T07:47:47+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -927,16 +924,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.25",
+            "version": "9.5.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
+                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
-                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2",
+                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2",
                 "shasum": ""
             },
             "require": {
@@ -1009,7 +1006,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26"
             },
             "funding": [
                 {
@@ -1025,7 +1022,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-25T03:44:45+00:00"
+            "time": "2022-10-28T06:00:21+00:00"
         },
         {
             "name": "sebastian/cli-parser",

From 582bfacc7f48be85a6edfe5de3f10f70f04e0f79 Mon Sep 17 00:00:00 2001
From: Viktor Rad <vrad@adobe.com>
Date: Tue, 13 Dec 2022 15:37:11 -0600
Subject: [PATCH 537/630] ACP2E-1466: Release of UCT 3.0.2, Mray 10.0.5,
 Magento API Index 5.4.3 and Magento Coding Standard 28

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 680863d5..c9f23250 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "27",
+    "version": "28",
     "require": {
         "php": "^8.1||^8.2",
         "webonyx/graphql-php": "^14.9",

From c45120e0bde31d093c3a9bf1e94185f9be87616a Mon Sep 17 00:00:00 2001
From: Viktor Rad <vrad@adobe.com>
Date: Tue, 13 Dec 2022 15:49:50 -0600
Subject: [PATCH 538/630] ACP2E-1466: Release of UCT 3.0.2, Mray 10.0.5,
 Magento API Index 5.4.3 and Magento Coding Standard 28

---
 composer.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/composer.lock b/composer.lock
index ecfa2b8c..60a5c8da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c101090e4e439fe14f68b90ca3dde531",
+    "content-hash": "de9d991dbdaf4c3b0df44666b8600182",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa"
+                "reference": "709999b91448d4f2bb07daffffedc889b33e461c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d6fdf01c53978b6429f1393ba4afeca39cc68afa",
-                "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/709999b91448d4f2bb07daffffedc889b33e461c",
+                "reference": "709999b91448d4f2bb07daffffedc889b33e461c",
                 "shasum": ""
             },
             "require": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.2"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.3"
             },
             "funding": [
                 {
@@ -125,7 +125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-10T09:56:11+00:00"
+            "time": "2022-12-13T10:28:10+00:00"
         },
         {
             "name": "rector/rector",
@@ -606,16 +606,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.19",
+            "version": "9.2.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
+                "reference": "af7463c955007de36db0c5e26d03e2f933c2e980"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/af7463c955007de36db0c5e26d03e2f933c2e980",
+                "reference": "af7463c955007de36db0c5e26d03e2f933c2e980",
                 "shasum": ""
             },
             "require": {
@@ -671,7 +671,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.20"
             },
             "funding": [
                 {
@@ -679,7 +679,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-11-18T07:47:47+00:00"
+            "time": "2022-12-13T07:49:28+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -924,16 +924,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.26",
+            "version": "9.5.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2"
+                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2",
-                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
                 "shasum": ""
             },
             "require": {
@@ -1006,7 +1006,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
             },
             "funding": [
                 {
@@ -1022,7 +1022,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-28T06:00:21+00:00"
+            "time": "2022-12-09T07:31:23+00:00"
         },
         {
             "name": "sebastian/cli-parser",

From 192acddccbfd847fabe4852a5db4ebe46f80b37d Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Wed, 21 Dec 2022 18:47:25 +0530
Subject: [PATCH 539/630] AC-7495:Return support of PHP 7 in Magento Coding
 Standard

---
 .github/workflows/php.yml | 3 +++
 composer.json             | 4 ++--
 composer.lock             | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f4472119..e579cf3c 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,6 +13,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "7.3"
+          - "7.4"
+          - "8.0"
           - "8.1"
         dependencies:
           - "lowest"
diff --git a/composer.json b/composer.json
index c9f23250..2e798fd2 100644
--- a/composer.json
+++ b/composer.json
@@ -6,9 +6,9 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "28",
+    "version": "29",
     "require": {
-        "php": "^8.1||^8.2",
+        "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index 60a5c8da..d814ed12 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "de9d991dbdaf4c3b0df44666b8600182",
+    "content-hash": "0d11ac46430aae72ed7ed45f94251944",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -2045,10 +2045,10 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1||^8.2",
+        "php": ">=7.3",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 196e86411e23b9f7e275061f420a904285c15f26 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 10 Jan 2023 18:15:11 +0530
Subject: [PATCH 540/630] AC-7563::Jenkin build is not executing for PHP8.2,
 update the latest package webonyx/graphql-php

---
 composer.json |  2 +-
 composer.lock | 46 +++++++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index c9f23250..c24c77ab 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "version": "28",
     "require": {
         "php": "^8.1||^8.2",
-        "webonyx/graphql-php": "^14.9",
+        "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
diff --git a/composer.lock b/composer.lock
index 60a5c8da..03207ea3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "de9d991dbdaf4c3b0df44666b8600182",
+    "content-hash": "62c9470a9f67101db2fc8b5bf86926cd",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -242,37 +242,41 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v14.11.8",
+            "version": "v15.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "04a48693acd785330eefd3b0e4fa67df8dfee7c3"
+                "reference": "dc754edf765479644a82d96105bd2979530d7f8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/04a48693acd785330eefd3b0e4fa67df8dfee7c3",
-                "reference": "04a48693acd785330eefd3b0e4fa67df8dfee7c3",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/dc754edf765479644a82d96105bd2979530d7f8d",
+                "reference": "dc754edf765479644a82d96105bd2979530d7f8d",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "php": "^7.1 || ^8"
+                "php": "^7.4 || ^8"
             },
             "require-dev": {
-                "amphp/amp": "^2.3",
-                "doctrine/coding-standard": "^6.0",
-                "nyholm/psr7": "^1.2",
+                "amphp/amp": "^2.6",
+                "dms/phpunit-arraysubset-asserts": "^0.4",
+                "ergebnis/composer-normalize": "^2.28",
+                "mll-lab/php-cs-fixer-config": "^4.4",
+                "nyholm/psr7": "^1.5",
                 "phpbench/phpbench": "^1.2",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "0.12.82",
-                "phpstan/phpstan-phpunit": "0.12.18",
-                "phpstan/phpstan-strict-rules": "0.12.9",
-                "phpunit/phpunit": "^7.2 || ^8.5",
-                "psr/http-message": "^1.0",
-                "react/promise": "2.*",
-                "simpod/php-coveralls-mirror": "^3.0",
-                "squizlabs/php_codesniffer": "3.5.4"
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "1.9.7",
+                "phpstan/phpstan-phpunit": "1.3.3",
+                "phpstan/phpstan-strict-rules": "1.4.4",
+                "phpunit/phpunit": "^9.5",
+                "psr/http-message": "^1",
+                "react/http": "^1.6",
+                "react/promise": "^2.9",
+                "symfony/polyfill-php81": "^1.23",
+                "symfony/var-exporter": "^5 || ^6",
+                "thecodingmachine/safe": "^1.3"
             },
             "suggest": {
                 "psr/http-message": "To use standard GraphQL server",
@@ -296,7 +300,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.8"
+                "source": "https://github.com/webonyx/graphql-php/tree/v15.0.0"
             },
             "funding": [
                 {
@@ -304,7 +308,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-09-21T15:35:03+00:00"
+            "time": "2023-01-06T12:18:04+00:00"
         }
     ],
     "packages-dev": [
@@ -2050,5 +2054,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 2466e633462a7eeec3a16c08b321c43e09ca7b23 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 10 Jan 2023 18:20:26 +0530
Subject: [PATCH 541/630] AC-7563::Jenkin build is not executing for PHP8.2,
 update the latest package webonyx/graphql-php

---
 composer.json | 4 ++--
 composer.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 2e798fd2..e617088e 100644
--- a/composer.json
+++ b/composer.json
@@ -6,10 +6,10 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "29",
+    "version": "30",
     "require": {
         "php": ">=7.3",
-        "webonyx/graphql-php": "^14.9",
+        "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
diff --git a/composer.lock b/composer.lock
index 2bfb420b..d9c0b456 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0d11ac46430aae72ed7ed45f94251944",
+    "content-hash": "8e87082adb0be1ca0902965b4afe98f6",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",

From 092b0b8e54083497fe28562064d7c84acce55da8 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Wed, 11 Jan 2023 15:03:02 +0530
Subject: [PATCH 542/630] AC-7563::Jenkin build is not executing for PHP8.2,
 update the latest package webonyx/graphql-php

---
 .github/workflows/php.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index e579cf3c..ac9fc0a0 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,7 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

From 98baf779b32d1b3c1e1e09fb78b12fa4c437e002 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Wed, 11 Jan 2023 16:10:29 +0530
Subject: [PATCH 543/630] AC-7563::Jenkin build is not executing for PHP8.2,
 update the latest package webonyx/graphql-php

---
 composer.json | 2 +-
 composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index e617088e..a277cf3a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "type": "phpcodesniffer-standard",
     "version": "30",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index d9c0b456..11f55459 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8e87082adb0be1ca0902965b4afe98f6",
+    "content-hash": "cfdb4177ef4747a5a6b83942ab05d65d",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -2049,7 +2049,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },

From 2ea3c393903fcbc1db310d96e0aff4bba540c4a3 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 17 Jan 2023 21:41:29 +1300
Subject: [PATCH 544/630] Allow class names with 'admin__' prefix

---
 Magento2/Sniffs/Less/ClassNamingSniff.php    |   5 +-
 Magento2/Tests/Less/ClassNamingUnitTest.less |   5 +
 composer.json                                |   3 +-
 composer.lock                                | 121 ++++++++++++++++++-
 4 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
index e684172b..babd0653 100644
--- a/Magento2/Sniffs/Less/ClassNamingSniff.php
+++ b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -66,7 +66,10 @@ public function process(File $phpcsFile, $stackPtr)
                 [implode("", $matches[0])]
             );
         }
-        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
+
+        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false
+            && !str_starts_with($className, 'admin__')
+        ) {
             $phpcsFile->addError(
                 'CSS class names should be separated with "-" (dash) instead of "_" (underscore)',
                 $stackPtr,
diff --git a/Magento2/Tests/Less/ClassNamingUnitTest.less b/Magento2/Tests/Less/ClassNamingUnitTest.less
index ba60c205..bbb29cde 100644
--- a/Magento2/Tests/Less/ClassNamingUnitTest.less
+++ b/Magento2/Tests/Less/ClassNamingUnitTest.less
@@ -30,3 +30,8 @@
 .category-title {
   background: green;
 }
+
+// @see https://github.com/magento/magento-coding-standard/issues/409
+.admin__allowed {
+  background: green;
+}
diff --git a/composer.json b/composer.json
index a277cf3a..49b3f7e2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,8 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.14.8"
+        "rector/rector": "^0.14.8",
+        "symfony/polyfill": "^1.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 11f55459..b4a64057 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cfdb4177ef4747a5a6b83942ab05d65d",
+    "content-hash": "0c1e598f16594c56f36b7da4e389d3f9",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -240,6 +240,123 @@
             },
             "time": "2022-06-18T07:21:10+00:00"
         },
+        {
+            "name": "symfony/polyfill",
+            "version": "v1.27.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill.git",
+                "reference": "b78222a273aac3e5bab6358bf499d7f1fb88e48b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill/zipball/b78222a273aac3e5bab6358bf499d7f1fb88e48b",
+                "reference": "b78222a273aac3e5bab6358bf499d7f1fb88e48b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "replace": {
+                "symfony/polyfill-apcu": "self.version",
+                "symfony/polyfill-ctype": "self.version",
+                "symfony/polyfill-iconv": "self.version",
+                "symfony/polyfill-intl-grapheme": "self.version",
+                "symfony/polyfill-intl-icu": "self.version",
+                "symfony/polyfill-intl-idn": "self.version",
+                "symfony/polyfill-intl-messageformatter": "self.version",
+                "symfony/polyfill-intl-normalizer": "self.version",
+                "symfony/polyfill-mbstring": "self.version",
+                "symfony/polyfill-php72": "self.version",
+                "symfony/polyfill-php73": "self.version",
+                "symfony/polyfill-php74": "self.version",
+                "symfony/polyfill-php80": "self.version",
+                "symfony/polyfill-php81": "self.version",
+                "symfony/polyfill-php82": "self.version",
+                "symfony/polyfill-php83": "self.version",
+                "symfony/polyfill-util": "self.version",
+                "symfony/polyfill-uuid": "self.version",
+                "symfony/polyfill-xml": "self.version"
+            },
+            "require-dev": {
+                "symfony/intl": "^4.4|^5.0|^6.0",
+                "symfony/phpunit-bridge": "^5.3|^6.0",
+                "symfony/var-dumper": "^4.4|^5.1|^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/bootstrap.php",
+                    "src/Apcu/bootstrap.php",
+                    "src/Ctype/bootstrap.php",
+                    "src/Uuid/bootstrap.php",
+                    "src/Iconv/bootstrap.php",
+                    "src/Intl/Grapheme/bootstrap.php",
+                    "src/Intl/Idn/bootstrap.php",
+                    "src/Intl/Icu/bootstrap.php",
+                    "src/Intl/MessageFormatter/bootstrap.php",
+                    "src/Intl/Normalizer/bootstrap.php",
+                    "src/Mbstring/bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\": "src/"
+                },
+                "classmap": [
+                    "src/Intl/Icu/Resources/stubs",
+                    "src/Intl/MessageFormatter/Resources/stubs",
+                    "src/Intl/Normalizer/Resources/stubs",
+                    "src/Php82/Resources/stubs",
+                    "src/Php80/Resources/stubs",
+                    "src/Php73/Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfills backporting features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compat",
+                "compatibility",
+                "polyfill",
+                "shim"
+            ],
+            "support": {
+                "issues": "https://github.com/symfony/polyfill/issues",
+                "source": "https://github.com/symfony/polyfill/tree/v1.27.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-11-10T10:11:03+00:00"
+        },
         {
             "name": "webonyx/graphql-php",
             "version": "v15.0.0",
@@ -2054,5 +2171,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 5936239050ddb99f5aea5c9ab655efbc1e6c2c35 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 26 Jan 2023 11:51:03 +0000
Subject: [PATCH 545/630] Automatically remove useless comments

When issues are detected and classified as
Magento2.Commenting.ClassAndInterfacePHPDocFormatting.ForbiddenTags or
Magento2.Commenting.ClassAndInterfacePHPDocFormatting.InvalidDescription,
these can be fixed by removing the offending comment.
---
 ...ClassAndInterfacePHPDocFormattingSniff.php |  42 ++++-
 ...AndInterfacePHPDocFormattingUnitTest.1.inc |   7 +
 ...erfacePHPDocFormattingUnitTest.1.inc.fixed | 166 ++++++++++++++++++
 ...AndInterfacePHPDocFormattingUnitTest.2.inc |  17 ++
 ...erfacePHPDocFormattingUnitTest.2.inc.fixed | 166 ++++++++++++++++++
 ...ssAndInterfacePHPDocFormattingUnitTest.php |   3 +-
 6 files changed, 398 insertions(+), 3 deletions(-)
 create mode 100644 Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc.fixed
 create mode 100644 Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc.fixed

diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index 2d715c50..fec9f396 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -62,8 +62,10 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
+
         if ($this->PHPDocFormattingValidator->providesMeaning($namePtr, $commentStartPtr, $tokens) !== true) {
-            $phpcsFile->addWarning(
+            $fix = $phpcsFile->addFixableWarning(
                 sprintf(
                     '%s description must contain meaningful information beyond what its name provides or be removed.',
                     ucfirst($tokens[$stackPtr]['content'])
@@ -71,6 +73,18 @@ public function process(File $phpcsFile, $stackPtr)
                 $stackPtr,
                 'InvalidDescription'
             );
+
+            if ($fix) {
+                for ($i = $commentStartPtr; $i <= $commentCloserPtr; $i++) {
+                    $phpcsFile->fixer->replaceToken($i, '');
+                }
+
+                if ($tokens[$commentStartPtr - 1]['code'] === T_WHITESPACE
+                    && $tokens[$commentCloserPtr + 1]['code'] === T_WHITESPACE
+                ) {
+                    $phpcsFile->fixer->replaceToken($commentCloserPtr + 1, '');
+                }
+            }
         }
 
         if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) {
@@ -104,11 +118,35 @@ private function validateTags(File $phpcsFile, $commentStartPtr, $tokens)
             }
 
             if (in_array($tokens[$i]['content'], $this->forbiddenTags) === true) {
-                $phpcsFile->addWarning(
+                $fix = $phpcsFile->addFixableWarning(
                     sprintf('Tag %s MUST NOT be used.', $tokens[$i]['content']),
                     $i,
                     'ForbiddenTags'
                 );
+
+                if ($fix) {
+                    for ($j = $i - 1; $j > $commentStartPtr; $j--) {
+                        if (!in_array($tokens[$j]['code'], [T_DOC_COMMENT_STAR, T_DOC_COMMENT_WHITESPACE], true)) {
+                            break;
+                        }
+
+                        if ($tokens[$j]['code'] === T_DOC_COMMENT_WHITESPACE && $tokens[$j]['content'] === "\n") {
+                            break;
+                        }
+
+                        $phpcsFile->fixer->replaceToken($j, '');
+                    }
+
+                    $phpcsFile->fixer->replaceToken($i, '');
+
+                    for ($j = $i + 1; $j < $commentCloserPtr; $j++) {
+                        $phpcsFile->fixer->replaceToken($j, '');
+
+                        if ($tokens[$j]['code'] === T_DOC_COMMENT_WHITESPACE && $tokens[$j]['content'] === "\n") {
+                            break;
+                        }
+                    }
+                }
             }
         }
 
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
index afd4c934..a17e80c8 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
@@ -179,3 +179,10 @@ class AlsoDeprecatedButHandler
 
 }
 
+/**
+ * @package this tag should not be used
+ */
+class OnlyUselessCommentContent
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc.fixed b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc.fixed
new file mode 100644
index 00000000..6be0195c
--- /dev/null
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc.fixed
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Handler for PHP errors/warnings/notices that converts them to exceptions.
+ */
+class ErrorHandler
+{
+
+}
+
+class NotAnErrorHandler
+{
+
+}
+
+class FaultyHandler
+{
+
+}
+
+class SomeHandler
+{
+
+}
+
+class YetAnotherHandler
+{
+
+}
+
+class GreenHandler
+{
+
+}
+
+class EmptyHandler
+{
+
+}
+
+/**
+ * Handler for PHP errors/warnings/notices that converts them to exceptions.
+ *
+ * @api is ok here
+ * @deprecated can be used in this context
+ * @see is ok here
+ * @author is actually ok
+ */
+class ExampleHandler
+{
+
+}
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+class ApiHandler
+{
+
+}
+
+/**
+ * @api
+ */
+class AsyncApiHandler
+{
+
+}
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GroupRepositoryHandler
+{
+
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ */
+class AncientHandler
+{
+
+}
+
+/**
+ * @deprecated
+ * @see
+ */
+class AgedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see
+ */
+class ArhaicHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see Magento\Framework\NewHandler
+ */
+class OldHandler
+{
+
+}
+
+/**
+ * @see Magento\Framework\NewHandler
+ */
+class SomethingHandler
+{
+
+}
+
+/**
+ * @see
+ */
+class DoNotCareHandler
+{
+
+}
+
+/**
+ * @deprecated
+ * @see Magento\Framework\NewHandler
+ */
+class OldHandler
+{
+
+}
+
+/**
+ * @deprecated This class will be removed in version 1.0.0 without replacement
+ */
+class DeprecatedButHandler
+{
+
+}
+
+/**
+ * @deprecated It's also deprecated - This class will be removed in version 1.0.0 without replacement
+ */
+class AlsoDeprecatedButHandler
+{
+
+}
+
+class OnlyUselessCommentContent
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
index c1c456ed..d6e4be63 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc
@@ -154,6 +154,15 @@ interface DoNotCareHandler
 
 }
 
+/**
+ * @deprecated
+ * @see Magento\Framework\NewHandler
+ */
+interface OldHandler
+{
+
+}
+
 /**
  * @deprecated This interface will be removed in version 1.0.0 without replacement
  */
@@ -169,3 +178,11 @@ interface AlsoDeprecatedButHandler
 {
 
 }
+
+/**
+ * @package this tag should not be used
+ */
+interface OnlyUselessCommentContent
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc.fixed b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc.fixed
new file mode 100644
index 00000000..9c90de04
--- /dev/null
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.2.inc.fixed
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Handler for PHP errors/warnings/notices that converts them to exceptions.
+ */
+interface ErrorHandler
+{
+
+}
+
+interface NotAnErrorHandler
+{
+
+}
+
+interface FaultyHandler
+{
+
+}
+
+interface SomeHandler
+{
+
+}
+
+interface YetAnotherHandler
+{
+
+}
+
+interface GreenHandler
+{
+
+}
+
+interface EmptyHandler
+{
+
+}
+
+/**
+ * Handler for PHP errors/warnings/notices that converts them to exceptions.
+ *
+ * @api is ok here
+ * @deprecated can be used in this context
+ * @see is ok here
+ * @author is actually ok
+ */
+interface ExampleHandler
+{
+
+}
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+interface ApiHandler
+{
+
+}
+
+/**
+ * @api
+ */
+interface AsyncApiHandler
+{
+
+}
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+interface GroupRepositoryHandler
+{
+
+}
+
+/**
+ * @deprecated
+ */
+interface DeprecatedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ */
+interface AncientHandler
+{
+
+}
+
+/**
+ * @deprecated
+ * @see
+ */
+interface AgedHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see
+ */
+interface ArhaicHandler
+{
+
+}
+
+/**
+ * @deprecated Should not be used
+ * @see Magento\Framework\NewHandler
+ */
+interface OldHandler
+{
+
+}
+
+/**
+ * @see Magento\Framework\NewHandler
+ */
+interface SomethingHandler
+{
+
+}
+
+/**
+ * @see
+ */
+interface DoNotCareHandler
+{
+
+}
+
+/**
+ * @deprecated
+ * @see Magento\Framework\NewHandler
+ */
+interface OldHandler
+{
+
+}
+
+/**
+ * @deprecated This interface will be removed in version 1.0.0 without replacement
+ */
+interface DeprecatedButHandler
+{
+
+}
+
+/**
+ * @deprecated Yeah! This interface will be removed in version 1.0.0 without replacement
+ */
+interface AlsoDeprecatedButHandler
+{
+
+}
+
+interface OnlyUselessCommentContent
+{
+
+}
diff --git a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
index 868187c3..8ef3e860 100644
--- a/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
+++ b/Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.php
@@ -35,7 +35,8 @@ public function getWarningList($testFile = '')
             101 => 1,
             109 => 1,
             118 => 1,
-            127 => 1
+            127 => 1,
+            183 => 1,
         ];
     }
 }

From d16895a56b57e1f12b54e54289a79de1c592097f Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Mon, 30 Jan 2023 13:24:26 +0530
Subject: [PATCH 546/630] AC-7822:Phpstan dependency should not be limited to a
 specific version, updated rector/rector with latest version

---
 composer.json |  4 ++--
 composer.lock | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index a277cf3a..355a66f6 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "30",
+    "version": "31",
     "require": {
         "php": ">=7.4",
         "webonyx/graphql-php": "^15.0",
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.14.8"
+        "rector/rector": "^0.15.10"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 11f55459..f2880864 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cfdb4177ef4747a5a6b83942ab05d65d",
+    "content-hash": "a1016f46104814a16b090a61a5c2ca2a",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.3",
+            "version": "1.9.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "709999b91448d4f2bb07daffffedc889b33e461c"
+                "reference": "e5fcc96289cf737304286a9b505fbed091f02e58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/709999b91448d4f2bb07daffffedc889b33e461c",
-                "reference": "709999b91448d4f2bb07daffffedc889b33e461c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58",
+                "reference": "e5fcc96289cf737304286a9b505fbed091f02e58",
                 "shasum": ""
             },
             "require": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.3"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.14"
             },
             "funding": [
                 {
@@ -125,31 +125,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-13T10:28:10+00:00"
+            "time": "2023-01-19T10:47:09+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.14.8",
+            "version": "0.15.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "46ee9a173a2b2645ca92a75ffc17460139fa226e"
+                "reference": "000bfb6f7974449399f39e1a210458395b75c887"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/46ee9a173a2b2645ca92a75ffc17460139fa226e",
-                "reference": "46ee9a173a2b2645ca92a75ffc17460139fa226e",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/000bfb6f7974449399f39e1a210458395b75c887",
+                "reference": "000bfb6f7974449399f39e1a210458395b75c887",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.9.0"
+                "phpstan/phpstan": "^1.9.7"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
                 "rector/rector-downgrade-php": "*",
                 "rector/rector-php-parser": "*",
-                "rector/rector-phpoffice": "*",
                 "rector/rector-phpunit": "*",
                 "rector/rector-symfony": "*"
             },
@@ -174,7 +173,7 @@
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.14.8"
+                "source": "https://github.com/rectorphp/rector/tree/0.15.10"
             },
             "funding": [
                 {
@@ -182,7 +181,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-11-14T14:09:49+00:00"
+            "time": "2023-01-21T14:30:16+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From 18a457925b43c41bd9020b33d53dd381e2e74037 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Tue, 14 Feb 2023 20:02:11 +0000
Subject: [PATCH 547/630] Ensure only the relevant docblock is read

---
 .../Sniffs/Annotation/MethodAnnotationStructureSniff.php  | 3 ++-
 .../Annotation/MethodAnnotationStructureUnitTest.inc      | 8 ++++++++
 .../Annotation/MethodAnnotationStructureUnitTest.php      | 4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index 538f80c9..d6f7ca3c 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -53,7 +53,8 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
         $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
         $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
-        if (!$commentStartPtr) {
+        $prevSemicolon = $phpcsFile->findPrevious(T_SEMICOLON, $stackPtr, $commentEndPtr);
+        if (!$commentStartPtr || $prevSemicolon) {
             $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
             return;
         }
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
index 2e0fdf0e..6402dad8 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -389,4 +389,12 @@ class MethodAnnotationFixture
     {
         return false;
     }
+
+    /** @var OutputInterface */
+    private $output;
+
+    private function thisMethodHasNoDocBlock(): bool
+    {
+        return false;
+    }
 }
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
index b4c80141..9494e2d1 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
@@ -31,13 +31,15 @@ public function getErrorList()
             185 => 1,
             227 => 1,
             235 => 1,
+            261 => 1,
             268 => 2,
             269 => 1,
             277 => 1,
             278 => 1,
             288 => 1,
             289 => 1,
-            298 => 1
+            298 => 1,
+            396 => 1,
         ];
     }
 

From 255e0290f9b50cae5e1efc5973bd1f7df200489f Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Thu, 16 Feb 2023 12:01:10 +0000
Subject: [PATCH 548/630] Add another test case

---
 Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc | 2 ++
 Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc
index b254ebc0..14f7ba1e 100644
--- a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc
+++ b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc
@@ -3,3 +3,5 @@
 <?php $foo = bar; ?>
 
 <?php echo "foo" ?>
+
+<?php /* @noEscape */ echo 'baz'; ?>
diff --git a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php
index 159ddedb..c7a68fe5 100644
--- a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php
+++ b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php
@@ -24,6 +24,7 @@ public function getWarningList()
     {
         return [
             5 => 1,
+            7 => 1,
         ];
     }
 }

From 4612aa3600a8bd0b46cf1bacd8fd9ed45c53e8fe Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Thu, 16 Feb 2023 12:02:29 +0000
Subject: [PATCH 549/630] Auto-fix short echo syntax

---
 Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php  | 21 ++++++++++++++++++-
 .../PHP/ShortEchoSyntaxUnitTest.inc.fixed     |  7 +++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc.fixed

diff --git a/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php b/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php
index 946bb273..da1aa279 100644
--- a/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php
+++ b/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php
@@ -37,11 +37,30 @@ public function process(File $phpcsFile, $stackPtr)
 
         $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($tokens[$nextToken]['code'] == T_ECHO) {
-            $phpcsFile->addWarning(
+            $fix = $phpcsFile->addFixableWarning(
                 'Short echo tag syntax must be used; expected "<?=" but found "<?php echo"',
                 $stackPtr,
                 'ShortEchoTag'
             );
+
+            if ($fix) {
+                $phpcsFile->fixer->beginChangeset();
+
+                if (($nextToken - $stackPtr) === 1) {
+                    $phpcsFile->fixer->replaceToken($stackPtr, '<?=');
+                } else {
+                    $phpcsFile->fixer->replaceToken($stackPtr, '<?= ');
+                }
+
+                for ($i = $stackPtr + 1; $i < $nextToken; $i++) {
+                    if ($tokens[$i]['code'] === T_WHITESPACE) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+                }
+
+                $phpcsFile->fixer->replaceToken($nextToken, '');
+                $phpcsFile->fixer->endChangeset();
+            }
         }
     }
 }
diff --git a/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc.fixed b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc.fixed
new file mode 100644
index 00000000..a3073e65
--- /dev/null
+++ b/Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc.fixed
@@ -0,0 +1,7 @@
+<?= "foo" ?>
+
+<?php $foo = bar; ?>
+
+<?= "foo" ?>
+
+<?= /* @noEscape */ 'baz'; ?>

From daed7c6d2863108579db68bede8fdb334f1cf184 Mon Sep 17 00:00:00 2001
From: Joan He <johe@adobe.com>
Date: Mon, 10 Apr 2023 17:43:45 -0500
Subject: [PATCH 550/630] B2B-2606: Graphql Parser called at least 3 times per
 request

---
 Magento2/Sniffs/Legacy/_files/restricted_classes.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index 3269caca..90092aa7 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -395,5 +395,10 @@
                 'Magento/Ui/Test/Unit/Model/ManagerTest.php',
                 'Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php',
             ]
+    ],
+    'GraphQL\Language\Parser' => [
+        'warning_code' => 'GraphQLLanguageParserIsRestricted',
+        'replacement' => 'Magento\Framework\GraphQl\Query\QueryParser',
+        'exclude' => []
     ]
 ];

From ed981cff04b257f9e8c265b63fc76cad4f386a86 Mon Sep 17 00:00:00 2001
From: Kiel Pykett <pykettk@gmail.com>
Date: Sat, 15 Apr 2023 01:34:46 +0100
Subject: [PATCH 551/630] Make Unescaped Output Error With Severity 10

---
 Magento2/ruleset.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index ee171871..81ff0d8d 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -94,6 +94,10 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.Security.XssTemplate.FoundUnescaped">
+        <severity>10</severity>
+        <type>error</type>
+    </rule>
     <rule ref="PSR1.Classes.ClassDeclaration">
         <severity>10</severity>
         <type>error</type>

From 0197a5ff31b4a5a816047e70cb015d00dde0d698 Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Wed, 26 Apr 2023 10:36:55 -0500
Subject: [PATCH 552/630] ACP2E-1887: Remove phpcsutils classes and add
 dependency on phpcsstandards/phpcsutils

---
 .../PHPCSUtils/BackCompat/BCTokens.php        | 109 ---
 .../Helpers/PHPCSUtils/BackCompat/Helper.php  | 242 ------
 .../TestUtils/UtilityMethodTestCase.php       | 450 -----------
 .../Helpers/PHPCSUtils/Tokens/Collections.php | 369 ---------
 .../Helpers/PHPCSUtils/Utils/Conditions.php   | 119 ---
 .../PHPCSUtils/Utils/FunctionDeclarations.php | 754 ------------------
 .../PHPCSUtils/Utils/GetTokensAsString.php    | 188 -----
 .../PHPCSUtils/Utils/ObjectDeclarations.php   | 363 ---------
 .../Helpers/PHPCSUtils/Utils/Parentheses.php  | 155 ----
 Magento2/Helpers/PHPCSUtils/Utils/Scopes.php  |  80 --
 .../Helpers/PHPCSUtils/Utils/TextStrings.php  | 133 ---
 .../PHPCSUtils/Utils/UseStatements.php        | 412 ----------
 .../ChangedIntToBoolParamTypeSniff.php        |   2 +-
 .../ForbiddenFinalPrivateMethodsSniff.php     |   4 +-
 ...llingDestructAfterConstructorExitSniff.php |  15 +-
 ...emovedOptionalBeforeRequiredParamSniff.php |  18 +-
 .../Tests/PHPCompatibility/BaseSniffTest.php  |   2 +-
 .../Util/CoreMethodTestFrame.php              |  51 --
 .../Util/TestHelperPHPCompatibility.php       |  92 ---
 composer.json                                 |   8 +-
 composer.lock                                 | 154 +++-
 21 files changed, 178 insertions(+), 3542 deletions(-)
 delete mode 100644 Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Tokens/Collections.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/Conditions.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/Scopes.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php
 delete mode 100644 Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php

diff --git a/Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php b/Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php
deleted file mode 100644
index 4542f9c6..00000000
--- a/Magento2/Helpers/PHPCSUtils/BackCompat/BCTokens.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\BackCompat;
-
-use PHP_CodeSniffer\Util\Tokens;
-
-class BCTokens
-{
-    /**
-     * Tokens that open class and object scopes.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha3 Visibility changed from `protected` to `private`.
-     *
-     * @var array <int|string> => <int|string>
-     */
-    private static $ooScopeTokens = [
-        \T_CLASS      => \T_CLASS,
-        \T_ANON_CLASS => \T_ANON_CLASS,
-        \T_INTERFACE  => \T_INTERFACE,
-        \T_TRAIT      => \T_TRAIT,
-    ];
-
-    /**
-     * Tokens that open class and object scopes.
-     *
-     * Retrieve the OO scope tokens array in a cross-version compatible manner.
-     *
-     * Changelog for the PHPCS native array:
-     * - Introduced in PHPCS 3.1.0.
-     *
-     * @see \PHP_CodeSniffer\Util\Tokens::$ooScopeTokens Original array.
-     *
-     * @since 1.0.0
-     *
-     * @return array <int|string> => <int|string> Token array.
-     */
-    public static function ooScopeTokens()
-    {
-        return self::$ooScopeTokens;
-    }
-
-    /**
-     * Tokens that represent arithmetic operators.
-     *
-     * Retrieve the PHPCS arithmetic tokens array in a cross-version compatible manner.
-     *
-     * Changelog for the PHPCS native array:
-     * - Introduced in PHPCS 0.5.0.
-     * - PHPCS 2.9.0: The PHP 5.6 `T_POW` token was added to the array.
-     *                The `T_POW` token was introduced in PHPCS 2.4.0.
-     *
-     * @see \PHP_CodeSniffer\Util\Tokens::$arithmeticTokens Original array.
-     *
-     * @since 1.0.0
-     *
-     * @return array <int|string> => <int|string> Token array or an empty array for PHPCS versions in
-     *                         which the PHPCS native comment tokens did not exist yet.
-     */
-    public static function arithmeticTokens()
-    {
-        return Tokens::$arithmeticTokens + [\T_POW => \T_POW];
-    }
-
-    /**
-     * Tokens that represent assignment operators.
-     *
-     * Retrieve the PHPCS assignment tokens array in a cross-version compatible manner.
-     *
-     * Changelog for the PHPCS native array:
-     * - Introduced in PHPCS 0.0.5.
-     * - PHPCS 2.9.0: The PHP 7.4 `T_COALESCE_EQUAL` token was added to the array.
-     *                The `T_COALESCE_EQUAL` token was introduced in PHPCS 2.8.1.
-     * - PHPCS 3.2.0: The JS `T_ZSR_EQUAL` token was added to the array.
-     *                The `T_ZSR_EQUAL` token was introduced in PHPCS 2.8.0.
-     *
-     * @see \PHP_CodeSniffer\Util\Tokens::$assignmentTokens Original array.
-     *
-     * @since 1.0.0
-     *
-     * @return array <int|string> => <int|string> Token array.
-     */
-    public static function assignmentTokens()
-    {
-        $tokens = Tokens::$assignmentTokens;
-
-        /*
-         * The `T_COALESCE_EQUAL` token may be available pre-PHPCS 2.8.1 depending on
-         * the PHP version used to run PHPCS.
-         */
-        if (\defined('T_COALESCE_EQUAL')) {
-            $tokens[\T_COALESCE_EQUAL] = \T_COALESCE_EQUAL;
-        }
-
-        if (\defined('T_ZSR_EQUAL')) {
-            $tokens[\T_ZSR_EQUAL] = \T_ZSR_EQUAL;
-        }
-
-        return $tokens;
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php b/Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php
deleted file mode 100644
index d82f39c2..00000000
--- a/Magento2/Helpers/PHPCSUtils/BackCompat/Helper.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\BackCompat;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Utility methods to retrieve (configuration) information from PHP_CodeSniffer.
- *
- * PHP_CodeSniffer cross-version compatibility helper for PHPCS 2.x vs PHPCS 3.x.
- *
- * A number of PHPCS classes were split up into several classes in PHPCS 3.x
- * Those classes cannot be aliased as they don't represent the same object.
- * This class provides helper methods for functions which were contained in
- * one of these classes and which are commonly used by external standards.
- *
- * @since 1.0.0 The initial methods in this class have been ported over from
- *              the external PHPCompatibility & WPCS standards.
- */
-class Helper
-{
-
-    /**
-     * The default tab width used by PHP_CodeSniffer.
-     *
-     * @since 1.0.0
-     *
-     * @var int
-     */
-    const DEFAULT_TABWIDTH = 4;
-
-    /**
-     * Get the PHP_CodeSniffer version number.
-     *
-     * @since 1.0.0
-     *
-     * @return string
-     */
-    public static function getVersion()
-    {
-        if (\defined('\PHP_CodeSniffer\Config::VERSION') === false) {
-            // PHPCS 2.x.
-            return \PHP_CodeSniffer::VERSION;
-        }
-
-        // PHPCS 3.x.
-        return \PHP_CodeSniffer\Config::VERSION;
-    }
-
-    /**
-     * Pass config data to PHP_CodeSniffer.
-     *
-     * @since 1.0.0
-     *
-     * @param string                  $key    The name of the config value.
-     * @param string|null             $value  The value to set. If `null`, the config entry
-     *                                        is deleted, reverting it to the default value.
-     * @param bool                    $temp   Set this config data temporarily for this script run.
-     *                                        This will not write the config data to the config file.
-     * @param \PHP_CodeSniffer\Config $config The PHPCS config object.
-     *                                        This parameter is required for PHPCS 4.x, optional
-     *                                        for PHPCS 3.x and not possible to pass for PHPCS 2.x.
-     *                                        Passing the `$phpcsFile->config` property should work
-     *                                        in PHPCS 3.x and higher.
-     *
-     * @return bool Whether the setting of the data was successfull.
-     */
-    public static function setConfigData($key, $value, $temp = false, $config = null)
-    {
-        if (\method_exists('\PHP_CodeSniffer\Config', 'setConfigData') === false) {
-            // PHPCS 2.x.
-            return \PHP_CodeSniffer::setConfigData($key, $value, $temp);
-        }
-
-        if (isset($config) === true) {
-            // PHPCS 3.x and 4.x.
-            return $config->setConfigData($key, $value, $temp);
-        }
-
-        if (\version_compare(self::getVersion(), '3.99.99', '>') === true) {
-            throw new RuntimeException('Passing the $config parameter is required in PHPCS 4.x');
-        }
-
-        // PHPCS 3.x.
-        return \PHP_CodeSniffer\Config::setConfigData($key, $value, $temp);
-    }
-
-    /**
-     * Get the value of a single PHP_CodeSniffer config key.
-     *
-     * @see Helper::getCommandLineData() Alternative for the same which is more reliable
-     *                                   if the `$phpcsFile` object is available.
-     *
-     * @since 1.0.0
-     *
-     * @param string $key The name of the config value.
-     *
-     * @return string|null
-     */
-    public static function getConfigData($key)
-    {
-        if (\method_exists('\PHP_CodeSniffer\Config', 'getConfigData') === false) {
-            // PHPCS 2.x.
-            return \PHP_CodeSniffer::getConfigData($key);
-        }
-
-        // PHPCS 3.x.
-        return \PHP_CodeSniffer\Config::getConfigData($key);
-    }
-
-    /**
-     * Get the value of a CLI overrulable single PHP_CodeSniffer config key.
-     *
-     * Use this for config keys which can be set in the `CodeSniffer.conf` file,
-     * on the command-line or in a ruleset.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
-     * @param string                      $key       The name of the config value.
-     *
-     * @return string|null
-     */
-    public static function getCommandLineData(File $phpcsFile, $key)
-    {
-        if (\class_exists('\PHP_CodeSniffer\Config') === false) {
-            // PHPCS 2.x.
-            $config = $phpcsFile->phpcs->cli->getCommandLineValues();
-            if (isset($config[$key])) {
-                return $config[$key];
-            }
-        } else {
-            // PHPCS 3.x.
-            $config = $phpcsFile->config;
-            if (isset($config->{$key})) {
-                return $config->{$key};
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the applicable tab width as passed to PHP_CodeSniffer from the
-     * command-line or the ruleset.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
-     *
-     * @return int Tab width. Defaults to the PHPCS native default of 4.
-     */
-    public static function getTabWidth(File $phpcsFile)
-    {
-        $tabWidth = self::getCommandLineData($phpcsFile, 'tabWidth');
-        if ($tabWidth > 0) {
-            return (int) $tabWidth;
-        }
-
-        return self::DEFAULT_TABWIDTH;
-    }
-
-    /**
-     * Get the applicable (file) encoding as passed to PHP_CodeSniffer from the
-     * command-line or the ruleset.
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @param \PHP_CodeSniffer\Files\File|null $phpcsFile Optional. The current file being processed.
-     *
-     * @return string Encoding. Defaults to the PHPCS native default, which is 'utf-8'
-     *                for PHPCS 3.x and was 'iso-8859-1' for PHPCS 2.x.
-     */
-    public static function getEncoding(File $phpcsFile = null)
-    {
-        static $default;
-
-        if (isset($default) === false) {
-            $default = 'utf-8';
-            if (\version_compare(self::getVersion(), '2.99.99', '<=') === true) {
-                // In PHPCS 2.x, the default encoding is `iso-8859-1`.
-                $default = 'iso-8859-1';
-            }
-        }
-
-        if ($phpcsFile instanceof File) {
-            // Most reliable.
-            $encoding = self::getCommandLineData($phpcsFile, 'encoding');
-            if ($encoding === null) {
-                $encoding = $default;
-            }
-
-            return $encoding;
-        }
-
-        // Less reliable.
-        $encoding = self::getConfigData('encoding');
-        if ($encoding === null) {
-            $encoding = $default;
-        }
-
-        return $encoding;
-    }
-
-    /**
-     * Check whether the "--ignore-annotations" option is in effect.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File|null $phpcsFile Optional. The current file being processed.
-     *
-     * @return bool `TRUE` if annotations should be ignored, `FALSE` otherwise.
-     */
-    public static function ignoreAnnotations(File $phpcsFile = null)
-    {
-        if (\class_exists('\PHP_CodeSniffer\Config') === false) {
-            // PHPCS 2.x does not support `--ignore-annotations`.
-            return false;
-        }
-
-        // PHPCS 3.x.
-        if (isset($phpcsFile, $phpcsFile->config->annotations)) {
-            return ! $phpcsFile->config->annotations;
-        }
-
-        $annotations = \PHP_CodeSniffer\Config::getConfigData('annotations');
-        if (isset($annotations)) {
-            return ! $annotations;
-        }
-
-        return false;
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php b/Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
deleted file mode 100644
index 7ffcc1e3..00000000
--- a/Magento2/Helpers/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\TestUtils;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Exceptions\TokenizerException;
-use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
-use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-use RuntimeException as PHPRuntimeException;
-
-/**
- * Base class for use when testing utility methods for PHP_CodeSniffer.
- *
- * This class is compatible with PHP_CodeSniffer 2.x as well as 3.x.
- *
- * This class is compatible with {@link http://phpunit.de/ PHPUnit} 4.5 - 9.x providing the PHPCSUtils
- * autoload file is included in the test bootstrap. For more information about that, please consult
- * the project's {@link https://github.com/PHPCSStandards/PHPCSUtils/blob/develop/README.md README}.
- *
- * To allow for testing of tab vs space content, the `tabWidth` is set to `4` by default.
- *
- * Typical usage:
- *
- * Test case file `path/to/ClassUnderTestUnitTest.inc`:
- * ```php
- * <?php
- *
- * /* testTestCaseDescription * /
- * const BAR = false;
- * ```
- *
- * Test file `path/to/ClassUnderTestUnitTest.php`:
- * ```php
- * <?php
- *
- * use Magento2\Helpers\PHPCSUtils\TestUtils\UtilityMethodTestCase;
- * use YourStandard\ClassUnderTest;
- *
- * class ClassUnderTestUnitTest extends UtilityMethodTestCase {
- *
- *     /**
- *      * Testing utility method MyMethod.
- *      *
- *      * @dataProvider dataMyMethod
- *      *
- *      * @covers \YourStandard\ClassUnderTest::MyMethod
- *      *
- *      * @param string $commentString The comment which prefaces the target token in the test file.
- *      * @param string $expected      The expected return value.
- *      *
- *      * @return void
- *      * /
- *     public function testMyMethod($commentString, $expected)
- *     {
- *         $stackPtr = $this->getTargetToken($commentString, [\T_TOKEN_CONSTANT, \T_ANOTHER_TOKEN]);
- *         $class    = new ClassUnderTest();
- *         $result   = $class->MyMethod(self::$phpcsFile, $stackPtr);
- *         // Or for static utility methods:
- *         $result   = ClassUnderTest::MyMethod(self::$phpcsFile, $stackPtr);
- *
- *         $this->assertSame($expected, $result);
- *     }
- *
- *     /**
- *      * Data Provider.
- *      *
- *      * @see ClassUnderTestUnitTest::testMyMethod() For the array format.
- *      *
- *      * @return array
- *      * /
- *     public function dataMyMethod()
- *     {
- *         return array(
- *             array('/* testTestCaseDescription * /', false),
- *         );
- *     }
- * }
- * ```
- *
- * Note:
- * - Remove the space between the comment closers `* /` for a working example.
- * - Each test case separator comment MUST start with `/* test`.
- *   This is to allow the {@see UtilityMethodTestCase::getTargetToken()} method to
- *   distinquish between the test separation comments and comments which may be part
- *   of the test case.
- * - The test case file and unit test file should be placed in the same directory.
- * - For working examples using this abstract class, have a look at the unit tests
- *   for the PHPCSUtils utility functions themselves.
- *
- * @since 1.0.0
- */
-abstract class UtilityMethodTestCase extends TestCase
-{
-
-    /**
-     * The PHPCS version the tests are being run on.
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @var string
-     */
-    protected static $phpcsVersion = '0';
-
-    /**
-     * The file extension of the test case file (without leading dot).
-     *
-     * This allows concrete test classes to overrule the default `"inc"` with, for instance,
-     * `"js"` or `"css"` when applicable.
-     *
-     * @since 1.0.0
-     *
-     * @var string
-     */
-    protected static $fileExtension = 'inc';
-
-    /**
-     * Full path to the test case file associated with the concrete test class.
-     *
-     * Optional. If left empty, the case file will be presumed to be in
-     * the same directory and named the same as the test class, but with an
-     * `"inc"` file extension.
-     *
-     * @since 1.0.0
-     *
-     * @var string
-     */
-    protected static $caseFile = '';
-
-    /**
-     * The tab width setting to use when tokenizing the file.
-     *
-     * This allows for test case files to use a different tab width than the default.
-     *
-     * @since 1.0.0
-     *
-     * @var int
-     */
-    protected static $tabWidth = 4;
-
-    /**
-     * The \PHP_CodeSniffer\Files\File object containing the parsed contents of the test case file.
-     *
-     * @since 1.0.0
-     *
-     * @var \PHP_CodeSniffer\Files\File
-     */
-    protected static $phpcsFile;
-
-    /**
-     * Set the name of a sniff to pass to PHPCS to limit the run (and force it to record errors).
-     *
-     * Normally, this propery won't need to be overloaded, but for utility methods which record
-     * violations and contain fixers, setting a dummy sniff name equal to the sniff name passed
-     * in the error code for `addError()`/`addWarning()` during the test, will allow for testing
-     * the recording of these violations, as well as testing the fixer.
-     *
-     * @since 1.0.0
-     *
-     * @var array
-     */
-    protected static $selectedSniff = ['Dummy.Dummy.Dummy'];
-
-    /**
-     * Initialize PHPCS & tokenize the test case file.
-     *
-     * The test case file for a unit test class has to be in the same directory
-     * directory and use the same file name as the test class, using the `.inc` extension
-     * or be explicitly set using the {@see UtilityMethodTestCase::$fileExtension}/
-     * {@see UtilityMethodTestCase::$caseFile} properties.
-     *
-     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::setUpBeforeClass()}
-     * method.
-     *
-     * @since 1.0.0
-     *
-     * @beforeClass
-     *
-     * @return void
-     */
-    public static function setUpTestFile()
-    {
-        parent::setUpBeforeClass();
-
-        self::$phpcsVersion = Helper::getVersion();
-
-        $caseFile = static::$caseFile;
-        if (\is_string($caseFile) === false || $caseFile === '') {
-            $testClass = \get_called_class();
-            $testFile  = (new ReflectionClass($testClass))->getFileName();
-            $caseFile  = \substr($testFile, 0, -3) . static::$fileExtension;
-        }
-
-        if (\is_readable($caseFile) === false) {
-            parent::fail("Test case file missing. Expected case file location: $caseFile");
-        }
-
-        $contents = \file_get_contents($caseFile);
-
-        if (\version_compare(self::$phpcsVersion, '2.99.99', '>')) {
-            // PHPCS 3.x.
-            $config = new \PHP_CodeSniffer\Config();
-
-            /*
-             * We just need to provide a standard so PHPCS will tokenize the file.
-             * The standard itself doesn't actually matter for testing utility methods,
-             * so use the smallest one to get the fastest results.
-             */
-            $config->standards = ['PSR1'];
-
-            /*
-             * Limiting the run to just one sniff will make it, yet again, slightly faster.
-             * Picked the simplest/fastest sniff available which is registered in PSR1.
-             */
-            $config->sniffs = static::$selectedSniff;
-
-            // Disable caching.
-            $config->cache = false;
-
-            // Also set a tab-width to enable testing tab-replaced vs `orig_content`.
-            $config->tabWidth = static::$tabWidth;
-
-            $ruleset = new \PHP_CodeSniffer\Ruleset($config);
-
-            // Make sure the file gets parsed correctly based on the file type.
-            $contents = 'phpcs_input_file: ' . $caseFile . \PHP_EOL . $contents;
-
-            self::$phpcsFile = new \PHP_CodeSniffer\Files\DummyFile($contents, $ruleset, $config);
-
-            // Only tokenize the file, do not process it.
-            try {
-                self::$phpcsFile->parse();
-            } catch (TokenizerException $e) {
-                // PHPCS 3.5.0 and higher.
-            } catch (RuntimeException $e) {
-                // PHPCS 3.0.0 < 3.5.0.
-            }
-        } else {
-            // PHPCS 2.x.
-            $phpcs           = new \PHP_CodeSniffer(null, static::$tabWidth);
-            self::$phpcsFile = new \PHP_CodeSniffer_File(
-                $caseFile,
-                [],
-                [],
-                $phpcs
-            );
-
-            /*
-             * Using error silencing to drown out "undefined index" notices for tokenizer
-             * issues in PHPCS 2.x which won't get fixed anymore anyway.
-             */
-            @self::$phpcsFile->start($contents);
-        }
-
-        // Fail the test if the case file failed to tokenize.
-        if (self::$phpcsFile->numTokens === 0) {
-            parent::fail("Tokenizing of the test case file failed for case file: $caseFile");
-        }
-    }
-
-    /**
-     * Skip JS and CSS related tests on PHPCS 4.x.
-     *
-     * PHPCS 4.x drops support for the JS and CSS tokenizers.
-     * This method takes care of automatically skipping tests involving JS/CSS case files
-     * when the tests are being run with PHPCS 4.x.
-     *
-     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::setUp()}
-     * method.
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @before
-     *
-     * @return void
-     */
-    public function skipJSCSSTestsOnPHPCS4()
-    {
-        if (static::$fileExtension !== 'js' && static::$fileExtension !== 'css') {
-            return;
-        }
-
-        if (\version_compare(self::$phpcsVersion, '3.99.99', '<=')) {
-            return;
-        }
-
-        $this->markTestSkipped('JS and CSS support has been removed in PHPCS 4.');
-    }
-
-    /**
-     * Clean up after finished test.
-     *
-     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::tearDownAfterClass()}
-     * method.
-     *
-     * @since 1.0.0
-     *
-     * @afterClass
-     *
-     * @return void
-     */
-    public static function resetTestFile()
-    {
-        self::$phpcsFile = null;
-    }
-
-    /**
-     * Check whether or not the PHP 8.0 identifier name tokens will be in use.
-     *
-     * The expected token positions/token counts for certain tokens will differ depending
-     * on whether the PHP 8.0 identifier name tokenization is used or the PHP < 8.0
-     * identifier name tokenization.
-     *
-     * Tests can use this method to determine which flavour of tokenization to expect and
-     * to set test expectations accordingly.
-     *
-     * @codeCoverageIgnore Nothing to test.
-     *
-     * @since 1.0.0
-     *
-     * @return bool
-     */
-    public static function usesPhp8NameTokens()
-    {
-        $version = Helper::getVersion();
-        if ((\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-                && \version_compare($version, '3.5.7', '<') === true)
-            || \version_compare($version, '4.0.0', '>=') === true
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the token pointer for a target token based on a specific comment.
-     *
-     * Note: the test delimiter comment MUST start with `/* test` to allow this function to
-     * distinguish between comments used *in* a test and test delimiters.
-     *
-     * If the delimiter comment is not found, the test will automatically be failed.
-     *
-     * @since 1.0.0
-     *
-     * @param string           $commentString The complete delimiter comment to look for as a string.
-     *                                        This string should include the comment opener and closer.
-     * @param int|string|array $tokenType     The type of token(s) to look for.
-     * @param string           $tokenContent  Optional. The token content for the target token.
-     * @param bool             $failTest      Optional. Whether the test should be marked as failed when
-     *                                        the target token cannot be found. Defaults to `true`.
-     *                                        When set to `false`, a catchable PHP native `RuntimeException`
-     *                                        will be thrown instead.
-     *
-     * @return int
-     *
-     * @throws \RuntimeException When the target token cannot be found and `$failTest` has been set to `false`.
-     */
-    public function getTargetToken($commentString, $tokenType, $tokenContent = null, $failTest = true)
-    {
-        $start   = (self::$phpcsFile->numTokens - 1);
-        $comment = self::$phpcsFile->findPrevious(
-            \T_COMMENT,
-            $start,
-            null,
-            false,
-            $commentString
-        );
-
-        if ($comment === false) {
-            $msg = 'Failed to find the test marker: ' . $commentString;
-            $this->fail($msg);
-        }
-
-        $tokens = self::$phpcsFile->getTokens();
-        $end    = ($start + 1);
-
-        // Limit the token finding to between this and the next delimiter comment.
-        for ($i = ($comment + 1); $i < $end; $i++) {
-            if ($tokens[$i]['code'] !== \T_COMMENT) {
-                continue;
-            }
-
-            if (\stripos($tokens[$i]['content'], '/* test') === 0) {
-                $end = $i;
-                break;
-            }
-        }
-
-        $target = self::$phpcsFile->findNext(
-            $tokenType,
-            ($comment + 1),
-            $end,
-            false,
-            $tokenContent
-        );
-
-        if ($target === false) {
-            $msg = 'Failed to find test target token for comment string: ' . $commentString;
-            if ($tokenContent !== null) {
-                $msg .= ' With token content: ' . $tokenContent;
-            }
-
-            if ($failTest === false) {
-                throw new PHPRuntimeException($msg);
-            }
-
-            $this->fail($msg);
-        }
-
-        return $target;
-    }
-
-    /**
-     * Helper method to tell PHPUnit to expect a PHPCS Exception in a PHPUnit and PHPCS cross-version
-     * compatible manner.
-     *
-     * @since 1.0.0
-     *
-     * @param string $msg  The expected exception message.
-     * @param string $type The PHPCS native exception type to expect. Either 'runtime' or 'tokenizer'.
-     *                     Defaults to 'runtime'.
-     *
-     * @return void
-     */
-    public function expectPhpcsException($msg, $type = 'runtime')
-    {
-        $exception = 'PHP_CodeSniffer\Exceptions\RuntimeException';
-        if ($type === 'tokenizer') {
-            $exception = 'PHP_CodeSniffer\Exceptions\TokenizerException';
-        }
-
-        if (\method_exists($this, 'expectException')) {
-            // PHPUnit 5+.
-            $this->expectException($exception);
-            $this->expectExceptionMessage($msg);
-        } else {
-            // PHPUnit 4.
-            $this->setExpectedException($exception, $msg);
-        }
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Tokens/Collections.php b/Magento2/Helpers/PHPCSUtils/Tokens/Collections.php
deleted file mode 100644
index bc8e30a4..00000000
--- a/Magento2/Helpers/PHPCSUtils/Tokens/Collections.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Tokens;
-
-/**
- * Collections of related tokens as often used and needed for sniffs.
- *
- * These are additional "token groups" to compliment the ones available through the PHPCS
- * native {@see \PHP_CodeSniffer\Util\Tokens} class.
- *
- * @see \PHP_CodeSniffer\Util\Tokens    PHPCS native token groups.
- * @see \PHPCSUtils\BackCompat\BCTokens Backward compatible version of the PHPCS native token groups.
- *
- * @since 1.0.0
- */
-class Collections
-{
-    /**
-     * Tokens for the PHP magic constants.
-     *
-     * @link https://www.php.net/language.constants.predefined PHP Manual on magic constants
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @var array <int|string> => <int|string>
-     */
-    public static $magicConstants = [
-        \T_CLASS_C  => \T_CLASS_C,
-        \T_DIR      => \T_DIR,
-        \T_FILE     => \T_FILE,
-        \T_FUNC_C   => \T_FUNC_C,
-        \T_LINE     => \T_LINE,
-        \T_METHOD_C => \T_METHOD_C,
-        \T_NS_C     => \T_NS_C,
-        \T_TRAIT_C  => \T_TRAIT_C,
-    ];
-
-    /**
-     * Object operators.
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @var array <int> => <int>
-     */
-    public static $objectOperators = [
-        \T_OBJECT_OPERATOR => \T_OBJECT_OPERATOR,
-        \T_DOUBLE_COLON    => \T_DOUBLE_COLON,
-    ];
-
-    /**
-     * Tokens types used for "forwarding" calls within OO structures.
-     *
-     * @link https://www.php.net/language.oop5.paamayim-nekudotayim PHP Manual on OO forwarding calls
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @var array <int|string> => <int|string>
-     */
-    public static $OOHierarchyKeywords = [
-        \T_PARENT => \T_PARENT,
-        \T_SELF   => \T_SELF,
-        \T_STATIC => \T_STATIC,
-    ];
-
-    /**
-     * List of tokens which represent "closed" scopes.
-     *
-     * I.e. anything declared within that scope - except for other closed scopes - is
-     * outside of the global namespace.
-     *
-     * This list doesn't contain the `T_NAMESPACE` token on purpose as variables declared
-     * within a namespace scope are still global and not limited to that namespace.
-     *
-     * @since 1.0.0
-     *
-     * @var array <int|string> => <int|string>
-     */
-    public static $closedScopes = [
-        \T_CLASS      => \T_CLASS,
-        \T_ANON_CLASS => \T_ANON_CLASS,
-        \T_INTERFACE  => \T_INTERFACE,
-        \T_TRAIT      => \T_TRAIT,
-        \T_FUNCTION   => \T_FUNCTION,
-        \T_CLOSURE    => \T_CLOSURE,
-    ];
-
-    /**
-     * OO structures which can use the "extends" keyword.
-     *
-     * @since 1.0.0
-     *
-     * @var array <int|string> => <int|string>
-     */
-    public static $OOCanExtend = [
-        \T_CLASS      => \T_CLASS,
-        \T_ANON_CLASS => \T_ANON_CLASS,
-        \T_INTERFACE  => \T_INTERFACE,
-    ];
-
-    /**
-     * Tokens which can start a - potentially multi-line - text string.
-     *
-     * @since 1.0.0
-     *
-     * @var array <int|string> => <int|string>
-     */
-    public static $textStingStartTokens = [
-        \T_START_HEREDOC            => \T_START_HEREDOC,
-        \T_START_NOWDOC             => \T_START_NOWDOC,
-        \T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
-        \T_DOUBLE_QUOTED_STRING     => \T_DOUBLE_QUOTED_STRING,
-    ];
-
-    /**
-     * Tokens which can represent the arrow function keyword.
-     *
-     * Note: this is a method, not a property as the `T_FN` token for arrow functions may not exist.
-     *
-     * @since 1.0.0-alpha2
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function arrowFunctionTokensBC()
-    {
-        $tokens = [
-            \T_STRING => \T_STRING,
-        ];
-
-        if (\defined('T_FN') === true) {
-            // PHP 7.4 or PHPCS 3.5.3+.
-            $tokens[\T_FN] = \T_FN;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Tokens which can represent a keyword which starts a function declaration.
-     *
-     * Note: this is a method, not a property as the `T_FN` token for arrow functions may not exist.
-     *
-     * Sister-method to the {@see Collections::functionDeclarationTokensBC()} method.
-     * This  method supports PHPCS 3.5.3 and up.
-     * The {@see Collections::functionDeclarationTokensBC()} method supports PHPCS 2.6.0 and up.
-     *
-     * @see \PHPCSUtils\Tokens\Collections::functionDeclarationTokensBC() Related method (PHPCS 2.6.0+).
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function functionDeclarationTokens()
-    {
-        $tokens = [
-            \T_FUNCTION => \T_FUNCTION,
-            \T_CLOSURE  => \T_CLOSURE,
-        ];
-
-        if (\defined('T_FN') === true) {
-            // PHP 7.4 or PHPCS 3.5.3+.
-            $tokens[\T_FN] = \T_FN;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Tokens which can represent a keyword which starts a function declaration.
-     *
-     * Note: this is a method, not a property as the `T_FN` token for arrow functions may not exist.
-     *
-     * Sister-method to the {@see Collections::functionDeclarationTokens()} method.
-     * The {@see Collections::functionDeclarationTokens()} method supports PHPCS 3.5.3 and up.
-     * This method supports PHPCS 2.6.0 and up.
-     *
-     * Notable difference:
-     * - This method accounts for when the `T_FN` token doesn't exist.
-     *
-     * Note: if this method is used, the {@see \PHPCSUtils\Utils\FunctionDeclarations::isArrowFunction()}
-     * method needs to be used on arrow function tokens to verify whether it really is an arrow function
-     * declaration or not.
-     *
-     * It is recommended to use the {@see Collections::functionDeclarationTokens()} method instead of
-     * this method if a standard supports does not need to support PHPCS < 3.5.3.
-     *
-     * @see \PHPCSUtils\Tokens\Collections::functionDeclarationTokens() Related method (PHPCS 3.5.3+).
-     * @see \PHPCSUtils\Utils\FunctionDeclarations::isArrowFunction()   Arrow function verification.
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function functionDeclarationTokensBC()
-    {
-        $tokens = [
-            \T_FUNCTION => \T_FUNCTION,
-            \T_CLOSURE  => \T_CLOSURE,
-        ];
-
-        $tokens += self::arrowFunctionTokensBC();
-
-        return $tokens;
-    }
-
-    /**
-     * The tokens used for "names", be it namespace, OO, function or constant names.
-     *
-     * Includes the tokens introduced in PHP 8.0 for "Namespaced names as single token" when available.
-     *
-     * Note: this is a method, not a property as the PHP 8.0 identifier name tokens may not exist.
-     *
-     * @link https://wiki.php.net/rfc/namespaced_names_as_token
-     *
-     * @since 1.0.0-alpha4
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function nameTokens()
-    {
-        $tokens = [
-            \T_STRING => \T_STRING,
-        ];
-
-        /*
-         * PHP >= 8.0 in combination with PHPCS < 3.5.7 and all PHP versions in combination
-         * with PHPCS >= 3.5.7, though when using PHPCS 3.5.7 < 4.0.0, these tokens are
-         * not yet in use, i.e. the PHP 8.0 change is "undone" for PHPCS 3.x.
-         */
-        if (\defined('T_NAME_QUALIFIED') === true) {
-            $tokens[\T_NAME_QUALIFIED] = \T_NAME_QUALIFIED;
-        }
-
-        if (\defined('T_NAME_FULLY_QUALIFIED') === true) {
-            $tokens[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;
-        }
-
-        if (\defined('T_NAME_RELATIVE') === true) {
-            $tokens[\T_NAME_RELATIVE] = \T_NAME_RELATIVE;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Tokens types which can be encountered in a fully, partially or unqualified name.
-     *
-     * Example:
-     * ```php
-     * echo namespace\Sub\ClassName::method();
-     * ```
-     *
-     * @since 1.0.0-alpha4
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function namespacedNameTokens()
-    {
-        $tokens = [
-            \T_NS_SEPARATOR => \T_NS_SEPARATOR,
-            \T_NAMESPACE    => \T_NAMESPACE,
-        ];
-
-        $tokens += self::nameTokens();
-
-        return $tokens;
-    }
-    /**
-     * Token types which can be encountered in a return type declaration.
-     *
-     * Note: this is a method, not a property as the `T_TYPE_UNION` token for PHP 8.0 union types may not exist.
-     *
-     * Sister-method to the {@see Collections::returnTypeTokensBC()} method.
-     * This method supports PHPCS 3.3.0 and up.
-     * The {@see Collections::returnTypeTokensBC()} method supports PHPCS 2.6.0 and up.
-     *
-     * Notable differences:
-     * - The {@see Collections::returnTypeTokensBC()} method will include the `T_ARRAY_HINT`
-     *   and the `T_RETURN_TYPE` tokens when used with PHPCS 2.x and 3.x.
-     *   These token constants will no longer exist in PHPCS 4.x.
-     *
-     * It is recommended to use this method instead of the {@see Collections::returnTypeTokensBC()}
-     * method if a standard does not need to support PHPCS < 3.3.0.
-     *
-     * @see \PHPCSUtils\Tokens\Collections::returnTypeTokensBC() Related method (cross-version).
-     *
-     * @since 1.0.0-alpha4 This method replaces the {@see Collections::$returnTypeTokens} property.
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 identifier name tokens.
-     * @since 1.0.0-alpha4 Added the T_TYPE_UNION token for union type support in PHPCS > 3.6.0.
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function returnTypeTokens()
-    {
-        $tokens = [
-            \T_CALLABLE   => \T_CALLABLE,
-            \T_SELF       => \T_SELF,
-            \T_PARENT     => \T_PARENT,
-            \T_STATIC     => \T_STATIC,
-            \T_FALSE      => \T_FALSE,      // Union types only.
-            \T_NULL       => \T_NULL,       // Union types only.
-            \T_ARRAY      => \T_ARRAY,      // Arrow functions PHPCS < 3.5.4 + union types.
-            \T_BITWISE_OR => \T_BITWISE_OR, // Union types for PHPCS < 3.6.0.
-        ];
-
-        $tokens += self::namespacedNameTokens();
-
-        // PHPCS > 3.6.0: a new token was introduced for the union type separator.
-        if (\defined('T_TYPE_UNION') === true) {
-            $tokens[\T_TYPE_UNION] = \T_TYPE_UNION;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Token types which can be encountered in a return type declaration (cross-version).
-     *
-     * Sister-method to the {@see Collections::returnTypeTokens()} method.
-     * The {@see Collections::returnTypeTokens()} method supports PHPCS 3.3.0 and up.
-     * This method supports PHPCS 2.6.0 and up.
-     *
-     * Notable differences:
-     * - This method will include the `T_ARRAY_HINT` and the `T_RETURN_TYPE` tokens when
-     *   used with PHPCS 2.x and 3.x.
-     *   These token constants will no longer exist in PHPCS 4.x.
-     *
-     * It is recommended to use the {@see Collections::returnTypeTokens()} method instead of
-     * this method if a standard does not need to support PHPCS < 3.3.0.
-     *
-     * @see \PHPCSUtils\Tokens\Collections::returnTypeTokens() Related method (PHPCS 3.3.0+).
-     *
-     * @since 1.0.0-alpha3
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 identifier name tokens.
-     *
-     * @return array <int|string> => <int|string>
-     */
-    public static function returnTypeTokensBC()
-    {
-        $tokens = self::returnTypeTokens();
-
-        /*
-         * PHPCS < 4.0. Needed for support of PHPCS 2.4.0 < 3.3.0.
-         * For PHPCS 3.3.0+ the constant is no longer used.
-         */
-        if (\defined('T_RETURN_TYPE') === true) {
-            $tokens[\T_RETURN_TYPE] = \T_RETURN_TYPE;
-        }
-
-        /*
-         * PHPCS < 4.0. Needed for support of PHPCS < 2.8.0 / PHPCS < 3.5.3 for arrow functions.
-         * For PHPCS 3.5.3+ the constant is no longer used.
-         */
-        if (\defined('T_ARRAY_HINT') === true) {
-            $tokens[\T_ARRAY_HINT] = \T_ARRAY_HINT;
-        }
-
-        return $tokens;
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/Conditions.php b/Magento2/Helpers/PHPCSUtils/Utils/Conditions.php
deleted file mode 100644
index 4d34ed92..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/Conditions.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Utility functions for use when examining token conditions.
- *
- * @since 1.0.0 The `Conditions::getCondition()` and `Conditions::hasCondition()`
- *              methods are based on and inspired by the methods of the same name in the
- *              PHPCS native `PHP_CodeSniffer\Files\File` class.
- *              Also see {@see \PHPCSUtils\BackCompat\BCFile}.
- */
-class Conditions
-{
-
-    /**
-     * Retrieve the position of a condition for the passed token.
-     *
-     * If no types are specified, the first condition for the token - or if `$first=false`,
-     * the last condition - will be returned.
-     *
-     * Main differences with the PHPCS version:
-     * - The singular `$type` parameter has become the more flexible `$types` parameter allowing to
-     *   search for several types of conditions in one go.
-     * - The `$types` parameter is now optional.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getCondition()   Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::getCondition() Cross-version compatible version of the original.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha2 The `$reverse` parameter has been renamed to `$first` and the meaning of the
-     *                     boolean reversed (`true` = first, `false` = last, was: `true` = last, `false` = first)
-     *                     to be in line with PHPCS itself which added the `$first` parameter in v 3.5.4
-     *                     to allow for the same/similar functionality as `$reverse` already offered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the token we are checking.
-     * @param int|string|array            $types     Optional. The type(s) of tokens to search for.
-     * @param bool                        $first     Optional. Whether to search for the first (outermost)
-     *                                               (`true`) or the last (innermost) condition (`false`) of
-     *                                               the specified type(s).
-     *
-     * @return int|false Integer stack pointer to the condition; or `FALSE` if the token
-     *                   does not have the condition or has no conditions at all.
-     */
-    public static function getCondition(File $phpcsFile, $stackPtr, $types = [], $first = true)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // Make sure the token has conditions.
-        if (empty($tokens[$stackPtr]['conditions'])) {
-            return false;
-        }
-
-        $types      = (array) $types;
-        $conditions = $tokens[$stackPtr]['conditions'];
-
-        if (empty($types) === true) {
-            // No types specified, just return the first/last condition pointer.
-            if ($first === false) {
-                \end($conditions);
-            } else {
-                \reset($conditions);
-            }
-
-            return \key($conditions);
-        }
-
-        if ($first === false) {
-            $conditions = \array_reverse($conditions, true);
-        }
-
-        foreach ($conditions as $ptr => $type) {
-            if (isset($tokens[$ptr]) === true
-                && \in_array($type, $types, true) === true
-            ) {
-                // We found a token with the required type.
-                return $ptr;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Return the position of the last (innermost) condition of a certain type for the passed token.
-     *
-     * If no types are specified, the last condition for the token, independently of type,
-     * will be returned.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position of the token we are checking.
-     * @param int|string|array            $types     Optional. The type(s) of tokens to search for.
-     *
-     * @return int|false Integer stack pointer to the condition; or `FALSE` if the token
-     *                   does not have the condition or has no conditions at all.
-     */
-    public static function getLastCondition(File $phpcsFile, $stackPtr, $types = [])
-    {
-        return self::getCondition($phpcsFile, $stackPtr, $types, false);
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php b/Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php
deleted file mode 100644
index 94641d48..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/FunctionDeclarations.php
+++ /dev/null
@@ -1,754 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-
-/**
- * Utility functions for use when examining function declaration statements.
- *
- * @since 1.0.0 The `FunctionDeclarations::getProperties()` and the
- *              `FunctionDeclarations::getParameters()` methods are based on and
- *              inspired by respectively the `getMethodProperties()`
- *              and `getMethodParameters()` methods in the PHPCS native
- *              `PHP_CodeSniffer\Files\File` class.
- *              Also see {@see \PHPCSUtils\BackCompat\BCFile}.
- */
-class FunctionDeclarations
-{
-
-    /**
-     * Retrieves the visibility and implementation properties of a method.
-     *
-     * Main differences with the PHPCS version:
-     * - Bugs fixed:
-     *   - Handling of PHPCS annotations.
-     *   - `"has_body"` index could be set to `true` for functions without body in the case of
-     *      parse errors or live coding.
-     * - Defensive coding against incorrect calls to this method.
-     * - More efficient checking whether a function has a body.
-     * - New `"return_type_end_token"` (int|false) array index.
-     * - To allow for backward compatible handling of arrow functions, this method will also accept
-     *   `T_STRING` tokens and examine them to check if these are arrow functions.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getMethodProperties()   Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::getMethodProperties() Cross-version compatible version of the original.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
-     * @since 1.0.0-alpha3 Added support for PHP 8.0 static return type.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position in the stack of the function token to
-     *                                               acquire the properties for.
-     *
-     * @return array Array with information about a function declaration.
-     *               The format of the return value is:
-     *               ```php
-     *               array(
-     *                 'scope'                 => 'public', // Public, private, or protected
-     *                 'scope_specified'       => true,     // TRUE if the scope keyword was found.
-     *                 'return_type'           => '',       // The return type of the method.
-     *                 'return_type_token'     => integer,  // The stack pointer to the start of the return type
-     *                                                      // or FALSE if there is no return type.
-     *                 'return_type_end_token' => integer,  // The stack pointer to the end of the return type
-     *                                                      // or FALSE if there is no return type.
-     *                 'nullable_return_type'  => false,    // TRUE if the return type is nullable.
-     *                 'is_abstract'           => false,    // TRUE if the abstract keyword was found.
-     *                 'is_final'              => false,    // TRUE if the final keyword was found.
-     *                 'is_static'             => false,    // TRUE if the static keyword was found.
-     *                 'has_body'              => false,    // TRUE if the method has a body
-     *               );
-     *               ```
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a T_FUNCTION
-     *                                                      or T_CLOSURE token, nor an arrow function.
-     */
-    public static function getProperties(File $phpcsFile, $stackPtr)
-    {
-        $tokens         = $phpcsFile->getTokens();
-        $arrowOpenClose = self::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
-
-        if (isset($tokens[$stackPtr]) === false
-            || ($tokens[$stackPtr]['code'] !== \T_FUNCTION
-                && $tokens[$stackPtr]['code'] !== \T_CLOSURE
-                && $arrowOpenClose === false)
-        ) {
-            throw new RuntimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or an arrow function');
-        }
-
-        if ($tokens[$stackPtr]['code'] === \T_FUNCTION) {
-            $valid = Tokens::$methodPrefixes;
-        } else {
-            $valid = [\T_STATIC => \T_STATIC];
-        }
-
-        $valid += Tokens::$emptyTokens;
-
-        $scope          = 'public';
-        $scopeSpecified = false;
-        $isAbstract     = false;
-        $isFinal        = false;
-        $isStatic       = false;
-
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$tokens[$i]['code']]) === false) {
-                break;
-            }
-
-            switch ($tokens[$i]['code']) {
-                case \T_PUBLIC:
-                    $scope          = 'public';
-                    $scopeSpecified = true;
-                    break;
-                case \T_PRIVATE:
-                    $scope          = 'private';
-                    $scopeSpecified = true;
-                    break;
-                case \T_PROTECTED:
-                    $scope          = 'protected';
-                    $scopeSpecified = true;
-                    break;
-                case \T_ABSTRACT:
-                    $isAbstract = true;
-                    break;
-                case \T_FINAL:
-                    $isFinal = true;
-                    break;
-                case \T_STATIC:
-                    $isStatic = true;
-                    break;
-            }
-        }
-
-        $returnType         = '';
-        $returnTypeToken    = false;
-        $returnTypeEndToken = false;
-        $nullableReturnType = false;
-        $hasBody            = false;
-        $returnTypeTokens   = Collections::returnTypeTokensBC();
-
-        $parenthesisCloser = null;
-        if (isset($tokens[$stackPtr]['parenthesis_closer']) === true) {
-            $parenthesisCloser = $tokens[$stackPtr]['parenthesis_closer'];
-        } elseif ($arrowOpenClose !== false) {
-            // Arrow function in combination with PHP < 7.4 or PHPCS < 3.5.3.
-            $parenthesisCloser = $arrowOpenClose['parenthesis_closer'];
-        }
-
-        if (isset($parenthesisCloser) === true) {
-            $scopeOpener = null;
-            if (isset($tokens[$stackPtr]['scope_opener']) === true) {
-                $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-            } elseif ($arrowOpenClose !== false) {
-                // Arrow function in combination with PHP < 7.4 or PHPCS < 3.5.3.
-                $scopeOpener = $arrowOpenClose['scope_opener'];
-            }
-
-            for ($i = $parenthesisCloser; $i < $phpcsFile->numTokens; $i++) {
-                if ($i === $scopeOpener) {
-                    // End of function definition.
-                    $hasBody = true;
-                    break;
-                }
-
-                if ($scopeOpener === null && $tokens[$i]['code'] === \T_SEMICOLON) {
-                    // End of abstract/interface function definition.
-                    break;
-                }
-
-                if ($tokens[$i]['type'] === 'T_NULLABLE'
-                    // Handle nullable tokens in PHPCS < 2.8.0.
-                    || (\defined('T_NULLABLE') === false && $tokens[$i]['code'] === \T_INLINE_THEN)
-                    // Handle nullable tokens with arrow functions in PHPCS 2.8.0 - 2.9.0.
-                    || ($arrowOpenClose !== false && $tokens[$i]['code'] === \T_INLINE_THEN
-                        && \version_compare(Helper::getVersion(), '2.9.1', '<') === true)
-                ) {
-                    $nullableReturnType = true;
-                }
-
-                if (isset($returnTypeTokens[$tokens[$i]['code']]) === true) {
-                    if ($returnTypeToken === false) {
-                        $returnTypeToken = $i;
-                    }
-
-                    $returnType        .= $tokens[$i]['content'];
-                    $returnTypeEndToken = $i;
-                }
-            }
-        }
-
-        if ($returnType !== '' && $nullableReturnType === true) {
-            $returnType = '?' . $returnType;
-        }
-
-        return [
-            'scope'                 => $scope,
-            'scope_specified'       => $scopeSpecified,
-            'return_type'           => $returnType,
-            'return_type_token'     => $returnTypeToken,
-            'return_type_end_token' => $returnTypeEndToken,
-            'nullable_return_type'  => $nullableReturnType,
-            'is_abstract'           => $isAbstract,
-            'is_final'              => $isFinal,
-            'is_static'             => $isStatic,
-            'has_body'              => $hasBody,
-        ];
-    }
-
-    /**
-     * Retrieve the parenthesis opener, parenthesis closer, the scope opener and the scope closer
-     * for an arrow function.
-     *
-     * Helper function for cross-version compatibility with both PHP as well as PHPCS.
-     * In PHPCS versions prior to PHPCS 3.5.3/3.5.4, the `T_FN` token is not yet backfilled
-     * and does not have parenthesis opener/closer nor scope opener/closer indexes assigned
-     * in the `$tokens` array.
-     *
-     * @see \PHPCSUtils\Utils\FunctionDeclarations::isArrowFunction() Related function.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha4 Handling of PHP 8.0 identifier name tokens in return types, cross-version PHP & PHPCS.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The token to retrieve the openers/closers for.
-     *                                               Typically a `T_FN` or `T_STRING` token as those are the
-     *                                               only two tokens which can be the arrow function keyword.
-     *
-     * @return array|false An array with the token pointers or `FALSE` if this is not an arrow function.
-     *                     The format of the return value is:
-     *                     ```php
-     *                     array(
-     *                       'parenthesis_opener' => integer, // Stack pointer to the parenthesis opener.
-     *                       'parenthesis_closer' => integer, // Stack pointer to the parenthesis closer.
-     *                       'scope_opener'       => integer, // Stack pointer to the scope opener (arrow).
-     *                       'scope_closer'       => integer, // Stack pointer to the scope closer.
-     *                     )
-     *                     ```
-     */
-    public static function getArrowFunctionOpenClose(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false
-            || isset(Collections::arrowFunctionTokensBC()[$tokens[$stackPtr]['code']]) === false
-            || \strtolower($tokens[$stackPtr]['content']) !== 'fn'
-        ) {
-            return false;
-        }
-
-        if ($tokens[$stackPtr]['type'] === 'T_FN'
-            && isset($tokens[$stackPtr]['scope_closer']) === true
-            && \version_compare(Helper::getVersion(), '3.5.4', '>') === true
-        ) {
-            // The keys will either all be set or none will be set, so no additional checks needed.
-            return [
-                'parenthesis_opener' => $tokens[$stackPtr]['parenthesis_opener'],
-                'parenthesis_closer' => $tokens[$stackPtr]['parenthesis_closer'],
-                'scope_opener'       => $tokens[$stackPtr]['scope_opener'],
-                'scope_closer'       => $tokens[$stackPtr]['scope_closer'],
-            ];
-        }
-
-        /*
-         * This is either a T_STRING token pre-PHP 7.4, or T_FN on PHP 7.4 in combination
-         * with PHPCS < 3.5.3/4/5.
-         *
-         * Now see about finding the relevant arrow function tokens.
-         */
-        $returnValue = [];
-
-        $nextNonEmpty = $phpcsFile->findNext(
-            (Tokens::$emptyTokens + [\T_BITWISE_AND]),
-            ($stackPtr + 1),
-            null,
-            true
-        );
-        if ($nextNonEmpty === false || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
-            return false;
-        }
-
-        $returnValue['parenthesis_opener'] = $nextNonEmpty;
-        if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
-            return false;
-        }
-
-        $returnValue['parenthesis_closer'] = $tokens[$nextNonEmpty]['parenthesis_closer'];
-
-        $ignore                 = Tokens::$emptyTokens;
-        $ignore                += Collections::returnTypeTokensBC();
-        $ignore[\T_COLON]       = \T_COLON;
-        $ignore[\T_INLINE_ELSE] = \T_INLINE_ELSE; // Return type colon on PHPCS < 2.9.1.
-        $ignore[\T_INLINE_THEN] = \T_INLINE_THEN; // Nullable type indicator on PHPCS < 2.9.1.
-
-        if (\defined('T_NULLABLE') === true) {
-            $ignore[\T_NULLABLE] = \T_NULLABLE;
-        }
-
-        $arrow = $phpcsFile->findNext(
-            $ignore,
-            ($tokens[$nextNonEmpty]['parenthesis_closer'] + 1),
-            null,
-            true
-        );
-
-        if ($arrow === false
-            || ($tokens[$arrow]['code'] !== \T_DOUBLE_ARROW && $tokens[$arrow]['type'] !== 'T_FN_ARROW')
-        ) {
-            return false;
-        }
-
-        $returnValue['scope_opener'] = $arrow;
-        $inTernary                   = false;
-        $lastEndToken                = null;
-
-        for ($scopeCloser = ($arrow + 1); $scopeCloser < $phpcsFile->numTokens; $scopeCloser++) {
-            if (isset(self::$arrowFunctionEndTokens[$tokens[$scopeCloser]['code']]) === true
-                // BC for misidentified ternary else in some PHPCS versions.
-                && ($tokens[$scopeCloser]['code'] !== \T_COLON || $inTernary === false)
-            ) {
-                if ($lastEndToken !== null
-                    && $tokens[$scopeCloser]['code'] === \T_CLOSE_PARENTHESIS
-                    && $tokens[$scopeCloser]['parenthesis_opener'] < $arrow
-                ) {
-                    $scopeCloser = $lastEndToken;
-                }
-
-                break;
-            }
-
-            if (isset(Collections::arrowFunctionTokensBC()[$tokens[$scopeCloser]['code']]) === true) {
-                $nested = self::getArrowFunctionOpenClose($phpcsFile, $scopeCloser);
-                if ($nested !== false && isset($nested['scope_closer'])) {
-                    // We minus 1 here in case the closer can be shared with us.
-                    $scopeCloser = ($nested['scope_closer'] - 1);
-                    continue;
-                }
-            }
-
-            if (isset($tokens[$scopeCloser]['scope_closer']) === true
-                && $tokens[$scopeCloser]['code'] !== \T_INLINE_ELSE
-                && $tokens[$scopeCloser]['code'] !== \T_END_HEREDOC
-                && $tokens[$scopeCloser]['code'] !== \T_END_NOWDOC
-            ) {
-                // We minus 1 here in case the closer can be shared with us.
-                $scopeCloser = ($tokens[$scopeCloser]['scope_closer'] - 1);
-                continue;
-            }
-
-            if (isset($tokens[$scopeCloser]['parenthesis_closer']) === true) {
-                $scopeCloser  = $tokens[$scopeCloser]['parenthesis_closer'];
-                $lastEndToken = $scopeCloser;
-                continue;
-            }
-
-            if (isset($tokens[$scopeCloser]['bracket_closer']) === true) {
-                $scopeCloser  = $tokens[$scopeCloser]['bracket_closer'];
-                $lastEndToken = $scopeCloser;
-                continue;
-            }
-
-            if ($tokens[$scopeCloser]['code'] === \T_INLINE_THEN) {
-                $inTernary = true;
-                continue;
-            }
-
-            if ($tokens[$scopeCloser]['code'] === \T_INLINE_ELSE) {
-                if ($inTernary === false) {
-                    break;
-                }
-
-                $inTernary = false;
-            }
-        }
-
-        if ($scopeCloser === $phpcsFile->numTokens) {
-            return false;
-        }
-
-        $returnValue['scope_closer'] = $scopeCloser;
-
-        return $returnValue;
-    }
-
-    /**
-     * Returns the declaration name for a function.
-     *
-     * Alias for the {@see \PHPCSUtils\Utils\ObjectDeclarations::getName()} method.
-     *
-     * @see \PHPCSUtils\BackCompat\BCFile::getDeclarationName() Original function.
-     * @see \PHPCSUtils\Utils\ObjectDeclarations::getName()     PHPCSUtils native improved version.
-     *
-     * @since 1.0.0
-     *
-     * @codeCoverageIgnore
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the function keyword token.
-     *
-     * @return string|null The name of the function; or `NULL` if the passed token doesn't exist,
-     *                     the function is anonymous or in case of a parse error/live coding.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
-     *                                                      `T_FUNCTION`.
-     */
-    public static function getName(File $phpcsFile, $stackPtr)
-    {
-        return ObjectDeclarations::getName($phpcsFile, $stackPtr);
-    }
-
-
-    /**
-     * Retrieves the method parameters for the specified function token.
-     *
-     * Also supports passing in a `T_USE` token for a closure use group.
-     *
-     * The returned array will contain the following information for each parameter:
-     *
-     * ```php
-     * 0 => array(
-     *   'name'                => '$var',  // The variable name.
-     *   'token'               => integer, // The stack pointer to the variable name.
-     *   'content'             => string,  // The full content of the variable definition.
-     *   'pass_by_reference'   => boolean, // Is the variable passed by reference?
-     *   'reference_token'     => integer, // The stack pointer to the reference operator
-     *                                     // or FALSE if the param is not passed by reference.
-     *   'variable_length'     => boolean, // Is the param of variable length through use of `...` ?
-     *   'variadic_token'      => integer, // The stack pointer to the ... operator
-     *                                     // or FALSE if the param is not variable length.
-     *   'type_hint'           => string,  // The type hint for the variable.
-     *   'type_hint_token'     => integer, // The stack pointer to the start of the type hint
-     *                                     // or FALSE if there is no type hint.
-     *   'type_hint_end_token' => integer, // The stack pointer to the end of the type hint
-     *                                     // or FALSE if there is no type hint.
-     *   'nullable_type'       => boolean, // TRUE if the var type is preceded by the nullability
-     *                                     // operator.
-     *   'comma_token'         => integer, // The stack pointer to the comma after the param
-     *                                     // or FALSE if this is the last param.
-     * )
-     * ```
-     *
-     * Parameters with default values have the following additional array indexes:
-     * ```php
-     *   'default'             => string,  // The full content of the default value.
-     *   'default_token'       => integer, // The stack pointer to the start of the default value.
-     *   'default_equal_token' => integer, // The stack pointer to the equals sign.
-     * ```
-     *
-     * Parameters declared using PHP 8 constructor property promotion, have these additional array indexes:
-     * ```php
-     *   'property_visibility' => string,  // The property visibility as declared.
-     *   'visibility_token'    => integer, // The stack pointer to the visibility modifier token.
-     * ```
-     *
-     * Main differences with the PHPCS version:
-     * - Defensive coding against incorrect calls to this method.
-     * - More efficient and more stable checking whether a `T_USE` token is a closure use.
-     * - More efficient and more stable looping of the default value.
-     * - Clearer exception message when a non-closure use token was passed to the function.
-     * - To allow for backward compatible handling of arrow functions, this method will also accept
-     *   `T_STRING` tokens and examine them to check if these are arrow functions.
-     * - Support for PHP 8.0 identifier name tokens in parameter types, cross-version PHP & PHPCS.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getMethodParameters()   Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::getMethodParameters() Cross-version compatible version of the original.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 constructor property promotion.
-     * @since 1.0.0-alpha4 Added support for PHP 8.0 identifier name tokenization.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position in the stack of the function token
-     *                                               to acquire the parameters for.
-     *
-     * @return array
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified $stackPtr is not of
-     *                                                      type `T_FUNCTION`, `T_CLOSURE` or `T_USE`,
-     *                                                      nor an arrow function.
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a passed `T_USE` token is not a closure
-     *                                                      use token.
-     */
-    public static function getParameters(File $phpcsFile, $stackPtr)
-    {
-        $tokens         = $phpcsFile->getTokens();
-        $arrowOpenClose = self::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
-
-        if (isset($tokens[$stackPtr]) === false
-            || ($tokens[$stackPtr]['code'] !== \T_FUNCTION
-                && $tokens[$stackPtr]['code'] !== \T_CLOSURE
-                && $tokens[$stackPtr]['code'] !== \T_USE
-                && $arrowOpenClose === false)
-        ) {
-            throw new RuntimeException('$stackPtr must be of type T_FUNCTION, T_CLOSURE or T_USE or an arrow function');
-        }
-
-        if ($tokens[$stackPtr]['code'] === \T_USE) {
-            // This will work PHPCS 3.x/4.x cross-version without much overhead.
-            $opener = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-            if ($opener === false
-                || $tokens[$opener]['code'] !== \T_OPEN_PARENTHESIS
-                || UseStatements::isClosureUse($phpcsFile, $stackPtr) === false
-            ) {
-                throw new RuntimeException('$stackPtr was not a valid closure T_USE');
-            }
-        } elseif ($arrowOpenClose !== false) {
-            // Arrow function in combination with PHP < 7.4 or PHPCS < 3.5.3/4/5.
-            $opener = $arrowOpenClose['parenthesis_opener'];
-        } else {
-            if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
-                // Live coding or syntax error, so no params to find.
-                return [];
-            }
-
-            $opener = $tokens[$stackPtr]['parenthesis_opener'];
-        }
-
-        if (isset($tokens[$opener]['parenthesis_closer']) === false) {
-            // Live coding or syntax error, so no params to find.
-            return [];
-        }
-
-        $closer = $tokens[$opener]['parenthesis_closer'];
-
-        $vars             = [];
-        $currVar          = null;
-        $paramStart       = ($opener + 1);
-        $defaultStart     = null;
-        $equalToken       = null;
-        $paramCount       = 0;
-        $passByReference  = false;
-        $referenceToken   = false;
-        $variableLength   = false;
-        $variadicToken    = false;
-        $typeHint         = '';
-        $typeHintToken    = false;
-        $typeHintEndToken = false;
-        $nullableType     = false;
-        $visibilityToken  = null;
-
-        for ($i = $paramStart; $i <= $closer; $i++) {
-            // Changed from checking 'code' to 'type' to allow for T_NULLABLE not existing in PHPCS < 2.8.0.
-            switch ($tokens[$i]['type']) {
-                case 'T_BITWISE_AND':
-                    $passByReference = true;
-                    $referenceToken  = $i;
-                    break;
-
-                case 'T_VARIABLE':
-                    $currVar = $i;
-                    break;
-
-                case 'T_ELLIPSIS':
-                    $variableLength = true;
-                    $variadicToken  = $i;
-                    break;
-
-                case 'T_ARRAY_HINT': // PHPCS < 3.3.0.
-                case 'T_CALLABLE':
-                case 'T_SELF':
-                case 'T_PARENT':
-                case 'T_STATIC': // Self and parent are valid, static invalid, but was probably intended as type hint.
-                case 'T_FALSE': // Union types.
-                case 'T_NULL': // Union types.
-                case 'T_STRING':
-                case 'T_NAMESPACE':
-                case 'T_NS_SEPARATOR':
-                case 'T_NAME_QUALIFIED':
-                case 'T_NAME_FULLY_QUALIFIED':
-                case 'T_NAME_RELATIVE':
-                case 'T_BITWISE_OR': // Union type separator PHPCS < 3.6.0.
-                case 'T_TYPE_UNION': // Union type separator PHPCS >= 3.6.0.
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $typeHint        .= $tokens[$i]['content'];
-                    $typeHintEndToken = $i;
-                    break;
-
-                case 'T_NULLABLE':
-                case 'T_INLINE_THEN': // PHPCS < 2.8.0.
-                    $nullableType     = true;
-                    $typeHint        .= $tokens[$i]['content'];
-                    $typeHintEndToken = $i;
-                    break;
-
-                case 'T_PUBLIC':
-                case 'T_PROTECTED':
-                case 'T_PRIVATE':
-                    $visibilityToken = $i;
-                    break;
-
-                case 'T_CLOSE_PARENTHESIS':
-                case 'T_COMMA':
-                    // If it's null, then there must be no parameters for this
-                    // method.
-                    if ($currVar === null) {
-                        continue 2;
-                    }
-
-                    $vars[$paramCount]            = [];
-                    $vars[$paramCount]['token']   = $currVar;
-                    $vars[$paramCount]['name']    = $tokens[$currVar]['content'];
-                    $vars[$paramCount]['content'] = \trim(
-                        GetTokensAsString::normal($phpcsFile, $paramStart, ($i - 1))
-                    );
-
-                    if ($defaultStart !== null) {
-                        $vars[$paramCount]['default']             = \trim(
-                            GetTokensAsString::normal($phpcsFile, $defaultStart, ($i - 1))
-                        );
-                        $vars[$paramCount]['default_token']       = $defaultStart;
-                        $vars[$paramCount]['default_equal_token'] = $equalToken;
-                    }
-
-                    $vars[$paramCount]['pass_by_reference']   = $passByReference;
-                    $vars[$paramCount]['reference_token']     = $referenceToken;
-                    $vars[$paramCount]['variable_length']     = $variableLength;
-                    $vars[$paramCount]['variadic_token']      = $variadicToken;
-                    $vars[$paramCount]['type_hint']           = $typeHint;
-                    $vars[$paramCount]['type_hint_token']     = $typeHintToken;
-                    $vars[$paramCount]['type_hint_end_token'] = $typeHintEndToken;
-                    $vars[$paramCount]['nullable_type']       = $nullableType;
-
-                    if ($visibilityToken !== null) {
-                        $vars[$paramCount]['property_visibility'] = $tokens[$visibilityToken]['content'];
-                        $vars[$paramCount]['visibility_token']    = $visibilityToken;
-                    }
-
-                    if ($tokens[$i]['code'] === \T_COMMA) {
-                        $vars[$paramCount]['comma_token'] = $i;
-                    } else {
-                        $vars[$paramCount]['comma_token'] = false;
-                    }
-
-                    // Reset the vars, as we are about to process the next parameter.
-                    $currVar          = null;
-                    $paramStart       = ($i + 1);
-                    $defaultStart     = null;
-                    $equalToken       = null;
-                    $passByReference  = false;
-                    $referenceToken   = false;
-                    $variableLength   = false;
-                    $variadicToken    = false;
-                    $typeHint         = '';
-                    $typeHintToken    = false;
-                    $typeHintEndToken = false;
-                    $nullableType     = false;
-                    $visibilityToken  = null;
-
-                    $paramCount++;
-                    break;
-
-                case 'T_EQUAL':
-                    $defaultStart = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                    $equalToken   = $i;
-
-                    // Skip past everything in the default value before going into the next switch loop.
-                    for ($j = ($i + 1); $j <= $closer; $j++) {
-                        // Skip past array()'s et al as default values.
-                        if (isset($tokens[$j]['parenthesis_opener'], $tokens[$j]['parenthesis_closer'])) {
-                            $j = $tokens[$j]['parenthesis_closer'];
-
-                            if ($j === $closer) {
-                                // Found the end of the parameter.
-                                break;
-                            }
-
-                            continue;
-                        }
-
-                        // Skip past short arrays et al as default values.
-                        if (isset($tokens[$j]['bracket_opener'])) {
-                            $j = $tokens[$j]['bracket_closer'];
-                            continue;
-                        }
-
-                        if ($tokens[$j]['code'] === \T_COMMA) {
-                            break;
-                        }
-                    }
-
-                    $i = ($j - 1);
-                    break;
-            }
-        }
-
-        return $vars;
-    }
-
-    /**
-     * Check if an arbitrary token is the "fn" keyword for a PHP 7.4 arrow function.
-     *
-     * Helper function for cross-version compatibility with both PHP as well as PHPCS.
-     * - PHP 7.4+ will tokenize most tokens with the content "fn" as `T_FN`, even when it isn't an arrow function.
-     * - PHPCS < 3.5.3 will tokenize arrow functions keywords as `T_STRING`.
-     * - PHPCS 3.5.3/3.5.4 will tokenize the keyword differently depending on which PHP version is used
-     *   and similar to PHP will tokenize most tokens with the content "fn" as `T_FN`, even when it's not an
-     *   arrow function.
-     *   > Note: the tokens tokenized by PHPCS 3.5.3 - 3.5.4 as `T_FN` are not 100% the same as those tokenized
-     *   by PHP 7.4+ as `T_FN`.
-     *
-     * Either way, the `T_FN` token is not a reliable search vector for finding or examining
-     * arrow functions, at least not until PHPCS 3.5.5.
-     * This function solves that and will give reliable results in the same way as this is now
-     * solved in PHPCS 3.5.5.
-     *
-     * > Note: Bugs are still being found and reported about how PHPCS tokenizes the arrow functions.
-     * This method will keep up with upstream changes and backport them, in as far possible, to allow
-     * for sniffing arrow functions in PHPCS < current.
-     *
-     * @see \PHPCSUtils\Utils\FunctionDeclarations::getArrowFunctionOpenClose() Related function.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The token to check. Typically a T_FN or
-     *                                               T_STRING token as those are the only two
-     *                                               tokens which can be the arrow function keyword.
-     *
-     * @return bool `TRUE` if the token is the "fn" keyword for an arrow function. `FALSE` when it's not
-     *              or in case of live coding/parse error.
-     */
-    public static function isArrowFunction(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        if ($tokens[$stackPtr]['type'] === 'T_FN'
-            && isset($tokens[$stackPtr]['scope_closer']) === true
-        ) {
-            return true;
-        }
-
-        if (isset(Collections::arrowFunctionTokensBC()[$tokens[$stackPtr]['code']]) === false
-            || \strtolower($tokens[$stackPtr]['content']) !== 'fn'
-        ) {
-            return false;
-        }
-
-        $openClose = self::getArrowFunctionOpenClose($phpcsFile, $stackPtr);
-        if ($openClose !== false && isset($openClose['scope_closer'])) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php b/Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php
deleted file mode 100644
index c7267f5c..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/GetTokensAsString.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Utility functions to retrieve the content of a set of tokens as a string.
- *
- * In contrast to the PHPCS native {@see \PHP_CodeSniffer\Files\File::getTokensAsString()} method,
- * which has `$length` as the third parameter, all methods in this class expect a stack pointer to
- * an `$end` token (inclusive) as the third parameter.
- *
- * @since 1.0.0 The principle of this class is loosely based on and inspired by the
- *              {@see \PHP_CodeSniffer\Files\File::getTokensAsString()} method in the
- *              PHPCS native `File` class.
- *              Also see {@see \PHPCSUtils\BackCompat\BCFile::getTokensAsString()}.
- */
-class GetTokensAsString
-{
-    /**
-     * Retrieve the tab-replaced content of the tokens from the specified start position in
-     * the token stack to the specified end position (inclusive).
-     *
-     * This is the default behaviour for PHPCS.
-     *
-     * If the `tabWidth` is set, either via a (custom) ruleset, the config file or by passing it
-     * on the command-line, PHPCS will automatically replace tabs with spaces.
-     * The `'content'` index key in the `$tokens` array will contain the tab-replaced content.
-     * The `'orig_content'` index key in the `$tokens` array will contain the original content.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getTokensAsString()   Similar length-based function.
-     * @see \PHPCSUtils\BackCompat\BCFile::getTokensAsString() Cross-version compatible version of the original.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $start     The position to start from in the token stack.
-     * @param int                         $end       The position to end at in the token stack (inclusive).
-     *
-     * @return string The token contents.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
-     */
-    public static function normal(File $phpcsFile, $start, $end)
-    {
-        return self::getString($phpcsFile, $start, $end);
-    }
-
-    /**
-     * Retrieve the content of the tokens from the specified start position in the token
-     * stack to the specified end position (inclusive) with all consecutive whitespace tokens - tabs,
-     * new lines, multiple spaces - replaced by a single space and optionally without comments.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getTokensAsString() Loosely related function.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile     The file being scanned.
-     * @param int                         $start         The position to start from in the token stack.
-     * @param int                         $end           The position to end at in the token stack (inclusive).
-     * @param bool                        $stripComments Whether comments should be stripped from the contents.
-     *                                                   Defaults to `false`.
-     *
-     * @return string The token contents with compacted whitespace and optionally stripped off comments.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
-     */
-    public static function compact(File $phpcsFile, $start, $end, $stripComments = false)
-    {
-        return self::getString($phpcsFile, $start, $end, false, $stripComments, false, true);
-    }
-
-    /**
-     * Retrieve the content of the tokens from the specified start position in the token stack
-     * to the specified end position (inclusive).
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile       The file being scanned.
-     * @param int                         $start           The position to start from in the token stack.
-     * @param int                         $end             The position to end at in the token stack (inclusive).
-     * @param bool                        $origContent     Whether the original content or the tab replaced
-     *                                                     content should be used.
-     *                                                     Defaults to `false` (= tabs replaced with spaces).
-     * @param bool                        $stripComments   Whether comments should be stripped from the contents.
-     *                                                     Defaults to `false`.
-     * @param bool                        $stripWhitespace Whether whitespace should be stripped from the contents.
-     *                                                     Defaults to `false`.
-     * @param bool                        $compact         Whether all consecutive whitespace tokens should be
-     *                                                     replaced with a single space. Defaults to `false`.
-     *
-     * @return string The token contents.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
-     */
-    protected static function getString(
-        File $phpcsFile,
-        $start,
-        $end,
-        $origContent = false,
-        $stripComments = false,
-        $stripWhitespace = false,
-        $compact = false
-    ) {
-        $tokens = $phpcsFile->getTokens();
-
-        if (\is_int($start) === false || isset($tokens[$start]) === false) {
-            throw new RuntimeException(
-                'The $start position for GetTokensAsString methods must exist in the token stack'
-            );
-        }
-
-        if (\is_int($end) === false || $end < $start) {
-            return '';
-        }
-
-        $str = '';
-        if ($end >= $phpcsFile->numTokens) {
-            $end = ($phpcsFile->numTokens - 1);
-        }
-
-        $lastAdded = null;
-        for ($i = $start; $i <= $end; $i++) {
-            if ($stripComments === true && isset(Tokens::$commentTokens[$tokens[$i]['code']])) {
-                continue;
-            }
-
-            if ($stripWhitespace === true && $tokens[$i]['code'] === \T_WHITESPACE) {
-                continue;
-            }
-
-            if ($compact === true && $tokens[$i]['code'] === \T_WHITESPACE) {
-                if (isset($lastAdded) === false || $tokens[$lastAdded]['code'] !== \T_WHITESPACE) {
-                    $str      .= ' ';
-                    $lastAdded = $i;
-                }
-                continue;
-            }
-
-            // If tabs are being converted to spaces by the tokenizer, the
-            // original content should be used instead of the converted content.
-            if ($origContent === true && isset($tokens[$i]['orig_content']) === true) {
-                $str .= $tokens[$i]['orig_content'];
-            } else {
-                $str .= $tokens[$i]['content'];
-            }
-
-            $lastAdded = $i;
-        }
-
-        return $str;
-    }
-
-    /**
-     * Retrieve the code-tokens only content of the tokens from the specified start position
-     * in the token stack to the specified end position (inclusive) without whitespace or comments.
-     *
-     * This is, for instance, useful to retrieve a namespace name without stray whitespace or comments.
-     * Use this function selectively and with care!
-     *
-     * @see \PHP_CodeSniffer\Files\File::getTokensAsString() Loosely related function.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $start     The position to start from in the token stack.
-     * @param int                         $end       The position to end at in the token stack (inclusive).
-     *
-     * @return string The token contents stripped off comments and whitespace.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified start position does not exist.
-     */
-    public static function noEmpties(File $phpcsFile, $start, $end)
-    {
-        return self::getString($phpcsFile, $start, $end, false, true, true);
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php b/Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php
deleted file mode 100644
index fdb46adb..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/ObjectDeclarations.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-
-/**
- * Utility functions for use when examining object declaration statements.
- *
- * @since 1.0.0 The `ObjectDeclarations::get(Declaration)Name()`,
- *              `ObjectDeclarations::getClassProperties()`, `ObjectDeclarations::findExtendedClassName()`
- *              and `ObjectDeclarations::findImplementedInterfaceNames()` methods are based on and
- *              inspired by the methods of the same name in the PHPCS native
- *              `PHP_CodeSniffer\Files\File` class.
- *              Also see {@see \PHPCSUtils\BackCompat\BCFile}.
- */
-class ObjectDeclarations
-{
-
-    /**
-     * Retrieves the declaration name for classes, interfaces, traits, and functions.
-     *
-     * Main differences with the PHPCS version:
-     * - Defensive coding against incorrect calls to this method.
-     * - Improved handling of invalid names, like names starting with a number.
-     *   This allows sniffs to report on invalid names instead of ignoring them.
-     * - Bug fix: improved handling of parse errors.
-     *   Using the original method, a parse error due to an invalid name could cause the method
-     *   to return the name of the *next* construct, a partial name and/or the name of a class
-     *   being extended/interface being implemented.
-     *   Using this version of the utility method, either the complete name (invalid or not) will
-     *   be returned or `null` in case of no name (parse error).
-     *
-     * Note:
-     * - For ES6 classes in combination with PHPCS 2.x, passing a `T_STRING` token to
-     *   this method will be accepted for JS files.
-     * - Support for JS ES6 method syntax has not been back-filled for PHPCS < 3.0.0.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getDeclarationName()   Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::getDeclarationName() Cross-version compatible version of the original.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the declaration token
-     *                                               which declared the class, interface,
-     *                                               trait, or function.
-     *
-     * @return string|null The name of the class, interface, trait, or function;
-     *                     or `NULL` if the passed token doesn't exist, the function or
-     *                     class is anonymous or in case of a parse error/live coding.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
-     *                                                      `T_FUNCTION`, `T_CLASS`, `T_TRAIT`, or `T_INTERFACE`.
-     */
-    public static function getName(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false
-            || ($tokens[$stackPtr]['code'] === \T_ANON_CLASS || $tokens[$stackPtr]['code'] === \T_CLOSURE)
-        ) {
-            return null;
-        }
-
-        $tokenCode = $tokens[$stackPtr]['code'];
-
-        /*
-         * BC: Work-around JS ES6 classes not being tokenized as T_CLASS in PHPCS < 3.0.0.
-         */
-        if (isset($phpcsFile->tokenizerType)
-            && $phpcsFile->tokenizerType === 'JS'
-            && $tokenCode === \T_STRING
-            && $tokens[$stackPtr]['content'] === 'class'
-        ) {
-            $tokenCode = \T_CLASS;
-        }
-
-        if ($tokenCode !== \T_FUNCTION
-            && $tokenCode !== \T_CLASS
-            && $tokenCode !== \T_INTERFACE
-            && $tokenCode !== \T_TRAIT
-        ) {
-            throw new RuntimeException(
-                'Token type "' . $tokens[$stackPtr]['type'] . '" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT'
-            );
-        }
-
-        if ($tokenCode === \T_FUNCTION
-            && \strtolower($tokens[$stackPtr]['content']) !== 'function'
-        ) {
-            // This is a function declared without the "function" keyword.
-            // So this token is the function name.
-            return $tokens[$stackPtr]['content'];
-        }
-
-        /*
-         * Determine the name. Note that we cannot simply look for the first T_STRING
-         * because an (invalid) class name starting with a number will be multiple tokens.
-         * Whitespace or comment are however not allowed within a name.
-         */
-
-        $stopPoint = $phpcsFile->numTokens;
-        if ($tokenCode === \T_FUNCTION && isset($tokens[$stackPtr]['parenthesis_opener']) === true) {
-            $stopPoint = $tokens[$stackPtr]['parenthesis_opener'];
-        } elseif (isset($tokens[$stackPtr]['scope_opener']) === true) {
-            $stopPoint = $tokens[$stackPtr]['scope_opener'];
-        }
-
-        $exclude   = Tokens::$emptyTokens;
-        $exclude[] = \T_OPEN_PARENTHESIS;
-        $exclude[] = \T_OPEN_CURLY_BRACKET;
-        $exclude[] = \T_BITWISE_AND;
-
-        $nameStart = $phpcsFile->findNext($exclude, ($stackPtr + 1), $stopPoint, true);
-        if ($nameStart === false) {
-            // Live coding or parse error.
-            return null;
-        }
-
-        $tokenAfterNameEnd = $phpcsFile->findNext($exclude, $nameStart, $stopPoint);
-
-        if ($tokenAfterNameEnd === false) {
-            $content = null;
-
-            /*
-             * BC: In PHPCS 2.6.0, in case of live coding, the last token in a file will be tokenized
-             * as T_STRING, but won't have the `content` index set.
-             */
-            if (isset($tokens[$nameStart]['content'])) {
-                $content = $tokens[$nameStart]['content'];
-            }
-
-            return $content;
-        }
-
-        // Name starts with number, so is composed of multiple tokens.
-        return GetTokensAsString::noEmpties($phpcsFile, $nameStart, ($tokenAfterNameEnd - 1));
-    }
-
-    /**
-     * Retrieves the implementation properties of a class.
-     *
-     * Main differences with the PHPCS version:
-     * - Bugs fixed:
-     *   - Handling of PHPCS annotations.
-     *   - Handling of unorthodox docblock placement.
-     *   - A class cannot both be abstract as well as final, so this utility should not allow for that.
-     * - Defensive coding against incorrect calls to this method.
-     *
-     * @see \PHP_CodeSniffer\Files\File::getClassProperties()   Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::getClassProperties() Cross-version compatible version of the original.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position in the stack of the `T_CLASS`
-     *                                               token to acquire the properties for.
-     *
-     * @return array Array with implementation properties of a class.
-     *               The format of the return value is:
-     *               ```php
-     *               array(
-     *                 'is_abstract' => false, // TRUE if the abstract keyword was found.
-     *                 'is_final'    => false, // TRUE if the final keyword was found.
-     *               );
-     *               ```
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      `T_CLASS` token.
-     */
-    public static function getClassProperties(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_CLASS) {
-            throw new RuntimeException('$stackPtr must be of type T_CLASS');
-        }
-
-        $valid      = Collections::$classModifierKeywords + Tokens::$emptyTokens;
-        $properties = [
-            'is_abstract' => false,
-            'is_final'    => false,
-        ];
-
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$tokens[$i]['code']]) === false) {
-                break;
-            }
-
-            switch ($tokens[$i]['code']) {
-                case \T_ABSTRACT:
-                    $properties['is_abstract'] = true;
-                    break 2;
-
-                case \T_FINAL:
-                    $properties['is_final'] = true;
-                    break 2;
-            }
-        }
-
-        return $properties;
-    }
-
-    /**
-     * Retrieves the name of the class that the specified class extends.
-     *
-     * Works for classes, anonymous classes and interfaces, though it is strongly recommended
-     * to use the {@see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedInterfaceNames()}
-     * method to examine interfaces instead. Interfaces can extend multiple parent interfaces,
-     * and that use-case is not handled by this method.
-     *
-     * Main differences with the PHPCS version:
-     * - Bugs fixed:
-     *   - Handling of PHPCS annotations.
-     *   - Handling of comments.
-     * - Improved handling of parse errors.
-     * - The returned name will be clean of superfluous whitespace and/or comments.
-     *
-     * @see \PHP_CodeSniffer\Files\File::findExtendedClassName()               Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::findExtendedClassName()             Cross-version compatible version of
-     *                                                                         the original.
-     * @see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedInterfaceNames() Similar method for extended interfaces.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The stack position of the class or interface.
-     *
-     * @return string|false The extended class name or `FALSE` on error or if there
-     *                      is no extended class name.
-     */
-    public static function findExtendedClassName(File $phpcsFile, $stackPtr)
-    {
-        $names = self::findNames($phpcsFile, $stackPtr, \T_EXTENDS, Collections::$OOCanExtend);
-        if ($names === false) {
-            return false;
-        }
-
-        // Classes can only extend one parent class.
-        return \array_shift($names);
-    }
-
-    /**
-     * Retrieves the names of the interfaces that the specified class implements.
-     *
-     * Main differences with the PHPCS version:
-     * - Bugs fixed:
-     *   - Handling of PHPCS annotations.
-     *   - Handling of comments.
-     * - Improved handling of parse errors.
-     * - The returned name(s) will be clean of superfluous whitespace and/or comments.
-     *
-     * @see \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames()   Original source.
-     * @see \PHPCSUtils\BackCompat\BCFile::findImplementedInterfaceNames() Cross-version compatible version of
-     *                                                                     the original.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The stack position of the class.
-     *
-     * @return array|false Array with names of the implemented interfaces or `FALSE` on
-     *                     error or if there are no implemented interface names.
-     */
-    public static function findImplementedInterfaceNames(File $phpcsFile, $stackPtr)
-    {
-        return self::findNames($phpcsFile, $stackPtr, \T_IMPLEMENTS, Collections::$OOCanImplement);
-    }
-
-    /**
-     * Retrieves the names of the interfaces that the specified interface extends.
-     *
-     * @see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedClassName() Similar method for extended classes.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The stack position of the interface keyword.
-     *
-     * @return array|false Array with names of the extended interfaces or `FALSE` on
-     *                     error or if there are no extended interface names.
-     */
-    public static function findExtendedInterfaceNames(File $phpcsFile, $stackPtr)
-    {
-        return self::findNames(
-            $phpcsFile,
-            $stackPtr,
-            \T_EXTENDS,
-            [\T_INTERFACE => \T_INTERFACE]
-        );
-    }
-
-    /**
-     * Retrieves the names of the extended classes or interfaces or the implemented
-     * interfaces that the specific class/interface declaration extends/implements.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile  The file where this token was found.
-     * @param int                         $stackPtr   The stack position of the
-     *                                                class/interface declaration keyword.
-     * @param int                         $keyword    The token constant for the keyword to examine.
-     *                                                Either `T_EXTENDS` or `T_IMPLEMENTS`.
-     * @param array                       $allowedFor Array of OO types for which use of the keyword
-     *                                                is allowed.
-     *
-     * @return array|false Returns an array of names or `FALSE` on error or when the object
-     *                     being declared does not extend/implement another object.
-     */
-    private static function findNames(File $phpcsFile, $stackPtr, $keyword, $allowedFor)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false
-            || isset($allowedFor[$tokens[$stackPtr]['code']]) === false
-            || isset($tokens[$stackPtr]['scope_opener']) === false
-        ) {
-            return false;
-        }
-
-        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-        $keywordPtr  = $phpcsFile->findNext($keyword, ($stackPtr + 1), $scopeOpener);
-        if ($keywordPtr === false) {
-            return false;
-        }
-
-        $find  = [
-            \T_NS_SEPARATOR,
-            \T_STRING,
-        ];
-        $find += Tokens::$emptyTokens;
-
-        $names = [];
-        $end   = $keywordPtr;
-        do {
-            $start = ($end + 1);
-            $end   = $phpcsFile->findNext($find, $start, ($scopeOpener + 1), true);
-            $name  = GetTokensAsString::noEmpties($phpcsFile, $start, ($end - 1));
-
-            if (\trim($name) !== '') {
-                $names[] = $name;
-            }
-        } while ($tokens[$end]['code'] === \T_COMMA);
-
-        if (empty($names)) {
-            return false;
-        }
-
-        return $names;
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php b/Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php
deleted file mode 100644
index 26ba1fd2..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/Parentheses.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
-
-/**
- * Utility functions for use when examining parenthesis tokens and arbitrary tokens wrapped
- * in parentheses.
- *
- * In contrast to PHPCS natively, `isset()`, `unset()`, `empty()`, `exit()`, `die()` and `eval()`
- * will be considered parentheses owners by the functions in this class.
- *
- * @since 1.0.0
- * @since 1.0.0-alpha4 Added support for `isset()`, `unset()`, `empty()`, `exit()`, `die()`
- *                     and `eval()`` as parentheses owners to all applicable functions.
- */
-class Parentheses
-{
-
-    /**
-     * Extra tokens which should be considered parentheses owners.
-     *
-     * - `T_LIST` and `T_ANON_CLASS` only became parentheses owners in PHPCS 3.5.0.
-     * - `T_ISSET`, `T_UNSET`, `T_EMPTY`, `T_EXIT` and `T_EVAL` are not PHPCS native parentheses,
-     *    owners, but are considered such for the purposes of this class.
-     *    Also {@see https://github.com/squizlabs/PHP_CodeSniffer/issues/3118}.
-     *
-     * @since 1.0.0-alpha4
-     *
-     * @var array <int|string> => <int|string>
-     */
-    private static $extraParenthesesOwners = [
-        \T_LIST       => \T_LIST,
-        \T_ISSET      => \T_ISSET,
-        \T_UNSET      => \T_UNSET,
-        \T_EMPTY      => \T_EMPTY,
-        \T_EXIT       => \T_EXIT,
-        \T_EVAL       => \T_EVAL,
-        \T_ANON_CLASS => \T_ANON_CLASS,
-        // Work-around: anon classes were, in certain circumstances, tokenized as T_CLASS prior to PHPCS 3.4.0.
-        \T_CLASS      => \T_CLASS,
-    ];
-
-    /**
-     * Get the stack pointer to the parentheses owner of an open/close parenthesis.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position of `T_OPEN/CLOSE_PARENTHESIS` token.
-     *
-     * @return int|false Integer stack pointer to the parentheses owner; or `FALSE` if the
-     *                   parenthesis does not have a (direct) owner or if the token passed
-     *                   was not a parenthesis.
-     */
-    public static function getOwner(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['parenthesis_owner'])) {
-            return $tokens[$stackPtr]['parenthesis_owner'];
-        }
-
-        /*
-         * - `T_FN` was only backfilled in PHPCS 3.5.3/4/5.
-         *    - On PHP 7.4 with PHPCS < 3.5.3, T_FN will not yet be a parentheses owner.
-         *    - On PHP < 7.4 with PHPCS < 3.5.3, T_FN will be tokenized as T_STRING and not yet be a parentheses owner.
-         *
-         * {@internal As the 'parenthesis_owner' index is only set on parentheses, we didn't need to do any
-         * input validation before, but now we do.}
-         */
-        if (isset($tokens[$stackPtr]) === false
-            || ($tokens[$stackPtr]['code'] !== \T_OPEN_PARENTHESIS
-                && $tokens[$stackPtr]['code'] !== \T_CLOSE_PARENTHESIS)
-        ) {
-            return false;
-        }
-
-        if ($tokens[$stackPtr]['code'] === \T_CLOSE_PARENTHESIS) {
-            $stackPtr = $tokens[$stackPtr]['parenthesis_opener'];
-        }
-
-        $skip                 = Tokens::$emptyTokens;
-        $skip[\T_BITWISE_AND] = \T_BITWISE_AND;
-
-        $prevNonEmpty = $phpcsFile->findPrevious($skip, ($stackPtr - 1), null, true);
-        if ($prevNonEmpty !== false
-            && (isset(self::$extraParenthesesOwners[$tokens[$prevNonEmpty]['code']])
-                // Possibly an arrow function.
-                || FunctionDeclarations::isArrowFunction($phpcsFile, $prevNonEmpty) === true)
-        ) {
-            return $prevNonEmpty;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether the parenthesis owner of an open/close parenthesis is within a limited
-     * set of valid owners.
-     *
-     * @since 1.0.0
-     * @since 1.0.0-alpha2 Added BC support for PHP 7.4 arrow functions.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file where this token was found.
-     * @param int                         $stackPtr    The position of `T_OPEN/CLOSE_PARENTHESIS` token.
-     * @param int|string|array            $validOwners Array of token constants for the owners
-     *                                                 which should be considered valid.
-     *
-     * @return bool `TRUE` if the owner is within the list of `$validOwners`; `FALSE` if not and
-     *              if the parenthesis does not have a (direct) owner.
-     */
-    public static function isOwnerIn(File $phpcsFile, $stackPtr, $validOwners)
-    {
-        $owner = self::getOwner($phpcsFile, $stackPtr);
-        if ($owner === false) {
-            return false;
-        }
-
-        $tokens      = $phpcsFile->getTokens();
-        $validOwners = (array) $validOwners;
-
-        /*
-         * Work around tokenizer bug where anon classes were, in certain circumstances, tokenized
-         * as `T_CLASS` prior to PHPCS 3.4.0.
-         * As `T_CLASS` is normally not an parenthesis owner, we can safely add it to the array
-         * without doing a version check.
-         */
-        if (\in_array(\T_ANON_CLASS, $validOwners, true)) {
-            $validOwners[] = \T_CLASS;
-        }
-
-        /*
-         * Allow for T_FN token being tokenized as T_STRING before PHPCS 3.5.3.
-         */
-        if (\defined('T_FN') && \in_array(\T_FN, $validOwners, true)) {
-            $validOwners += Collections::arrowFunctionTokensBC();
-        }
-
-        return \in_array($tokens[$owner]['code'], $validOwners, true);
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/Scopes.php b/Magento2/Helpers/PHPCSUtils/Utils/Scopes.php
deleted file mode 100644
index 3975a6b3..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/Scopes.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Utility functions for use when examining token scopes.
- *
- * @since 1.0.0
- */
-class Scopes
-{
-
-    /**
-     * Check whether the direct wrapping scope of a token is within a limited set of
-     * acceptable tokens.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file where this token was found.
-     * @param int                         $stackPtr    The position in the stack of the
-     *                                                 token to verify.
-     * @param int|string|array            $validScopes Array of token constants representing
-     *                                                 the scopes considered valid.
-     *
-     * @return int|false Integer stack pointer to the valid direct scope; or `FALSE` if
-     *                   no valid direct scope was found.
-     */
-    public static function validDirectScope(File $phpcsFile, $stackPtr, $validScopes)
-    {
-        $ptr = Conditions::getLastCondition($phpcsFile, $stackPtr);
-
-        if ($ptr !== false) {
-            $tokens      = $phpcsFile->getTokens();
-            $validScopes = (array) $validScopes;
-
-            if (\in_array($tokens[$ptr]['code'], $validScopes, true) === true) {
-                return $ptr;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether a T_FUNCTION token is a class/interface/trait method declaration.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position in the stack of the
-     *                                               `T_FUNCTION` token to verify.
-     *
-     * @return bool
-     */
-    public static function isOOMethod(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_FUNCTION) {
-            return false;
-        }
-
-        if (self::validDirectScope($phpcsFile, $stackPtr, BCTokens::ooScopeTokens()) !== false) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php b/Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php
deleted file mode 100644
index aca9ce09..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/TextStrings.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-
-/**
- * Utility functions for working with text string tokens.
- *
- * @since 1.0.0
- */
-class TextStrings
-{
-
-    /**
-     * Get the complete contents of a - potentially multi-line - text string.
-     *
-     * PHPCS tokenizes multi-line text strings with a single token for each line.
-     * This method can be used to retrieve the text string as it would be received and
-     * processed in PHP itself.
-     *
-     * This method is particularly useful for sniffs which examine the contents of text strings,
-     * where the content matching might result in false positives/false negatives if the text
-     * were to be examined line by line.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file where this token was found.
-     * @param int                         $stackPtr    Pointer to the first text string token
-     *                                                 of a - potentially multi-line - text string
-     *                                                 or to a Nowdoc/Heredoc opener.
-     * @param bool                        $stripQuotes Optional. Whether to strip text delimiter
-     *                                                 quotes off the resulting text string.
-     *                                                 Defaults to `true`.
-     *
-     * @return string The complete text string.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      valid text string token.
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not the _first_
-     *                                                      token in a text string.
-     */
-    public static function getCompleteTextString(File $phpcsFile, $stackPtr, $stripQuotes = true)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Must be the start of a text string token.
-        if (isset($tokens[$stackPtr], Collections::$textStingStartTokens[$tokens[$stackPtr]['code']]) === false) {
-            throw new RuntimeException(
-                '$stackPtr must be of type T_START_HEREDOC, T_START_NOWDOC, T_CONSTANT_ENCAPSED_STRING'
-                . ' or T_DOUBLE_QUOTED_STRING'
-            );
-        }
-
-        if ($tokens[$stackPtr]['code'] === \T_CONSTANT_ENCAPSED_STRING
-            || $tokens[$stackPtr]['code'] === \T_DOUBLE_QUOTED_STRING
-        ) {
-            $prev = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-            if ($tokens[$stackPtr]['code'] === $tokens[$prev]['code']) {
-                throw new RuntimeException('$stackPtr must be the start of the text string');
-            }
-        }
-
-        $stripNewline = false;
-
-        switch ($tokens[$stackPtr]['code']) {
-            case \T_START_HEREDOC:
-                $stripQuotes  = false;
-                $stripNewline = true;
-                $targetType   = \T_HEREDOC;
-                $current      = ($stackPtr + 1);
-                break;
-
-            case \T_START_NOWDOC:
-                $stripQuotes  = false;
-                $stripNewline = true;
-                $targetType   = \T_NOWDOC;
-                $current      = ($stackPtr + 1);
-                break;
-
-            default:
-                $targetType = $tokens[$stackPtr]['code'];
-                $current    = $stackPtr;
-                break;
-        }
-
-        $string = '';
-        do {
-            $string .= $tokens[$current]['content'];
-            ++$current;
-        } while (isset($tokens[$current]) && $tokens[$current]['code'] === $targetType);
-
-        if ($stripNewline === true) {
-            // Heredoc/nowdoc: strip the new line at the end of the string to emulate how PHP sees the string.
-            $string = \rtrim($string, "\r\n");
-        }
-
-        if ($stripQuotes === true) {
-            return self::stripQuotes($string);
-        }
-
-        return $string;
-    }
-
-    /**
-     * Strip text delimiter quotes from an arbitrary string.
-     *
-     * Intended for use with the "contents" of a `T_CONSTANT_ENCAPSED_STRING` / `T_DOUBLE_QUOTED_STRING`.
-     *
-     * - Prevents stripping mis-matched quotes.
-     * - Prevents stripping quotes from the textual content of the string.
-     *
-     * @since 1.0.0
-     *
-     * @param string $string The raw string.
-     *
-     * @return string String without quotes around it.
-     */
-    public static function stripQuotes($string)
-    {
-        return \preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $string);
-    }
-}
diff --git a/Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php b/Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php
deleted file mode 100644
index 5e965d33..00000000
--- a/Magento2/Helpers/PHPCSUtils/Utils/UseStatements.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-/**
- * PHPCSUtils, utility functions and classes for PHP_CodeSniffer sniff developers.
- *
- * @package   PHPCSUtils
- * @copyright 2019-2020 PHPCSUtils Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCSStandards/PHPCSUtils
- */
-
-namespace Magento2\Helpers\PHPCSUtils\Utils;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
-
-use Magento2\Helpers\PHPCSUtils\Utils\Parentheses;
-
-/**
- * Utility functions for examining use statements.
- *
- * @since 1.0.0
- */
-class UseStatements
-{
-
-    /**
-     * Determine what a T_USE token is used for.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the `T_USE` token.
-     *
-     * @return string Either `'closure'`, `'import'` or `'trait'`.
-     *                An empty string will be returned if the token is used in an
-     *                invalid context or if it couldn't be reliably determined what
-     *                the `T_USE` token is used for. An empty string being returned will
-     *                normally mean the code being examined contains a parse error.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      `T_USE` token.
-     */
-    public static function getType(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false
-            || $tokens[$stackPtr]['code'] !== \T_USE
-        ) {
-            throw new RuntimeException('$stackPtr must be of type T_USE');
-        }
-
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($next === false) {
-            // Live coding or parse error.
-            return '';
-        }
-
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($prev !== false && $tokens[$prev]['code'] === \T_CLOSE_PARENTHESIS
-            && Parentheses::isOwnerIn($phpcsFile, $prev, \T_CLOSURE) === true
-        ) {
-            return 'closure';
-        }
-
-        $lastCondition = Conditions::getLastCondition($phpcsFile, $stackPtr);
-        if ($lastCondition === false || $tokens[$lastCondition]['code'] === \T_NAMESPACE) {
-            // Global or scoped namespace and not a closure use statement.
-            return 'import';
-        }
-
-        $traitScopes = BCTokens::ooScopeTokens();
-        // Only classes and traits can import traits.
-        unset($traitScopes[\T_INTERFACE]);
-
-        if (isset($traitScopes[$tokens[$lastCondition]['code']]) === true) {
-            return 'trait';
-        }
-
-        return '';
-    }
-
-    /**
-     * Determine whether a T_USE token represents a closure use statement.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the `T_USE` token.
-     *
-     * @return bool `TRUE` if the token passed is a closure use statement.
-     *              `FALSE` if it's not.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      `T_USE` token.
-     */
-    public static function isClosureUse(File $phpcsFile, $stackPtr)
-    {
-        return (self::getType($phpcsFile, $stackPtr) === 'closure');
-    }
-
-    /**
-     * Determine whether a T_USE token represents a class/function/constant import use statement.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the `T_USE` token.
-     *
-     * @return bool `TRUE` if the token passed is an import use statement.
-     *              `FALSE` if it's not.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      `T_USE` token.
-     */
-    public static function isImportUse(File $phpcsFile, $stackPtr)
-    {
-        return (self::getType($phpcsFile, $stackPtr) === 'import');
-    }
-
-    /**
-     * Determine whether a T_USE token represents a trait use statement.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the `T_USE` token.
-     *
-     * @return bool `TRUE` if the token passed is a trait use statement.
-     *              `FALSE` if it's not.
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      `T_USE` token.
-     */
-    public static function isTraitUse(File $phpcsFile, $stackPtr)
-    {
-        return (self::getType($phpcsFile, $stackPtr) === 'trait');
-    }
-
-    /**
-     * Split an import use statement into individual imports.
-     *
-     * Handles single import, multi-import and group-import use statements.
-     *
-     * @since 1.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position in the stack of the `T_USE` token.
-     *
-     * @return array A multi-level array containing information about the use statement.
-     *               The first level is `'name'`, `'function'` and `'const'`. These keys will always exist.
-     *               If any statements are found for any of these categories, the second level
-     *               will contain the alias/name as the key and the full original use name as the
-     *               value for each of the found imports or an empty array if no imports were found
-     *               in this use statement for a particular category.
-     *
-     *               For example, for this function group use statement:
-     *               ```php
-     *               use function Vendor\Package\{
-     *                   LevelA\Name as Alias,
-     *                   LevelB\Another_Name,
-     *               };
-     *               ```
-     *               the return value would look like this:
-     *               ```php
-     *               array(
-     *                 'name'     => array(),
-     *                 'function' => array(
-     *                   'Alias'        => 'Vendor\Package\LevelA\Name',
-     *                   'Another_Name' => 'Vendor\Package\LevelB\Another_Name',
-     *                 ),
-     *                 'const'    => array(),
-     *               )
-     *               ```
-     *
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
-     *                                                      `T_USE` token.
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the `T_USE` token is not for an import
-     *                                                      use statement.
-     */
-    public static function splitImportUseStatement(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_USE) {
-            throw new RuntimeException('$stackPtr must be of type T_USE');
-        }
-
-        if (self::isImportUse($phpcsFile, $stackPtr) === false) {
-            throw new RuntimeException('$stackPtr must be an import use statement');
-        }
-
-        $statements = [
-            'name'     => [],
-            'function' => [],
-            'const'    => [],
-        ];
-
-        $endOfStatement = $phpcsFile->findNext([\T_SEMICOLON, \T_CLOSE_TAG], ($stackPtr + 1));
-        if ($endOfStatement === false) {
-            // Live coding or parse error.
-            return $statements;
-        }
-
-        $endOfStatement++;
-
-        $start     = true;
-        $useGroup  = false;
-        $hasAlias  = false;
-        $baseName  = '';
-        $name      = '';
-        $type      = '';
-        $fixedType = false;
-        $alias     = '';
-
-        for ($i = ($stackPtr + 1); $i < $endOfStatement; $i++) {
-            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
-                continue;
-            }
-
-            $tokenCode = $tokens[$i]['code'];
-
-            /*
-             * BC: Work round a tokenizer bug related to a parse error.
-             *
-             * If `function` or `const` is used as the alias, the semi-colon after it would
-             * be tokenized as T_STRING.
-             * For `function` this was fixed in PHPCS 2.8.0. For `const` the issue still exists
-             * in PHPCS 3.5.2.
-             *
-             * Along the same lines, the `}` T_CLOSE_USE_GROUP would also be tokenized as T_STRING.
-             */
-            if ($tokenCode === \T_STRING) {
-                if ($tokens[$i]['content'] === ';') {
-                    $tokenCode = \T_SEMICOLON;
-                } elseif ($tokens[$i]['content'] === '}') {
-                    $tokenCode = \T_CLOSE_USE_GROUP;
-                }
-            }
-
-            switch ($tokenCode) {
-                case \T_STRING:
-                    // Only when either at the start of the statement or at the start of a new sub within a group.
-                    if ($start === true && $fixedType === false) {
-                        $content = \strtolower($tokens[$i]['content']);
-                        if ($content === 'function'
-                            || $content === 'const'
-                        ) {
-                            $type  = $content;
-                            $start = false;
-                            if ($useGroup === false) {
-                                $fixedType = true;
-                            }
-
-                            break;
-                        } else {
-                            $type = 'name';
-                        }
-                    }
-
-                    $start = false;
-
-                    if ($hasAlias === false) {
-                        $name .= $tokens[$i]['content'];
-                    }
-
-                    $alias = $tokens[$i]['content'];
-                    break;
-
-                case \T_AS:
-                    $hasAlias = true;
-                    break;
-
-                case \T_OPEN_USE_GROUP:
-                    $start    = true;
-                    $useGroup = true;
-                    $baseName = $name;
-                    $name     = '';
-                    break;
-
-                case \T_SEMICOLON:
-                case \T_CLOSE_TAG:
-                case \T_CLOSE_USE_GROUP:
-                case \T_COMMA:
-                    if ($name !== '') {
-                        if ($useGroup === true) {
-                            $statements[$type][$alias] = $baseName . $name;
-                        } else {
-                            $statements[$type][$alias] = $name;
-                        }
-                    }
-
-                    if ($tokenCode !== \T_COMMA) {
-                        break 2;
-                    }
-
-                    // Reset.
-                    $start    = true;
-                    $name     = '';
-                    $hasAlias = false;
-                    if ($fixedType === false) {
-                        $type = '';
-                    }
-                    break;
-
-                case \T_NS_SEPARATOR:
-                    $name .= $tokens[$i]['content'];
-                    break;
-
-                case \T_FUNCTION:
-                case \T_CONST:
-                    /*
-                     * BC: Work around tokenizer bug in PHPCS < 3.4.1.
-                     *
-                     * `function`/`const` in `use function`/`use const` tokenized as T_FUNCTION/T_CONST
-                     * instead of T_STRING when there is a comment between the keywords.
-                     *
-                     * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/2431
-                     */
-                    if ($start === true && $fixedType === false) {
-                        $type  = \strtolower($tokens[$i]['content']);
-                        $start = false;
-                        if ($useGroup === false) {
-                            $fixedType = true;
-                        }
-
-                        break;
-                    }
-
-                    $start = false;
-
-                    if ($hasAlias === false) {
-                        $name .= $tokens[$i]['content'];
-                    }
-
-                    $alias = $tokens[$i]['content'];
-                    break;
-
-                /*
-                 * Fall back in case reserved keyword is (illegally) used in name.
-                 * Parse error, but not our concern.
-                 */
-                default:
-                    if ($hasAlias === false) {
-                        $name .= $tokens[$i]['content'];
-                    }
-
-                    $alias = $tokens[$i]['content'];
-                    break;
-            }
-        }
-
-        return $statements;
-    }
-
-    /**
-     * Split an import use statement into individual imports and merge it with an array of previously
-     * seen import use statements.
-     *
-     * Beware: this method should only be used to combine the import use statements found in *one* file.
-     * Do NOT combine the statements of multiple files as the result will be inaccurate and unreliable.
-     *
-     * In most cases when tempted to use this method, the {@see \PHPCSUtils\AbstractSniffs\AbstractFileContextSniff}
-     * (upcoming) should be used instead.
-     *
-     * @see \PHPCSUtils\AbstractSniffs\AbstractFileContextSniff
-     * @see \PHPCSUtils\Utils\UseStatements::splitImportUseStatement()
-     *
-     * @since 1.0.0-alpha3
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile             The file where this token was found.
-     * @param int                         $stackPtr              The position in the stack of the `T_USE` token.
-     * @param array                       $previousUseStatements The import `use` statements collected so far.
-     *                                                           This should be either the output of a
-     *                                                           previous call to this method or the output of
-     *                                                           an earlier call to the
-     *                                                           {@see UseStatements::splitImportUseStatement()}
-     *                                                           method.
-     *
-     * @return array A multi-level array containing information about the current `use` statement combined with
-     *               the previously collected `use` statement information.
-     *               See {@see UseStatements::splitImportUseStatement()} for more details about the array format.
-     */
-    public static function splitAndMergeImportUseStatement(File $phpcsFile, $stackPtr, $previousUseStatements)
-    {
-        try {
-            $useStatements = self::splitImportUseStatement($phpcsFile, $stackPtr);
-
-            if (isset($previousUseStatements['name']) === false) {
-                $previousUseStatements['name'] = $useStatements['name'];
-            } else {
-                $previousUseStatements['name'] += $useStatements['name'];
-            }
-            if (isset($previousUseStatements['function']) === false) {
-                $previousUseStatements['function'] = $useStatements['function'];
-            } else {
-                $previousUseStatements['function'] += $useStatements['function'];
-            }
-            if (isset($previousUseStatements['const']) === false) {
-                $previousUseStatements['const'] = $useStatements['const'];
-            } else {
-                $previousUseStatements['const'] += $useStatements['const'];
-            }
-        } catch (RuntimeException $e) {
-            // Not an import use statement.
-        }
-
-        return $previousUseStatements;
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
index 673a0fe7..f01be4f6 100644
--- a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
@@ -13,7 +13,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use Magento2\Helpers\PHPCSUtils\BackCompat\BCTokens;
+use PHPCSUtils\BackCompat\BCTokens;
 
 /**
  * Detect calls to functions where the expected type of a parameter has been changed from integer to boolean.
diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
index 85b2fe11..365942e7 100644
--- a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
@@ -12,8 +12,8 @@
 
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
-use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
-use Magento2\Helpers\PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\Scopes;
 
 /**
  * Applying the final modifier on a private method will produce a warning since PHP 8.0
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
index 8782039d..0c0dc944 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
@@ -13,11 +13,12 @@
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
-use Magento2\Helpers\PHPCSUtils\Utils\ObjectDeclarations;
-use Magento2\Helpers\PHPCSUtils\Utils\Scopes;
-use Magento2\Helpers\PHPCSUtils\Utils\UseStatements;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\UseStatements;
 
 /**
  * As of PHP 8.0, when an object constructor exit()s, the destructor will no longer be called.
@@ -100,7 +101,7 @@ public function process(File $phpcsFile, $stackPtr)
 
             // Skip over nested closed scopes as possible for efficiency.
             // Ignore arrow functions as they aren't closed scopes.
-            if (isset(Collections::$closedScopes[$tokens[$current]['code']]) === true
+            if (isset(Collections::closedScopes()[$tokens[$current]['code']]) === true
                 && isset($tokens[$current]['scope_closer']) === true
             ) {
                 $current = $tokens[$current]['scope_closer'];
@@ -201,7 +202,7 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         foreach ($exits as $ptr) {
-            $this->addMessage($phpcsFile, $error, $ptr, $isError, $errorCode, [$tokens[$ptr]['content']]);
+            MessageHelper::addMessage($phpcsFile, $error, $ptr, $isError, $errorCode, [$tokens[$ptr]['content']]);
         }
     }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
index 588ff7d2..5adff7ee 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
@@ -10,12 +10,11 @@
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCompatibility\Sniff;
-use Magento2\Helpers\PHPCSUtils\Tokens\Collections;
-use Magento2\Helpers\PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
 
 /**
  * Declaring a required function parameter after an optional parameter is deprecated since PHP 8.0.
@@ -58,7 +57,7 @@ public function register()
     {
         $this->allowedInDefault += Tokens::$emptyTokens;
 
-        return Collections::functionDeclarationTokensBC();
+        return Collections::functionDeclarationTokens();
     }
 
     /**
@@ -78,14 +77,9 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        try {
-            // Get all parameters from the function signature.
-            $parameters = FunctionDeclarations::getParameters($phpcsFile, $stackPtr);
-            if (empty($parameters)) {
-                return;
-            }
-        } catch (RuntimeException $e) {
-            // Most likely a T_STRING which wasn't an arrow function.
+        // Get all parameters from the function signature.
+        $parameters = FunctionDeclarations::getParameters($phpcsFile, $stackPtr);
+        if (empty($parameters)) {
             return;
         }
 
diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
index f6554540..6c84e617 100644
--- a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
+++ b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
@@ -12,7 +12,7 @@
 
 use PHPUnit\Framework\TestCase;
 use PHP_CodeSniffer\Files\File;
-use Magento2\Helpers\PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Base sniff test class file.
diff --git a/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php b/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
deleted file mode 100644
index e4441380..00000000
--- a/Magento2/Tests/PHPCompatibility/Util/CoreMethodTestFrame.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility\Util;
-
-use Magento2\Helpers\PHPCSUtils\TestUtils\UtilityMethodTestCase;
-
-/**
- * Base class to use when testing utility methods.
- *
- * Set up and Tear down methods for testing methods in the Sniff.php file.
- *
- * @since 7.0.3
- * @since 7.0.5  Renamed from `BaseAbstractClassMethodTest` to `CoreMethodTestFrame`.
- * @since 7.1.2  No longer extends the `BaseSniffTest` class.
- * @since 10.0.0 Now extends the PHPCSUtils `UtilityMethodTestCase`.
- */
-abstract class CoreMethodTestFrame extends UtilityMethodTestCase
-{
-
-    /**
-     * Instance of the PHPCompatibility Sniff test double.
-     *
-     * @since 7.0.3
-     *
-     * @var TestHelperPHPCompatibility
-     */
-    public static $helperClass;
-
-    /**
-     * Initialize PHPCS & tokenize the test case file.
-     *
-     * @beforeClass
-     *
-     * @since 10.0.0
-     *
-     * @return void
-     */
-    public static function setUpTestFile()
-    {
-        parent::setUpTestFile();
-        self::$helperClass = new TestHelperPHPCompatibility();
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php b/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
deleted file mode 100644
index 827eded9..00000000
--- a/Magento2/Tests/PHPCompatibility/Util/TestHelperPHPCompatibility.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility\Util;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Helper class to facilitate testing of the methods within the abstract \PHPCompatibility\Sniff class.
- *
- * @since 7.0.3
- */
-class TestHelperPHPCompatibility extends Sniff
-{
-
-    /**
-     * Dummy method to bypass the abstract method implementation requirements.
-     *
-     * @since 7.0.3
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
-
-    /**
-     * Dummy method to bypass the abstract method implementation requirements.
-     *
-     * @since 7.0.3
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-    }
-
-    /* phpcs:disable */
-    /**
-     * Wrapper to make the protected parent::isNumber() method testable.
-     *
-     * @since 8.2.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
-     * @param int                         $start       Start of the snippet (inclusive), i.e. this
-     *                                                 token will be examined as part of the
-     *                                                 snippet.
-     * @param int                         $end         End of the snippet (inclusive), i.e. this
-     *                                                 token will be examined as part of the
-     *                                                 snippet.
-     * @param bool                        $allowFloats Whether to only consider integers, or also floats.
-     *
-     * @return int|float|bool
-     */
-    public function isNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
-        return parent::isNumber($phpcsFile, $start, $end, $allowFloats);
-    }
-
-    /**
-     * Wrapper to make the protected parent::isNumericCalculation() method testable.
-     *
-     * @since 9.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $start     Start of the snippet (inclusive), i.e. this
-     *                                               token will be examined as part of the
-     *                                               snippet.
-     * @param int                         $end       End of the snippet (inclusive), i.e. this
-     *                                               token will be examined as part of the
-     *                                               snippet.
-     *
-     * @return bool
-     */
-    public function isNumericCalculation(File $phpcsFile, $start, $end)
-    {
-        return parent::isNumericCalculation($phpcsFile, $start, $end);
-    }
-    /* phpcs:enable */
-}
diff --git a/composer.json b/composer.json
index 58996ae3..6b46479f 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.15.10",
-        "symfony/polyfill": "^1.16"
+        "symfony/polyfill": "^1.16",
+        "phpcsstandards/phpcsutils": "~1.0.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
@@ -37,5 +38,10 @@
     "scripts": {
         "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility",
         "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": false
+        }
     }
 }
diff --git a/composer.lock b/composer.lock
index e9e1ad93..f276bf23 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,86 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "15fe639e2947bab4e7afcbd629e84805",
+    "content-hash": "e29ee133b6cf81aa67686db10288783b",
     "packages": [
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/composer-installer.git",
+                "reference": "4be43904336affa5c2f70744a348312336afd0da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da",
+                "reference": "4be43904336affa5c2f70744a348312336afd0da",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "ext-json": "*",
+                "ext-zip": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "yoast/phpunit-polyfills": "^1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcbf",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/composer-installer/issues",
+                "source": "https://github.com/PHPCSStandards/composer-installer"
+            },
+            "time": "2023-01-05T11:28:13+00:00"
+        },
         {
             "name": "phpcompatibility/php-compatibility",
             "version": "9.3.5",
@@ -68,6 +146,80 @@
             },
             "time": "2019-12-27T09:44:58+00:00"
         },
+        {
+            "name": "phpcsstandards/phpcsutils",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
+                "reference": "0cfef5193e68e8ff179333d8ae937db62939b656"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/0cfef5193e68e8ff179333d8ae937db62939b656",
+                "reference": "0cfef5193e68e8ff179333d8ae937db62939b656",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^3.7.1 || 4.0.x-dev@dev"
+            },
+            "require-dev": {
+                "ext-filter": "*",
+                "php-parallel-lint/php-console-highlighter": "^1.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcsstandards/phpcsdevcs": "^1.1.3",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3",
+                "yoast/phpunit-polyfills": "^1.0.1"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-stable": "1.x-dev",
+                    "dev-develop": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPCSUtils/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors"
+                }
+            ],
+            "description": "A suite of utility functions for use with PHP_CodeSniffer",
+            "homepage": "https://phpcsutils.com/",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "phpcbf",
+                "phpcodesniffer-standard",
+                "phpcs",
+                "phpcs3",
+                "standards",
+                "static analysis",
+                "tokens",
+                "utility"
+            ],
+            "support": {
+                "docs": "https://phpcsutils.com/",
+                "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+                "source": "https://github.com/PHPCSStandards/PHPCSUtils"
+            },
+            "time": "2023-04-17T16:27:27+00:00"
+        },
         {
             "name": "phpstan/phpstan",
             "version": "1.9.14",

From 32d4ded256d0c03071c11603a9e0ef1b4157b5da Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Tue, 18 Apr 2023 17:17:21 -0500
Subject: [PATCH 553/630] ACP2E-1868: Move sniff
 PHPCompatibility.TextStrings.RemovedDollarBraceStringEmbeds from
 PHPCompatibility to Magento Coding Standards

- Added dependency on phpcsstandards/phpcsutils
- Removed internal copy of utils from phpcsstandards/phpcsutils
---
 .../RemovedDollarBraceStringEmbedsSniff.php   | 134 +++++++++
 ...movedDollarBraceStringEmbedsUnitTest.1.inc |  90 +++++++
 ...movedDollarBraceStringEmbedsUnitTest.2.inc |  42 +++
 ...RemovedDollarBraceStringEmbedsUnitTest.php | 254 ++++++++++++++++++
 Magento2/ruleset.xml                          |   1 +
 5 files changed, 521 insertions(+)
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.2.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php

diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
new file mode 100644
index 00000000..200cffbd
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2022 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHPCompatibility\Sniff;
+use PHPCSUtils\Utils\GetTokensAsString;
+use PHPCSUtils\Utils\TextStrings;
+
+/**
+ * Detect use of select forms of variable embedding in heredocs and double strings as deprecated per PHP 8.2.
+ *
+ * > PHP allows embedding variables in strings with double-quotes (") and heredoc in various ways.
+ * > 1. Directly embedding variables (`$foo`)
+ * > 2. Braces outside the variable (`{$foo}`)
+ * > 3. Braces after the dollar sign (`${foo}`)
+ * > 4. Variable variables (`${expr}`, equivalent to `(string) ${expr}`)
+ * >
+ * > [...] to deprecate options 3 and 4 in PHP 8.2 and remove them in PHP 9.0.
+ *
+ * PHP version 8.2
+ * PHP version 9.0
+ *
+ * @link https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
+ *
+ * @since 10.0.0
+ */
+class RemovedDollarBraceStringEmbedsSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [
+            \T_DOUBLE_QUOTED_STRING,
+            \T_START_HEREDOC,
+            \T_DOLLAR_OPEN_CURLY_BRACES,
+        ];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void|int Void or a stack pointer to skip forward.
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.2') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        /*
+         * Defensive coding, this code is not expected to ever actually be hit since PHPCS#3604
+         * (included in 3.7.0), but _will_ be hit if a file containing a PHP 7.3 indented heredoc/nowdocs
+         * is scanned with PHPCS on PHP < 7.3. People shouldn't do that, but hey, we can't stop them.
+         */
+        if ($tokens[$stackPtr]['code'] === \T_DOLLAR_OPEN_CURLY_BRACES) {
+            // @codeCoverageIgnoreStart
+            if ($tokens[($stackPtr - 1)]['code'] === \T_DOUBLE_QUOTED_STRING) {
+                --$stackPtr;
+            } else {
+                // Throw an error anyway, though it won't be very informative.
+                $message = 'Using ${} in strings is deprecated since PHP 8.2, use {$var} or {${expr}} instead.';
+                $code    = 'DeprecatedDollarBraceEmbed';
+                $phpcsFile->addWarning($message, $stackPtr, $code);
+                return;
+            }
+            // @codeCoverageIgnoreEnd
+        }
+
+        $endOfString   = TextStrings::getEndOfCompleteTextString($phpcsFile, $stackPtr);
+        $startOfString = $stackPtr;
+        if ($tokens[$stackPtr]['code'] === \T_START_HEREDOC) {
+            $startOfString = ($stackPtr + 1);
+        }
+
+        $contents = GetTokensAsString::normal($phpcsFile, $startOfString, $endOfString);
+        if (\strpos($contents, '${') === false) {
+            // No interpolation found or only interpolations which are still supported.
+            return ($endOfString + 1);
+        }
+
+        $embeds = TextStrings::getEmbeds($contents);
+        foreach ($embeds as $offset => $embed) {
+            if (\strpos($embed, '${') !== 0) {
+                continue;
+            }
+
+            // Figure out the stack pointer to throw the warning on.
+            $errorPtr = $startOfString;
+            $length   = 0;
+            while (($length + $tokens[$errorPtr]['length']) < $offset) {
+                $length += $tokens[$errorPtr]['length'];
+                ++$errorPtr;
+            }
+
+            // Type 4.
+            $message = 'Using %s (variable variables) in strings is deprecated since PHP 8.2, use {${expr}} instead.';
+            $code    = 'DeprecatedExpressionSyntax';
+            if (\preg_match('`^\$\{(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)(?:\[([\'"])?[^\$\{\}\]]+(?:\2)?\])?\}$`', $embed) === 1) {
+                // Type 3.
+                $message = 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: %s';
+                $code    = 'DeprecatedVariableSyntax';
+            }
+
+            $phpcsFile->addWarning($message, $errorPtr, $code, [$embed]);
+
+        }
+
+        return ($endOfString + 1);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
new file mode 100644
index 00000000..4ec71d18
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * Embedded variables which are supported cross-version.
+ */
+
+// Type 1: directly embedding variables.
+echo "$foo";
+echo "$$foo";
+echo "$foo[bar]";
+echo "$foo->bar";
+$text = "some text $var some text";
+
+$heredoc = <<<EOD
+some text $var some text
+EOD;
+
+// Type 2: Braces around the variable/expression.
+echo "{$foo}";
+echo "{$$foo}";
+echo "{$foo['bar']}";
+echo "{$foo->bar}";
+echo "{$foo->bar()}";
+echo "{$foo['bar']->baz()()}";
+echo "{${$bar}}";
+echo "{$foo()}";
+echo "{${$object->getMethod()}}"
+$text = "some text {$var} some text";
+
+$heredoc = <<<"EOD"
+some text {$var} some text
+EOD;
+
+/*
+ * Not our target.
+ */
+
+// Ordinary variable variables outside strings.
+$foo = ${'bar'};
+
+// Heredoc without embeds.
+echo <<<EOD
+Some text
+EOD;
+
+// Not actually interpolated - $ is escaped. The second $foo is to force T_DOUBLE_QUOTED_STRING tokenization.
+echo "\${foo} and $foo";
+echo "\${foo[\"bar\"]} and $foo";
+echo "$\{foo} and $foo";
+
+
+/*
+ * PHP 8.2: deprecated forms of embedding variables.
+ */
+
+// Type 3: Braces after the dollar sign.
+echo "${foo}";
+echo "${foo['bar']}";
+$text = "some text ${foo} some ${text}";
+
+$heredoc = <<<EOD
+some text ${foo} some text
+EOD;
+
+echo "\\${foo}"; // Not actually escaped, the backslash escapes the backslash, not the dollar sign.
+
+// Type 4: Variable variables.
+echo "${$bar}";
+echo "${(foo)}";
+echo "${foo->bar}";
+echo "${$object->getMethod()}"
+$text = "some text ${(foo)} some text";
+echo "${substr('laruence', 0, 2)}";
+
+echo "${foo["${bar}"]}";
+echo "${foo["${bar['baz']}"]}";
+echo "${foo->{$baz}}";
+echo "${foo->{${'a'}}}";
+echo "${foo->{"${'a'}"}}";
+
+// Verify correct handling of stack pointers in multi-token code.
+$text = "Line without embed
+some text ${foo["${bar}"]} some text
+some text ${foo["${bar['baz']}"]} some text
+some text ${foo->{${'a'}}} some text
+";
+
+$heredoc = <<<"EOD"
+some text ${(foo)} some text
+EOD;
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.2.inc b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.2.inc
new file mode 100644
index 00000000..f637fbf1
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.2.inc
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * The tests involving PHP 7.3+ indented heredocs are in a separate test case file
+ * as any code after an indented heredoc will be tokenizer garbage on PHP < 7.3.
+ */
+
+// No embeds.
+$php73IndentedHeredoc = <<<"EOD"
+    some text some text
+    EOD;
+
+/*
+ * Embedded variables which are supported cross-version.
+ */
+
+// Type 1: directly embedding variables.
+$php73IndentedHeredoc = <<<"EOD"
+    some text $foo[bar] some text
+    EOD;
+
+// Type 2: Braces around the variable/expression.
+$php73IndentedHeredoc = <<<EOD
+    some text {${$bar}} some text
+    EOD;
+
+/*
+ * PHP 8.2: deprecated forms of embedding variables.
+ */
+
+// Type 3: Braces after the dollar sign.
+$php73IndentedHeredoc = <<<"EOD"
+    some text ${foo['bar']} some text
+    EOD;
+
+// Type 4: Variable variables.
+$php73IndentedHeredoc = <<<EOD
+    Line without embed
+    some text ${$object->getMethod()} some text
+    some text ${foo["${bar['baz']}"]} some text
+    some text ${foo->{${'a'}}} some text
+    EOD;
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
new file mode 100644
index 00000000..8009b2cb
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2022 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedDollarBraceStringEmbeds sniff.
+ *
+ * @group removedDollarBraceStringEmbeds
+ * @group textstrings
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedDollarBraceStringEmbedsSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedDollarBraceStringEmbedsUnitTest extends BaseSniffTest
+{
+
+    /**
+     * The name of the primary test case file.
+     *
+     * @var string
+     */
+    const TEST_FILE = 'RemovedDollarBraceStringEmbedsUnitTest.1.inc';
+
+    /**
+     * The name of a secondary test case file containing PHP 7.3+ indented heredocs.
+     *
+     * @var string
+     */
+    const TEST_FILE_PHP73HEREDOCS = 'RemovedDollarBraceStringEmbedsUnitTest.2.inc';
+
+    /**
+     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
+     * are correctly detected.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType3
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded variable found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType3($line, $found)
+    {
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
+        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType3()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType3()
+    {
+        return [
+            [57, '${foo}'],
+            [58, '${foo[\'bar\']}'],
+            [59, '${foo}'],
+            [59, '${text}'],
+            [62, '${foo}'],
+            [65, '${foo}'],
+        ];
+    }
+
+
+    /**
+     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
+     * (string) ${expr}) - are correctly detected.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType4
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded expression found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType4($line, $found)
+    {
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
+        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType4()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType4()
+    {
+        return [
+            [68, '${$bar}'],
+            [69, '${(foo)}'],
+            [70, '${foo->bar}'],
+            [71, '${$object->getMethod()}'],
+            [72, '${(foo)}'],
+            [73, '${substr(\'laruence\', 0, 2)}'],
+            [75, '${foo["${bar}"]}'],
+            [76, '${foo["${bar[\'baz\']}"]}'],
+            [77, '${foo->{$baz}}'],
+            [78, '${foo->{${\'a\'}}}'],
+            [79, '${foo->{"${\'a\'}"}}'],
+            [83, '${foo["${bar}"]}'],
+            [84, '${foo["${bar[\'baz\']}"]}'],
+            [85, '${foo->{${\'a\'}}}'],
+            [89, '${(foo)}'],
+        ];
+    }
+
+
+    /**
+     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
+     * are correctly detected in PHP 7.3+ indented heredocs.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded variable found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc($line, $found)
+    {
+        if (\PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
+        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
+    {
+        return [
+            [33, '${foo[\'bar\']}'],
+        ];
+    }
+
+
+    /**
+     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
+     * (string) ${expr}) - are correctly detected in PHP 7.3+ indented heredocs.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded expression found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc($line, $found)
+    {
+        if (\PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
+        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
+    {
+        return [
+            [39, '${$object->getMethod()}'],
+            [40, '${foo["${bar[\'baz\']}"]}'],
+            [41, '${foo->{${\'a\'}}}'],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataTestFiles
+     *
+     * @param string $testFile File name for the test case file to use.
+     * @param int    $lines    Number of lines at the top of the file for which we don't expect errors.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($testFile, $lines)
+    {
+        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.2');
+
+        // No errors expected on the first # lines.
+        for ($line = 1; $line <= $lines; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @dataProvider dataTestFiles
+     *
+     * @param string $testFile File name for the test case file to use.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion($testFile)
+    {
+        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.1');
+        $this->assertNoViolation($file);
+    }
+
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function dataTestFiles()
+    {
+        return [
+            [self::TEST_FILE, 51],
+            [self::TEST_FILE_PHP73HEREDOCS, 26],
+        ];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index ee171871..b26c8a73 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -783,4 +783,5 @@
     <rule ref="Magento2.PHPCompatibility.RemovedAssertStringAssertion" />
     <rule ref="Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse" />
     <rule ref="Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse" />
+    <rule ref="Magento2.PHPCompatibility.RemovedDollarBraceStringEmbeds" />
 </ruleset>

From 274949b0dd47a0e0d2e5cb2f71493028aaa2d25d Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Thu, 27 Apr 2023 13:56:55 -0500
Subject: [PATCH 554/630] ACP2E-1871: Extend
 PHPCompatibility.FunctionUse.RemovedFunctions to add deprecated/removed
 functions in PHP8.x

---
 .../RemovedFunctionsSniff.php                 | 5135 +++++++++++++++++
 .../RemovedFunctionsUnitTest.inc              | 1236 ++++
 .../RemovedFunctionsUnitTest.php              | 1552 +++++
 Magento2/ruleset.xml                          |    4 +-
 4 files changed, 7926 insertions(+), 1 deletion(-)
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php

diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
new file mode 100644
index 00000000..d9b3ff6b
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
@@ -0,0 +1,5135 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\Sniff;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\MessageHelper;
+
+/**
+ * Detect calls to deprecated/removed native PHP functions.
+ *
+ * Suggests alternative if available.
+ *
+ * PHP version All
+ *
+ * @since 5.5
+ * @since 5.6    Now extends the base `Sniff` class instead of the upstream
+ *               `Generic.PHP.ForbiddenFunctions` sniff.
+ * @since 7.1.0  Now extends the `AbstractRemovedFeatureSniff` instead of the base `Sniff` class.
+ * @since 9.0.0  Renamed from `DeprecatedFunctionsSniff` to `RemovedFunctionsSniff`.
+ * @since 10.0.0 Now extends the base `Sniff` class and uses the `ComplexVersionDeprecatedRemovedFeatureTrait`.
+ */
+class RemovedFunctionsSniff extends Sniff
+{
+    /**
+     * Basic error message template for deprecated/removed features.
+     *
+     * @var string
+     */
+    protected $msgTemplate = '%s is ';
+
+    /**
+     * Message template to use if an alternative is available for the deprecated/removed
+     * feature.
+     *
+     * @var string
+     */
+    protected $alternativeOptionTemplate = '; Use %s instead';
+
+    /**
+     * A list of deprecated and removed functions with their alternatives.
+     *
+     * The array lists : version number with false (deprecated) or true (removed) and an alternative function.
+     * If no alternative exists, it is NULL, i.e, the function should just not be used.
+     *
+     * @since 5.5
+     * @since 5.6   Visibility changed from `protected` to `public`.
+     * @since 7.0.2 Visibility changed back from `public` to `protected`.
+     *              The earlier change was made to be in line with the upstream sniff,
+     *              but that sniff is no longer being extended.
+     * @since 7.0.8 Property renamed from `$forbiddenFunctions` to `$removedFunctions`.
+     *
+     * @var array(string => array(string => bool|string|null))
+     */
+    protected $removedFunctions = [
+        'crack_check' => [
+            '5.0'       => true,
+            'extension' => 'crack',
+        ],
+        'crack_closedict' => [
+            '5.0'       => true,
+            'extension' => 'crack',
+        ],
+        'crack_getlastmessage' => [
+            '5.0'       => true,
+            'extension' => 'crack',
+        ],
+        'crack_opendict' => [
+            '5.0'       => true,
+            'extension' => 'crack',
+        ],
+
+        'php_check_syntax' => [
+            '5.0.5' => true,
+        ],
+
+        'pfpro_cleanup' => [
+            '5.1'       => true,
+            'extension' => 'pfpro',
+        ],
+        'pfpro_init' => [
+            '5.1'       => true,
+            'extension' => 'pfpro',
+        ],
+        'pfpro_process_raw' => [
+            '5.1'       => true,
+            'extension' => 'pfpro',
+        ],
+        'pfpro_process' => [
+            '5.1'       => true,
+            'extension' => 'pfpro',
+        ],
+        'pfpro_version' => [
+            '5.1'       => true,
+            'extension' => 'pfpro',
+        ],
+        'm_checkstatus' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_completeauthorizations' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_connect' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_connectionerror' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_deletetrans' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_destroyconn' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_destroyengine' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_getcell' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_getcellbynum' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_getcommadelimited' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_getheader' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_initconn' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_initengine' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_iscommadelimited' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_maxconntimeout' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_monitor' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_numcolumns' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_numrows' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_parsecommadelimited' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_responsekeys' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_responseparam' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_returnstatus' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_setblocking' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_setdropfile' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_setip' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_setssl_cafile' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_setssl_files' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_setssl' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_settimeout' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_sslcert_gen_hash' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_transactionssent' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_transinqueue' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_transkeyval' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_transnew' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_transsend' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_uwait' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_validateidentifier' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_verifyconnection' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'm_verifysslcert' => [
+            '5.1'       => true,
+            'extension' => 'mcve',
+        ],
+        'dio_close' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_fcntl' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_open' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_read' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_seek' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_stat' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_tcsetattr' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_truncate' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'dio_write' => [
+            '5.1'       => true,
+            'extension' => 'dio',
+        ],
+        'fam_cancel_monitor' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_close' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_monitor_collection' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_monitor_directory' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_monitor_file' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_next_event' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_open' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_pending' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_resume_monitor' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'fam_suspend_monitor' => [
+            '5.1'       => true,
+            'extension' => 'fam',
+        ],
+        'yp_all' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_cat' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_err_string' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_errno' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_first' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_get_default_domain' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_master' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_match' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_next' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'yp_order' => [
+            '5.1'       => true,
+            'extension' => 'yp',
+        ],
+        'udm_add_search_limit' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_alloc_agent_array' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_alloc_agent' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_api_version' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_cat_list' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_cat_path' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_check_charset' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_clear_search_limits' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_crc32' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_errno' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_error' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_find' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_free_agent' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_free_ispell_data' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_free_res' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_get_doc_count' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_get_res_field' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_get_res_param' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_hash32' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_load_ispell_data' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'udm_set_agent_param' => [
+            '5.1'       => true,
+            'extension' => 'mnogosearch',
+        ],
+        'w32api_deftype' => [
+            '5.1'       => true,
+            'extension' => 'w32api',
+        ],
+        'w32api_init_dtype' => [
+            '5.1'       => true,
+            'extension' => 'w32api',
+        ],
+        'w32api_invoke_function' => [
+            '5.1'       => true,
+            'extension' => 'w32api',
+        ],
+        'w32api_register_function' => [
+            '5.1'       => true,
+            'extension' => 'w32api',
+        ],
+        'w32api_set_call_method' => [
+            '5.1'       => true,
+            'extension' => 'w32api',
+        ],
+        'cpdf_add_annotation' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_add_outline' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_arc' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_begin_text' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_circle' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_clip' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_close' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_closepath_fill_stroke' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_closepath_stroke' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_closepath' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_continue_text' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_curveto' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_end_text' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_fill_stroke' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_fill' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_finalize_page' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_finalize' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_global_set_document_limits' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_import_jpeg' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_lineto' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_moveto' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_newpath' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_open' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_output_buffer' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_page_init' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_place_inline_image' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_rect' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_restore' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_rlineto' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_rmoveto' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_rotate_text' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_rotate' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_save_to_file' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_save' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_scale' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_action_url' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_char_spacing' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_creator' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_current_page' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_font_directories' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_font_map_file' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_font' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_horiz_scaling' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_keywords' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_leading' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_page_animation' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_subject' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_text_matrix' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_text_pos' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_text_rendering' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_text_rise' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_title' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_viewer_preferences' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_set_word_spacing' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setdash' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setflat' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setgray_fill' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setgray_stroke' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setgray' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setlinecap' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setlinejoin' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setlinewidth' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setmiterlimit' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setrgbcolor_fill' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setrgbcolor_stroke' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_setrgbcolor' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_show_xy' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_show' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_stringwidth' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_stroke' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_text' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'cpdf_translate' => [
+            '5.1'       => true,
+            'extension' => 'cpdf',
+        ],
+        'ircg_channel_mode' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_disconnect' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_eval_ecmascript_params' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_fetch_error_msg' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_get_username' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_html_encode' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_ignore_add' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_ignore_del' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_invite' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_is_conn_alive' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_join' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_kick' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_list' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_lookup_format_messages' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_lusers' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_msg' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_names' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_nick' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_nickname_escape' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_nickname_unescape' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_notice' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_oper' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_part' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_pconnect' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_register_format_messages' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_set_current' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_set_file' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_set_on_die' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_topic' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_who' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'ircg_whois' => [
+            '5.1'       => true,
+            'extension' => 'ircg',
+        ],
+        'dbx_close' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_compare' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_connect' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_error' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_escape_string' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_fetch_row' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_query' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'dbx_sort' => [
+            '5.1'       => true,
+            'extension' => 'dbx',
+        ],
+        'ingres_autocommit' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_close' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_commit' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_connect' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_fetch_array' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_fetch_object' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_fetch_row' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_field_length' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_field_name' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_field_nullable' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_field_precision' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_field_scale' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_field_type' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_num_fields' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_num_rows' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_pconnect' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_query' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ingres_rollback' => [
+            '5.1'       => true,
+            'extension' => 'ingres',
+        ],
+        'ovrimos_close' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_commit' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_connect' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_cursor' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_exec' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_execute' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_fetch_into' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_fetch_row' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_field_len' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_field_name' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_field_num' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_field_type' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_free_result' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_longreadlen' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_num_fields' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_num_rows' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_prepare' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_result_all' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_result' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_rollback' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ovrimos_close_all' => [
+            '5.1'       => true,
+            'extension' => 'ovrimos',
+        ],
+        'ora_bind' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_close' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_columnname' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_columnsize' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_columntype' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_commit' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_commitoff' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_commiton' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_do' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_error' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_errorcode' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_exec' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_fetch_into' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_fetch' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_getcolumn' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_logoff' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_logon' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_numcols' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_numrows' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_open' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_parse' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_plogon' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'ora_rollback' => [
+            '5.1'       => true,
+            'extension' => 'oracle',
+        ],
+        'mysqli_embedded_connect' => [
+            '5.1' => true,
+        ],
+        'mysqli_server_end' => [
+            '5.1' => true,
+        ],
+        'mysqli_server_init' => [
+            '5.1' => true,
+        ],
+
+        'msession_connect' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_count' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_create' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_destroy' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_disconnect' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_find' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_get_array' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_get_data' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_get' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_inc' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_list' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_listvar' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_lock' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_plugin' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_randstr' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_set_array' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_set_data' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_set' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_timeout' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_uniq' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+        'msession_unlock' => [
+            '5.1.3'     => true,
+            'extension' => 'msession',
+        ],
+
+        'mysqli_resource' => [
+            '5.1.4' => true,
+        ],
+
+        'mysql_createdb' => [
+            '5.1.7'     => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_dropdb' => [
+            '5.1.7'     => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_listtables' => [
+            '5.1.7'     => true,
+            'extension' => 'mysql',
+        ],
+
+        'hwapi_attribute_new' => [
+            '5.2'       => true,
+            'extension' => 'hwapi',
+        ],
+        'hwapi_content_new' => [
+            '5.2'       => true,
+            'extension' => 'hwapi',
+        ],
+        'hwapi_hgcsp' => [
+            '5.2'       => true,
+            'extension' => 'hwapi',
+        ],
+        'hwapi_object_new' => [
+            '5.2'       => true,
+            'extension' => 'hwapi',
+        ],
+        'filepro_fieldcount' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+        'filepro_fieldname' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+        'filepro_fieldtype' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+        'filepro_fieldwidth' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+        'filepro_retrieve' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+        'filepro_rowcount' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+        'filepro' => [
+            '5.2'       => true,
+            'extension' => 'filepro',
+        ],
+
+        'ifx_affected_rows' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_blobinfile_mode' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_byteasvarchar' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_close' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_connect' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_copy_blob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_create_blob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_create_char' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_do' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_error' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_errormsg' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_fetch_row' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_fieldproperties' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_fieldtypes' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_free_blob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_free_char' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_free_result' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_get_blob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_get_char' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_getsqlca' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_htmltbl_result' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_nullformat' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_num_fields' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_num_rows' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_pconnect' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_prepare' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_query' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_textasvarchar' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_update_blob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifx_update_char' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_close_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_create_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_free_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_open_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_read_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_seek_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_tell_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+        'ifxus_write_slob' => [
+            '5.2.1'     => true,
+            'extension' => 'ifx',
+        ],
+
+        'ncurses_addch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_addchnstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_addchstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_addnstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_addstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_assume_default_colors' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_attroff' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_attron' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_attrset' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_baudrate' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_beep' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_bkgd' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_bkgdset' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_border' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_bottom_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_can_change_color' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_cbreak' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_clear' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_clrtobot' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_clrtoeol' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_color_content' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_color_set' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_curs_set' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_def_prog_mode' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_def_shell_mode' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_define_key' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_del_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_delay_output' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_delch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_deleteln' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_delwin' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_doupdate' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_echo' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_echochar' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_end' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_erase' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_erasechar' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_filter' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_flash' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_flushinp' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_getch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_getmaxyx' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_getmouse' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_getyx' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_halfdelay' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_has_colors' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_has_ic' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_has_il' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_has_key' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_hide_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_hline' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_inch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_init_color' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_init_pair' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_init' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_insch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_insdelln' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_insertln' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_insstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_instr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_isendwin' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_keyok' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_keypad' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_killchar' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_longname' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_meta' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mouse_trafo' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mouseinterval' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mousemask' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_move_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_move' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvaddch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvaddchnstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvaddchstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvaddnstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvaddstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvcur' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvdelch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvgetch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvhline' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvinch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvvline' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_mvwaddstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_napms' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_new_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_newpad' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_newwin' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_nl' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_nocbreak' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_noecho' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_nonl' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_noqiflush' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_noraw' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_pair_content' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_panel_above' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_panel_below' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_panel_window' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_pnoutrefresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_prefresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_putp' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_qiflush' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_raw' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_refresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_replace_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_reset_prog_mode' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_reset_shell_mode' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_resetty' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_savetty' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_scr_dump' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_scr_init' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_scr_restore' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_scr_set' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_scrl' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_show_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_attr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_attroff' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_attron' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_attrset' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_clear' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_color' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_init' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_noutrefresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_refresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_restore' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_set' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_slk_touch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_standend' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_standout' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_start_color' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_termattrs' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_termname' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_timeout' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_top_panel' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_typeahead' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_ungetch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_ungetmouse' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_update_panels' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_use_default_colors' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_use_env' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_use_extended_names' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_vidattr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_vline' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_waddch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_waddstr' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wattroff' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wattron' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wattrset' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wborder' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wclear' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wcolor_set' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_werase' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wgetch' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_whline' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wmouse_trafo' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wmove' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wnoutrefresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wrefresh' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wstandend' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wstandout' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'ncurses_wvline' => [
+            '5.3'       => true,
+            'extension' => 'ncurses',
+        ],
+        'fdf_add_doc_javascript' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_add_template' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_close' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_create' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_enum_values' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_errno' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_error' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_ap' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_attachment' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_encoding' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_file' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_flags' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_opt' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_status' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_value' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_get_version' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_header' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_next_field_name' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_open_string' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_open' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_remove_item' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_save_string' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_save' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_ap' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_encoding' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_file' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_flags' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_javascript_action' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_on_import_javascript' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_opt' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_status' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_submit_form_action' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_target_frame' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_value' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'fdf_set_version' => [
+            '5.3'       => true,
+            'extension' => 'fdf',
+        ],
+        'ming_keypress' => [
+            '5.3'       => true,
+            'extension' => 'ming',
+        ],
+        'ming_setcubicthreshold' => [
+            '5.3'       => true,
+            'extension' => 'ming',
+        ],
+        'ming_setscale' => [
+            '5.3'       => true,
+            'extension' => 'ming',
+        ],
+        'ming_setswfcompression' => [
+            '5.3'       => true,
+            'extension' => 'ming',
+        ],
+        'ming_useconstants' => [
+            '5.3'       => true,
+            'extension' => 'ming',
+        ],
+        'ming_useswfversion' => [
+            '5.3'       => true,
+            'extension' => 'ming',
+        ],
+        'dbase_add_record' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_close' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_create' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_delete_record' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_get_header_info' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_get_record_with_names' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_get_record' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_numfields' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_numrecords' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_open' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_pack' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'dbase_replace_record' => [
+            '5.3'       => true,
+            'extension' => 'dbase',
+        ],
+        'fbsql_affected_rows' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_autocommit' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_blob_size' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_change_user' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_clob_size' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_close' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_commit' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_connect' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_create_blob' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_create_clob' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_create_db' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_data_seek' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_database_password' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_database' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_db_query' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_db_status' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_drop_db' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_errno' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_error' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_fetch_array' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_fetch_assoc' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_fetch_field' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_fetch_lengths' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_fetch_object' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_fetch_row' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_field_flags' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_field_len' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_field_name' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_field_seek' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_field_table' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_field_type' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_free_result' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_get_autostart_info' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_hostname' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_insert_id' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_list_dbs' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_list_fields' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_list_tables' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_next_result' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_num_fields' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_num_rows' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_password' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_pconnect' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_query' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_read_blob' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_read_clob' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_result' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_rollback' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_rows_fetched' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_select_db' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_set_characterset' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_set_lob_mode' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_set_password' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_set_transaction' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_start_db' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_stop_db' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_table_name' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_tablename' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_username' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'fbsql_warnings' => [
+            '5.3'       => true,
+            'extension' => 'fbsql',
+        ],
+        'msql_affected_rows' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_close' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_connect' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_create_db' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_createdb' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_data_seek' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_db_query' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_dbname' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_drop_db' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_error' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fetch_array' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fetch_field' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fetch_object' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fetch_row' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_field_flags' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_field_len' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_field_name' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_field_seek' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_field_table' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_field_type' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fieldflags' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fieldlen' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fieldname' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fieldtable' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_fieldtype' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_free_result' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_list_dbs' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_list_fields' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_list_tables' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_num_fields' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_num_rows' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_numfields' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_numrows' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_pconnect' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_query' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_regcase' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_result' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_select_db' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql_tablename' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'msql' => [
+            '5.3'       => true,
+            'extension' => 'msql',
+        ],
+        'mysqli_disable_reads_from_master' => [
+            '5.3' => true,
+        ],
+        'mysqli_disable_rpl_parse' => [
+            '5.3' => true,
+        ],
+        'mysqli_enable_reads_from_master' => [
+            '5.3' => true,
+        ],
+        'mysqli_enable_rpl_parse' => [
+            '5.3' => true,
+        ],
+        'mysqli_master_query' => [
+            '5.3' => true,
+        ],
+        'mysqli_rpl_parse_enabled' => [
+            '5.3' => true,
+        ],
+        'mysqli_rpl_probe' => [
+            '5.3' => true,
+        ],
+        'mysqli_slave_query' => [
+            '5.3' => true,
+        ],
+
+        'call_user_method' => [
+            '4.1'         => false,
+            '7.0'         => true,
+            'alternative' => 'call_user_func()',
+        ],
+        'call_user_method_array' => [
+            '4.1'         => false,
+            '7.0'         => true,
+            'alternative' => 'call_user_func_array()',
+        ],
+        'define_syslog_variables' => [
+            '5.3' => false,
+            '5.4' => true,
+        ],
+        'dl' => [
+            '5.3' => false,
+        ],
+        'ereg' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_match()',
+            'extension'   => 'ereg',
+        ],
+        'ereg_replace' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_replace()',
+            'extension'   => 'ereg',
+        ],
+        'eregi' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_match() (with the i modifier)',
+            'extension'   => 'ereg',
+        ],
+        'eregi_replace' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_replace() (with the i modifier)',
+            'extension'   => 'ereg',
+        ],
+        'imagepsbbox' => [
+            '7.0' => true,
+        ],
+        'imagepsencodefont' => [
+            '7.0' => true,
+        ],
+        'imagepsextendfont' => [
+            '7.0' => true,
+        ],
+        'imagepsfreefont' => [
+            '7.0' => true,
+        ],
+        'imagepsloadfont' => [
+            '7.0' => true,
+        ],
+        'imagepsslantfont' => [
+            '7.0' => true,
+        ],
+        'imagepstext' => [
+            '7.0' => true,
+        ],
+        'import_request_variables' => [
+            '5.3' => false,
+            '5.4' => true,
+        ],
+        'ldap_sort' => [
+            '7.0' => false,
+            '8.0' => true,
+        ],
+        'mcrypt_generic_end' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_generic_deinit()',
+            'extension'   => 'mcrypt',
+        ],
+        'mysql_db_query' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'mysqli::select_db() and mysqli::query()',
+            'extension'   => 'mysql',
+        ],
+        'mysql_escape_string' => [
+            '4.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'mysqli::real_escape_string()',
+            'extension'   => 'mysql',
+        ],
+        'mysql_list_dbs' => [
+            '5.4'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_list_fields' => [
+            '5.4'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysqli_bind_param' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::bind_param()',
+        ],
+        'mysqli_bind_result' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::bind_result()',
+        ],
+        'mysqli_client_encoding' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli::character_set_name()',
+        ],
+        'mysqli_fetch' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::fetch()',
+        ],
+        'mysqli_param_count' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt_param_count()',
+        ],
+        'mysqli_get_metadata' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::result_metadata()',
+        ],
+        'mysqli_send_long_data' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::send_long_data()',
+        ],
+        'magic_quotes_runtime' => [
+            '5.3' => false,
+            '7.0' => true,
+        ],
+        'session_register' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => '$_SESSION',
+        ],
+        'session_unregister' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => '$_SESSION',
+        ],
+        'session_is_registered' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => '$_SESSION',
+        ],
+        'set_magic_quotes_runtime' => [
+            '5.3' => false,
+            '7.0' => true,
+        ],
+        'set_socket_blocking' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'stream_set_blocking()',
+        ],
+        'split' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_split(), explode() or str_split()',
+            'extension'   => 'ereg',
+        ],
+        'spliti' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_split() (with the i modifier)',
+            'extension'   => 'ereg',
+        ],
+        'sql_regcase' => [
+            '5.3'       => false,
+            '7.0'       => true,
+            'extension' => 'ereg',
+        ],
+        'php_logo_guid' => [
+            '5.5' => true,
+        ],
+        'php_egg_logo_guid' => [
+            '5.5' => true,
+        ],
+        'php_real_logo_guid' => [
+            '5.5' => true,
+        ],
+        'zend_logo_guid' => [
+            '5.5'         => true,
+            'alternative' => 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"',
+        ],
+        'datefmt_set_timezone_id' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'IntlDateFormatter::setTimeZone()',
+        ],
+        'mcrypt_ecb' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_cbc' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_cfb' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_ofb' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+            'extension'   => 'mcrypt',
+        ],
+        'ocibindbyname' => [
+            '5.4'         => false,
+            'alternative' => 'oci_bind_by_name()',
+        ],
+        'ocicancel' => [
+            '5.4'         => false,
+            'alternative' => 'oci_cancel()',
+        ],
+        'ocicloselob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::close() / OCILob::close() (PHP 8+)',
+        ],
+        'ocicollappend' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::append() / OCICollection::append() (PHP 8+)',
+        ],
+        'ocicollassign' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)',
+        ],
+        'ocicollassignelem' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)',
+        ],
+        'ocicollgetelem' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)',
+        ],
+        'ocicollmax' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::max() / OCICollection::max() (PHP 8+)',
+        ],
+        'ocicollsize' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::size() / OCICollection::size() (PHP 8+)',
+        ],
+        'ocicolltrim' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)',
+        ],
+        'ocicolumnisnull' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_is_null()',
+        ],
+        'ocicolumnname' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_name()',
+        ],
+        'ocicolumnprecision' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_precision()',
+        ],
+        'ocicolumnscale' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_scale()',
+        ],
+        'ocicolumnsize' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_size()',
+        ],
+        'ocicolumntype' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_type()',
+        ],
+        'ocicolumntyperaw' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_type_raw()',
+        ],
+        'ocicommit' => [
+            '5.4'         => false,
+            'alternative' => 'oci_commit()',
+        ],
+        'ocidefinebyname' => [
+            '5.4'         => false,
+            'alternative' => 'oci_define_by_name()',
+        ],
+        'ocierror' => [
+            '5.4'         => false,
+            'alternative' => 'oci_error()',
+        ],
+        'ociexecute' => [
+            '5.4'         => false,
+            'alternative' => 'oci_execute()',
+        ],
+        'ocifetch' => [
+            '5.4'         => false,
+            'alternative' => 'oci_fetch()',
+        ],
+        'ocifetchinto' => [
+            '5.4' => false,
+        ],
+        'ocifetchstatement' => [
+            '5.4'         => false,
+            'alternative' => 'oci_fetch_all()',
+        ],
+        'ocifreecollection' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::free() / OCICollection::free() (PHP 8+)',
+        ],
+        'ocifreecursor' => [
+            '5.4'         => false,
+            'alternative' => 'oci_free_statement()',
+        ],
+        'ocifreedesc' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::free() / OCILob::free() (PHP 8+)',
+        ],
+        'ocifreestatement' => [
+            '5.4'         => false,
+            'alternative' => 'oci_free_statement()',
+        ],
+        'ociinternaldebug' => [
+            '5.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'oci_internal_debug() (PHP < 8.0)',
+        ],
+        'ociloadlob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::load() / OCILob::load() (PHP 8+)',
+        ],
+        'ocilogoff' => [
+            '5.4'         => false,
+            'alternative' => 'oci_close()',
+        ],
+        'ocilogon' => [
+            '5.4'         => false,
+            'alternative' => 'oci_connect()',
+        ],
+        'ocinewcollection' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_collection()',
+        ],
+        'ocinewcursor' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_cursor()',
+        ],
+        'ocinewdescriptor' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_descriptor()',
+        ],
+        'ocinlogon' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_connect()',
+        ],
+        'ocinumcols' => [
+            '5.4'         => false,
+            'alternative' => 'oci_num_fields()',
+        ],
+        'ociparse' => [
+            '5.4'         => false,
+            'alternative' => 'oci_parse()',
+        ],
+        'ociplogon' => [
+            '5.4'         => false,
+            'alternative' => 'oci_pconnect()',
+        ],
+        'ociresult' => [
+            '5.4'         => false,
+            'alternative' => 'oci_result()',
+        ],
+        'ocirollback' => [
+            '5.4'         => false,
+            'alternative' => 'oci_rollback()',
+        ],
+        'ocirowcount' => [
+            '5.4'         => false,
+            'alternative' => 'oci_num_rows()',
+        ],
+        'ocisavelob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::save() / OCILob::save() (PHP 8+)',
+        ],
+        'ocisavelobfile' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::import() / OCILob::import() (PHP 8+)',
+        ],
+        'ociserverversion' => [
+            '5.4'         => false,
+            'alternative' => 'oci_server_version()',
+        ],
+        'ocisetprefetch' => [
+            '5.4'         => false,
+            'alternative' => 'oci_set_prefetch()',
+        ],
+        'ocistatementtype' => [
+            '5.4'         => false,
+            'alternative' => 'oci_statement_type()',
+        ],
+        'ociwritelobtofile' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::export() / OCILob::export() (PHP 8+)',
+        ],
+        'ociwritetemporarylob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)',
+        ],
+        'mysqli_get_cache_stats' => [
+            '5.4' => true,
+        ],
+        'sqlite_array_query' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_busy_timeout' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_changes' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_close' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_column' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_create_aggregate' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_create_function' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_current' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_error_string' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_escape_string' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_exec' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_factory' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_fetch_all' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_fetch_array' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_fetch_column_types' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_fetch_object' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_fetch_single' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_fetch_string' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_field_name' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_has_more' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_has_prev' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_key' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_last_error' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_last_insert_rowid' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_libencoding' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_libversion' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_next' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_num_fields' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_num_rows' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_open' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_popen' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_prev' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_query' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_rewind' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_seek' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_single_query' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_udf_decode_binary' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_udf_encode_binary' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_unbuffered_query' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+        'sqlite_valid' => [
+            '5.4'       => true,
+            'extension' => 'sqlite',
+        ],
+
+        'mssql_bind' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_close' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_connect' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_data_seek' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_execute' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_fetch_array' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_fetch_assoc' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_fetch_batch' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_fetch_field' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_fetch_object' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_fetch_row' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_field_length' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_field_name' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_field_seek' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_field_type' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_free_result' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_free_statement' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_get_last_message' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_guid_string' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_init' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_min_error_severity' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_min_message_severity' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_next_result' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_num_fields' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_num_rows' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_pconnect' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_query' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_result' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_rows_affected' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mssql_select_db' => [
+            '7.0'       => true,
+            'extension' => 'mssql',
+        ],
+        'mysql_affected_rows' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_client_encoding' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_close' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_connect' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_create_db' => [
+            '4.3'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_data_seek' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_db_name' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_drop_db' => [
+            '4.3'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_errno' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_error' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fetch_array' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fetch_assoc' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fetch_field' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fetch_lengths' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fetch_object' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fetch_row' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_field_flags' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_field_len' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_field_name' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_field_seek' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_field_table' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_field_type' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_free_result' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_get_client_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_get_host_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_get_proto_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_get_server_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_insert_id' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_list_processes' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_list_tables' => [
+            '4.3.7'     => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_num_fields' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_num_rows' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_pconnect' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_ping' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_query' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_real_escape_string' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_result' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_select_db' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_set_charset' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_stat' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_tablename' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_thread_id' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_unbuffered_query' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fieldname' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fieldtable' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fieldlen' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fieldtype' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_fieldflags' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_selectdb' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_freeresult' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_numfields' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_numrows' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_listdbs' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_listfields' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_dbname' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'mysql_table_name' => [
+            '5.5'       => false,
+            '7.0'       => true,
+            'extension' => 'mysql',
+        ],
+        'sybase_affected_rows' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_close' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_connect' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_data_seek' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_deadlock_retry_count' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_fetch_array' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_fetch_assoc' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_fetch_field' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_fetch_object' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_fetch_row' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_field_seek' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_free_result' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_get_last_message' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_min_client_severity' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_min_error_severity' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_min_message_severity' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_min_server_severity' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_num_fields' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_num_rows' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_pconnect' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_query' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_result' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_select_db' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_set_message_handler' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+        'sybase_unbuffered_query' => [
+            '7.0'       => true,
+            'extension' => 'sybase',
+        ],
+
+        'mcrypt_create_iv' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'random_bytes() or OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_decrypt' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_get_algorithms_name' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_get_block_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_get_iv_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_get_key_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_get_modes_name' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_get_supported_key_sizes' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_is_block_algorithm_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_is_block_algorithm' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_is_block_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_enc_self_test' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_encrypt' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_generic_deinit' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_generic_init' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_generic' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_get_block_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_get_cipher_name' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_get_iv_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_get_key_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_list_algorithms' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_list_modes' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_close' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_get_algo_block_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_get_algo_key_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_get_supported_key_sizes' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_is_block_algorithm_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_is_block_algorithm' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_is_block_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_open' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mcrypt_module_self_test' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'mdecrypt_generic' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+            'extension'   => 'mcrypt',
+        ],
+        'jpeg2wbmp' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'imagecreatefromjpeg() and imagewbmp()',
+        ],
+        'png2wbmp' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'imagecreatefrompng() or imagewbmp()',
+        ],
+        '__autoload' => [
+            '7.2'         => false,
+            'alternative' => 'SPL autoload',
+        ],
+        'create_function' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'an anonymous function',
+        ],
+        'each' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'a foreach loop or ArrayIterator',
+        ],
+        'gmp_random' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'gmp_random_bits() or gmp_random_range()',
+        ],
+        'read_exif_data' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'exif_read_data()',
+        ],
+
+        'image2wbmp' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'imagewbmp()',
+        ],
+        'mbregex_encoding' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_regex_encoding()',
+        ],
+        'mbereg' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg()',
+        ],
+        'mberegi' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_eregi()',
+        ],
+        'mbereg_replace' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_replace()',
+        ],
+        'mberegi_replace' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_eregi_replace()',
+        ],
+        'mbsplit' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_split()',
+        ],
+        'mbereg_match' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_match()',
+        ],
+        'mbereg_search' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search()',
+        ],
+        'mbereg_search_pos' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_pos()',
+        ],
+        'mbereg_search_regs' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_regs()',
+        ],
+        'mbereg_search_init' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_init()',
+        ],
+        'mbereg_search_getregs' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_getregs()',
+        ],
+        'mbereg_search_getpos' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_getpos()',
+        ],
+        'mbereg_search_setpos' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_setpos()',
+        ],
+        'fgetss' => [
+            '7.3' => false,
+            '8.0' => true,
+        ],
+        'gzgetss' => [
+            '7.3' => false,
+            '8.0' => true,
+        ],
+
+        'convert_cyr_string' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_convert_encoding(), iconv() or UConverter',
+        ],
+        'ezmlm_hash' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'get_magic_quotes_gpc' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'get_magic_quotes_runtime' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'hebrevc' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'is_real' => [
+            '7.4'         => false,
+            'alternative' => 'is_float()',
+        ],
+        'money_format' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'NumberFormatter::formatCurrency()',
+        ],
+        'restore_include_path' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => "ini_restore('include_path')",
+        ],
+        'ibase_add_user' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_affected_rows' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_backup' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_add' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_cancel' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_close' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_create' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_echo' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_get' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_import' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_blob_open' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_close' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_commit_ret' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_commit' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_connect' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_db_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_delete_user' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_drop_db' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_errcode' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_errmsg' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_execute' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_fetch_assoc' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_fetch_object' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_fetch_row' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_field_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_free_event_handler' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_free_query' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_free_result' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_gen_id' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_maintain_db' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_modify_user' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_name_result' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_num_fields' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_num_params' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_param_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_pconnect' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_prepare' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_query' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_restore' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_rollback_ret' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_rollback' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_server_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_service_attach' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_service_detach' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_set_event_handler' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_trans' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'ibase_wait_event' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_add_user' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_affected_rows' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_backup' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_add' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_cancel' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_close' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_create' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_echo' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_get' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_import' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_blob_open' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_close' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_commit_ret' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_commit' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_connect' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_db_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_delete_user' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_drop_db' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_errcode' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_errmsg' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_execute' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_fetch_assoc' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_fetch_object' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_fetch_row' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_field_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_free_event_handler' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_free_query' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_free_result' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_gen_id' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_maintain_db' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_modify_user' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_name_result' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_num_fields' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_num_params' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_param_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_pconnect' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_prepare' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_query' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_restore' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_rollback_ret' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_rollback' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_server_info' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_service_attach' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_service_detach' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_set_event_handler' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_trans' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+        'fbird_wait_event' => [
+            '7.4'       => true,
+            'extension' => 'ibase',
+        ],
+
+        'ldap_control_paged_result_response' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'ldap_search()',
+        ],
+        'ldap_control_paged_result' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'ldap_search()',
+        ],
+        'recode_file' => [
+            '7.4'         => true,
+            'alternative' => 'the iconv or mbstring extension',
+            'extension'   => 'recode',
+        ],
+        'recode_string' => [
+            '7.4'         => true,
+            'alternative' => 'the iconv or mbstring extension',
+            'extension'   => 'recode',
+        ],
+        'recode' => [
+            '7.4'         => true,
+            'alternative' => 'the iconv or mbstring extension',
+            'extension'   => 'recode',
+        ],
+        'wddx_add_vars' => [
+            '7.4'       => true,
+            'extension' => 'wddx',
+        ],
+        'wddx_deserialize' => [
+            '7.4'       => true,
+            'extension' => 'wddx',
+        ],
+        'wddx_packet_end' => [
+            '7.4'       => true,
+            'extension' => 'wddx',
+        ],
+        'wddx_packet_start' => [
+            '7.4'       => true,
+            'extension' => 'wddx',
+        ],
+        'wddx_serialize_value' => [
+            '7.4'       => true,
+            'extension' => 'wddx',
+        ],
+        'wddx_serialize_vars' => [
+            '7.4'       => true,
+            'extension' => 'wddx',
+        ],
+        'mysqli_embedded_server_end' => [
+            '7.4' => true,
+        ],
+        'mysqli_embedded_server_start' => [
+            '7.4' => true,
+        ],
+
+        'enchant_broker_get_dict_path' => [
+            '8.0' => false,
+        ],
+        'enchant_broker_set_dict_path' => [
+            '8.0' => false,
+        ],
+        'enchant_broker_free' => [
+            '8.0'         => false,
+            'alternative' => 'unset the object',
+        ],
+        'enchant_broker_free_dict' => [
+            '8.0'         => false,
+            'alternative' => 'unset the object',
+        ],
+        'enchant_dict_add_to_personal' => [
+            '8.0'         => false,
+            'alternative' => 'enchant_dict_add()',
+        ],
+        'enchant_dict_is_in_session' => [
+            '8.0'         => false,
+            'alternative' => 'enchant_dict_is_added()',
+        ],
+        'imap_header' => [
+            '8.0'         => true,
+            'alternative' => 'imap_headerinfo()',
+        ],
+        'libxml_disable_entity_loader' => [
+            '8.0' => false,
+        ],
+        'oci_internal_debug' => [
+            '8.0' => true,
+        ],
+        'openssl_x509_free' => [
+            '8.0' => false,
+        ],
+        'openssl_pkey_free' => [
+            '8.0' => false,
+        ],
+        'openssl_free_key' => [
+            '8.0' => false,
+        ],
+        'pg_clientencoding' => [
+            '8.0'         => false,
+            'alternative' => 'pg_client_encoding()',
+        ],
+        'pg_cmdtuples' => [
+            '8.0'         => false,
+            'alternative' => 'pg_affected_rows()',
+        ],
+        'pg_errormessage' => [
+            '8.0'         => false,
+            'alternative' => 'pg_last_error()',
+        ],
+        'pg_fieldname' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_name()',
+        ],
+        'pg_fieldnum' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_num()',
+        ],
+        'pg_fieldisnull' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_is_null()',
+        ],
+        'pg_fieldprtlen' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_prtlen()',
+        ],
+        'pg_fieldsize' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_size()',
+        ],
+        'pg_fieldtype' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_type()',
+        ],
+        'pg_freeresult' => [
+            '8.0'         => false,
+            'alternative' => 'pg_free_result()',
+        ],
+        'pg_getlastoid' => [
+            '8.0'         => false,
+            'alternative' => 'pg_last_oid()',
+        ],
+        'pg_loclose' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_close()',
+        ],
+        'pg_locreate' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_create()',
+        ],
+        'pg_loexport' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_export()',
+        ],
+        'pg_loimport' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_import()',
+        ],
+        'pg_loopen' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_open()',
+        ],
+        'pg_loread' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_read()',
+        ],
+        'pg_loreadall' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_read_all()',
+        ],
+        'pg_lounlink' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_unlink()',
+        ],
+        'pg_lowrite' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_write()',
+        ],
+        'pg_numfields' => [
+            '8.0'         => false,
+            'alternative' => 'pg_num_fields()',
+        ],
+        'pg_numrows' => [
+            '8.0'         => false,
+            'alternative' => 'pg_num_rows()',
+        ],
+        'pg_result' => [
+            '8.0'         => false,
+            'alternative' => 'pg_fetch_result()',
+        ],
+        'pg_setclientencoding' => [
+            '8.0'         => false,
+            'alternative' => 'pg_set_client_encoding()',
+        ],
+        'shmop_close' => [
+            '8.0' => false,
+        ],
+        'xmlrpc_decode_request' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_decode' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_encode_request' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_encode' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_get_type' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_is_fault' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_parse_method_descriptions' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_server_add_introspection_data' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_server_call_method' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_server_create' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_server_destroy' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_server_register_introspection_callback' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_server_register_method' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'xmlrpc_set_type' => [
+            '8.0'       => true,
+            'extension' => 'xmlrpc',
+        ],
+        'zip_close' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive::close()',
+        ],
+        'zip_entry_close' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_compressedsize' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_compressionmethod' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_filesize' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_name' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_open' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_read' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_open' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive::open()',
+        ],
+        'zip_read' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+
+        'date_sunrise' => [
+            '8.1'         => false,
+            'alternative' => 'date_sun_info()',
+        ],
+        'date_sunset' => [
+            '8.1'         => false,
+            'alternative' => 'date_sun_info()',
+        ],
+        'strptime' => [
+            '8.1'         => false,
+            'alternative' => 'date_parse_from_format() or IntlDateFormatter::parse()',
+        ],
+        'strftime' => [
+            '8.1'         => false,
+            'alternative' => 'date() or IntlDateFormatter::format()',
+        ],
+        'gmstrftime' => [
+            '8.1'         => false,
+            'alternative' => 'date() or IntlDateFormatter::format()',
+        ],
+        'mhash_count' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash_get_block_size' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash_get_hash_name' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash_keygen_s2k' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'odbc_result_all' => [
+            '8.1' => false,
+        ],
+        'utf8_encode' => [
+            '8.2' => false,
+            'alternative' => 'iconv()',
+        ],
+        'utf8_decode' => [
+            '8.2' => false,
+            'alternative' => 'iconv()',
+        ],
+    ];
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 5.6
+     *
+     * @return array
+     */
+    public function register()
+    {
+        // Handle case-insensitivity of function names.
+        $this->removedFunctions = \array_change_key_case($this->removedFunctions, \CASE_LOWER);
+
+        return [\T_STRING];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 5.5
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in
+     *                                               the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $function   = $tokens[$stackPtr]['content'];
+        $functionLc = \strtolower($function);
+
+        if (isset($this->removedFunctions[$functionLc]) === false) {
+            return;
+        }
+
+        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($nextToken === false
+            || $tokens[$nextToken]['code'] !== \T_OPEN_PARENTHESIS
+            || isset($tokens[$nextToken]['parenthesis_owner']) === true
+        ) {
+            return;
+        }
+
+        $ignore  = [\T_NEW => true];
+        $ignore += Collections::objectOperators();
+
+        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+            // Not a call to a PHP function.
+            return;
+
+        } elseif ($tokens[$prevToken]['code'] === \T_NS_SEPARATOR) {
+            $prevPrevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true);
+            if ($tokens[$prevPrevToken]['code'] === \T_STRING
+                || $tokens[$prevPrevToken]['code'] === \T_NAMESPACE
+            ) {
+                // Namespaced function.
+                return;
+            }
+        }
+
+        $itemInfo = [
+            'name'   => $function,
+            'nameLc' => $functionLc,
+        ];
+        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+    }
+
+    /**
+     * Handle the retrieval of relevant information and if necessary throwing of an error/warning for a matched item.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the relevant token in
+     *                                               the stack.
+     * @param array                       $itemInfo  Base information about the item.
+     *
+     * @return void
+     */
+    protected function handleFeature(File $phpcsFile, $stackPtr, array $itemInfo)
+    {
+        $itemArray   = $this->removedFunctions[$itemInfo['nameLc']];
+        $versionInfo = $this->getVersionInfo($itemArray);
+        $isError     = null;
+
+        if (empty($versionInfo['removed']) === false
+            && $this->supportsAbove($versionInfo['removed']) === true
+        ) {
+            $isError = true;
+        } elseif (empty($versionInfo['deprecated']) === false
+            && $this->supportsAbove($versionInfo['deprecated']) === true
+        ) {
+            $isError = false;
+
+            // Reset the 'removed' info as it is not relevant for the current notice.
+            $versionInfo['removed'] = '';
+        }
+
+        if (isset($isError) === false) {
+            return;
+        }
+
+        // Overrule the default message template.
+        $this->msgTemplate = 'Function %s() is ';
+
+        $msgInfo = $this->getMessageInfo($itemInfo['name'], $itemInfo['name'], $versionInfo);
+
+        MessageHelper::addMessage(
+            $phpcsFile,
+            $msgInfo['message'],
+            $stackPtr,
+            $isError,
+            $msgInfo['errorcode'],
+            $msgInfo['data']
+        );
+    }
+
+    /**
+     * Retrieve version numbers in which a feature was deprecated and/or removed from
+     * an array with arbitrary contents.
+     * Will also retrieve a potential "alternative" for the feature from the same array.
+     *
+     * The array is expected to have at least one entry with a PHP version number as a key
+     * and a boolean value.
+     *
+     * @param array $itemArray Sub-array for a specific matched item from a complex version array.
+     *
+     * @return string[] Array with three keys `'deprecated'`, `'removed'` and `'alternative'`.
+     *                  The array values will always be strings and will be either the values retrieved
+     *                  from the $itemArray or an empty string if the value for a key was unavailable
+     *                  or could not be determined.
+     */
+    protected function getVersionInfo(array $itemArray)
+    {
+        $versionInfo = [
+            'deprecated'  => '',
+            'removed'     => '',
+            'alternative' => '',
+        ];
+
+        foreach ($itemArray as $version => $removed) {
+            if (isset($itemArray['alternative']) === true) {
+                $versionInfo['alternative'] = (string) $itemArray['alternative'];
+            }
+
+            if (\preg_match('`^\d\.\d(\.\d{1,2})?$`', $version) !== 1) {
+                // Not a version key.
+                continue;
+            }
+
+            if ($removed === true && $versionInfo['removed'] === '') {
+                $versionInfo['removed'] = $version;
+            } elseif ($removed === false && $versionInfo['deprecated'] === '') {
+                $versionInfo['deprecated'] = $version;
+            }
+        }
+
+        return $versionInfo;
+    }
+
+    /**
+     * Convenience method to retrieve the information to be passed to a call to the PHPCS native
+     * `addError()` or `addWarning()` methods in a simple organized array.
+     *
+     * @param string   $itemName     Item name, normally name of the function or class detected.
+     * @param string   $itemBaseCode The basis for the error code.
+     * @param string[] $versionInfo  Array of version info as received from the getVersionInfo() method.
+     *
+     * @return array
+     */
+    protected function getMessageInfo($itemName, $itemBaseCode, array $versionInfo)
+    {
+        $message   = $this->msgTemplate;
+        $errorCode = MessageHelper::stringToErrorCode($itemBaseCode, true);
+        $data      = [$itemName];
+
+        if ($versionInfo['deprecated'] !== '') {
+            $message   .= 'deprecated since PHP %s and ';
+            $errorCode .= 'Deprecated';
+            $data[]     = $versionInfo['deprecated'];
+        }
+
+        if ($versionInfo['removed'] !== '') {
+            $message   .= 'removed since PHP %s and ';
+            $errorCode .= 'Removed';
+            $data[]     = $versionInfo['removed'];
+        }
+
+        // Remove the last 'and' from the message.
+        $message = \substr($message, 0, (\strlen($message) - 5));
+
+        if ($versionInfo['alternative'] !== '') {
+            $message .= $this->alternativeOptionTemplate;
+            $data[]   = $versionInfo['alternative'];
+        }
+
+        return [
+            'message'   => $message,
+            'errorcode' => $errorCode,
+            'data'      => $data,
+        ];
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc
new file mode 100644
index 00000000..ebca6c67
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc
@@ -0,0 +1,1236 @@
+<?php
+
+call_user_method();
+call_user_method_array();
+define_syslog_variables();
+dl();
+ereg();
+ereg_replace();
+eregi();
+eregi_replace();
+import_request_variables();
+mcrypt_generic_end();
+mysql_db_query();
+mysql_escape_string();
+mysql_list_dbs();
+mysqli_bind_param();
+mysqli_bind_result();
+mysqli_client_encoding();
+mysqli_fetch();
+mysqli_param_count();
+mysqli_get_metadata();
+mysqli_send_long_data();
+magic_quotes_runtime();
+session_register();
+session_unregister();
+session_is_registered();
+set_magic_quotes_runtime();
+set_socket_blocking();
+split();
+spliti();
+sql_regcase();
+php_logo_guid();
+php_egg_logo_guid();
+php_real_logo_guid();
+zend_logo_guid();
+datefmt_set_timezone_id();
+mcrypt_ecb();
+mcrypt_cbc();
+mcrypt_cfb();
+mcrypt_ofb();
+ocibindbyname();
+ocicancel();
+ocicloselob();
+ocicollappend();
+ocicollassign();
+ocicollassignelem();
+ocicollgetelem();
+ocicollmax();
+ocicollsize();
+ocicolltrim();
+ocicolumnisnull();
+ocicolumnname();
+ocicolumnprecision();
+ocicolumnscale();
+ocicolumnsize();
+ocicolumntype();
+ocicolumntyperaw();
+ocicommit();
+ocidefinebyname();
+ocierror();
+ociexecute();
+ocifetch();
+ocifetchinto();
+ocifetchstatement();
+ocifreecollection();
+ocifreecursor();
+ocifreedesc();
+ocifreestatement();
+ociinternaldebug();
+ociloadlob();
+ocilogoff();
+ocilogon();
+ocinewcollection();
+ocinewcursor();
+ocinewdescriptor();
+ocinlogon();
+ocinumcols();
+ociparse();
+ociplogon();
+ociresult();
+ocirollback();
+ocirowcount();
+ocisavelob();
+ocisavelobfile();
+ociserverversion();
+ocisetprefetch();
+ocistatementtype();
+ociwritelobtofile();
+ociwritetemporarylob();
+imagepsbbox();
+imagepsencodefont();
+imagepsextendfont();
+imagepsfreefont();
+imagepsloadfont();
+imagepsslantfont();
+imagepstext();
+ldap_sort();
+php_check_syntax();
+mysqli_get_cache_stats();
+mcrypt_create_iv();
+mcrypt_decrypt();
+mcrypt_enc_get_algorithms_name();
+mcrypt_enc_get_block_size();
+mcrypt_enc_get_iv_size();
+mcrypt_enc_get_key_size();
+mcrypt_enc_get_modes_name();
+mcrypt_enc_get_supported_key_sizes();
+mcrypt_enc_is_block_algorithm_mode();
+mcrypt_enc_is_block_algorithm();
+mcrypt_enc_is_block_mode();
+mcrypt_enc_self_test();
+mcrypt_encrypt();
+mcrypt_generic_deinit();
+mcrypt_generic_init();
+mcrypt_generic();
+mcrypt_get_block_size();
+mcrypt_get_cipher_name();
+mcrypt_get_iv_size();
+mcrypt_get_key_size();
+mcrypt_list_algorithms();
+mcrypt_list_modes();
+mcrypt_module_close();
+mcrypt_module_get_algo_block_size();
+mcrypt_module_get_algo_key_size();
+mcrypt_module_get_supported_key_sizes();
+mcrypt_module_is_block_algorithm_mode();
+mcrypt_module_is_block_algorithm();
+mcrypt_module_is_block_mode();
+mcrypt_module_open();
+mcrypt_module_self_test();
+mdecrypt_generic();
+
+// Test against false positives.
+$class->php_check_syntax();
+MyClass::php_check_syntax();
+MyNamespace\php_check_syntax();
+echo PHP_CHECK_SYNTAX; // Constant.
+const php_check_syntax = 'abc';
+use php_check_syntax;
+function php_check_syntax() {}
+abstract class Split {}
+
+// More deprecated functions, PHP 7.2
+jpeg2wbmp();
+png2wbmp();
+create_function();
+while (list($key, $val) = each($array)) {}
+gmp_random(2);
+read_exif_data();
+
+// PHP 7.3.
+image2wbmp();
+mbregex_encoding();
+mbereg();
+mberegi();
+mbereg_replace();
+mberegi_replace();
+mbsplit();
+mbereg_match();
+mbereg_search();
+mbereg_search_pos();
+mbereg_search_regs();
+mbereg_search_init();
+mbereg_search_getregs();
+mbereg_search_getpos();
+mbereg_search_setpos();
+fgetss();
+gzgetss();
+
+// PHP 7.4.
+ibase_add_user();
+ibase_affected_rows();
+ibase_backup();
+ibase_blob_add();
+ibase_blob_cancel();
+ibase_blob_close();
+ibase_blob_create();
+ibase_blob_echo();
+ibase_blob_get();
+ibase_blob_import();
+ibase_blob_info();
+ibase_blob_open();
+ibase_close();
+ibase_commit_ret();
+ibase_commit();
+ibase_connect();
+ibase_db_info();
+ibase_delete_user();
+ibase_drop_db();
+ibase_errcode();
+ibase_errmsg();
+ibase_execute();
+ibase_fetch_assoc();
+ibase_fetch_object();
+ibase_fetch_row();
+ibase_field_info();
+ibase_free_event_handler();
+ibase_free_query();
+ibase_free_result();
+ibase_gen_id();
+ibase_maintain_db();
+ibase_modify_user();
+ibase_name_result();
+ibase_num_fields();
+ibase_num_params();
+ibase_param_info();
+ibase_pconnect();
+ibase_prepare();
+ibase_query();
+ibase_restore();
+ibase_rollback_ret();
+ibase_rollback();
+ibase_server_info();
+ibase_service_attach();
+ibase_service_detach();
+ibase_set_event_handler();
+ibase_trans();
+ibase_wait_event();
+
+// Pfpro extension - PHP 5.1
+pfpro_cleanup();
+pfpro_init();
+pfpro_process_raw();
+pfpro_process();
+pfpro_version();
+
+// PHP 7.4.
+wddx_add_vars();
+wddx_deserialize();
+wddx_packet_end();
+wddx_packet_start();
+wddx_serialize_value();
+wddx_serialize_vars();
+ldap_control_paged_result_response();
+ldap_control_paged_result();
+recode_file();
+recode_string();
+recode();
+is_real();
+get_magic_quotes_gpc();
+get_magic_quotes_runtime();
+hebrevc($str));
+convert_cyr_string($str, 'k', 'i');
+money_format();
+ezmlm_hash();
+restore_include_path();
+
+// These calls should *not* trigger an error.
+$myobject -> php_check_syntax (); // Method, not the native PHP function.
+myNamespace \ /*comment*/ php_check_syntax(); // Namespaced function, not the native PHP function.
+namespace\php_check_syntax(); // Namespaced function, not the native PHP function.
+$obj = new php_check_syntax /*comment*/ (); // Class not method.
+
+// PHP 5.3 Ncurses extension.
+ncurses_addch();
+ncurses_addchnstr();
+ncurses_addchstr();
+ncurses_addnstr();
+ncurses_addstr();
+ncurses_assume_default_colors();
+ncurses_attroff();
+ncurses_attron();
+ncurses_attrset();
+ncurses_baudrate();
+ncurses_beep();
+ncurses_bkgd();
+ncurses_bkgdset();
+ncurses_border();
+ncurses_bottom_panel();
+ncurses_can_change_color();
+ncurses_cbreak();
+ncurses_clear();
+ncurses_clrtobot();
+ncurses_clrtoeol();
+ncurses_color_content();
+ncurses_color_set();
+ncurses_curs_set();
+ncurses_def_prog_mode();
+ncurses_def_shell_mode();
+ncurses_define_key();
+ncurses_del_panel();
+ncurses_delay_output();
+ncurses_delch();
+ncurses_deleteln();
+ncurses_delwin();
+ncurses_doupdate();
+ncurses_echo();
+ncurses_echochar();
+ncurses_end();
+ncurses_erase();
+ncurses_erasechar();
+ncurses_filter();
+ncurses_flash();
+ncurses_flushinp();
+ncurses_getch();
+ncurses_getmaxyx();
+ncurses_getmouse();
+ncurses_getyx();
+ncurses_halfdelay();
+ncurses_has_colors();
+ncurses_has_ic();
+ncurses_has_il();
+ncurses_has_key();
+ncurses_hide_panel();
+ncurses_hline();
+ncurses_inch();
+ncurses_init_color();
+ncurses_init_pair();
+ncurses_init();
+ncurses_insch();
+ncurses_insdelln();
+ncurses_insertln();
+ncurses_insstr();
+ncurses_instr();
+ncurses_isendwin();
+ncurses_keyok();
+ncurses_keypad();
+ncurses_killchar();
+ncurses_longname();
+ncurses_meta();
+ncurses_mouse_trafo();
+ncurses_mouseinterval();
+ncurses_mousemask();
+ncurses_move_panel();
+ncurses_move();
+ncurses_mvaddch();
+ncurses_mvaddchnstr();
+ncurses_mvaddchstr();
+ncurses_mvaddnstr();
+ncurses_mvaddstr();
+ncurses_mvcur();
+ncurses_mvdelch();
+ncurses_mvgetch();
+ncurses_mvhline();
+ncurses_mvinch();
+ncurses_mvvline();
+ncurses_mvwaddstr();
+ncurses_napms();
+ncurses_new_panel();
+ncurses_newpad();
+ncurses_newwin();
+ncurses_nl();
+ncurses_nocbreak();
+ncurses_noecho();
+ncurses_nonl();
+ncurses_noqiflush();
+ncurses_noraw();
+ncurses_pair_content();
+ncurses_panel_above();
+ncurses_panel_below();
+ncurses_panel_window();
+ncurses_pnoutrefresh();
+ncurses_prefresh();
+ncurses_putp();
+ncurses_qiflush();
+ncurses_raw();
+ncurses_refresh();
+ncurses_replace_panel();
+ncurses_reset_prog_mode();
+ncurses_reset_shell_mode();
+ncurses_resetty();
+ncurses_savetty();
+ncurses_scr_dump();
+ncurses_scr_init();
+ncurses_scr_restore();
+ncurses_scr_set();
+ncurses_scrl();
+ncurses_show_panel();
+ncurses_slk_attr();
+ncurses_slk_attroff();
+ncurses_slk_attron();
+ncurses_slk_attrset();
+ncurses_slk_clear();
+ncurses_slk_color();
+ncurses_slk_init();
+ncurses_slk_noutrefresh();
+ncurses_slk_refresh();
+ncurses_slk_restore();
+ncurses_slk_set();
+ncurses_slk_touch();
+ncurses_standend();
+ncurses_standout();
+ncurses_start_color();
+ncurses_termattrs();
+ncurses_termname();
+ncurses_timeout();
+ncurses_top_panel();
+ncurses_typeahead();
+ncurses_ungetch();
+ncurses_ungetmouse();
+ncurses_update_panels();
+ncurses_use_default_colors();
+ncurses_use_env();
+ncurses_use_extended_names();
+ncurses_vidattr();
+ncurses_vline();
+ncurses_waddch();
+ncurses_waddstr();
+ncurses_wattroff();
+ncurses_wattron();
+ncurses_wattrset();
+ncurses_wborder();
+ncurses_wclear();
+ncurses_wcolor_set();
+ncurses_werase();
+ncurses_wgetch();
+ncurses_whline();
+ncurses_wmouse_trafo();
+ncurses_wmove();
+ncurses_wnoutrefresh();
+ncurses_wrefresh();
+ncurses_wstandend();
+ncurses_wstandout();
+ncurses_wvline();
+
+// PHP 5.1 MCVE extension.
+m_checkstatus();
+m_completeauthorizations();
+m_connect();
+m_connectionerror();
+m_deletetrans();
+m_destroyconn();
+m_destroyengine();
+m_getcell();
+m_getcellbynum();
+m_getcommadelimited();
+m_getheader();
+m_initconn();
+m_initengine();
+m_iscommadelimited();
+m_maxconntimeout();
+m_monitor();
+m_numcolumns();
+m_numrows();
+m_parsecommadelimited();
+m_responsekeys();
+m_responseparam();
+m_returnstatus();
+m_setblocking();
+m_setdropfile();
+m_setip();
+m_setssl_cafile();
+m_setssl_files();
+m_setssl();
+m_settimeout();
+m_sslcert_gen_hash();
+m_transactionssent();
+m_transinqueue();
+m_transkeyval();
+m_transnew();
+m_transsend();
+m_uwait();
+m_validateidentifier();
+m_verifyconnection();
+m_verifysslcert();
+
+// PHP 5.1 DIO extension.
+dio_close();
+dio_fcntl();
+dio_open();
+dio_read();
+dio_seek();
+dio_stat();
+dio_tcsetattr();
+dio_truncate();
+dio_write();
+
+// PHP 5.3 FDF extension.
+fdf_add_doc_javascript();
+fdf_add_template();
+fdf_close();
+fdf_create();
+fdf_enum_values();
+fdf_errno();
+fdf_error();
+fdf_get_ap();
+fdf_get_attachment();
+fdf_get_encoding();
+fdf_get_file();
+fdf_get_flags();
+fdf_get_opt();
+fdf_get_status();
+fdf_get_value();
+fdf_get_version();
+fdf_header();
+fdf_next_field_name();
+fdf_open_string();
+fdf_open();
+fdf_remove_item();
+fdf_save_string();
+fdf_save();
+fdf_set_ap();
+fdf_set_encoding();
+fdf_set_file();
+fdf_set_flags();
+fdf_set_javascript_action();
+fdf_set_on_import_javascript();
+fdf_set_opt();
+fdf_set_status();
+fdf_set_submit_form_action();
+fdf_set_target_frame();
+fdf_set_value();
+fdf_set_version();
+
+// PHP 5.3 Ming extension.
+ming_keypress();
+ming_setcubicthreshold();
+ming_setscale();
+ming_setswfcompression();
+ming_useconstants();
+ming_useswfversion();
+
+// PHP 5.1 Fam extension.
+fam_cancel_monitor();
+fam_close();
+fam_monitor_collection();
+fam_monitor_directory();
+fam_monitor_file();
+fam_next_event();
+fam_open();
+fam_pending();
+fam_resume_monitor();
+fam_suspend_monitor();
+
+// PHP 5.2 HWAPI extension.
+hwapi_attribute_new();
+hwapi_content_new();
+hwapi_hgcsp();
+hwapi_object_new();
+
+// PHP 5.1 YP/NIS extension.
+yp_all();
+yp_cat();
+yp_err_string();
+yp_errno();
+yp_first();
+yp_get_default_domain();
+yp_master();
+yp_match();
+yp_next();
+yp_order();
+
+// PHP 5.1 Mnogosearch extension.
+udm_add_search_limit();
+udm_alloc_agent_array();
+udm_alloc_agent();
+udm_api_version();
+udm_cat_list();
+udm_cat_path();
+udm_check_charset();
+udm_clear_search_limits();
+udm_crc32();
+udm_errno();
+udm_error();
+udm_find();
+udm_free_agent();
+udm_free_ispell_data();
+udm_free_res();
+udm_get_doc_count();
+udm_get_res_field();
+udm_get_res_param();
+udm_hash32();
+udm_load_ispell_data();
+udm_set_agent_param();
+
+// PHP 5.1.3 Msession extension.
+msession_connect();
+msession_count();
+msession_create();
+msession_destroy();
+msession_disconnect();
+msession_find();
+msession_get_array();
+msession_get_data();
+msession_get();
+msession_inc();
+msession_list();
+msession_listvar();
+msession_lock();
+msession_plugin();
+msession_randstr();
+msession_set_array();
+msession_set_data();
+msession_set();
+msession_timeout();
+msession_uniq();
+msession_unlock();
+
+__autoload($class);
+
+// PHP 5.0 Crack extension.
+crack_check();
+crack_closedict();
+crack_getlastmessage();
+crack_opendict();
+
+// PHP 5.1 W32API extension.
+w32api_deftype();
+w32api_init_dtype();
+w32api_invoke_function();
+w32api_register_function();
+w32api_set_call_method();
+
+// PHP 5.1 CPDF extension.
+cpdf_add_annotation();
+cpdf_add_outline();
+cpdf_arc();
+cpdf_begin_text();
+cpdf_circle();
+cpdf_clip();
+cpdf_close();
+cpdf_closepath_fill_stroke();
+cpdf_closepath_stroke();
+cpdf_closepath();
+cpdf_continue_text();
+cpdf_curveto();
+cpdf_end_text();
+cpdf_fill_stroke();
+cpdf_fill();
+cpdf_finalize_page();
+cpdf_finalize();
+cpdf_global_set_document_limits();
+cpdf_import_jpeg();
+cpdf_lineto();
+cpdf_moveto();
+cpdf_newpath();
+cpdf_open();
+cpdf_output_buffer();
+cpdf_page_init();
+cpdf_place_inline_image();
+cpdf_rect();
+cpdf_restore();
+cpdf_rlineto();
+cpdf_rmoveto();
+cpdf_rotate_text();
+cpdf_rotate();
+cpdf_save_to_file();
+cpdf_save();
+cpdf_scale();
+cpdf_set_action_url();
+cpdf_set_char_spacing();
+cpdf_set_creator();
+cpdf_set_current_page();
+cpdf_set_font_directories();
+cpdf_set_font_map_file();
+cpdf_set_font();
+cpdf_set_horiz_scaling();
+cpdf_set_keywords();
+cpdf_set_leading();
+cpdf_set_page_animation();
+cpdf_set_subject();
+cpdf_set_text_matrix();
+cpdf_set_text_pos();
+cpdf_set_text_rendering();
+cpdf_set_text_rise();
+cpdf_set_title();
+cpdf_set_viewer_preferences();
+cpdf_set_word_spacing();
+cpdf_setdash();
+cpdf_setflat();
+cpdf_setgray_fill();
+cpdf_setgray_stroke();
+cpdf_setgray();
+cpdf_setlinecap();
+cpdf_setlinejoin();
+cpdf_setlinewidth();
+cpdf_setmiterlimit();
+cpdf_setrgbcolor_fill();
+cpdf_setrgbcolor_stroke();
+cpdf_setrgbcolor();
+cpdf_show_xy();
+cpdf_show();
+cpdf_stringwidth();
+cpdf_stroke();
+cpdf_text();
+cpdf_translate();
+ircg_channel_mode();
+ircg_disconnect();
+ircg_eval_ecmascript_params();
+ircg_fetch_error_msg();
+ircg_get_username();
+ircg_html_encode();
+ircg_ignore_add();
+ircg_ignore_del();
+ircg_invite();
+ircg_is_conn_alive();
+ircg_join();
+ircg_kick();
+ircg_list();
+ircg_lookup_format_messages();
+ircg_lusers();
+ircg_msg();
+ircg_names();
+ircg_nick();
+ircg_nickname_escape();
+ircg_nickname_unescape();
+ircg_notice();
+ircg_oper();
+ircg_part();
+ircg_pconnect();
+ircg_register_format_messages();
+ircg_set_current();
+ircg_set_file();
+ircg_set_on_die();
+ircg_topic();
+ircg_who();
+ircg_whois();
+dbase_add_record();
+dbase_close();
+dbase_create();
+dbase_delete_record();
+dbase_get_header_info();
+dbase_get_record_with_names();
+dbase_get_record();
+dbase_numfields();
+dbase_numrecords();
+dbase_open();
+dbase_pack();
+dbase_replace_record();
+dbx_close();
+dbx_compare();
+dbx_connect();
+dbx_error();
+dbx_escape_string();
+dbx_fetch_row();
+dbx_query();
+dbx_sort();
+fbsql_affected_rows();
+fbsql_autocommit();
+fbsql_blob_size();
+fbsql_change_user();
+fbsql_clob_size();
+fbsql_close();
+fbsql_commit();
+fbsql_connect();
+fbsql_create_blob();
+fbsql_create_clob();
+fbsql_create_db();
+fbsql_data_seek();
+fbsql_database_password();
+fbsql_database();
+fbsql_db_query();
+fbsql_db_status();
+fbsql_drop_db();
+fbsql_errno();
+fbsql_error();
+fbsql_fetch_array();
+fbsql_fetch_assoc();
+fbsql_fetch_field();
+fbsql_fetch_lengths();
+fbsql_fetch_object();
+fbsql_fetch_row();
+fbsql_field_flags();
+fbsql_field_len();
+fbsql_field_name();
+fbsql_field_seek();
+fbsql_field_table();
+fbsql_field_type();
+fbsql_free_result();
+fbsql_get_autostart_info();
+fbsql_hostname();
+fbsql_insert_id();
+fbsql_list_dbs();
+fbsql_list_fields();
+fbsql_list_tables();
+fbsql_next_result();
+fbsql_num_fields();
+fbsql_num_rows();
+fbsql_password();
+fbsql_pconnect();
+fbsql_query();
+fbsql_read_blob();
+fbsql_read_clob();
+fbsql_result();
+fbsql_rollback();
+fbsql_rows_fetched();
+fbsql_select_db();
+fbsql_set_characterset();
+fbsql_set_lob_mode();
+fbsql_set_password();
+fbsql_set_transaction();
+fbsql_start_db();
+fbsql_stop_db();
+fbsql_table_name();
+fbsql_tablename();
+fbsql_username();
+fbsql_warnings();
+filepro_fieldcount();
+filepro_fieldname();
+filepro_fieldtype();
+filepro_fieldwidth();
+filepro_retrieve();
+filepro_rowcount();
+filepro();
+ingres_autocommit();
+ingres_close();
+ingres_commit();
+ingres_connect();
+ingres_fetch_array();
+ingres_fetch_object();
+ingres_fetch_row();
+ingres_field_length();
+ingres_field_name();
+ingres_field_nullable();
+ingres_field_precision();
+ingres_field_scale();
+ingres_field_type();
+ingres_num_fields();
+ingres_num_rows();
+ingres_pconnect();
+ingres_query();
+ingres_rollback();
+msql_affected_rows();
+msql_close();
+msql_connect();
+msql_create_db();
+msql_createdb();
+msql_data_seek();
+msql_db_query();
+msql_dbname();
+msql_drop_db();
+msql_error();
+msql_fetch_array();
+msql_fetch_field();
+msql_fetch_object();
+msql_fetch_row();
+msql_field_flags();
+msql_field_len();
+msql_field_name();
+msql_field_seek();
+msql_field_table();
+msql_field_type();
+msql_fieldflags();
+msql_fieldlen();
+msql_fieldname();
+msql_fieldtable();
+msql_fieldtype();
+msql_free_result();
+msql_list_dbs();
+msql_list_fields();
+msql_list_tables();
+msql_num_fields();
+msql_num_rows();
+msql_numfields();
+msql_numrows();
+msql_pconnect();
+msql_query();
+msql_regcase();
+msql_result();
+msql_select_db();
+msql_tablename();
+msql();
+mssql_bind();
+mssql_close();
+mssql_connect();
+mssql_data_seek();
+mssql_execute();
+mssql_fetch_array();
+mssql_fetch_assoc();
+mssql_fetch_batch();
+mssql_fetch_field();
+mssql_fetch_object();
+mssql_fetch_row();
+mssql_field_length();
+mssql_field_name();
+mssql_field_seek();
+mssql_field_type();
+mssql_free_result();
+mssql_free_statement();
+mssql_get_last_message();
+mssql_guid_string();
+mssql_init();
+mssql_min_error_severity();
+mssql_min_message_severity();
+mssql_next_result();
+mssql_num_fields();
+mssql_num_rows();
+mssql_pconnect();
+mssql_query();
+mssql_result();
+mssql_rows_affected();
+mssql_select_db();
+sqlite_array_query();
+sqlite_busy_timeout();
+sqlite_changes();
+sqlite_close();
+sqlite_column();
+sqlite_create_aggregate();
+sqlite_create_function();
+sqlite_current();
+sqlite_error_string();
+sqlite_escape_string();
+sqlite_exec();
+sqlite_factory();
+sqlite_fetch_all();
+sqlite_fetch_array();
+sqlite_fetch_column_types();
+sqlite_fetch_object();
+sqlite_fetch_single();
+sqlite_fetch_string();
+sqlite_field_name();
+sqlite_has_more();
+sqlite_has_prev();
+sqlite_key();
+sqlite_last_error();
+sqlite_last_insert_rowid();
+sqlite_libencoding();
+sqlite_libversion();
+sqlite_next();
+sqlite_num_fields();
+sqlite_num_rows();
+sqlite_open();
+sqlite_popen();
+sqlite_prev();
+sqlite_query();
+sqlite_rewind();
+sqlite_seek();
+sqlite_single_query();
+sqlite_udf_decode_binary();
+sqlite_udf_encode_binary();
+sqlite_unbuffered_query();
+sqlite_valid();
+mysql_affected_rows();
+mysql_client_encoding();
+mysql_close();
+mysql_connect();
+mysql_create_db();
+mysql_data_seek();
+mysql_db_name();
+mysql_drop_db();
+mysql_errno();
+mysql_error();
+mysql_fetch_array();
+mysql_fetch_assoc();
+mysql_fetch_field();
+mysql_fetch_lengths();
+mysql_fetch_object();
+mysql_fetch_row();
+mysql_field_flags();
+mysql_field_len();
+mysql_field_name();
+mysql_field_seek();
+mysql_field_table();
+mysql_field_type();
+mysql_free_result();
+mysql_get_client_info();
+mysql_get_host_info();
+mysql_get_proto_info();
+mysql_get_server_info();
+mysql_info();
+mysql_insert_id();
+mysql_list_fields();
+mysql_list_processes();
+mysql_list_tables();
+mysql_num_fields();
+mysql_num_rows();
+mysql_pconnect();
+mysql_ping();
+mysql_query();
+mysql_real_escape_string();
+mysql_result();
+mysql_select_db();
+mysql_set_charset();
+mysql_stat();
+mysql_tablename();
+mysql_thread_id();
+mysql_unbuffered_query();
+mysql();
+mysql_fieldname();
+mysql_fieldtable();
+mysql_fieldlen();
+mysql_fieldtype();
+mysql_fieldflags();
+mysql_selectdb();
+mysql_createdb();
+mysql_dropdb();
+mysql_freeresult();
+mysql_numfields();
+mysql_numrows();
+mysql_listdbs();
+mysql_listtables();
+mysql_listfields();
+mysql_dbname();
+mysql_table_name();
+
+// PHP 7.4 ibase extension aliases.
+fbird_add_user();
+fbird_affected_rows();
+fbird_backup();
+fbird_blob_add();
+fbird_blob_cancel();
+fbird_blob_close();
+fbird_blob_create();
+fbird_blob_echo();
+fbird_blob_get();
+fbird_blob_import();
+fbird_blob_info();
+fbird_blob_open();
+fbird_close();
+fbird_commit_ret();
+fbird_commit();
+fbird_connect();
+fbird_db_info();
+fbird_delete_user();
+fbird_drop_db();
+fbird_errcode();
+fbird_errmsg();
+fbird_execute();
+fbird_fetch_assoc();
+fbird_fetch_object();
+fbird_fetch_row();
+fbird_field_info();
+fbird_free_event_handler();
+fbird_free_query();
+fbird_free_result();
+fbird_gen_id();
+fbird_maintain_db();
+fbird_modify_user();
+fbird_name_result();
+fbird_num_fields();
+fbird_num_params();
+fbird_param_info();
+fbird_pconnect();
+fbird_prepare();
+fbird_query();
+fbird_restore();
+fbird_rollback_ret();
+fbird_rollback();
+fbird_server_info();
+fbird_service_attach();
+fbird_service_detach();
+fbird_set_event_handler();
+fbird_trans();
+fbird_wait_event();
+
+ovrimos_close();
+ovrimos_commit();
+ovrimos_connect();
+ovrimos_cursor();
+ovrimos_exec();
+ovrimos_execute();
+ovrimos_fetch_into();
+ovrimos_fetch_row();
+ovrimos_field_len();
+ovrimos_field_name();
+ovrimos_field_num();
+ovrimos_field_type();
+ovrimos_free_result();
+ovrimos_longreadlen();
+ovrimos_num_fields();
+ovrimos_num_rows();
+ovrimos_prepare();
+ovrimos_result_all();
+ovrimos_result();
+ovrimos_rollback();
+ovrimos_close_all();
+
+ora_bind();
+ora_close();
+ora_columnname();
+ora_columnsize();
+ora_columntype();
+ora_commit();
+ora_commitoff();
+ora_commiton();
+ora_do();
+ora_error();
+ora_errorcode();
+ora_exec();
+ora_fetch_into();
+ora_fetch();
+ora_getcolumn();
+ora_logoff();
+ora_logon();
+ora_numcols();
+ora_numrows();
+ora_open();
+ora_parse();
+ora_plogon();
+ora_rollback();
+sybase_affected_rows();
+sybase_close();
+sybase_connect();
+sybase_data_seek();
+sybase_deadlock_retry_count();
+sybase_fetch_array();
+sybase_fetch_assoc();
+sybase_fetch_field();
+sybase_fetch_object();
+sybase_fetch_row();
+sybase_field_seek();
+sybase_free_result();
+sybase_get_last_message();
+sybase_min_client_severity();
+sybase_min_error_severity();
+sybase_min_message_severity();
+sybase_min_server_severity();
+sybase_num_fields();
+sybase_num_rows();
+sybase_pconnect();
+sybase_query();
+sybase_result();
+sybase_select_db();
+sybase_set_message_handler();
+sybase_unbuffered_query();
+ifx_affected_rows();
+ifx_blobinfile_mode();
+ifx_byteasvarchar();
+ifx_close();
+ifx_connect();
+ifx_copy_blob();
+ifx_create_blob();
+ifx_create_char();
+ifx_do();
+ifx_error();
+ifx_errormsg();
+ifx_fetch_row();
+ifx_fieldproperties();
+ifx_fieldtypes();
+ifx_free_blob();
+ifx_free_char();
+ifx_free_result();
+ifx_get_blob();
+ifx_get_char();
+ifx_getsqlca();
+ifx_htmltbl_result();
+ifx_nullformat();
+ifx_num_fields();
+ifx_num_rows();
+ifx_pconnect();
+ifx_prepare();
+ifx_query();
+ifx_textasvarchar();
+ifx_update_blob();
+ifx_update_char();
+ifxus_close_slob();
+ifxus_create_slob();
+ifxus_free_slob();
+ifxus_open_slob();
+ifxus_read_slob();
+ifxus_seek_slob();
+ifxus_tell_slob();
+ifxus_write_slob();
+mysqli_disable_reads_from_master();
+mysqli_disable_rpl_parse();
+mysqli_embedded_connect();
+mysqli_embedded_server_end();
+mysqli_embedded_server_start();
+mysqli_enable_reads_from_master();
+mysqli_enable_rpl_parse();
+mysqli_master_query();
+mysqli_resource();
+mysqli_rpl_parse_enabled();
+mysqli_rpl_probe();
+mysqli_server_end();
+mysqli_server_init();
+mysqli_slave_query();
+xmlrpc_decode_request();
+xmlrpc_decode();
+xmlrpc_encode_request();
+xmlrpc_encode();
+xmlrpc_get_type();
+xmlrpc_is_fault();
+xmlrpc_parse_method_descriptions();
+xmlrpc_server_add_introspection_data();
+xmlrpc_server_call_method();
+xmlrpc_server_create();
+xmlrpc_server_destroy();
+xmlrpc_server_register_introspection_callback();
+xmlrpc_server_register_method();
+xmlrpc_set_type();
+enchant_broker_get_dict_path();
+enchant_broker_set_dict_path();
+enchant_broker_free();
+enchant_broker_free_dict();
+enchant_dict_add_to_personal();
+enchant_dict_is_in_session();
+oci_internal_debug();
+zip_close();
+zip_entry_close();
+zip_entry_compressedsize();
+zip_entry_compressionmethod();
+zip_entry_filesize();
+zip_entry_name();
+zip_entry_open();
+zip_entry_read();
+zip_open();
+zip_read();
+openssl_x509_free();
+openssl_pkey_free();
+libxml_disable_entity_loader();
+pg_clientencoding();
+pg_cmdtuples();
+pg_errormessage();
+pg_fieldname();
+pg_fieldnum();
+pg_fieldisnull();
+pg_fieldprtlen();
+pg_fieldsize();
+pg_fieldtype();
+pg_freeresult();
+pg_getlastoid();
+pg_loclose();
+pg_locreate();
+pg_loexport();
+pg_loimport();
+pg_loopen();
+pg_loread();
+pg_loreadall();
+pg_lounlink();
+pg_lowrite();
+pg_numfields();
+pg_numrows();
+pg_result();
+pg_setclientencoding();
+imap_header();
+shmop_close();
+openssl_free_key();
+date_sunrise();
+date_sunset();
+strptime();
+strftime();
+gmstrftime();
+mhash_count();
+mhash_get_block_size();
+mhash_get_hash_name();
+mhash_keygen_s2k();
+mhash();
+odbc_result_all();
+
+// Prevent false positives on PHP 8.0+ nullsafe method calls.
+$obj?->php_check_syntax(); // OK.
+
+//PHP 8.2 deprecations
+utf8_encode();
+utf8_decode();
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
new file mode 100644
index 00000000..6c409bfa
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
@@ -0,0 +1,1552 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedFunctions sniff.
+ *
+ * @group removedFunctions
+ * @group functionUse
+ *
+ * @covers \RemovedFunctionsSniff
+ *
+ * @since 5.5
+ */
+class RemovedFunctionsUnitTest extends BaseSniffTest
+{
+    /**
+     * testDeprecatedFunction
+     *
+     * @dataProvider dataDeprecatedFunction
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedFunction($functionName, $deprecatedIn, $lines, $okVersion, $deprecatedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedFunction()
+     *
+     * @return array
+     */
+    public function dataDeprecatedFunction()
+    {
+        return [
+            ['dl', '5.3', [6], '5.2'],
+            ['ocifetchinto', '5.4', [63], '5.3'],
+            ['enchant_broker_get_dict_path', '8.0', [1172], '7.4'],
+            ['enchant_broker_set_dict_path', '8.0', [1173], '7.4'],
+            ['libxml_disable_entity_loader', '8.0', [1191], '7.4'],
+            ['openssl_x509_free', '8.0', [1189], '7.4'],
+            ['openssl_pkey_free', '8.0', [1190], '7.4'],
+            ['shmop_close', '8.0', [1217], '7.4'],
+            ['openssl_free_key', '8.0', [1218], '7.4'],
+            ['odbc_result_all', '8.1', [1229], '8.0'],
+        ];
+    }
+
+
+    /**
+     * testDeprecatedFunctionWithAlternative
+     *
+     * @dataProvider dataDeprecatedFunctionWithAlternative
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param string $alternative       An alternative function.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedFunctionWithAlternative($functionName, $deprecatedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedFunctionWithAlternative()
+     *
+     * @return array
+     */
+    public function dataDeprecatedFunctionWithAlternative()
+    {
+        return [
+            ['ocibindbyname', '5.4', 'oci_bind_by_name()', [41], '5.3'],
+            ['ocicancel', '5.4', 'oci_cancel()', [42], '5.3'],
+            ['ocicloselob', '5.4', 'OCI-Lob::close() / OCILob::close() (PHP 8+)', [43], '5.3'],
+            ['ocicollappend', '5.4', 'OCI-Collection::append() / OCICollection::append() (PHP 8+)', [44], '5.3'],
+            ['ocicollassign', '5.4', 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)', [45], '5.3'],
+            ['ocicollassignelem', '5.4', 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)', [46], '5.3'],
+            ['ocicollgetelem', '5.4', 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)', [47], '5.3'],
+            ['ocicollmax', '5.4', 'OCI-Collection::max() / OCICollection::max() (PHP 8+)', [48], '5.3'],
+            ['ocicollsize', '5.4', 'OCI-Collection::size() / OCICollection::size() (PHP 8+)', [49], '5.3'],
+            ['ocicolltrim', '5.4', 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)', [50], '5.3'],
+            ['ocicolumnisnull', '5.4', 'oci_field_is_null()', [51], '5.3'],
+            ['ocicolumnname', '5.4', 'oci_field_name()', [52], '5.3'],
+            ['ocicolumnprecision', '5.4', 'oci_field_precision()', [53], '5.3'],
+            ['ocicolumnscale', '5.4', 'oci_field_scale()', [54], '5.3'],
+            ['ocicolumnsize', '5.4', 'oci_field_size()', [55], '5.3'],
+            ['ocicolumntype', '5.4', 'oci_field_type()', [56], '5.3'],
+            ['ocicolumntyperaw', '5.4', 'oci_field_type_raw()', [57], '5.3'],
+            ['ocicommit', '5.4', 'oci_commit()', [58], '5.3'],
+            ['ocidefinebyname', '5.4', 'oci_define_by_name()', [59], '5.3'],
+            ['ocierror', '5.4', 'oci_error()', [60], '5.3'],
+            ['ociexecute', '5.4', 'oci_execute()', [61], '5.3'],
+            ['ocifetch', '5.4', 'oci_fetch()', [62], '5.3'],
+            ['ocifetchstatement', '5.4', 'oci_fetch_all()', [64], '5.3'],
+            ['ocifreecollection', '5.4', 'OCI-Collection::free() / OCICollection::free() (PHP 8+)', [65], '5.3'],
+            ['ocifreecursor', '5.4', 'oci_free_statement()', [66], '5.3'],
+            ['ocifreedesc', '5.4', 'OCI-Lob::free() / OCILob::free() (PHP 8+)', [67], '5.3'],
+            ['ocifreestatement', '5.4', 'oci_free_statement()', [68], '5.3'],
+            ['ociloadlob', '5.4', 'OCI-Lob::load() / OCILob::load() (PHP 8+)', [70], '5.3'],
+            ['ocilogoff', '5.4', 'oci_close()', [71], '5.3'],
+            ['ocilogon', '5.4', 'oci_connect()', [72], '5.3'],
+            ['ocinewcollection', '5.4', 'oci_new_collection()', [73], '5.3'],
+            ['ocinewcursor', '5.4', 'oci_new_cursor()', [74], '5.3'],
+            ['ocinewdescriptor', '5.4', 'oci_new_descriptor()', [75], '5.3'],
+            ['ocinlogon', '5.4', 'oci_new_connect()', [76], '5.3'],
+            ['ocinumcols', '5.4', 'oci_num_fields()', [77], '5.3'],
+            ['ociparse', '5.4', 'oci_parse()', [78], '5.3'],
+            ['ociplogon', '5.4', 'oci_pconnect()', [79], '5.3'],
+            ['ociresult', '5.4', 'oci_result()', [80], '5.3'],
+            ['ocirollback', '5.4', 'oci_rollback()', [81], '5.3'],
+            ['ocirowcount', '5.4', 'oci_num_rows()', [82], '5.3'],
+            ['ocisavelob', '5.4', 'OCI-Lob::save() / OCILob::save() (PHP 8+)', [83], '5.3'],
+            ['ocisavelobfile', '5.4', 'OCI-Lob::import() / OCILob::import() (PHP 8+)', [84], '5.3'],
+            ['ociserverversion', '5.4', 'oci_server_version()', [85], '5.3'],
+            ['ocisetprefetch', '5.4', 'oci_set_prefetch()', [86], '5.3'],
+            ['ocistatementtype', '5.4', 'oci_statement_type()', [87], '5.3'],
+            ['ociwritelobtofile', '5.4', 'OCI-Lob::export() / OCILob::export() (PHP 8+)', [88], '5.3'],
+            ['ociwritetemporarylob', '5.4', 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)', [89], '5.3'],
+
+            ['__autoload', '7.2', 'SPL autoload', [589], '7.1'],
+            ['is_real', '7.4', 'is_float()', [239], '7.3'],
+
+            ['enchant_broker_free', '8.0', 'unset the object', [1174], '7.4'],
+            ['enchant_broker_free_dict', '8.0', 'unset the object', [1175], '7.4'],
+            ['enchant_dict_add_to_personal', '8.0', 'enchant_dict_add()', [1176], '7.4'],
+            ['enchant_dict_is_in_session', '8.0', 'enchant_dict_is_added()', [1177], '7.4'],
+            ['zip_close', '8.0', 'ZipArchive::close()', [1179], '7.4'],
+            ['zip_entry_close', '8.0', 'ZipArchive', [1180], '7.4'],
+            ['zip_entry_compressedsize', '8.0', 'ZipArchive', [1181], '7.4'],
+            ['zip_entry_compressionmethod', '8.0', 'ZipArchive', [1182], '7.4'],
+            ['zip_entry_filesize', '8.0', 'ZipArchive', [1183], '7.4'],
+            ['zip_entry_name', '8.0', 'ZipArchive', [1184], '7.4'],
+            ['zip_entry_open', '8.0', 'ZipArchive', [1185], '7.4'],
+            ['zip_entry_read', '8.0', 'ZipArchive', [1186], '7.4'],
+            ['zip_open', '8.0', 'ZipArchive::open()', [1187], '7.4'],
+            ['zip_read', '8.0', 'ZipArchive', [1188], '7.4'],
+            ['pg_clientencoding', '8.0', 'pg_client_encoding()', [1192], '7.4'],
+            ['pg_cmdtuples', '8.0', 'pg_affected_rows()', [1193], '7.4'],
+            ['pg_errormessage', '8.0', 'pg_last_error()', [1194], '7.4'],
+            ['pg_fieldname', '8.0', 'pg_field_name()', [1195], '7.4'],
+            ['pg_fieldnum', '8.0', 'pg_field_num()', [1196], '7.4'],
+            ['pg_fieldisnull', '8.0', 'pg_field_is_null()', [1197], '7.4'],
+            ['pg_fieldprtlen', '8.0', 'pg_field_prtlen()', [1198], '7.4'],
+            ['pg_fieldsize', '8.0', 'pg_field_size()', [1199], '7.4'],
+            ['pg_fieldtype', '8.0', 'pg_field_type()', [1200], '7.4'],
+            ['pg_freeresult', '8.0', 'pg_free_result()', [1201], '7.4'],
+            ['pg_getlastoid', '8.0', 'pg_last_oid()', [1202], '7.4'],
+            ['pg_loclose', '8.0', 'pg_lo_close()', [1203], '7.4'],
+            ['pg_locreate', '8.0', 'pg_lo_create()', [1204], '7.4'],
+            ['pg_loexport', '8.0', 'pg_lo_export()', [1205], '7.4'],
+            ['pg_loimport', '8.0', 'pg_lo_import()', [1206], '7.4'],
+            ['pg_loopen', '8.0', 'pg_lo_open()', [1207], '7.4'],
+            ['pg_loread', '8.0', 'pg_lo_read()', [1208], '7.4'],
+            ['pg_loreadall', '8.0', 'pg_lo_read_all()', [1209], '7.4'],
+            ['pg_lounlink', '8.0', 'pg_lo_unlink()', [1210], '7.4'],
+            ['pg_lowrite', '8.0', 'pg_lo_write()', [1211], '7.4'],
+            ['pg_numfields', '8.0', 'pg_num_fields()', [1212], '7.4'],
+            ['pg_numrows', '8.0', 'pg_num_rows()', [1213], '7.4'],
+            ['pg_result', '8.0', 'pg_fetch_result()', [1214], '7.4'],
+            ['pg_setclientencoding', '8.0', 'pg_set_client_encoding()', [1215], '7.4'],
+
+            ['date_sunrise', '8.1', 'date_sun_info()', [1219], '8.0'],
+            ['date_sunset', '8.1', 'date_sun_info()', [1220], '8.0'],
+            ['strptime', '8.1', 'date_parse_from_format() or IntlDateFormatter::parse()', [1221], '8.0'],
+            ['strftime', '8.1', 'date() or IntlDateFormatter::format()', [1222], '8.0'],
+            ['gmstrftime', '8.1', 'date() or IntlDateFormatter::format()', [1223], '8.0'],
+            ['mhash_count', '8.1', 'the hash_*() functions', [1224], '8.0'],
+            ['mhash_get_block_size', '8.1', 'the hash_*() functions', [1225], '8.0'],
+            ['mhash_get_hash_name', '8.1', 'the hash_*() functions', [1226], '8.0'],
+            ['mhash_keygen_s2k', '8.1', 'the hash_*() functions', [1227], '8.0'],
+            ['mhash', '8.1', 'the hash_*() functions', [1228], '8.0'],
+            ['utf8_encode', '8.2', 'iconv()', [1235], '8.0'],
+            ['utf8_decode', '8.2', 'iconv()', [1236], '8.0'],
+        ];
+    }
+
+
+    /**
+     * testRemovedFunction
+     *
+     * @dataProvider dataRemovedFunction
+     *
+     * @param string $functionName   Name of the function.
+     * @param string $removedIn      The PHP version in which the function was removed.
+     * @param array  $lines          The line numbers in the test file which apply to this function.
+     * @param string $okVersion      A PHP version in which the function was still valid.
+     * @param string $removedVersion Optional PHP version to test removed message with -
+     *                               if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testRemovedFunction($functionName, $removedIn, $lines, $okVersion, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is removed since PHP {$removedIn}";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedFunction()
+     *
+     * @return array
+     */
+    public function dataRemovedFunction()
+    {
+        return [
+            ['crack_check', '5.0', [592], '4.4'],
+            ['crack_closedict', '5.0', [593], '4.4'],
+            ['crack_getlastmessage', '5.0', [594], '4.4'],
+            ['crack_opendict', '5.0', [595], '4.4'],
+
+            ['pfpro_cleanup', '5.1', [221], '5.0'],
+            ['pfpro_init', '5.1', [222], '5.0'],
+            ['pfpro_process_raw', '5.1', [223], '5.0'],
+            ['pfpro_process', '5.1', [224], '5.0'],
+            ['pfpro_version', '5.1', [225], '5.0'],
+            ['m_checkstatus', '5.1', [417], '5.0'],
+            ['m_completeauthorizations', '5.1', [418], '5.0'],
+            ['m_connect', '5.1', [419], '5.0'],
+            ['m_connectionerror', '5.1', [420], '5.0'],
+            ['m_deletetrans', '5.1', [421], '5.0'],
+            ['m_destroyconn', '5.1', [422], '5.0'],
+            ['m_destroyengine', '5.1', [423], '5.0'],
+            ['m_getcell', '5.1', [424], '5.0'],
+            ['m_getcellbynum', '5.1', [425], '5.0'],
+            ['m_getcommadelimited', '5.1', [426], '5.0'],
+            ['m_getheader', '5.1', [427], '5.0'],
+            ['m_initconn', '5.1', [428], '5.0'],
+            ['m_initengine', '5.1', [429], '5.0'],
+            ['m_iscommadelimited', '5.1', [430], '5.0'],
+            ['m_maxconntimeout', '5.1', [431], '5.0'],
+            ['m_monitor', '5.1', [432], '5.0'],
+            ['m_numcolumns', '5.1', [433], '5.0'],
+            ['m_numrows', '5.1', [434], '5.0'],
+            ['m_parsecommadelimited', '5.1', [435], '5.0'],
+            ['m_responsekeys', '5.1', [436], '5.0'],
+            ['m_responseparam', '5.1', [437], '5.0'],
+            ['m_returnstatus', '5.1', [438], '5.0'],
+            ['m_setblocking', '5.1', [439], '5.0'],
+            ['m_setdropfile', '5.1', [440], '5.0'],
+            ['m_setip', '5.1', [441], '5.0'],
+            ['m_setssl_cafile', '5.1', [442], '5.0'],
+            ['m_setssl_files', '5.1', [443], '5.0'],
+            ['m_setssl', '5.1', [444], '5.0'],
+            ['m_settimeout', '5.1', [445], '5.0'],
+            ['m_sslcert_gen_hash', '5.1', [446], '5.0'],
+            ['m_transactionssent', '5.1', [447], '5.0'],
+            ['m_transinqueue', '5.1', [448], '5.0'],
+            ['m_transkeyval', '5.1', [449], '5.0'],
+            ['m_transnew', '5.1', [450], '5.0'],
+            ['m_transsend', '5.1', [451], '5.0'],
+            ['m_uwait', '5.1', [452], '5.0'],
+            ['m_validateidentifier', '5.1', [453], '5.0'],
+            ['m_verifyconnection', '5.1', [454], '5.0'],
+            ['m_verifysslcert', '5.1', [455], '5.0'],
+            ['dio_close', '5.1', [458], '5.0'],
+            ['dio_fcntl', '5.1', [459], '5.0'],
+            ['dio_open', '5.1', [460], '5.0'],
+            ['dio_read', '5.1', [461], '5.0'],
+            ['dio_seek', '5.1', [462], '5.0'],
+            ['dio_stat', '5.1', [463], '5.0'],
+            ['dio_tcsetattr', '5.1', [464], '5.0'],
+            ['dio_truncate', '5.1', [465], '5.0'],
+            ['dio_write', '5.1', [466], '5.0'],
+            ['fam_cancel_monitor', '5.1', [514], '5.0'],
+            ['fam_close', '5.1', [515], '5.0'],
+            ['fam_monitor_collection', '5.1', [516], '5.0'],
+            ['fam_monitor_directory', '5.1', [517], '5.0'],
+            ['fam_monitor_file', '5.1', [518], '5.0'],
+            ['fam_next_event', '5.1', [519], '5.0'],
+            ['fam_open', '5.1', [520], '5.0'],
+            ['fam_pending', '5.1', [521], '5.0'],
+            ['fam_resume_monitor', '5.1', [522], '5.0'],
+            ['fam_suspend_monitor', '5.1', [523], '5.0'],
+            ['yp_all', '5.1', [532], '5.0'],
+            ['yp_cat', '5.1', [533], '5.0'],
+            ['yp_err_string', '5.1', [534], '5.0'],
+            ['yp_errno', '5.1', [535], '5.0'],
+            ['yp_first', '5.1', [536], '5.0'],
+            ['yp_get_default_domain', '5.1', [537], '5.0'],
+            ['yp_master', '5.1', [538], '5.0'],
+            ['yp_match', '5.1', [539], '5.0'],
+            ['yp_next', '5.1', [540], '5.0'],
+            ['yp_order', '5.1', [541], '5.0'],
+            ['udm_add_search_limit', '5.1', [544], '5.0'],
+            ['udm_alloc_agent_array', '5.1', [545], '5.0'],
+            ['udm_alloc_agent', '5.1', [546], '5.0'],
+            ['udm_api_version', '5.1', [547], '5.0'],
+            ['udm_cat_list', '5.1', [548], '5.0'],
+            ['udm_cat_path', '5.1', [549], '5.0'],
+            ['udm_check_charset', '5.1', [550], '5.0'],
+            ['udm_clear_search_limits', '5.1', [551], '5.0'],
+            ['udm_crc32', '5.1', [552], '5.0'],
+            ['udm_errno', '5.1', [553], '5.0'],
+            ['udm_error', '5.1', [554], '5.0'],
+            ['udm_find', '5.1', [555], '5.0'],
+            ['udm_free_agent', '5.1', [556], '5.0'],
+            ['udm_free_ispell_data', '5.1', [557], '5.0'],
+            ['udm_free_res', '5.1', [558], '5.0'],
+            ['udm_get_doc_count', '5.1', [559], '5.0'],
+            ['udm_get_res_field', '5.1', [560], '5.0'],
+            ['udm_get_res_param', '5.1', [561], '5.0'],
+            ['udm_hash32', '5.1', [562], '5.0'],
+            ['udm_load_ispell_data', '5.1', [563], '5.0'],
+            ['udm_set_agent_param', '5.1', [564], '5.0'],
+            ['w32api_deftype', '5.1', [598], '5.0'],
+            ['w32api_init_dtype', '5.1', [599], '5.0'],
+            ['w32api_invoke_function', '5.1', [600], '5.0'],
+            ['w32api_register_function', '5.1', [601], '5.0'],
+            ['w32api_set_call_method', '5.1', [602], '5.0'],
+            ['cpdf_add_annotation', '5.1', [605], '5.0'],
+            ['cpdf_add_outline', '5.1', [606], '5.0'],
+            ['cpdf_arc', '5.1', [607], '5.0'],
+            ['cpdf_begin_text', '5.1', [608], '5.0'],
+            ['cpdf_circle', '5.1', [609], '5.0'],
+            ['cpdf_clip', '5.1', [610], '5.0'],
+            ['cpdf_close', '5.1', [611], '5.0'],
+            ['cpdf_closepath_fill_stroke', '5.1', [612], '5.0'],
+            ['cpdf_closepath_stroke', '5.1', [613], '5.0'],
+            ['cpdf_closepath', '5.1', [614], '5.0'],
+            ['cpdf_continue_text', '5.1', [615], '5.0'],
+            ['cpdf_curveto', '5.1', [616], '5.0'],
+            ['cpdf_end_text', '5.1', [617], '5.0'],
+            ['cpdf_fill_stroke', '5.1', [618], '5.0'],
+            ['cpdf_fill', '5.1', [619], '5.0'],
+            ['cpdf_finalize_page', '5.1', [620], '5.0'],
+            ['cpdf_finalize', '5.1', [621], '5.0'],
+            ['cpdf_global_set_document_limits', '5.1', [622], '5.0'],
+            ['cpdf_import_jpeg', '5.1', [623], '5.0'],
+            ['cpdf_lineto', '5.1', [624], '5.0'],
+            ['cpdf_moveto', '5.1', [625], '5.0'],
+            ['cpdf_newpath', '5.1', [626], '5.0'],
+            ['cpdf_open', '5.1', [627], '5.0'],
+            ['cpdf_output_buffer', '5.1', [628], '5.0'],
+            ['cpdf_page_init', '5.1', [629], '5.0'],
+            ['cpdf_place_inline_image', '5.1', [630], '5.0'],
+            ['cpdf_rect', '5.1', [631], '5.0'],
+            ['cpdf_restore', '5.1', [632], '5.0'],
+            ['cpdf_rlineto', '5.1', [633], '5.0'],
+            ['cpdf_rmoveto', '5.1', [634], '5.0'],
+            ['cpdf_rotate_text', '5.1', [635], '5.0'],
+            ['cpdf_rotate', '5.1', [636], '5.0'],
+            ['cpdf_save_to_file', '5.1', [637], '5.0'],
+            ['cpdf_save', '5.1', [638], '5.0'],
+            ['cpdf_scale', '5.1', [639], '5.0'],
+            ['cpdf_set_action_url', '5.1', [640], '5.0'],
+            ['cpdf_set_char_spacing', '5.1', [641], '5.0'],
+            ['cpdf_set_creator', '5.1', [642], '5.0'],
+            ['cpdf_set_current_page', '5.1', [643], '5.0'],
+            ['cpdf_set_font_directories', '5.1', [644], '5.0'],
+            ['cpdf_set_font_map_file', '5.1', [645], '5.0'],
+            ['cpdf_set_font', '5.1', [646], '5.0'],
+            ['cpdf_set_horiz_scaling', '5.1', [647], '5.0'],
+            ['cpdf_set_keywords', '5.1', [648], '5.0'],
+            ['cpdf_set_leading', '5.1', [649], '5.0'],
+            ['cpdf_set_page_animation', '5.1', [650], '5.0'],
+            ['cpdf_set_subject', '5.1', [651], '5.0'],
+            ['cpdf_set_text_matrix', '5.1', [652], '5.0'],
+            ['cpdf_set_text_pos', '5.1', [653], '5.0'],
+            ['cpdf_set_text_rendering', '5.1', [654], '5.0'],
+            ['cpdf_set_text_rise', '5.1', [655], '5.0'],
+            ['cpdf_set_title', '5.1', [656], '5.0'],
+            ['cpdf_set_viewer_preferences', '5.1', [657], '5.0'],
+            ['cpdf_set_word_spacing', '5.1', [658], '5.0'],
+            ['cpdf_setdash', '5.1', [659], '5.0'],
+            ['cpdf_setflat', '5.1', [660], '5.0'],
+            ['cpdf_setgray_fill', '5.1', [661], '5.0'],
+            ['cpdf_setgray_stroke', '5.1', [662], '5.0'],
+            ['cpdf_setgray', '5.1', [663], '5.0'],
+            ['cpdf_setlinecap', '5.1', [664], '5.0'],
+            ['cpdf_setlinejoin', '5.1', [665], '5.0'],
+            ['cpdf_setlinewidth', '5.1', [666], '5.0'],
+            ['cpdf_setmiterlimit', '5.1', [667], '5.0'],
+            ['cpdf_setrgbcolor_fill', '5.1', [668], '5.0'],
+            ['cpdf_setrgbcolor_stroke', '5.1', [669], '5.0'],
+            ['cpdf_setrgbcolor', '5.1', [670], '5.0'],
+            ['cpdf_show_xy', '5.1', [671], '5.0'],
+            ['cpdf_show', '5.1', [672], '5.0'],
+            ['cpdf_stringwidth', '5.1', [673], '5.0'],
+            ['cpdf_stroke', '5.1', [674], '5.0'],
+            ['cpdf_text', '5.1', [675], '5.0'],
+            ['cpdf_translate', '5.1', [676], '5.0'],
+            ['ircg_channel_mode', '5.1', [677], '5.0'],
+            ['ircg_disconnect', '5.1', [678], '5.0'],
+            ['ircg_eval_ecmascript_params', '5.1', [679], '5.0'],
+            ['ircg_fetch_error_msg', '5.1', [680], '5.0'],
+            ['ircg_get_username', '5.1', [681], '5.0'],
+            ['ircg_html_encode', '5.1', [682], '5.0'],
+            ['ircg_ignore_add', '5.1', [683], '5.0'],
+            ['ircg_ignore_del', '5.1', [684], '5.0'],
+            ['ircg_invite', '5.1', [685], '5.0'],
+            ['ircg_is_conn_alive', '5.1', [686], '5.0'],
+            ['ircg_join', '5.1', [687], '5.0'],
+            ['ircg_kick', '5.1', [688], '5.0'],
+            ['ircg_list', '5.1', [689], '5.0'],
+            ['ircg_lookup_format_messages', '5.1', [690], '5.0'],
+            ['ircg_lusers', '5.1', [691], '5.0'],
+            ['ircg_msg', '5.1', [692], '5.0'],
+            ['ircg_names', '5.1', [693], '5.0'],
+            ['ircg_nick', '5.1', [694], '5.0'],
+            ['ircg_nickname_escape', '5.1', [695], '5.0'],
+            ['ircg_nickname_unescape', '5.1', [696], '5.0'],
+            ['ircg_notice', '5.1', [697], '5.0'],
+            ['ircg_oper', '5.1', [698], '5.0'],
+            ['ircg_part', '5.1', [699], '5.0'],
+            ['ircg_pconnect', '5.1', [700], '5.0'],
+            ['ircg_register_format_messages', '5.1', [701], '5.0'],
+            ['ircg_set_current', '5.1', [702], '5.0'],
+            ['ircg_set_file', '5.1', [703], '5.0'],
+            ['ircg_set_on_die', '5.1', [704], '5.0'],
+            ['ircg_topic', '5.1', [705], '5.0'],
+            ['ircg_who', '5.1', [706], '5.0'],
+            ['ircg_whois', '5.1', [707], '5.0'],
+            ['dbx_close', '5.1', [720], '5.0'],
+            ['dbx_compare', '5.1', [721], '5.0'],
+            ['dbx_connect', '5.1', [722], '5.0'],
+            ['dbx_error', '5.1', [723], '5.0'],
+            ['dbx_escape_string', '5.1', [724], '5.0'],
+            ['dbx_fetch_row', '5.1', [725], '5.0'],
+            ['dbx_query', '5.1', [726], '5.0'],
+            ['dbx_sort', '5.1', [727], '5.0'],
+            ['ingres_autocommit', '5.1', [795], '5.0'],
+            ['ingres_close', '5.1', [796], '5.0'],
+            ['ingres_commit', '5.1', [797], '5.0'],
+            ['ingres_connect', '5.1', [798], '5.0'],
+            ['ingres_fetch_array', '5.1', [799], '5.0'],
+            ['ingres_fetch_object', '5.1', [800], '5.0'],
+            ['ingres_fetch_row', '5.1', [801], '5.0'],
+            ['ingres_field_length', '5.1', [802], '5.0'],
+            ['ingres_field_name', '5.1', [803], '5.0'],
+            ['ingres_field_nullable', '5.1', [804], '5.0'],
+            ['ingres_field_precision', '5.1', [805], '5.0'],
+            ['ingres_field_scale', '5.1', [806], '5.0'],
+            ['ingres_field_type', '5.1', [807], '5.0'],
+            ['ingres_num_fields', '5.1', [808], '5.0'],
+            ['ingres_num_rows', '5.1', [809], '5.0'],
+            ['ingres_pconnect', '5.1', [810], '5.0'],
+            ['ingres_query', '5.1', [811], '5.0'],
+            ['ingres_rollback', '5.1', [812], '5.0'],
+            ['ovrimos_close', '5.1', [1036], '5.0'],
+            ['ovrimos_commit', '5.1', [1037], '5.0'],
+            ['ovrimos_connect', '5.1', [1038], '5.0'],
+            ['ovrimos_cursor', '5.1', [1039], '5.0'],
+            ['ovrimos_exec', '5.1', [1040], '5.0'],
+            ['ovrimos_execute', '5.1', [1041], '5.0'],
+            ['ovrimos_fetch_into', '5.1', [1042], '5.0'],
+            ['ovrimos_fetch_row', '5.1', [1043], '5.0'],
+            ['ovrimos_field_len', '5.1', [1044], '5.0'],
+            ['ovrimos_field_name', '5.1', [1045], '5.0'],
+            ['ovrimos_field_num', '5.1', [1046], '5.0'],
+            ['ovrimos_field_type', '5.1', [1047], '5.0'],
+            ['ovrimos_free_result', '5.1', [1048], '5.0'],
+            ['ovrimos_longreadlen', '5.1', [1049], '5.0'],
+            ['ovrimos_num_fields', '5.1', [1050], '5.0'],
+            ['ovrimos_num_rows', '5.1', [1051], '5.0'],
+            ['ovrimos_prepare', '5.1', [1052], '5.0'],
+            ['ovrimos_result_all', '5.1', [1053], '5.0'],
+            ['ovrimos_result', '5.1', [1054], '5.0'],
+            ['ovrimos_rollback', '5.1', [1055], '5.0'],
+            ['ovrimos_close_all', '5.1', [1056], '5.0'],
+            ['ora_bind', '5.1', [1058], '5.0'],
+            ['ora_close', '5.1', [1059], '5.0'],
+            ['ora_columnname', '5.1', [1060], '5.0'],
+            ['ora_columnsize', '5.1', [1061], '5.0'],
+            ['ora_columntype', '5.1', [1062], '5.0'],
+            ['ora_commit', '5.1', [1063], '5.0'],
+            ['ora_commitoff', '5.1', [1064], '5.0'],
+            ['ora_commiton', '5.1', [1065], '5.0'],
+            ['ora_do', '5.1', [1066], '5.0'],
+            ['ora_error', '5.1', [1067], '5.0'],
+            ['ora_errorcode', '5.1', [1068], '5.0'],
+            ['ora_exec', '5.1', [1069], '5.0'],
+            ['ora_fetch_into', '5.1', [1070], '5.0'],
+            ['ora_fetch', '5.1', [1071], '5.0'],
+            ['ora_getcolumn', '5.1', [1072], '5.0'],
+            ['ora_logoff', '5.1', [1073], '5.0'],
+            ['ora_logon', '5.1', [1074], '5.0'],
+            ['ora_numcols', '5.1', [1075], '5.0'],
+            ['ora_numrows', '5.1', [1076], '5.0'],
+            ['ora_open', '5.1', [1077], '5.0'],
+            ['ora_parse', '5.1', [1078], '5.0'],
+            ['ora_plogon', '5.1', [1079], '5.0'],
+            ['ora_rollback', '5.1', [1080], '5.0'],
+            ['mysqli_embedded_connect', '5.1', [1146], '5.0'],
+            ['mysqli_server_end', '5.1', [1155], '5.0'],
+            ['mysqli_server_init', '5.1', [1156], '5.0'],
+
+            ['msession_connect', '5.1.3', [567], '5.1', '5.2'],
+            ['msession_count', '5.1.3', [568], '5.1', '5.2'],
+            ['msession_create', '5.1.3', [569], '5.1', '5.2'],
+            ['msession_destroy', '5.1.3', [570], '5.1', '5.2'],
+            ['msession_disconnect', '5.1.3', [571], '5.1', '5.2'],
+            ['msession_find', '5.1.3', [572], '5.1', '5.2'],
+            ['msession_get_array', '5.1.3', [573], '5.1', '5.2'],
+            ['msession_get_data', '5.1.3', [574], '5.1', '5.2'],
+            ['msession_get', '5.1.3', [575], '5.1', '5.2'],
+            ['msession_inc', '5.1.3', [576], '5.1', '5.2'],
+            ['msession_list', '5.1.3', [577], '5.1', '5.2'],
+            ['msession_listvar', '5.1.3', [578], '5.1', '5.2'],
+            ['msession_lock', '5.1.3', [579], '5.1', '5.2'],
+            ['msession_plugin', '5.1.3', [580], '5.1', '5.2'],
+            ['msession_randstr', '5.1.3', [581], '5.1', '5.2'],
+            ['msession_set_array', '5.1.3', [582], '5.1', '5.2'],
+            ['msession_set_data', '5.1.3', [583], '5.1', '5.2'],
+            ['msession_set', '5.1.3', [584], '5.1', '5.2'],
+            ['msession_timeout', '5.1.3', [585], '5.1', '5.2'],
+            ['msession_uniq', '5.1.3', [586], '5.1', '5.2'],
+            ['msession_unlock', '5.1.3', [587], '5.1', '5.2'],
+
+            ['mysqli_resource', '5.1.4', [1152], '5.1', '5.2'],
+
+            ['mysql_createdb', '5.1.7', [975], '5.1', '5.2'],
+            ['mysql_dropdb', '5.1.7', [976], '5.1', '5.2'],
+            ['mysql_listtables', '5.1.7', [981], '5.1', '5.2'],
+
+            ['hwapi_attribute_new', '5.2', [526], '5.1'],
+            ['hwapi_content_new', '5.2', [527], '5.1'],
+            ['hwapi_hgcsp', '5.2', [528], '5.1'],
+            ['hwapi_object_new', '5.2', [529], '5.1'],
+            ['filepro_fieldcount', '5.2', [788], '5.1'],
+            ['filepro_fieldname', '5.2', [789], '5.1'],
+            ['filepro_fieldtype', '5.2', [790], '5.1'],
+            ['filepro_fieldwidth', '5.2', [791], '5.1'],
+            ['filepro_retrieve', '5.2', [792], '5.1'],
+            ['filepro_rowcount', '5.2', [793], '5.1'],
+            ['filepro', '5.2', [794], '5.1'],
+
+            ['ifx_affected_rows', '5.2.1', [1106], '5.2', '5.3'],
+            ['ifx_blobinfile_mode', '5.2.1', [1107], '5.2', '5.3'],
+            ['ifx_byteasvarchar', '5.2.1', [1108], '5.2', '5.3'],
+            ['ifx_close', '5.2.1', [1109], '5.2', '5.3'],
+            ['ifx_connect', '5.2.1', [1110], '5.2', '5.3'],
+            ['ifx_copy_blob', '5.2.1', [1111], '5.2', '5.3'],
+            ['ifx_create_blob', '5.2.1', [1112], '5.2', '5.3'],
+            ['ifx_create_char', '5.2.1', [1113], '5.2', '5.3'],
+            ['ifx_do', '5.2.1', [1114], '5.2', '5.3'],
+            ['ifx_error', '5.2.1', [1115], '5.2', '5.3'],
+            ['ifx_errormsg', '5.2.1', [1116], '5.2', '5.3'],
+            ['ifx_fetch_row', '5.2.1', [1117], '5.2', '5.3'],
+            ['ifx_fieldproperties', '5.2.1', [1118], '5.2', '5.3'],
+            ['ifx_fieldtypes', '5.2.1', [1119], '5.2', '5.3'],
+            ['ifx_free_blob', '5.2.1', [1120], '5.2', '5.3'],
+            ['ifx_free_char', '5.2.1', [1121], '5.2', '5.3'],
+            ['ifx_free_result', '5.2.1', [1122], '5.2', '5.3'],
+            ['ifx_get_blob', '5.2.1', [1123], '5.2', '5.3'],
+            ['ifx_get_char', '5.2.1', [1124], '5.2', '5.3'],
+            ['ifx_getsqlca', '5.2.1', [1125], '5.2', '5.3'],
+            ['ifx_htmltbl_result', '5.2.1', [1126], '5.2', '5.3'],
+            ['ifx_nullformat', '5.2.1', [1127], '5.2', '5.3'],
+            ['ifx_num_fields', '5.2.1', [1128], '5.2', '5.3'],
+            ['ifx_num_rows', '5.2.1', [1129], '5.2', '5.3'],
+            ['ifx_pconnect', '5.2.1', [1130], '5.2', '5.3'],
+            ['ifx_prepare', '5.2.1', [1131], '5.2', '5.3'],
+            ['ifx_query', '5.2.1', [1132], '5.2', '5.3'],
+            ['ifx_textasvarchar', '5.2.1', [1133], '5.2', '5.3'],
+            ['ifx_update_blob', '5.2.1', [1134], '5.2', '5.3'],
+            ['ifx_update_char', '5.2.1', [1135], '5.2', '5.3'],
+            ['ifxus_close_slob', '5.2.1', [1136], '5.2', '5.3'],
+            ['ifxus_create_slob', '5.2.1', [1137], '5.2', '5.3'],
+            ['ifxus_free_slob', '5.2.1', [1138], '5.2', '5.3'],
+            ['ifxus_open_slob', '5.2.1', [1139], '5.2', '5.3'],
+            ['ifxus_read_slob', '5.2.1', [1140], '5.2', '5.3'],
+            ['ifxus_seek_slob', '5.2.1', [1141], '5.2', '5.3'],
+            ['ifxus_tell_slob', '5.2.1', [1142], '5.2', '5.3'],
+            ['ifxus_write_slob', '5.2.1', [1143], '5.2', '5.3'],
+
+            ['ncurses_addch', '5.3', [255], '5.2'],
+            ['ncurses_addchnstr', '5.3', [256], '5.2'],
+            ['ncurses_addchstr', '5.3', [257], '5.2'],
+            ['ncurses_addnstr', '5.3', [258], '5.2'],
+            ['ncurses_addstr', '5.3', [259], '5.2'],
+            ['ncurses_assume_default_colors', '5.3', [260], '5.2'],
+            ['ncurses_attroff', '5.3', [261], '5.2'],
+            ['ncurses_attron', '5.3', [262], '5.2'],
+            ['ncurses_attrset', '5.3', [263], '5.2'],
+            ['ncurses_baudrate', '5.3', [264], '5.2'],
+            ['ncurses_beep', '5.3', [265], '5.2'],
+            ['ncurses_bkgd', '5.3', [266], '5.2'],
+            ['ncurses_bkgdset', '5.3', [267], '5.2'],
+            ['ncurses_border', '5.3', [268], '5.2'],
+            ['ncurses_bottom_panel', '5.3', [269], '5.2'],
+            ['ncurses_can_change_color', '5.3', [270], '5.2'],
+            ['ncurses_cbreak', '5.3', [271], '5.2'],
+            ['ncurses_clear', '5.3', [272], '5.2'],
+            ['ncurses_clrtobot', '5.3', [273], '5.2'],
+            ['ncurses_clrtoeol', '5.3', [274], '5.2'],
+            ['ncurses_color_content', '5.3', [275], '5.2'],
+            ['ncurses_color_set', '5.3', [276], '5.2'],
+            ['ncurses_curs_set', '5.3', [277], '5.2'],
+            ['ncurses_def_prog_mode', '5.3', [278], '5.2'],
+            ['ncurses_def_shell_mode', '5.3', [279], '5.2'],
+            ['ncurses_define_key', '5.3', [280], '5.2'],
+            ['ncurses_del_panel', '5.3', [281], '5.2'],
+            ['ncurses_delay_output', '5.3', [282], '5.2'],
+            ['ncurses_delch', '5.3', [283], '5.2'],
+            ['ncurses_deleteln', '5.3', [284], '5.2'],
+            ['ncurses_delwin', '5.3', [285], '5.2'],
+            ['ncurses_doupdate', '5.3', [286], '5.2'],
+            ['ncurses_echo', '5.3', [287], '5.2'],
+            ['ncurses_echochar', '5.3', [288], '5.2'],
+            ['ncurses_end', '5.3', [289], '5.2'],
+            ['ncurses_erase', '5.3', [290], '5.2'],
+            ['ncurses_erasechar', '5.3', [291], '5.2'],
+            ['ncurses_filter', '5.3', [292], '5.2'],
+            ['ncurses_flash', '5.3', [293], '5.2'],
+            ['ncurses_flushinp', '5.3', [294], '5.2'],
+            ['ncurses_getch', '5.3', [295], '5.2'],
+            ['ncurses_getmaxyx', '5.3', [296], '5.2'],
+            ['ncurses_getmouse', '5.3', [297], '5.2'],
+            ['ncurses_getyx', '5.3', [298], '5.2'],
+            ['ncurses_halfdelay', '5.3', [299], '5.2'],
+            ['ncurses_has_colors', '5.3', [300], '5.2'],
+            ['ncurses_has_ic', '5.3', [301], '5.2'],
+            ['ncurses_has_il', '5.3', [302], '5.2'],
+            ['ncurses_has_key', '5.3', [303], '5.2'],
+            ['ncurses_hide_panel', '5.3', [304], '5.2'],
+            ['ncurses_hline', '5.3', [305], '5.2'],
+            ['ncurses_inch', '5.3', [306], '5.2'],
+            ['ncurses_init_color', '5.3', [307], '5.2'],
+            ['ncurses_init_pair', '5.3', [308], '5.2'],
+            ['ncurses_init', '5.3', [309], '5.2'],
+            ['ncurses_insch', '5.3', [310], '5.2'],
+            ['ncurses_insdelln', '5.3', [311], '5.2'],
+            ['ncurses_insertln', '5.3', [312], '5.2'],
+            ['ncurses_insstr', '5.3', [313], '5.2'],
+            ['ncurses_instr', '5.3', [314], '5.2'],
+            ['ncurses_isendwin', '5.3', [315], '5.2'],
+            ['ncurses_keyok', '5.3', [316], '5.2'],
+            ['ncurses_keypad', '5.3', [317], '5.2'],
+            ['ncurses_killchar', '5.3', [318], '5.2'],
+            ['ncurses_longname', '5.3', [319], '5.2'],
+            ['ncurses_meta', '5.3', [320], '5.2'],
+            ['ncurses_mouse_trafo', '5.3', [321], '5.2'],
+            ['ncurses_mouseinterval', '5.3', [322], '5.2'],
+            ['ncurses_mousemask', '5.3', [323], '5.2'],
+            ['ncurses_move_panel', '5.3', [324], '5.2'],
+            ['ncurses_move', '5.3', [325], '5.2'],
+            ['ncurses_mvaddch', '5.3', [326], '5.2'],
+            ['ncurses_mvaddchnstr', '5.3', [327], '5.2'],
+            ['ncurses_mvaddchstr', '5.3', [328], '5.2'],
+            ['ncurses_mvaddnstr', '5.3', [329], '5.2'],
+            ['ncurses_mvaddstr', '5.3', [330], '5.2'],
+            ['ncurses_mvcur', '5.3', [331], '5.2'],
+            ['ncurses_mvdelch', '5.3', [332], '5.2'],
+            ['ncurses_mvgetch', '5.3', [333], '5.2'],
+            ['ncurses_mvhline', '5.3', [334], '5.2'],
+            ['ncurses_mvinch', '5.3', [335], '5.2'],
+            ['ncurses_mvvline', '5.3', [336], '5.2'],
+            ['ncurses_mvwaddstr', '5.3', [337], '5.2'],
+            ['ncurses_napms', '5.3', [338], '5.2'],
+            ['ncurses_new_panel', '5.3', [339], '5.2'],
+            ['ncurses_newpad', '5.3', [340], '5.2'],
+            ['ncurses_newwin', '5.3', [341], '5.2'],
+            ['ncurses_nl', '5.3', [342], '5.2'],
+            ['ncurses_nocbreak', '5.3', [343], '5.2'],
+            ['ncurses_noecho', '5.3', [344], '5.2'],
+            ['ncurses_nonl', '5.3', [345], '5.2'],
+            ['ncurses_noqiflush', '5.3', [346], '5.2'],
+            ['ncurses_noraw', '5.3', [347], '5.2'],
+            ['ncurses_pair_content', '5.3', [348], '5.2'],
+            ['ncurses_panel_above', '5.3', [349], '5.2'],
+            ['ncurses_panel_below', '5.3', [350], '5.2'],
+            ['ncurses_panel_window', '5.3', [351], '5.2'],
+            ['ncurses_pnoutrefresh', '5.3', [352], '5.2'],
+            ['ncurses_prefresh', '5.3', [353], '5.2'],
+            ['ncurses_putp', '5.3', [354], '5.2'],
+            ['ncurses_qiflush', '5.3', [355], '5.2'],
+            ['ncurses_raw', '5.3', [356], '5.2'],
+            ['ncurses_refresh', '5.3', [357], '5.2'],
+            ['ncurses_replace_panel', '5.3', [358], '5.2'],
+            ['ncurses_reset_prog_mode', '5.3', [359], '5.2'],
+            ['ncurses_reset_shell_mode', '5.3', [360], '5.2'],
+            ['ncurses_resetty', '5.3', [361], '5.2'],
+            ['ncurses_savetty', '5.3', [362], '5.2'],
+            ['ncurses_scr_dump', '5.3', [363], '5.2'],
+            ['ncurses_scr_init', '5.3', [364], '5.2'],
+            ['ncurses_scr_restore', '5.3', [365], '5.2'],
+            ['ncurses_scr_set', '5.3', [366], '5.2'],
+            ['ncurses_scrl', '5.3', [367], '5.2'],
+            ['ncurses_show_panel', '5.3', [368], '5.2'],
+            ['ncurses_slk_attr', '5.3', [369], '5.2'],
+            ['ncurses_slk_attroff', '5.3', [370], '5.2'],
+            ['ncurses_slk_attron', '5.3', [371], '5.2'],
+            ['ncurses_slk_attrset', '5.3', [372], '5.2'],
+            ['ncurses_slk_clear', '5.3', [373], '5.2'],
+            ['ncurses_slk_color', '5.3', [374], '5.2'],
+            ['ncurses_slk_init', '5.3', [375], '5.2'],
+            ['ncurses_slk_noutrefresh', '5.3', [376], '5.2'],
+            ['ncurses_slk_refresh', '5.3', [377], '5.2'],
+            ['ncurses_slk_restore', '5.3', [378], '5.2'],
+            ['ncurses_slk_set', '5.3', [379], '5.2'],
+            ['ncurses_slk_touch', '5.3', [380], '5.2'],
+            ['ncurses_standend', '5.3', [381], '5.2'],
+            ['ncurses_standout', '5.3', [382], '5.2'],
+            ['ncurses_start_color', '5.3', [383], '5.2'],
+            ['ncurses_termattrs', '5.3', [384], '5.2'],
+            ['ncurses_termname', '5.3', [385], '5.2'],
+            ['ncurses_timeout', '5.3', [386], '5.2'],
+            ['ncurses_top_panel', '5.3', [387], '5.2'],
+            ['ncurses_typeahead', '5.3', [388], '5.2'],
+            ['ncurses_ungetch', '5.3', [389], '5.2'],
+            ['ncurses_ungetmouse', '5.3', [390], '5.2'],
+            ['ncurses_update_panels', '5.3', [391], '5.2'],
+            ['ncurses_use_default_colors', '5.3', [392], '5.2'],
+            ['ncurses_use_env', '5.3', [393], '5.2'],
+            ['ncurses_use_extended_names', '5.3', [394], '5.2'],
+            ['ncurses_vidattr', '5.3', [395], '5.2'],
+            ['ncurses_vline', '5.3', [396], '5.2'],
+            ['ncurses_waddch', '5.3', [397], '5.2'],
+            ['ncurses_waddstr', '5.3', [398], '5.2'],
+            ['ncurses_wattroff', '5.3', [399], '5.2'],
+            ['ncurses_wattron', '5.3', [400], '5.2'],
+            ['ncurses_wattrset', '5.3', [401], '5.2'],
+            ['ncurses_wborder', '5.3', [402], '5.2'],
+            ['ncurses_wclear', '5.3', [403], '5.2'],
+            ['ncurses_wcolor_set', '5.3', [404], '5.2'],
+            ['ncurses_werase', '5.3', [405], '5.2'],
+            ['ncurses_wgetch', '5.3', [406], '5.2'],
+            ['ncurses_whline', '5.3', [407], '5.2'],
+            ['ncurses_wmouse_trafo', '5.3', [408], '5.2'],
+            ['ncurses_wmove', '5.3', [409], '5.2'],
+            ['ncurses_wnoutrefresh', '5.3', [410], '5.2'],
+            ['ncurses_wrefresh', '5.3', [411], '5.2'],
+            ['ncurses_wstandend', '5.3', [412], '5.2'],
+            ['ncurses_wstandout', '5.3', [413], '5.2'],
+            ['ncurses_wvline', '5.3', [414], '5.2'],
+            ['fdf_add_doc_javascript', '5.3', [469], '5.2'],
+            ['fdf_add_template', '5.3', [470], '5.2'],
+            ['fdf_close', '5.3', [471], '5.2'],
+            ['fdf_create', '5.3', [472], '5.2'],
+            ['fdf_enum_values', '5.3', [473], '5.2'],
+            ['fdf_errno', '5.3', [474], '5.2'],
+            ['fdf_error', '5.3', [475], '5.2'],
+            ['fdf_get_ap', '5.3', [476], '5.2'],
+            ['fdf_get_attachment', '5.3', [477], '5.2'],
+            ['fdf_get_encoding', '5.3', [478], '5.2'],
+            ['fdf_get_file', '5.3', [479], '5.2'],
+            ['fdf_get_flags', '5.3', [480], '5.2'],
+            ['fdf_get_opt', '5.3', [481], '5.2'],
+            ['fdf_get_status', '5.3', [482], '5.2'],
+            ['fdf_get_value', '5.3', [483], '5.2'],
+            ['fdf_get_version', '5.3', [484], '5.2'],
+            ['fdf_header', '5.3', [485], '5.2'],
+            ['fdf_next_field_name', '5.3', [486], '5.2'],
+            ['fdf_open_string', '5.3', [487], '5.2'],
+            ['fdf_open', '5.3', [488], '5.2'],
+            ['fdf_remove_item', '5.3', [489], '5.2'],
+            ['fdf_save_string', '5.3', [490], '5.2'],
+            ['fdf_save', '5.3', [491], '5.2'],
+            ['fdf_set_ap', '5.3', [492], '5.2'],
+            ['fdf_set_encoding', '5.3', [493], '5.2'],
+            ['fdf_set_file', '5.3', [494], '5.2'],
+            ['fdf_set_flags', '5.3', [495], '5.2'],
+            ['fdf_set_javascript_action', '5.3', [496], '5.2'],
+            ['fdf_set_on_import_javascript', '5.3', [497], '5.2'],
+            ['fdf_set_opt', '5.3', [498], '5.2'],
+            ['fdf_set_status', '5.3', [499], '5.2'],
+            ['fdf_set_submit_form_action', '5.3', [500], '5.2'],
+            ['fdf_set_target_frame', '5.3', [501], '5.2'],
+            ['fdf_set_value', '5.3', [502], '5.2'],
+            ['fdf_set_version', '5.3', [503], '5.2'],
+            ['ming_keypress', '5.3', [506], '5.2'],
+            ['ming_setcubicthreshold', '5.3', [507], '5.2'],
+            ['ming_setscale', '5.3', [508], '5.2'],
+            ['ming_setswfcompression', '5.3', [509], '5.2'],
+            ['ming_useconstants', '5.3', [510], '5.2'],
+            ['ming_useswfversion', '5.3', [511], '5.2'],
+            ['dbase_add_record', '5.3', [708], '5.2'],
+            ['dbase_close', '5.3', [709], '5.2'],
+            ['dbase_create', '5.3', [710], '5.2'],
+            ['dbase_delete_record', '5.3', [711], '5.2'],
+            ['dbase_get_header_info', '5.3', [712], '5.2'],
+            ['dbase_get_record_with_names', '5.3', [713], '5.2'],
+            ['dbase_get_record', '5.3', [714], '5.2'],
+            ['dbase_numfields', '5.3', [715], '5.2'],
+            ['dbase_numrecords', '5.3', [716], '5.2'],
+            ['dbase_open', '5.3', [717], '5.2'],
+            ['dbase_pack', '5.3', [718], '5.2'],
+            ['dbase_replace_record', '5.3', [719], '5.2'],
+            ['fbsql_affected_rows', '5.3', [728], '5.2'],
+            ['fbsql_autocommit', '5.3', [729], '5.2'],
+            ['fbsql_blob_size', '5.3', [730], '5.2'],
+            ['fbsql_change_user', '5.3', [731], '5.2'],
+            ['fbsql_clob_size', '5.3', [732], '5.2'],
+            ['fbsql_close', '5.3', [733], '5.2'],
+            ['fbsql_commit', '5.3', [734], '5.2'],
+            ['fbsql_connect', '5.3', [735], '5.2'],
+            ['fbsql_create_blob', '5.3', [736], '5.2'],
+            ['fbsql_create_clob', '5.3', [737], '5.2'],
+            ['fbsql_create_db', '5.3', [738], '5.2'],
+            ['fbsql_data_seek', '5.3', [739], '5.2'],
+            ['fbsql_database_password', '5.3', [740], '5.2'],
+            ['fbsql_database', '5.3', [741], '5.2'],
+            ['fbsql_db_query', '5.3', [742], '5.2'],
+            ['fbsql_db_status', '5.3', [743], '5.2'],
+            ['fbsql_drop_db', '5.3', [744], '5.2'],
+            ['fbsql_errno', '5.3', [745], '5.2'],
+            ['fbsql_error', '5.3', [746], '5.2'],
+            ['fbsql_fetch_array', '5.3', [747], '5.2'],
+            ['fbsql_fetch_assoc', '5.3', [748], '5.2'],
+            ['fbsql_fetch_field', '5.3', [749], '5.2'],
+            ['fbsql_fetch_lengths', '5.3', [750], '5.2'],
+            ['fbsql_fetch_object', '5.3', [751], '5.2'],
+            ['fbsql_fetch_row', '5.3', [752], '5.2'],
+            ['fbsql_field_flags', '5.3', [753], '5.2'],
+            ['fbsql_field_len', '5.3', [754], '5.2'],
+            ['fbsql_field_name', '5.3', [755], '5.2'],
+            ['fbsql_field_seek', '5.3', [756], '5.2'],
+            ['fbsql_field_table', '5.3', [757], '5.2'],
+            ['fbsql_field_type', '5.3', [758], '5.2'],
+            ['fbsql_free_result', '5.3', [759], '5.2'],
+            ['fbsql_get_autostart_info', '5.3', [760], '5.2'],
+            ['fbsql_hostname', '5.3', [761], '5.2'],
+            ['fbsql_insert_id', '5.3', [762], '5.2'],
+            ['fbsql_list_dbs', '5.3', [763], '5.2'],
+            ['fbsql_list_fields', '5.3', [764], '5.2'],
+            ['fbsql_list_tables', '5.3', [765], '5.2'],
+            ['fbsql_next_result', '5.3', [766], '5.2'],
+            ['fbsql_num_fields', '5.3', [767], '5.2'],
+            ['fbsql_num_rows', '5.3', [768], '5.2'],
+            ['fbsql_password', '5.3', [769], '5.2'],
+            ['fbsql_pconnect', '5.3', [770], '5.2'],
+            ['fbsql_query', '5.3', [771], '5.2'],
+            ['fbsql_read_blob', '5.3', [772], '5.2'],
+            ['fbsql_read_clob', '5.3', [773], '5.2'],
+            ['fbsql_result', '5.3', [774], '5.2'],
+            ['fbsql_rollback', '5.3', [775], '5.2'],
+            ['fbsql_rows_fetched', '5.3', [776], '5.2'],
+            ['fbsql_select_db', '5.3', [777], '5.2'],
+            ['fbsql_set_characterset', '5.3', [778], '5.2'],
+            ['fbsql_set_lob_mode', '5.3', [779], '5.2'],
+            ['fbsql_set_password', '5.3', [780], '5.2'],
+            ['fbsql_set_transaction', '5.3', [781], '5.2'],
+            ['fbsql_start_db', '5.3', [782], '5.2'],
+            ['fbsql_stop_db', '5.3', [783], '5.2'],
+            ['fbsql_table_name', '5.3', [784], '5.2'],
+            ['fbsql_tablename', '5.3', [785], '5.2'],
+            ['fbsql_username', '5.3', [786], '5.2'],
+            ['fbsql_warnings', '5.3', [787], '5.2'],
+            ['msql_affected_rows', '5.3', [813], '5.2'],
+            ['msql_close', '5.3', [814], '5.2'],
+            ['msql_connect', '5.3', [815], '5.2'],
+            ['msql_create_db', '5.3', [816], '5.2'],
+            ['msql_createdb', '5.3', [817], '5.2'],
+            ['msql_data_seek', '5.3', [818], '5.2'],
+            ['msql_db_query', '5.3', [819], '5.2'],
+            ['msql_dbname', '5.3', [820], '5.2'],
+            ['msql_drop_db', '5.3', [821], '5.2'],
+            ['msql_error', '5.3', [822], '5.2'],
+            ['msql_fetch_array', '5.3', [823], '5.2'],
+            ['msql_fetch_field', '5.3', [824], '5.2'],
+            ['msql_fetch_object', '5.3', [825], '5.2'],
+            ['msql_fetch_row', '5.3', [826], '5.2'],
+            ['msql_field_flags', '5.3', [827], '5.2'],
+            ['msql_field_len', '5.3', [828], '5.2'],
+            ['msql_field_name', '5.3', [829], '5.2'],
+            ['msql_field_seek', '5.3', [830], '5.2'],
+            ['msql_field_table', '5.3', [831], '5.2'],
+            ['msql_field_type', '5.3', [832], '5.2'],
+            ['msql_fieldflags', '5.3', [833], '5.2'],
+            ['msql_fieldlen', '5.3', [834], '5.2'],
+            ['msql_fieldname', '5.3', [835], '5.2'],
+            ['msql_fieldtable', '5.3', [836], '5.2'],
+            ['msql_fieldtype', '5.3', [837], '5.2'],
+            ['msql_free_result', '5.3', [838], '5.2'],
+            ['msql_list_dbs', '5.3', [839], '5.2'],
+            ['msql_list_fields', '5.3', [840], '5.2'],
+            ['msql_list_tables', '5.3', [841], '5.2'],
+            ['msql_num_fields', '5.3', [842], '5.2'],
+            ['msql_num_rows', '5.3', [843], '5.2'],
+            ['msql_numfields', '5.3', [844], '5.2'],
+            ['msql_numrows', '5.3', [845], '5.2'],
+            ['msql_pconnect', '5.3', [846], '5.2'],
+            ['msql_query', '5.3', [847], '5.2'],
+            ['msql_regcase', '5.3', [848], '5.2'],
+            ['msql_result', '5.3', [849], '5.2'],
+            ['msql_select_db', '5.3', [850], '5.2'],
+            ['msql_tablename', '5.3', [851], '5.2'],
+            ['msql', '5.3', [852], '5.2'],
+            ['mysqli_disable_reads_from_master', '5.3', [1144], '5.2'],
+            ['mysqli_disable_rpl_parse', '5.3', [1145], '5.2'],
+            ['mysqli_enable_reads_from_master', '5.3', [1149], '5.2'],
+            ['mysqli_enable_rpl_parse', '5.3', [1150], '5.2'],
+            ['mysqli_master_query', '5.3', [1151], '5.2'],
+            ['mysqli_rpl_parse_enabled', '5.3', [1153], '5.2'],
+            ['mysqli_rpl_probe', '5.3', [1154], '5.2'],
+            ['mysqli_slave_query', '5.3', [1157], '5.2'],
+
+            ['sqlite_array_query', '5.4', [883], '5.3'],
+            ['sqlite_busy_timeout', '5.4', [884], '5.3'],
+            ['sqlite_changes', '5.4', [885], '5.3'],
+            ['sqlite_close', '5.4', [886], '5.3'],
+            ['sqlite_column', '5.4', [887], '5.3'],
+            ['sqlite_create_aggregate', '5.4', [888], '5.3'],
+            ['sqlite_create_function', '5.4', [889], '5.3'],
+            ['sqlite_current', '5.4', [890], '5.3'],
+            ['sqlite_error_string', '5.4', [891], '5.3'],
+            ['sqlite_escape_string', '5.4', [892], '5.3'],
+            ['sqlite_exec', '5.4', [893], '5.3'],
+            ['sqlite_factory', '5.4', [894], '5.3'],
+            ['sqlite_fetch_all', '5.4', [895], '5.3'],
+            ['sqlite_fetch_array', '5.4', [896], '5.3'],
+            ['sqlite_fetch_column_types', '5.4', [897], '5.3'],
+            ['sqlite_fetch_object', '5.4', [898], '5.3'],
+            ['sqlite_fetch_single', '5.4', [899], '5.3'],
+            ['sqlite_fetch_string', '5.4', [900], '5.3'],
+            ['sqlite_field_name', '5.4', [901], '5.3'],
+            ['sqlite_has_more', '5.4', [902], '5.3'],
+            ['sqlite_has_prev', '5.4', [903], '5.3'],
+            ['sqlite_key', '5.4', [904], '5.3'],
+            ['sqlite_last_error', '5.4', [905], '5.3'],
+            ['sqlite_last_insert_rowid', '5.4', [906], '5.3'],
+            ['sqlite_libencoding', '5.4', [907], '5.3'],
+            ['sqlite_libversion', '5.4', [908], '5.3'],
+            ['sqlite_next', '5.4', [909], '5.3'],
+            ['sqlite_num_fields', '5.4', [910], '5.3'],
+            ['sqlite_num_rows', '5.4', [911], '5.3'],
+            ['sqlite_open', '5.4', [912], '5.3'],
+            ['sqlite_popen', '5.4', [913], '5.3'],
+            ['sqlite_prev', '5.4', [914], '5.3'],
+            ['sqlite_query', '5.4', [915], '5.3'],
+            ['sqlite_rewind', '5.4', [916], '5.3'],
+            ['sqlite_seek', '5.4', [917], '5.3'],
+            ['sqlite_single_query', '5.4', [918], '5.3'],
+            ['sqlite_udf_decode_binary', '5.4', [919], '5.3'],
+            ['sqlite_udf_encode_binary', '5.4', [920], '5.3'],
+            ['sqlite_unbuffered_query', '5.4', [921], '5.3'],
+            ['sqlite_valid', '5.4', [922], '5.3'],
+
+            ['php_logo_guid', '5.5', [32], '5.4'],
+            ['php_egg_logo_guid', '5.5', [33], '5.4'],
+            ['php_real_logo_guid', '5.5', [34], '5.4'],
+            ['imagepsbbox', '7.0', [90], '5.6'],
+            ['imagepsencodefont', '7.0', [91], '5.6'],
+            ['imagepsextendfont', '7.0', [92], '5.6'],
+            ['imagepsfreefont', '7.0', [93], '5.6'],
+            ['imagepsloadfont', '7.0', [94], '5.6'],
+            ['imagepsslantfont', '7.0', [95], '5.6'],
+            ['imagepstext', '7.0', [96], '5.6'],
+            ['mssql_bind', '7.0', [853], '5.6'],
+            ['mssql_close', '7.0', [854], '5.6'],
+            ['mssql_connect', '7.0', [855], '5.6'],
+            ['mssql_data_seek', '7.0', [856], '5.6'],
+            ['mssql_execute', '7.0', [857], '5.6'],
+            ['mssql_fetch_array', '7.0', [858], '5.6'],
+            ['mssql_fetch_assoc', '7.0', [859], '5.6'],
+            ['mssql_fetch_batch', '7.0', [860], '5.6'],
+            ['mssql_fetch_field', '7.0', [861], '5.6'],
+            ['mssql_fetch_object', '7.0', [862], '5.6'],
+            ['mssql_fetch_row', '7.0', [863], '5.6'],
+            ['mssql_field_length', '7.0', [864], '5.6'],
+            ['mssql_field_name', '7.0', [865], '5.6'],
+            ['mssql_field_seek', '7.0', [866], '5.6'],
+            ['mssql_field_type', '7.0', [867], '5.6'],
+            ['mssql_free_result', '7.0', [868], '5.6'],
+            ['mssql_free_statement', '7.0', [869], '5.6'],
+            ['mssql_get_last_message', '7.0', [870], '5.6'],
+            ['mssql_guid_string', '7.0', [871], '5.6'],
+            ['mssql_init', '7.0', [872], '5.6'],
+            ['mssql_min_error_severity', '7.0', [873], '5.6'],
+            ['mssql_min_message_severity', '7.0', [874], '5.6'],
+            ['mssql_next_result', '7.0', [875], '5.6'],
+            ['mssql_num_fields', '7.0', [876], '5.6'],
+            ['mssql_num_rows', '7.0', [877], '5.6'],
+            ['mssql_pconnect', '7.0', [878], '5.6'],
+            ['mssql_query', '7.0', [879], '5.6'],
+            ['mssql_result', '7.0', [880], '5.6'],
+            ['mssql_rows_affected', '7.0', [881], '5.6'],
+            ['mssql_select_db', '7.0', [882], '5.6'],
+            ['sybase_affected_rows', '7.0', [1081], '5.6'],
+            ['sybase_close', '7.0', [1082], '5.6'],
+            ['sybase_connect', '7.0', [1083], '5.6'],
+            ['sybase_data_seek', '7.0', [1084], '5.6'],
+            ['sybase_deadlock_retry_count', '7.0', [1085], '5.6'],
+            ['sybase_fetch_array', '7.0', [1086], '5.6'],
+            ['sybase_fetch_assoc', '7.0', [1087], '5.6'],
+            ['sybase_fetch_field', '7.0', [1088], '5.6'],
+            ['sybase_fetch_object', '7.0', [1089], '5.6'],
+            ['sybase_fetch_row', '7.0', [1090], '5.6'],
+            ['sybase_field_seek', '7.0', [1091], '5.6'],
+            ['sybase_free_result', '7.0', [1092], '5.6'],
+            ['sybase_get_last_message', '7.0', [1093], '5.6'],
+            ['sybase_min_client_severity', '7.0', [1094], '5.6'],
+            ['sybase_min_error_severity', '7.0', [1095], '5.6'],
+            ['sybase_min_message_severity', '7.0', [1096], '5.6'],
+            ['sybase_min_server_severity', '7.0', [1097], '5.6'],
+            ['sybase_num_fields', '7.0', [1098], '5.6'],
+            ['sybase_num_rows', '7.0', [1099], '5.6'],
+            ['sybase_pconnect', '7.0', [1100], '5.6'],
+            ['sybase_query', '7.0', [1101], '5.6'],
+            ['sybase_result', '7.0', [1102], '5.6'],
+            ['sybase_select_db', '7.0', [1103], '5.6'],
+            ['sybase_set_message_handler', '7.0', [1104], '5.6'],
+            ['sybase_unbuffered_query', '7.0', [1105], '5.6'],
+
+            ['php_check_syntax', '5.0.5', [98], '5.0', '5.1'],
+            ['mysqli_get_cache_stats', '5.4', [99], '5.3'],
+            ['ibase_add_user', '7.4', [171], '7.3'],
+            ['ibase_affected_rows', '7.4', [172], '7.3'],
+            ['ibase_backup', '7.4', [173], '7.3'],
+            ['ibase_blob_add', '7.4', [174], '7.3'],
+            ['ibase_blob_cancel', '7.4', [175], '7.3'],
+            ['ibase_blob_close', '7.4', [176], '7.3'],
+            ['ibase_blob_create', '7.4', [177], '7.3'],
+            ['ibase_blob_echo', '7.4', [178], '7.3'],
+            ['ibase_blob_get', '7.4', [179], '7.3'],
+            ['ibase_blob_import', '7.4', [180], '7.3'],
+            ['ibase_blob_info', '7.4', [181], '7.3'],
+            ['ibase_blob_open', '7.4', [182], '7.3'],
+            ['ibase_close', '7.4', [183], '7.3'],
+            ['ibase_commit_ret', '7.4', [184], '7.3'],
+            ['ibase_commit', '7.4', [185], '7.3'],
+            ['ibase_connect', '7.4', [186], '7.3'],
+            ['ibase_db_info', '7.4', [187], '7.3'],
+            ['ibase_delete_user', '7.4', [188], '7.3'],
+            ['ibase_drop_db', '7.4', [189], '7.3'],
+            ['ibase_errcode', '7.4', [190], '7.3'],
+            ['ibase_errmsg', '7.4', [191], '7.3'],
+            ['ibase_execute', '7.4', [192], '7.3'],
+            ['ibase_fetch_assoc', '7.4', [193], '7.3'],
+            ['ibase_fetch_object', '7.4', [194], '7.3'],
+            ['ibase_fetch_row', '7.4', [195], '7.3'],
+            ['ibase_field_info', '7.4', [196], '7.3'],
+            ['ibase_free_event_handler', '7.4', [197], '7.3'],
+            ['ibase_free_query', '7.4', [198], '7.3'],
+            ['ibase_free_result', '7.4', [199], '7.3'],
+            ['ibase_gen_id', '7.4', [200], '7.3'],
+            ['ibase_maintain_db', '7.4', [201], '7.3'],
+            ['ibase_modify_user', '7.4', [202], '7.3'],
+            ['ibase_name_result', '7.4', [203], '7.3'],
+            ['ibase_num_fields', '7.4', [204], '7.3'],
+            ['ibase_num_params', '7.4', [205], '7.3'],
+            ['ibase_param_info', '7.4', [206], '7.3'],
+            ['ibase_pconnect', '7.4', [207], '7.3'],
+            ['ibase_prepare', '7.4', [208], '7.3'],
+            ['ibase_query', '7.4', [209], '7.3'],
+            ['ibase_restore', '7.4', [210], '7.3'],
+            ['ibase_rollback_ret', '7.4', [211], '7.3'],
+            ['ibase_rollback', '7.4', [212], '7.3'],
+            ['ibase_server_info', '7.4', [213], '7.3'],
+            ['ibase_service_attach', '7.4', [214], '7.3'],
+            ['ibase_service_detach', '7.4', [215], '7.3'],
+            ['ibase_set_event_handler', '7.4', [216], '7.3'],
+            ['ibase_trans', '7.4', [217], '7.3'],
+            ['ibase_wait_event', '7.4', [218], '7.3'],
+            ['fbird_add_user', '7.4', [987], '7.3'],
+            ['fbird_affected_rows', '7.4', [988], '7.3'],
+            ['fbird_backup', '7.4', [989], '7.3'],
+            ['fbird_blob_add', '7.4', [990], '7.3'],
+            ['fbird_blob_cancel', '7.4', [991], '7.3'],
+            ['fbird_blob_close', '7.4', [992], '7.3'],
+            ['fbird_blob_create', '7.4', [993], '7.3'],
+            ['fbird_blob_echo', '7.4', [994], '7.3'],
+            ['fbird_blob_get', '7.4', [995], '7.3'],
+            ['fbird_blob_import', '7.4', [996], '7.3'],
+            ['fbird_blob_info', '7.4', [997], '7.3'],
+            ['fbird_blob_open', '7.4', [998], '7.3'],
+            ['fbird_close', '7.4', [999], '7.3'],
+            ['fbird_commit_ret', '7.4', [1000], '7.3'],
+            ['fbird_commit', '7.4', [1001], '7.3'],
+            ['fbird_connect', '7.4', [1002], '7.3'],
+            ['fbird_db_info', '7.4', [1003], '7.3'],
+            ['fbird_delete_user', '7.4', [1004], '7.3'],
+            ['fbird_drop_db', '7.4', [1005], '7.3'],
+            ['fbird_errcode', '7.4', [1006], '7.3'],
+            ['fbird_errmsg', '7.4', [1007], '7.3'],
+            ['fbird_execute', '7.4', [1008], '7.3'],
+            ['fbird_fetch_assoc', '7.4', [1009], '7.3'],
+            ['fbird_fetch_object', '7.4', [1010], '7.3'],
+            ['fbird_fetch_row', '7.4', [1011], '7.3'],
+            ['fbird_field_info', '7.4', [1012], '7.3'],
+            ['fbird_free_event_handler', '7.4', [1013], '7.3'],
+            ['fbird_free_query', '7.4', [1014], '7.3'],
+            ['fbird_free_result', '7.4', [1015], '7.3'],
+            ['fbird_gen_id', '7.4', [1016], '7.3'],
+            ['fbird_maintain_db', '7.4', [1017], '7.3'],
+            ['fbird_modify_user', '7.4', [1018], '7.3'],
+            ['fbird_name_result', '7.4', [1019], '7.3'],
+            ['fbird_num_fields', '7.4', [1020], '7.3'],
+            ['fbird_num_params', '7.4', [1021], '7.3'],
+            ['fbird_param_info', '7.4', [1022], '7.3'],
+            ['fbird_pconnect', '7.4', [1023], '7.3'],
+            ['fbird_prepare', '7.4', [1024], '7.3'],
+            ['fbird_query', '7.4', [1025], '7.3'],
+            ['fbird_restore', '7.4', [1026], '7.3'],
+            ['fbird_rollback_ret', '7.4', [1027], '7.3'],
+            ['fbird_rollback', '7.4', [1028], '7.3'],
+            ['fbird_server_info', '7.4', [1029], '7.3'],
+            ['fbird_service_attach', '7.4', [1030], '7.3'],
+            ['fbird_service_detach', '7.4', [1031], '7.3'],
+            ['fbird_set_event_handler', '7.4', [1032], '7.3'],
+            ['fbird_trans', '7.4', [1033], '7.3'],
+            ['fbird_wait_event', '7.4', [1034], '7.3'],
+
+            ['wddx_add_vars', '7.4', [228], '7.3'],
+            ['wddx_deserialize', '7.4', [229], '7.3'],
+            ['wddx_packet_end', '7.4', [230], '7.3'],
+            ['wddx_packet_start', '7.4', [231], '7.3'],
+            ['wddx_serialize_value', '7.4', [232], '7.3'],
+            ['wddx_serialize_vars', '7.4', [233], '7.3'],
+            ['mysqli_embedded_server_end', '7.4', [1147], '7.3'],
+            ['mysqli_embedded_server_start', '7.4', [1148], '7.3'],
+
+            ['oci_internal_debug', '8.0', [1178], '7.4'],
+            ['xmlrpc_decode_request', '8.0', [1158], '7.4'],
+            ['xmlrpc_decode', '8.0', [1159], '7.4'],
+            ['xmlrpc_encode_request', '8.0', [1160], '7.4'],
+            ['xmlrpc_encode', '8.0', [1161], '7.4'],
+            ['xmlrpc_get_type', '8.0', [1162], '7.4'],
+            ['xmlrpc_is_fault', '8.0', [1163], '7.4'],
+            ['xmlrpc_parse_method_descriptions', '8.0', [1164], '7.4'],
+            ['xmlrpc_server_add_introspection_data', '8.0', [1165], '7.4'],
+            ['xmlrpc_server_call_method', '8.0', [1166], '7.4'],
+            ['xmlrpc_server_create', '8.0', [1167], '7.4'],
+            ['xmlrpc_server_destroy', '8.0', [1168], '7.4'],
+            ['xmlrpc_server_register_introspection_callback', '8.0', [1169], '7.4'],
+            ['xmlrpc_server_register_method', '8.0', [1170], '7.4'],
+            ['xmlrpc_set_type', '8.0', [1171], '7.4'],
+        ];
+    }
+
+
+    /**
+     * testRemovedFunctionWithAlternative
+     *
+     * @dataProvider dataRemovedFunctionWithAlternative
+     *
+     * @param string $functionName   Name of the function.
+     * @param string $removedIn      The PHP version in which the function was removed.
+     * @param string $alternative    An alternative function.
+     * @param array  $lines          The line numbers in the test file which apply to this function.
+     * @param string $okVersion      A PHP version in which the function was still valid.
+     * @param string $removedVersion Optional PHP version to test removed message with -
+     *                               if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testRemovedFunctionWithAlternative($functionName, $removedIn, $alternative, $lines, $okVersion, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is removed since PHP {$removedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedFunctionWithAlternative()
+     *
+     * @return array
+     */
+    public function dataRemovedFunctionWithAlternative()
+    {
+        return [
+            ['zend_logo_guid', '5.5', 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"', [35], '5.4'],
+
+            ['recode_file', '7.4', 'the iconv or mbstring extension', [236], '7.3'],
+            ['recode_string', '7.4', 'the iconv or mbstring extension', [237], '7.3'],
+            ['recode', '7.4', 'the iconv or mbstring extension', [238], '7.3'],
+
+            ['imap_header', '8.0', 'imap_headerinfo()', [1216], '7.4'],
+        ];
+    }
+
+
+    /**
+     * testDeprecatedRemovedFunction
+     *
+     * @dataProvider dataDeprecatedRemovedFunction
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param string $removedIn         The PHP version in which the function was removed.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     * @param string $removedVersion    Optional PHP version to test removed message with -
+     *                                  if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedRemovedFunction($functionName, $deprecatedIn, $removedIn, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedRemovedFunction()
+     *
+     * @return array
+     */
+    public function dataDeprecatedRemovedFunction()
+    {
+        return [
+            ['define_syslog_variables', '5.3', '5.4', [5], '5.2'],
+            ['import_request_variables', '5.3', '5.4', [11], '5.2'],
+            ['mysql_list_dbs', '5.4', '7.0', [15], '5.3'],
+            ['magic_quotes_runtime', '5.3', '7.0', [23], '5.2'],
+            ['set_magic_quotes_runtime', '5.3', '7.0', [27], '5.2'],
+            ['sql_regcase', '5.3', '7.0', [31], '5.2'],
+            ['mysql_affected_rows', '5.5', '7.0', [923], '5.4'],
+            ['mysql_client_encoding', '5.5', '7.0', [924], '5.4'],
+            ['mysql_close', '5.5', '7.0', [925], '5.4'],
+            ['mysql_connect', '5.5', '7.0', [926], '5.4'],
+            ['mysql_create_db', '4.3', '7.0', [927], '4.2'],
+            ['mysql_data_seek', '5.5', '7.0', [928], '5.4'],
+            ['mysql_db_name', '5.5', '7.0', [929], '5.4'],
+            ['mysql_drop_db', '4.3', '7.0', [930], '4.2'],
+            ['mysql_errno', '5.5', '7.0', [931], '5.4'],
+            ['mysql_error', '5.5', '7.0', [932], '5.4'],
+            ['mysql_fetch_array', '5.5', '7.0', [933], '5.4'],
+            ['mysql_fetch_assoc', '5.5', '7.0', [934], '5.4'],
+            ['mysql_fetch_field', '5.5', '7.0', [935], '5.4'],
+            ['mysql_fetch_lengths', '5.5', '7.0', [936], '5.4'],
+            ['mysql_fetch_object', '5.5', '7.0', [937], '5.4'],
+            ['mysql_fetch_row', '5.5', '7.0', [938], '5.4'],
+            ['mysql_field_flags', '5.5', '7.0', [939], '5.4'],
+            ['mysql_field_len', '5.5', '7.0', [940], '5.4'],
+            ['mysql_field_name', '5.5', '7.0', [941], '5.4'],
+            ['mysql_field_seek', '5.5', '7.0', [942], '5.4'],
+            ['mysql_field_table', '5.5', '7.0', [943], '5.4'],
+            ['mysql_field_type', '5.5', '7.0', [944], '5.4'],
+            ['mysql_free_result', '5.5', '7.0', [945], '5.4'],
+            ['mysql_get_client_info', '5.5', '7.0', [946], '5.4'],
+            ['mysql_get_host_info', '5.5', '7.0', [947], '5.4'],
+            ['mysql_get_proto_info', '5.5', '7.0', [948], '5.4'],
+            ['mysql_get_server_info', '5.5', '7.0', [949], '5.4'],
+            ['mysql_info', '5.5', '7.0', [950], '5.4'],
+            ['mysql_insert_id', '5.5', '7.0', [951], '5.4'],
+            ['mysql_list_fields', '5.4', '7.0', [952], '5.3'],
+            ['mysql_list_processes', '5.5', '7.0', [953], '5.4'],
+            ['mysql_list_tables', '4.3.7', '7.0', [954], '4.3', '4.4'],
+            ['mysql_num_fields', '5.5', '7.0', [955], '5.4'],
+            ['mysql_num_rows', '5.5', '7.0', [956], '5.4'],
+            ['mysql_pconnect', '5.5', '7.0', [957], '5.4'],
+            ['mysql_ping', '5.5', '7.0', [958], '5.4'],
+            ['mysql_query', '5.5', '7.0', [959], '5.4'],
+            ['mysql_real_escape_string', '5.5', '7.0', [960], '5.4'],
+            ['mysql_result', '5.5', '7.0', [961], '5.4'],
+            ['mysql_select_db', '5.5', '7.0', [962], '5.4'],
+            ['mysql_set_charset', '5.5', '7.0', [963], '5.4'],
+            ['mysql_stat', '5.5', '7.0', [964], '5.4'],
+            ['mysql_tablename', '5.5', '7.0', [965], '5.4'],
+            ['mysql_thread_id', '5.5', '7.0', [966], '5.4'],
+            ['mysql_unbuffered_query', '5.5', '7.0', [967], '5.4'],
+            ['mysql', '5.5', '7.0', [968], '5.4'],
+            ['mysql_fieldname', '5.5', '7.0', [969], '5.4'],
+            ['mysql_fieldtable', '5.5', '7.0', [970], '5.4'],
+            ['mysql_fieldlen', '5.5', '7.0', [971], '5.4'],
+            ['mysql_fieldtype', '5.5', '7.0', [972], '5.4'],
+            ['mysql_fieldflags', '5.5', '7.0', [973], '5.4'],
+            ['mysql_selectdb', '5.5', '7.0', [974], '5.4'],
+            ['mysql_freeresult', '5.5', '7.0', [977], '5.4'],
+            ['mysql_numfields', '5.5', '7.0', [978], '5.4'],
+            ['mysql_numrows', '5.5', '7.0', [979], '5.4'],
+            ['mysql_listdbs', '5.5', '7.0', [980], '5.4'],
+            ['mysql_listfields', '5.5', '7.0', [982], '5.4'],
+            ['mysql_dbname', '5.5', '7.0', [983], '5.4'],
+            ['mysql_table_name', '5.5', '7.0', [984], '5.4'],
+
+            ['ldap_sort', '7.0', '8.0', [97], '5.6'],
+            ['fgetss', '7.3', '8.0', [167], '7.2'],
+            ['gzgetss', '7.3', '8.0', [168], '7.2'],
+            ['ezmlm_hash', '7.4', '8.0', [245], '7.3'],
+            ['get_magic_quotes_gpc', '7.4', '8.0', [240], '7.3'],
+            ['get_magic_quotes_runtime', '7.4', '8.0', [241], '7.3'],
+            ['hebrevc', '7.4', '8.0', [242], '7.3'],
+        ];
+    }
+
+
+    /**
+     * testDeprecatedRemovedFunctionWithAlternative
+     *
+     * @dataProvider dataDeprecatedRemovedFunctionWithAlternative
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param string $removedIn         The PHP version in which the function was removed.
+     * @param string $alternative       An alternative function.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     * @param string $removedVersion    Optional PHP version to test removed message with -
+     *                                  if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedRemovedFunctionWithAlternative($functionName, $deprecatedIn, $removedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedRemovedFunctionWithAlternative()
+     *
+     * @return array
+     */
+    public function dataDeprecatedRemovedFunctionWithAlternative()
+    {
+        return [
+            ['call_user_method', '4.1', '7.0', 'call_user_func()', [3], '4.0'],
+            ['call_user_method_array', '4.1', '7.0', 'call_user_func_array()', [4], '4.0'],
+            ['ereg', '5.3', '7.0', 'preg_match()', [7], '5.2'],
+            ['ereg_replace', '5.3', '7.0', 'preg_replace()', [8], '5.2'],
+            ['eregi', '5.3', '7.0', 'preg_match() (with the i modifier)', [9], '5.2'],
+            ['eregi_replace', '5.3', '7.0', 'preg_replace() (with the i modifier)', [10], '5.2'],
+            ['mcrypt_generic_end', '5.3', '7.0', 'mcrypt_generic_deinit()', [12], '5.2'],
+            ['mcrypt_ecb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [37], '5.4'],
+            ['mcrypt_cbc', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [38], '5.4'],
+            ['mcrypt_cfb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [39], '5.4'],
+            ['mcrypt_ofb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [40], '5.4'],
+            ['mysql_db_query', '5.3', '7.0', 'mysqli::select_db() and mysqli::query()', [13], '5.2'],
+            ['mysql_escape_string', '4.3', '7.0', 'mysqli::real_escape_string()', [14], '4.2'],
+            ['mysqli_bind_param', '5.3', '5.4', 'mysqli_stmt::bind_param()', [16], '5.2'],
+            ['mysqli_bind_result', '5.3', '5.4', 'mysqli_stmt::bind_result()', [17], '5.2'],
+            ['mysqli_client_encoding', '5.3', '5.4', 'mysqli::character_set_name()', [18], '5.2'],
+            ['mysqli_fetch', '5.3', '5.4', 'mysqli_stmt::fetch()', [19], '5.2'],
+            ['mysqli_param_count', '5.3', '5.4', 'mysqli_stmt_param_count()', [20], '5.2'],
+            ['mysqli_get_metadata', '5.3', '5.4', 'mysqli_stmt::result_metadata()', [21], '5.2'],
+            ['mysqli_send_long_data', '5.3', '5.4', 'mysqli_stmt::send_long_data()', [22], '5.2'],
+            ['session_register', '5.3', '5.4', '$_SESSION', [24], '5.2'],
+            ['session_unregister', '5.3', '5.4', '$_SESSION', [25], '5.2'],
+            ['session_is_registered', '5.3', '5.4', '$_SESSION', [26], '5.2'],
+            ['set_socket_blocking', '5.3', '7.0', 'stream_set_blocking()', [28], '5.2'],
+            ['split', '5.3', '7.0', 'preg_split(), explode() or str_split()', [29], '5.2'],
+            ['spliti', '5.3', '7.0', 'preg_split() (with the i modifier)', [30], '5.2'],
+            ['datefmt_set_timezone_id', '5.5', '7.0', 'IntlDateFormatter::setTimeZone()', [36], '5.4'],
+
+            ['mcrypt_create_iv', '7.1', '7.2', 'random_bytes() or OpenSSL', [100], '7.0'],
+            ['mcrypt_decrypt', '7.1', '7.2', 'OpenSSL', [101], '7.0'],
+            ['mcrypt_enc_get_algorithms_name', '7.1', '7.2', 'OpenSSL', [102], '7.0'],
+            ['mcrypt_enc_get_block_size', '7.1', '7.2', 'OpenSSL', [103], '7.0'],
+            ['mcrypt_enc_get_iv_size', '7.1', '7.2', 'OpenSSL', [104], '7.0'],
+            ['mcrypt_enc_get_key_size', '7.1', '7.2', 'OpenSSL', [105], '7.0'],
+            ['mcrypt_enc_get_modes_name', '7.1', '7.2', 'OpenSSL', [106], '7.0'],
+            ['mcrypt_enc_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [107], '7.0'],
+            ['mcrypt_enc_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [108], '7.0'],
+            ['mcrypt_enc_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [109], '7.0'],
+            ['mcrypt_enc_is_block_mode', '7.1', '7.2', 'OpenSSL', [110], '7.0'],
+            ['mcrypt_enc_self_test', '7.1', '7.2', 'OpenSSL', [111], '7.0'],
+            ['mcrypt_encrypt', '7.1', '7.2', 'OpenSSL', [112], '7.0'],
+            ['mcrypt_generic_deinit', '7.1', '7.2', 'OpenSSL', [113], '7.0'],
+            ['mcrypt_generic_init', '7.1', '7.2', 'OpenSSL', [114], '7.0'],
+            ['mcrypt_generic', '7.1', '7.2', 'OpenSSL', [115], '7.0'],
+            ['mcrypt_get_block_size', '7.1', '7.2', 'OpenSSL', [116], '7.0'],
+            ['mcrypt_get_cipher_name', '7.1', '7.2', 'OpenSSL', [117], '7.0'],
+            ['mcrypt_get_iv_size', '7.1', '7.2', 'OpenSSL', [118], '7.0'],
+            ['mcrypt_get_key_size', '7.1', '7.2', 'OpenSSL', [119], '7.0'],
+            ['mcrypt_list_algorithms', '7.1', '7.2', 'OpenSSL', [120], '7.0'],
+            ['mcrypt_list_modes', '7.1', '7.2', 'OpenSSL', [121], '7.0'],
+            ['mcrypt_module_close', '7.1', '7.2', 'OpenSSL', [122], '7.0'],
+            ['mcrypt_module_get_algo_block_size', '7.1', '7.2', 'OpenSSL', [123], '7.0'],
+            ['mcrypt_module_get_algo_key_size', '7.1', '7.2', 'OpenSSL', [124], '7.0'],
+            ['mcrypt_module_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [125], '7.0'],
+            ['mcrypt_module_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [126], '7.0'],
+            ['mcrypt_module_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [127], '7.0'],
+            ['mcrypt_module_is_block_mode', '7.1', '7.2', 'OpenSSL', [128], '7.0'],
+            ['mcrypt_module_open', '7.1', '7.2', 'OpenSSL', [129], '7.0'],
+            ['mcrypt_module_self_test', '7.1', '7.2', 'OpenSSL', [130], '7.0'],
+            ['mdecrypt_generic', '7.1', '7.2', 'OpenSSL', [131], '7.0'],
+
+            ['create_function', '7.2', '8.0', 'an anonymous function', [146], '7.1'],
+            ['each', '7.2', '8.0', 'a foreach loop or ArrayIterator', [147], '7.1'],
+            ['read_exif_data', '7.2', '8.0', 'exif_read_data()', [149], '7.1'],
+            ['jpeg2wbmp', '7.2', '8.0', 'imagecreatefromjpeg() and imagewbmp()', [144], '7.1'],
+            ['png2wbmp', '7.2', '8.0', 'imagecreatefrompng() or imagewbmp()', [145], '7.1'],
+            ['gmp_random', '7.2', '8.0', 'gmp_random_bits() or gmp_random_range()', [148], '7.1'],
+
+            ['image2wbmp', '7.3', '8.0', 'imagewbmp()', [152], '7.2'],
+            ['mbregex_encoding', '7.3', '8.0', 'mb_regex_encoding()', [153], '7.2'],
+            ['mbereg', '7.3', '8.0', 'mb_ereg()', [154], '7.2'],
+            ['mberegi', '7.3', '8.0', 'mb_eregi()', [155], '7.2'],
+            ['mbereg_replace', '7.3', '8.0', 'mb_ereg_replace()', [156], '7.2'],
+            ['mberegi_replace', '7.3', '8.0', 'mb_eregi_replace()', [157], '7.2'],
+            ['mbsplit', '7.3', '8.0', 'mb_split()', [158], '7.2'],
+            ['mbereg_match', '7.3', '8.0', 'mb_ereg_match()', [159], '7.2'],
+            ['mbereg_search', '7.3', '8.0', 'mb_ereg_search()', [160], '7.2'],
+            ['mbereg_search_pos', '7.3', '8.0', 'mb_ereg_search_pos()', [161], '7.2'],
+            ['mbereg_search_regs', '7.3', '8.0', 'mb_ereg_search_regs()', [162], '7.2'],
+            ['mbereg_search_init', '7.3', '8.0', 'mb_ereg_search_init()', [163], '7.2'],
+            ['mbereg_search_getregs', '7.3', '8.0', 'mb_ereg_search_getregs()', [164], '7.2'],
+            ['mbereg_search_getpos', '7.3', '8.0', 'mb_ereg_search_getpos()', [165], '7.2'],
+            ['mbereg_search_setpos', '7.3', '8.0', 'mb_ereg_search_setpos()', [166], '7.2'],
+
+            ['convert_cyr_string', '7.4', '8.0', 'mb_convert_encoding(), iconv() or UConverter', [243], '7.3'],
+            ['money_format', '7.4', '8.0', 'NumberFormatter::formatCurrency()', [244], '7.3'],
+            ['restore_include_path', '7.4', '8.0', "ini_restore('include_path')", [246], '7.3'],
+            ['ociinternaldebug', '5.4', '8.0', 'oci_internal_debug() (PHP < 8.0)', [69], '5.3'],
+            ['ldap_control_paged_result_response', '7.4', '8.0', 'ldap_search()', [234], '7.3'],
+            ['ldap_control_paged_result', '7.4', '8.0', 'ldap_search()', [235], '7.3'],
+        ];
+    }
+
+
+    /**
+     * testNoFalsePositives
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '99.0'); // High version beyond latest deprecation.
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            [134],
+            [135],
+            [136],
+            [137],
+            [138],
+            [139],
+            [140],
+            [141],
+            [249],
+            [250],
+            [251],
+            [252],
+            [1232],
+        ];
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '4.0'); // Low version below the first deprecation.
+        $this->assertNoViolation($file);
+    }
+}
\ No newline at end of file
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index b26c8a73..6234fb1b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -168,7 +168,7 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions">
+    <rule ref="Magento2.PHPCompatibility.RemovedFunctions">
         <severity>10</severity>
         <type>error</type>
     </rule>
@@ -771,6 +771,8 @@
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
+        <!-- Following sniffs have an equivalent in Magento2 -->
+        <exclude name="PHPCompatibility.FunctionUse.RemovedFunctions" />
     </rule>
     <!--
      All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is

From ad860aab7a90bb39294ffe69e7c84b4444abae17 Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Fri, 28 Apr 2023 13:54:55 -0500
Subject: [PATCH 555/630] ACP2E-1915: Implement sniff that reports usage of the
 QPrint, Base64, Uuencode, and HTML-ENTITIES 'text encodings' with MBString
 functions as deprecated

---
 .gitignore                                    |   1 +
 ...atedEncodingsForMBStringFunctionsSniff.php | 206 ++++++++++++++++++
 ...dEncodingsForMBStringFunctionsUnitTest.inc | 188 ++++++++++++++++
 ...dEncodingsForMBStringFunctionsUnitTest.php |  98 +++++++++
 4 files changed, 493 insertions(+)
 create mode 100644 Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php

diff --git a/.gitignore b/.gitignore
index 422a08ec..d0326eff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 
 .phpunit.result.cache
 .DS_Store
+phpunit.xml
diff --git a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
new file mode 100644
index 00000000..1b7c6484
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer_Tokens as Tokens;
+
+/**
+ * Detect: Usage of the QPrint, Base64, Uuencode, and HTML-ENTITIES encodings is deprecated for all MBString functions.
+ *
+ * PHP version 8.2
+ *
+ * @link https://www.php.net/manual/en/migration82.deprecated.php
+ */
+class DeprecatedEncodingsForMBStringFunctionsSniff extends Sniff
+{
+    /**
+     * List of tokens which when they precede the $stackPtr indicate that this
+     * is not a function call.
+     *
+     * @var array
+     */
+    private $ignoreTokens = [
+        \T_DOUBLE_COLON => true,
+        \T_OBJECT_OPERATOR => true,
+        \T_FUNCTION => true,
+        \T_NEW => true,
+        \T_CONST => true,
+        \T_USE => true,
+    ];
+
+    /**
+     * Text string tokens to examine.
+     *
+     * @var array
+     */
+    private $textStringTokens = [
+        \T_CONSTANT_ENCAPSED_STRING => true,
+        \T_DOUBLE_QUOTED_STRING => true,
+        \T_INLINE_HTML => true,
+        \T_HEREDOC => true,
+        \T_NOWDOC => true,
+    ];
+
+    /**
+     * A list of MBString functions that emits deprecation notice
+     *
+     * @var \int[][]
+     */
+    protected $targetFunctions = [
+        'mb_check_encoding' => [2],
+        'mb_chr' => [2],
+        'mb_convert_case' => [3],
+        'mb_convert_encoding' => [2],
+        'mb_convert_kana' => [3],
+        'mb_convert_variables' => [1],
+        'mb_decode_numericentity' => [3],
+        'mb_encode_numericentity' => [3],
+        'mb_encoding_aliases' => [1],
+        'mb_ord' => [2],
+        'mb_scrub' => [2],
+        'mb_str_split' => [3],
+        'mb_strcut' => [4],
+        'mb_strimwidth' => [5],
+        'mb_stripos' => [4],
+        'mb_stristr' => [4],
+        'mb_strlen' => [2],
+        'mb_strpos' => [4],
+        'mb_strrchr' => [4],
+        'mb_strrichr' => [4],
+        'mb_strripos' => [4],
+        'mb_strrpos' => [4],
+        'mb_strstr' => [4],
+        'mb_strtolower' => [2],
+        'mb_strtoupper' => [2],
+        'mb_strwidth' => [2],
+        'mb_substr_count' => [3],
+        'mb_substr' => [4],
+    ];
+
+    /**
+     * Message per encoding
+     *
+     * @var string[]
+     */
+    protected $messages = [
+        'qprint' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
+            ' use quoted_printable_encode/quoted_printable_decode instead',
+        'quoted-printable' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
+            ' use quoted_printable_encode/quoted_printable_decode instead',
+        'base64' => 'Handling Base64 via mbstring is deprecated since PHP 8.2;' .
+            ' use base64_encode/base64_decode instead',
+        'uuencode' => 'Handling Uuencode via mbstring is deprecated since PHP 8.2;' .
+            ' use convert_uuencode/convert_uudecode instead',
+        'html-entities' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
+            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
+        'html' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
+            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [\T_STRING];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if (!$this->supportsAbove('8.2')) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $function = $tokens[$stackPtr]['content'];
+        $functionLc = strtolower($function);
+
+        if (strpos($functionLc, 'mb_') !== 0) {
+            return;
+        }
+
+        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+
+        if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
+            // Not a call to a PHP function.
+            return;
+        }
+
+        if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR
+            && $tokens[$prevNonEmpty - 1]['code'] === \T_STRING
+        ) {
+            // Namespaced function.
+            return;
+        }
+
+        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
+
+        foreach ($parameters as $index => $parameter) {
+            $this->processParameter($phpcsFile, $function, $index, $parameter);
+        }
+    }
+
+    /**
+     * Process function parameter
+     *
+     * @param File $phpcsFile
+     * @param string $function
+     * @param int $index
+     * @param array $parameter
+     * @return void
+     */
+    public function processParameter(File $phpcsFile, string $function, int $index, array $parameter)
+    {
+        $functionLc = strtolower($function);
+        if (!isset($this->targetFunctions[$functionLc]) || !in_array($index, $this->targetFunctions[$functionLc])) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $targetParam = $parameter;
+        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $targetParam['start'], $targetParam['end'], true);
+
+        if ($nextNonEmpty !== false && in_array($tokens[$nextNonEmpty]['code'], [\T_ARRAY, \T_OPEN_SHORT_ARRAY])) {
+            $items = $this->getFunctionCallParameters($phpcsFile, $nextNonEmpty);
+        } else {
+            $items = [$parameter];
+        }
+
+        foreach ($items as $item) {
+            for ($i = $item['start']; $i <= $item['end']; $i++) {
+                if ($tokens[$i]['code'] === \T_STRING
+                    || $tokens[$i]['code'] === \T_VARIABLE
+                ) {
+                    // Variable, constant, function call. Ignore complete item as undetermined.
+                    break;
+                }
+
+                if (isset($this->textStringTokens[$tokens[$i]['code']]) === true) {
+                    $encoding = $this->stripQuotes(strtolower(trim($tokens[$i]['content'])));
+                    $encodings = array_flip(explode(',', $encoding));
+                    if (count(array_intersect_key($encodings, $this->messages)) > 0) {
+                        $phpcsFile->addWarning(
+                            $this->messages[$encoding],
+                            $i,
+                            'Deprecated',
+                            [$item['raw']]
+                        );
+
+                    }
+
+                    // Only throw one error per array item.
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc
new file mode 100644
index 00000000..cf7fb97f
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc
@@ -0,0 +1,188 @@
+<?php
+/*
+ * Test: Usage of the QPrint, BASE64, UUENCODE, and HTML-ENTITIES "text encodings" is deprecated for all MBString functions
+ */
+
+### BASE64 ###
+mb_check_encoding($str, "BASE64");
+mb_chr(65, "BASE64");
+mb_convert_case($str, MB_CASE_UPPER, "BASE64");
+mb_convert_encoding($str, "BASE64");
+mb_convert_kana($str, "KVa", "BASE64");
+mb_convert_variables("BASE64", "ASCII,UTF-8,SJIS-win", $str1, $str2);
+mb_decode_numericentity($str, $convmap, "BASE64");
+mb_encode_numericentity($str, $convmap, "BASE64");
+mb_ord($str, "BASE64");
+mb_scrub($str, "BASE64");
+mb_str_split($str, 1, "BASE64");
+mb_strcut($str, 0, 1, "BASE64");
+mb_strimwidth($str, 0, 5, "...", "BASE64");
+mb_stripos($str, "s", 0, "BASE64");
+mb_stristr($str, "s", true, "BASE64");
+mb_strlen($str, "BASE64");
+mb_strpos($str, "s", 0, "BASE64");
+mb_strrchr($str, "s", true, "BASE64");
+mb_strrichr($str, "s", true, "BASE64");
+mb_strripos($str, "s", 0, "BASE64");
+mb_strrpos($str, "s", 0, "BASE64");
+mb_strstr($str, "s", true, "BASE64");
+mb_strtolower($str, "BASE64");
+mb_strtoupper($str, "BASE64");
+mb_strwidth($str, "BASE64");
+mb_substr_count($str, "s", "BASE64");
+mb_substr($str, 0, 1, "BASE64");
+### BASE64 ###
+#### QPrint ###
+mb_check_encoding($str, "QPrint");
+mb_chr(65, "QPrint");
+mb_convert_case($str, MB_CASE_UPPER, "QPrint");
+mb_convert_encoding($str, "QPrint");
+mb_convert_kana($str, "KVa", "QPrint");
+mb_convert_variables("QPrint", "ASCII,UTF-8,SJIS-win", $str1, $str2);
+mb_decode_numericentity($str, $convmap, "QPrint");
+mb_encode_numericentity($str, $convmap, "QPrint");
+mb_ord($str, "QPrint");
+mb_scrub($str, "QPrint");
+mb_str_split($str, 1, "QPrint");
+mb_strcut($str, 0, 1, "QPrint");
+mb_strimwidth($str, 0, 5, "...", "QPrint");
+mb_stripos($str, "s", 0, "QPrint");
+mb_stristr($str, "s", true, "QPrint");
+mb_strlen($str, "QPrint");
+mb_strpos($str, "s", 0, "QPrint");
+mb_strrchr($str, "s", true, "QPrint");
+mb_strrichr($str, "s", true, "QPrint");
+mb_strripos($str, "s", 0, "QPrint");
+mb_strrpos($str, "s", 0, "QPrint");
+mb_strstr($str, "s", true, "QPrint");
+mb_strtolower($str, "QPrint");
+mb_strtoupper($str, "QPrint");
+mb_strwidth($str, "QPrint");
+mb_substr_count($str, "s", "QPrint");
+mb_substr($str, 0, 1, "QPrint");
+### QPrint ###
+##### Quoted-Printable ###
+mb_check_encoding($str, "Quoted-Printable");
+mb_chr(65, "Quoted-Printable");
+mb_convert_case($str, MB_CASE_UPPER, "Quoted-Printable");
+mb_convert_encoding($str, "Quoted-Printable");
+mb_convert_kana($str, "KVa", "Quoted-Printable");
+mb_convert_variables("Quoted-Printable", "ASCII,UTF-8,SJIS-win", $str1, $str2);
+mb_decode_numericentity($str, $convmap, "Quoted-Printable");
+mb_encode_numericentity($str, $convmap, "Quoted-Printable");
+mb_ord($str, "Quoted-Printable");
+mb_scrub($str, "Quoted-Printable");
+mb_str_split($str, 1, "Quoted-Printable");
+mb_strcut($str, 0, 1, "Quoted-Printable");
+mb_strimwidth($str, 0, 5, "...", "Quoted-Printable");
+mb_stripos($str, "s", 0, "Quoted-Printable");
+mb_stristr($str, "s", true, "Quoted-Printable");
+mb_strlen($str, "Quoted-Printable");
+mb_strpos($str, "s", 0, "Quoted-Printable");
+mb_strrchr($str, "s", true, "Quoted-Printable");
+mb_strrichr($str, "s", true, "Quoted-Printable");
+mb_strripos($str, "s", 0, "Quoted-Printable");
+mb_strrpos($str, "s", 0, "Quoted-Printable");
+mb_strstr($str, "s", true, "Quoted-Printable");
+mb_strtolower($str, "Quoted-Printable");
+mb_strtoupper($str, "Quoted-Printable");
+mb_strwidth($str, "Quoted-Printable");
+mb_substr_count($str, "s", "Quoted-Printable");
+mb_substr($str, 0, 1, "Quoted-Printable");
+### Quoted-Printable ###
+### UUENCODE ###
+mb_check_encoding($str, "UUENCODE");
+mb_chr(65, "UUENCODE");
+mb_convert_case($str, MB_CASE_UPPER, "UUENCODE");
+mb_convert_encoding($str, "UUENCODE");
+mb_convert_kana($str, "KVa", "UUENCODE");
+mb_convert_variables("UUENCODE", "ASCII,UTF-8,SJIS-win", $str1, $str2);
+mb_decode_numericentity($str, $convmap, "UUENCODE");
+mb_encode_numericentity($str, $convmap, "UUENCODE");
+mb_ord($str, "UUENCODE");
+mb_scrub($str, "UUENCODE");
+mb_str_split($str, 1, "UUENCODE");
+mb_strcut($str, 0, 1, "UUENCODE");
+mb_strimwidth($str, 0, 5, "...", "UUENCODE");
+mb_stripos($str, "s", 0, "UUENCODE");
+mb_stristr($str, "s", true, "UUENCODE");
+mb_strlen($str, "UUENCODE");
+mb_strpos($str, "s", 0, "UUENCODE");
+mb_strrchr($str, "s", true, "UUENCODE");
+mb_strrichr($str, "s", true, "UUENCODE");
+mb_strripos($str, "s", 0, "UUENCODE");
+mb_strrpos($str, "s", 0, "UUENCODE");
+mb_strstr($str, "s", true, "UUENCODE");
+mb_strtolower($str, "UUENCODE");
+mb_strtoupper($str, "UUENCODE");
+mb_strwidth($str, "UUENCODE");
+mb_substr_count($str, "s", "UUENCODE");
+mb_substr($str, 0, 1, "UUENCODE");
+### UUENCODE ###
+#### HTML-ENTITIES ###
+mb_check_encoding($str, "HTML-ENTITIES");
+mb_chr(65, "HTML-ENTITIES");
+mb_convert_case($str, MB_CASE_UPPER, "HTML-ENTITIES");
+mb_convert_encoding($str, "HTML-ENTITIES");
+mb_convert_kana($str, "KVa", "HTML-ENTITIES");
+mb_convert_variables("HTML-ENTITIES", "ASCII,UTF-8,SJIS-win", $str1, $str2);
+mb_decode_numericentity($str, $convmap, "HTML-ENTITIES");
+mb_encode_numericentity($str, $convmap, "HTML-ENTITIES");
+mb_ord($str, "HTML-ENTITIES");
+mb_scrub($str, "HTML-ENTITIES");
+mb_str_split($str, 1, "HTML-ENTITIES");
+mb_strcut($str, 0, 1, "HTML-ENTITIES");
+mb_strimwidth($str, 0, 5, "...", "HTML-ENTITIES");
+mb_stripos($str, "s", 0, "HTML-ENTITIES");
+mb_stristr($str, "s", true, "HTML-ENTITIES");
+mb_strlen($str, "HTML-ENTITIES");
+mb_strpos($str, "s", 0, "HTML-ENTITIES");
+mb_strrchr($str, "s", true, "HTML-ENTITIES");
+mb_strrichr($str, "s", true, "HTML-ENTITIES");
+mb_strripos($str, "s", 0, "HTML-ENTITIES");
+mb_strrpos($str, "s", 0, "HTML-ENTITIES");
+mb_strstr($str, "s", true, "HTML-ENTITIES");
+mb_strtolower($str, "HTML-ENTITIES");
+mb_strtoupper($str, "HTML-ENTITIES");
+mb_strwidth($str, "HTML-ENTITIES");
+mb_substr_count($str, "s", "HTML-ENTITIES");
+mb_substr($str, 0, 1, "HTML-ENTITIES");
+### HTML-ENTITIES ###
+##### HTML ###
+mb_check_encoding($str, "HTML");
+mb_chr(65, "HTML");
+mb_convert_case($str, MB_CASE_UPPER, "HTML");
+mb_convert_encoding($str, "HTML");
+mb_convert_kana($str, "KVa", "HTML");
+mb_convert_variables("HTML", "ASCII,UTF-8,SJIS-win", $str1, $str2);
+mb_decode_numericentity($str, $convmap, "HTML");
+mb_encode_numericentity($str, $convmap, "HTML");
+mb_ord($str, "HTML");
+mb_scrub($str, "HTML");
+mb_str_split($str, 1, "HTML");
+mb_strcut($str, 0, 1, "HTML");
+mb_strimwidth($str, 0, 5, "...", "HTML");
+mb_stripos($str, "s", 0, "HTML");
+mb_stristr($str, "s", true, "HTML");
+mb_strlen($str, "HTML");
+mb_strpos($str, "s", 0, "HTML");
+mb_strrchr($str, "s", true, "HTML");
+mb_strrichr($str, "s", true, "HTML");
+mb_strripos($str, "s", 0, "HTML");
+mb_strrpos($str, "s", 0, "HTML");
+mb_strstr($str, "s", true, "HTML");
+mb_strtolower($str, "HTML");
+mb_strtoupper($str, "HTML");
+mb_strwidth($str, "HTML");
+mb_substr_count($str, "s", "HTML");
+mb_substr($str, 0, 1, "HTML");
+### HTML ###
+
+// Ok
+mb_convert_encoding($str, "SJIS");
+mb_convert_encoding($str, "UTF-7", "EUC-JP");
+mb_convert_encoding($str, "UCS-2LE", "JIS, eucjp-win, sjis-win");
+mb_convert_encoding($str, "EUC-JP", "auto");
+mb_convert_encoding($str, "UTF-8", "BASE64");
+mb_convert_encoding($str, strtolower('BASE64'));
+mb_detect_encoding($str, ['BASE64']);
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
new file mode 100644
index 00000000..d5b5b8c3
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the DeprecatedEncodingsForMBStringFunctions sniff.
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\DeprecatedEncodingsForMBStringFunctionsSniff
+ */
+class DeprecatedEncodingsForMBStringFunctionsUnitTest extends BaseSniffTest
+{
+    /**
+     * Message per encoding
+     *
+     * @var string[]
+     */
+    private $messages = [
+        'qprint' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
+            ' use quoted_printable_encode/quoted_printable_decode instead',
+        'quoted-printable' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
+            ' use quoted_printable_encode/quoted_printable_decode instead',
+        'base64' => 'Handling Base64 via mbstring is deprecated since PHP 8.2;' .
+            ' use base64_encode/base64_decode instead',
+        'uuencode' => 'Handling Uuencode via mbstring is deprecated since PHP 8.2;' .
+            ' use convert_uuencode/convert_uudecode instead',
+        'html-entities' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
+            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
+        'html' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
+            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
+    ];
+
+    /**
+     * Verify a deprecation warning is thrown if MBString function is used with encodings: QPrint,BASE64,UUENCODE,HTML
+     *
+     * @dataProvider usageOfDeprecatedEncodingsInMbStringFunctionsDataProvider
+     * @param string $encoding
+     * @param int $start
+     * @param int $end
+     * @return void
+     */
+    public function testUsageOfDeprecatedEncodingsInMbStringFunctions($encoding, $start, $end)
+    {
+        $file = $this->sniffFile(__FILE__, '8.2');
+        // No errors expected on the first 11 lines.
+        for ($line = $start; $line <= $end; $line++) {
+            $this->assertWarning($file, $line, $this->messages[$encoding]);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testUsageOfDeprecatedEncodingsInMbStringFunctions()
+     *
+     * @return array
+     */
+    public function usageOfDeprecatedEncodingsInMbStringFunctionsDataProvider()
+    {
+        return [
+            ['base64', 7, 33],
+            ['qprint', 36, 62],
+            ['quoted-printable', 65, 91],
+            ['uuencode', 94, 120],
+            ['html-entities', 123, 149],
+            ['html', 157, 178],
+        ];
+    }
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '8.2');
+
+        // No errors expected on the first 11 lines.
+        for ($line = 183; $line <= 188; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '8.1');
+        $this->assertNoViolation($file);
+    }
+}

From ee72865780a9458f06c7bd971dda3679541f734d Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Thu, 4 May 2023 15:03:46 -0500
Subject: [PATCH 556/630] ACP2E-1919: Implement sniff that reports usage of
 dynamic properties as deprecated

---
 Magento2/Internal/Cache.php                   |  87 ++++++
 .../Rector/Src/ReplacePregSplitNullLimit.php  |   7 +-
 .../Fixture/replace_null.php.inc              |  10 +-
 .../DeprecatedDynamicPropertySniff.php        | 275 ++++++++++++++++++
 ...atedEncodingsForMBStringFunctionsSniff.php |  12 +-
 .../RemovedDollarBraceStringEmbedsSniff.php   |   2 +-
 ...ecatedDynamicPropertyUnitTest.autoload.inc |  21 ++
 .../DeprecatedDynamicPropertyUnitTest.inc     | 177 +++++++++++
 .../DeprecatedDynamicPropertyUnitTest.php     | 113 +++++++
 ...dEncodingsForMBStringFunctionsUnitTest.php |  12 +-
 ...movedDollarBraceStringEmbedsUnitTest.1.inc |   2 +-
 ...RemovedDollarBraceStringEmbedsUnitTest.php |   2 +-
 12 files changed, 700 insertions(+), 20 deletions(-)
 create mode 100644 Magento2/Internal/Cache.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php

diff --git a/Magento2/Internal/Cache.php b/Magento2/Internal/Cache.php
new file mode 100644
index 00000000..2717eece
--- /dev/null
+++ b/Magento2/Internal/Cache.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Internal;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Wrapper for \PHPCSUtils\Internal\Cache
+ *
+ * @see \PHPCSUtils\Internal\Cache
+ * @internal
+ */
+final class Cache
+{
+    /**
+     * Wrapper for \PHPCSUtils\Internal\Cache::isCached() method.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param string $key
+     * @param int|string $id
+     *
+     * @return bool
+     * @see \PHPCSUtils\Internal\Cache::isCached()
+     */
+    public static function isCached(File $phpcsFile, $key, $id)
+    {
+        return \PHPCSUtils\Internal\Cache::isCached($phpcsFile, $key, $id);
+    }
+
+    /**
+     * Wrapper for \PHPCSUtils\Internal\Cache::get() method.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param string $key
+     * @param int|string $id
+     *
+     * @return mixed
+     * @see \PHPCSUtils\Internal\Cache::get()
+     */
+    public static function get(File $phpcsFile, $key, $id)
+    {
+        return \PHPCSUtils\Internal\Cache::get($phpcsFile, $key, $id);
+    }
+
+    /**
+     * Wrapper for \PHPCSUtils\Internal\Cache::getForFile() method.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param string $key
+     * @return array
+     * @see \PHPCSUtils\Internal\Cache::getForFile()
+     */
+    public static function getForFile(File $phpcsFile, $key)
+    {
+        return \PHPCSUtils\Internal\Cache::getForFile($phpcsFile, $key);
+    }
+
+    /**
+     * Wrapper for \PHPCSUtils\Internal\Cache::set() method.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param string $key
+     * @param int|string $id
+     * @param mixed $value
+     * @return void
+     * @see \PHPCSUtils\Internal\Cache::set()
+     */
+    public static function set(File $phpcsFile, $key, $id, $value)
+    {
+        \PHPCSUtils\Internal\Cache::set($phpcsFile, $key, $id, $value);
+    }
+
+    /**
+     * Wrapper for \PHPCSUtils\Internal\Cache::clear() method.
+     *
+     * @return void
+     * @see \PHPCSUtils\Internal\Cache::clear()
+     */
+    public static function clear()
+    {
+        \PHPCSUtils\Internal\Cache::clear();
+    }
+}
diff --git a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
index f8e6cb3d..cc918eb4 100644
--- a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
+++ b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
@@ -8,8 +8,8 @@
 namespace Magento2\Rector\Src;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Scalar\LNumber;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -29,11 +29,12 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (!$this->isName($node->name, 'preg_split')) {
+        if (!$this->isName($node->name, 'preg_split') || !isset($node->args[2])) {
             return null;
         }
+        $value = $node->args[2]->value;
 
-        if ($node->args[2] !== LNumber::class) {
+        if ($value instanceof ConstFetch && $value->name->toString() === 'null') {
             $node->args[2] = $this->nodeFactory->createArg(-1);
             return $node;
         }
diff --git a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc
index f0efbcf9..06116b3b 100644
--- a/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc
+++ b/Magento2/Rector/Tests/ReplacePregSplitNullLimit/Fixture/replace_null.php.inc
@@ -1,11 +1,17 @@
 <?php
 
-preg_split('pattern', 'subject', null, 0)
+preg_split('pattern', 'subject', null, 0);
+preg_split('pattern', 'subject', 2);
+preg_split('pattern', 'subject', $var);
+preg_split('pattern', 'subject');
 
 ?>
 -----
 <?php
 
-preg_split('pattern', 'subject', -1, 0)
+preg_split('pattern', 'subject', -1, 0);
+preg_split('pattern', 'subject', 2);
+preg_split('pattern', 'subject', $var);
+preg_split('pattern', 'subject');
 
 ?>
diff --git a/Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php b/Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php
new file mode 100644
index 00000000..3e7d98ab
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
+use Magento2\Internal\Cache;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Conditions;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\UseStatements;
+
+/**
+ * Detects usage of dynamic properties in classes
+ */
+class DeprecatedDynamicPropertySniff extends \PHPCompatibility\Sniff
+{
+    /**
+     * @var PHPDocFormattingValidator
+     */
+    private PHPDocFormattingValidator $phpDocFormattingValidator;
+
+    /**
+     * List of tags that declare a magic property.
+     *
+     * @var string[]
+     */
+    private array $magicPropertyTags = [
+        '@property',
+        '@property-read',
+        '@property-write',
+    ];
+
+    /**
+     * Constructor for this sniff.
+     */
+    public function __construct()
+    {
+        $this->phpDocFormattingValidator = new PHPDocFormattingValidator();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            \T_OBJECT_OPERATOR,
+            \T_NULLSAFE_OBJECT_OPERATOR
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if (!$this->supportsAbove('8.2')) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        // Check if pointer is inside a class.
+        $classPtr = Conditions::getLastCondition($phpcsFile, $stackPtr, [\T_CLASS]);
+        if ($classPtr === false) {
+            return;
+        }
+
+        // Check if it is string.
+        $propertyNamePtr = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
+        if ($propertyNamePtr === false || $tokens[$propertyNamePtr]['code'] !== \T_STRING) {
+            return;
+        }
+
+        $afterPropertyNamePtr = $phpcsFile->findNext(Tokens::$emptyTokens, ($propertyNamePtr + 1), null, true);
+        // Check if it is not a method call.
+        if ($tokens[$afterPropertyNamePtr]['code'] === \T_OPEN_PARENTHESIS) {
+            return;
+        }
+
+        // Check if it is a property access on $this.
+        $thisPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
+        if ($thisPtr === false
+            || $tokens[$thisPtr]['code'] !== \T_VARIABLE
+            || $tokens[$thisPtr]['content'] !== '$this'
+        ) {
+            return;
+        }
+
+        // Check if it is a direct property access.
+        $beforeThisPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $thisPtr - 1, null, true);
+        if ($beforeThisPtr &&
+            \in_array(
+                $tokens[$beforeThisPtr]['code'],
+                [\T_OBJECT_OPERATOR, \T_NULLSAFE_OBJECT_OPERATOR, \T_DOUBLE_COLON]
+            )
+        ) {
+            return;
+        }
+
+        $propertyName = $tokens[$propertyNamePtr]['content'];
+        if (\in_array($propertyName, $this->getClassDeclaredProperties($phpcsFile, $classPtr), true)
+            || \in_array($propertyName, $this->getClassPromotedProperties($phpcsFile, $classPtr), true)
+            || \in_array($propertyName, $this->getClassMagicProperties($phpcsFile, $classPtr), true)
+        ) {
+            return;
+        }
+
+        $className = ObjectDeclarations::getName($phpcsFile, $classPtr);
+        $namespace = Namespaces::determineNamespace($phpcsFile, $classPtr);
+        if ($namespace !== '') {
+            $className = $namespace . '\\' . $className;
+        }
+        $isPropertyInherited = true;
+        try {
+            // Try to autoload the class and check if the property is inherited.
+            if (\class_exists($className)) {
+                $isPropertyInherited = \property_exists($className, $propertyName);
+            }
+        } catch (\Throwable $e) {
+            unset($e);
+            // Ignore any errors that may occur during autoloading.
+        }
+        if ($isPropertyInherited === false ||
+            !$this->isClassUsingTraits($phpcsFile, $classPtr)
+            && ObjectDeclarations::findExtendedClassName($phpcsFile, $classPtr) === false
+        ) {
+            $error = 'Access to an undefined property %s::$%s;' .
+                ' Creation of dynamic property is deprecated since PHP 8.2';
+            $data = [$className, $propertyName];
+            $phpcsFile->addWarning($error, $propertyNamePtr, 'Deprecated', $data);
+        }
+    }
+
+    /**
+     * Get properties declared in the scope class
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return string[]
+     */
+    private function getClassDeclaredProperties(File $phpcsFile, int $stackPtr): array
+    {
+        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
+            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
+        }
+        $tokens = $phpcsFile->getTokens();
+        $properties = [];
+        $next = $stackPtr;
+        while ($next = $this->findInClass($phpcsFile, $stackPtr, $next + 1, \T_VARIABLE)) {
+            if (Scopes::isOOProperty($phpcsFile, $next) !== false) {
+                $properties[] = \ltrim($tokens[$next]['content'], '$');
+            }
+        }
+        Cache::set($phpcsFile, __METHOD__, $stackPtr, $properties);
+        return $properties;
+    }
+
+    /**
+     * Get properties declared in the constructor method
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return string[]
+     */
+    private function getClassPromotedProperties(File $phpcsFile, int $stackPtr): array
+    {
+        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
+            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
+        }
+        $properties = [];
+        $next = $stackPtr;
+        while ($next = $this->findInClass($phpcsFile, $stackPtr, $next + 1, \T_FUNCTION)) {
+            if (Scopes::isOOMethod($phpcsFile, $next)
+                && \strtolower(FunctionDeclarations::getName($phpcsFile, $next)) === '__construct'
+            ) {
+                $params = FunctionDeclarations::getParameters($phpcsFile, $next);
+                foreach ($params as $param) {
+                    if (isset($param['property_visibility']) === true) {
+                        $properties[] = \ltrim($param['name'], '$');
+                    }
+                }
+                break;
+            }
+        }
+        Cache::set($phpcsFile, __METHOD__, $stackPtr, $properties);
+        return $properties;
+    }
+
+    /**
+     * Find magic properties declared in the class PHPDoc
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return string[]
+     */
+    public function getClassMagicProperties(File $phpcsFile, int $stackPtr): array
+    {
+        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
+            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
+        }
+        $properties = [];
+        $tokens = $phpcsFile->getTokens();
+        $commentStartPtr = $this->phpDocFormattingValidator->findPHPDoc($stackPtr, $phpcsFile);
+        if ($commentStartPtr === -1) {
+            return [];
+        }
+        foreach ($tokens[$commentStartPtr]['comment_tags'] as $tag) {
+            $token = $tokens[$tag];
+            if (!\in_array($token['content'], $this->magicPropertyTags, true)
+                || $tokens[($tag + 2)]['code'] !== \T_DOC_COMMENT_STRING
+            ) {
+                continue;
+            }
+            $commentParts = \preg_split('/\s+/', (string)$tokens[($tag + 2)]['content'], 3);
+            if (\strpos($commentParts[0], '$') === 0) {
+                $properties[] = \ltrim($commentParts[0], '$');
+            } elseif (isset($commentParts[1])) {
+                $properties[] = \ltrim($commentParts[1], '$');
+            }
+        }
+        Cache::set($phpcsFile, __METHOD__, $stackPtr, $properties);
+        return $properties;
+    }
+
+    /**
+     * Check if class uses traits
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function isClassUsingTraits(File $phpcsFile, int $stackPtr): bool
+    {
+        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
+            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
+        }
+        $usesTraits = false;
+        $next = $stackPtr;
+        while ($next = $this->findInClass($phpcsFile, $stackPtr, $next + 1, \T_USE)) {
+            if (UseStatements::isTraitUse($phpcsFile, $next) === true) {
+                $usesTraits = true;
+                break;
+            }
+        }
+        Cache::set($phpcsFile, __METHOD__, $stackPtr, $usesTraits);
+        return $usesTraits;
+    }
+
+    /**
+     * Find token in class scope
+     *
+     * @param File $phpcsFile
+     * @param int $classPtr
+     * @param int $currentPtr
+     * @param array|int|string $needle
+     * @return int|false
+     */
+    private function findInClass(File $phpcsFile, int $classPtr, int $currentPtr, $needle)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $classScopeEnd = $tokens[$classPtr]['scope_closer'];
+        $classScopeStart = $tokens[$classPtr]['scope_opener'];
+        return $phpcsFile->findNext($needle, \max($currentPtr, $classScopeStart), $classScopeEnd);
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
index 1b7c6484..7889d01a 100644
--- a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
@@ -90,17 +90,17 @@ class DeprecatedEncodingsForMBStringFunctionsSniff extends Sniff
      */
     protected $messages = [
         'qprint' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' use quoted_printable_encode/quoted_printable_decode instead',
+            ' Use quoted_printable_encode/quoted_printable_decode instead',
         'quoted-printable' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' use quoted_printable_encode/quoted_printable_decode instead',
+            ' Use quoted_printable_encode/quoted_printable_decode instead',
         'base64' => 'Handling Base64 via mbstring is deprecated since PHP 8.2;' .
-            ' use base64_encode/base64_decode instead',
+            ' Use base64_encode/base64_decode instead',
         'uuencode' => 'Handling Uuencode via mbstring is deprecated since PHP 8.2;' .
-            ' use convert_uuencode/convert_uudecode instead',
+            ' Use convert_uuencode/convert_uudecode instead',
         'html-entities' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
+            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
         'html' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
+            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
     ];
 
     /**
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
index 200cffbd..83588c2a 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
@@ -119,7 +119,7 @@ public function process(File $phpcsFile, $stackPtr)
             // Type 4.
             $message = 'Using %s (variable variables) in strings is deprecated since PHP 8.2, use {${expr}} instead.';
             $code    = 'DeprecatedExpressionSyntax';
-            if (\preg_match('`^\$\{(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)(?:\[([\'"])?[^\$\{\}\]]+(?:\2)?\])?\}$`', $embed) === 1) {
+            if (\preg_match('`^\$\{(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:\[([\'"])?[^\$\{\}\]]+(?:\2)?\])?\}$`', $embed) === 1) {
                 // Type 3.
                 $message = 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: %s';
                 $code    = 'DeprecatedVariableSyntax';
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc
new file mode 100644
index 00000000..da973bc1
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc
@@ -0,0 +1,21 @@
+<?php
+/*
+ * Test: Creation of dynamic property when class cannot be autoloaded
+ */
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use PHP_CodeSniffer\Files\File;
+
+class DeprecatedDynamicPropertySniff extends \PHPCompatibility\Sniff
+{
+    public function register()
+    {
+        // TODO: Implement register() method.
+    }
+
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $this->xyz = 1; // this property is not defined anywhere.
+        $this->superglobals['TEST_VAR'] = 'TEST_VAR'; // this property is defined in the parent class.
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc
new file mode 100644
index 00000000..da5b8593
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc
@@ -0,0 +1,177 @@
+<?php
+/*
+ * Test: Creation of dynamic property when class cannot be autoloaded
+ */
+
+trait TraitA
+{
+    private bool $prop2;
+}
+
+trait TraitB
+{
+    private bool $prop3;
+}
+
+class Bar
+{
+    public bool $prop1;
+
+    public function resetProp1()
+    {
+        $this->prop1 = false;
+    }
+}
+
+/**
+ * @property bool $prop6 full format
+ * @property $prop7 prop without type
+ * @property bool prop8 prop with comment
+ */
+class Foo1 extends Bar
+{
+    use TraitA, TraitB;
+    private bool $prop4;
+    public function __construct(
+        private bool $prop5
+    ) {
+    }
+
+    private function reset(): void
+    {
+        $this->resetProp1();
+        $this->prop1 = false;
+        $this->prop2 = false;
+        $this->prop3 = false;
+        $this->prop4 = false;
+        $this->prop5 = false;
+        $this->prop6 = false;
+        $this->prop7 = false;
+        $this->prop8 = false;
+        $this->prop9 = false;
+    }
+}
+
+/**
+ * @property bool $prop6 full format
+ * @property $prop7 prop without type
+ * @property bool prop8 prop with comment
+ */
+class Foo2
+{
+    use TraitA, TraitB;
+    private bool $prop4;
+    public function __construct(
+        private bool $prop5
+    ) {
+    }
+
+    private function reset(): void
+    {
+        $this->resetProp1();
+        $this->prop1 = false;
+        $this->prop2 = false;
+        $this->prop3 = false;
+        $this->prop4 = false;
+        $this->prop5 = false;
+        $this->prop6 = false;
+        $this->prop7 = false;
+        $this->prop8 = false;
+        $this->prop9 = false;
+    }
+}
+
+/**
+ * @property bool $prop6 full format
+ * @property $prop7 prop without type
+ * @property bool prop8 prop with comment
+ */
+class Foo3 extends Bar
+{
+    private bool $prop4;
+    public function __construct(
+        private bool $prop5
+    ) {
+    }
+
+    private function reset(): void
+    {
+        $this->resetProp1();
+        $this->prop1 = false;
+        $this->prop2 = false;
+        $this->prop3 = false;
+        $this->prop4 = false;
+        $this->prop5 = false;
+        $this->prop6 = false;
+        $this->prop7 = false;
+        $this->prop8 = false;
+        $this->prop9 = false;
+    }
+}
+
+/**
+ * @property bool $prop6 full format
+ * @property $prop7 prop without type
+ * @property bool prop8 prop with comment
+ */
+class Foo4
+{
+    private bool $prop4;
+    public function __construct(
+        private bool $prop5
+    ) {
+    }
+
+    private function reset(): void
+    {
+        $this->resetProp1();
+        $this->prop1 = false;
+        $this->prop2 = false;
+        $this->prop3 = false;
+        $this->prop4 = false;
+        $this->prop5 = false;
+        $this->prop6 = false;
+        $this->prop7 = false;
+        $this->prop8 = false;
+        $this->prop9 = false;
+    }
+}
+
+class Foo5
+{
+    private bool $prop4;
+    public function __construct(
+        private bool $prop5
+    ) {
+    }
+
+    private function reset(): void
+    {
+        $this->resetProp1();
+        $this->prop1 = false;
+        $this->prop2 = false;
+        $this->prop3 = false;
+        $this->prop4 = false;
+        $this->prop5 = false;
+        $this->prop6 = false;
+        $this->prop7 = false;
+        $this->prop8 = false;
+        $this->prop9 = false;
+        $this/** a comment */ ->/** another comment*/ prop9 = false;
+        $this->setSomething($this->prop9);
+        $prop9 = $this->prop9;
+        $this::$prop9 = false;
+        $this->prop4->prop9 = false;
+        $thisVar = $this;
+        $thisVar->prop9 = false; // undetermined context
+        $thisVar->$this->prop9 = false; // false positive
+    }
+
+    public function setSomething()
+    {
+
+    }
+}
+
+$object->prop9 = false;
+$object->reset();
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
new file mode 100644
index 00000000..b6f207d8
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the DeprecatedDynamicProperty sniff.
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\DeprecatedEncodingsForMBStringFunctionsSniff
+ */
+class DeprecatedDynamicPropertyUnitTest extends BaseSniffTest
+{
+    const TEST_FILE_WITH_AUTOLOADABLE_CLASS = 'DeprecatedDynamicPropertyUnitTest.autoload.inc';
+
+    /**
+     * Verify a deprecation warning is thrown if a dynamic property is found in a class.
+     *
+     * @dataProvider dataProvider
+     * @param string $testFile
+     * @param array $errors
+     * @return void
+     */
+    public function testCreationOfDynamicProperty(string $testFile, array $errors): void
+    {
+        $file = $this->sniffFile($testFile, '8.2');
+        foreach ($errors as [$line, $property]) {
+            $this->assertWarning(
+                $file,
+                $line,
+                'Access to an undefined property '. $property .'; Creation of dynamic property is deprecated since PHP 8.2'
+            );
+        }
+    }
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataProvider
+     * @param string $testFile
+     * @param array $errors
+     * @return void
+     */
+    public function testNoFalsePositives(string $testFile, array $errors): void
+    {
+        $file = $this->sniffFile($testFile, '8.2');
+        $errorLines = array_column($errors, 0, 0);
+        $totalLines = substr_count(file_get_contents(\str_replace('UnitTest.php', 'UnitTest.inc', $testFile)), PHP_EOL);
+
+        for ($line = 1; $line <= $totalLines; $line++) {
+            if (isset($errorLines[$line])) {
+                continue;
+            }
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @dataProvider dataProvider
+     * @param string $file
+     * @param array $errors
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion(string $testFile, array $errors): void
+    {
+        $file = $this->sniffFile($testFile, '8.1');
+        $this->assertNoViolation($file);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     * @see testCreationOfDynamicProperty()
+     * @see testNoFalsePositives()
+     * @see testNoViolationsInFileOnValidVersion()
+     *
+     */
+    public function dataProvider()
+    {
+        return [
+            [
+                __FILE__,
+                [
+                    [128, 'Foo4::$prop1'],
+                    [129, 'Foo4::$prop2'],
+                    [130, 'Foo4::$prop3'],
+                    [136, 'Foo4::$prop9'],
+                    [151, 'Foo5::$prop1'],
+                    [152, 'Foo5::$prop2'],
+                    [153, 'Foo5::$prop3'],
+                    [156, 'Foo5::$prop6'],
+                    [157, 'Foo5::$prop7'],
+                    [158, 'Foo5::$prop8'],
+                    [159, 'Foo5::$prop9'],
+                    [160, 'Foo5::$prop9'],
+                    [161, 'Foo5::$prop9'],
+                    [162, 'Foo5::$prop9'],
+                ]
+            ],
+            [
+                __DIR__ . '/' . self::TEST_FILE_WITH_AUTOLOADABLE_CLASS,
+                [
+                    [18, 'Magento2\Sniffs\PHPCompatibility\DeprecatedDynamicPropertySniff::$xyz'],
+                ]
+            ]
+        ];
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
index d5b5b8c3..f7cfc1b6 100644
--- a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
@@ -20,17 +20,17 @@ class DeprecatedEncodingsForMBStringFunctionsUnitTest extends BaseSniffTest
      */
     private $messages = [
         'qprint' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' use quoted_printable_encode/quoted_printable_decode instead',
+            ' Use quoted_printable_encode/quoted_printable_decode instead',
         'quoted-printable' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' use quoted_printable_encode/quoted_printable_decode instead',
+            ' Use quoted_printable_encode/quoted_printable_decode instead',
         'base64' => 'Handling Base64 via mbstring is deprecated since PHP 8.2;' .
-            ' use base64_encode/base64_decode instead',
+            ' Use base64_encode/base64_decode instead',
         'uuencode' => 'Handling Uuencode via mbstring is deprecated since PHP 8.2;' .
-            ' use convert_uuencode/convert_uudecode instead',
+            ' Use convert_uuencode/convert_uudecode instead',
         'html-entities' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
+            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
         'html' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
+            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
     ];
 
     /**
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
index 4ec71d18..b3221a88 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
+++ b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
@@ -56,7 +56,7 @@ echo "$\{foo} and $foo";
 // Type 3: Braces after the dollar sign.
 echo "${foo}";
 echo "${foo['bar']}";
-$text = "some text ${foo} some ${text}";
+$text = "some text ${foo} some ${t}";
 
 $heredoc = <<<EOD
 some text ${foo} some text
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
index 8009b2cb..c3a29985 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
@@ -67,7 +67,7 @@ public function dataRemovedDollarBraceStringEmbedsType3()
             [57, '${foo}'],
             [58, '${foo[\'bar\']}'],
             [59, '${foo}'],
-            [59, '${text}'],
+            [59, '${t}'],
             [62, '${foo}'],
             [65, '${foo}'],
         ];

From 6bd92bedd594c2db0c019630b59204cbf791b501 Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Wed, 10 May 2023 15:08:57 -0500
Subject: [PATCH 557/630] ACP2E-1946: Move PHPCompatibility/PHPCompatibility
 sniffs into separate namespace

---
 Magento2/Internal/FileProxy.php               |  465 ++
 .../ChangedIntToBoolParamTypeSniff.php        |  117 +-
 .../ForbiddenFinalPrivateMethodsSniff.php     |   92 +-
 .../RemovedAssertStringAssertionSniff.php     |  127 +-
 ...llingDestructAfterConstructorExitSniff.php |  202 +-
 .../RemovedDollarBraceStringEmbedsSniff.php   |  128 +-
 .../RemovedFunctionsSniff.php                 | 5135 -----------------
 ...inedFunctionsExcludeDisabledFalseSniff.php |   77 +-
 ...emovedOptionalBeforeRequiredParamSniff.php |  140 +-
 ...ovedSplAutoloadRegisterThrowFalseSniff.php |   75 +-
 .../ChangedIntToBoolParamTypeUnitTest.php     |   99 +-
 .../DeprecatedDynamicPropertyUnitTest.php     |   10 +-
 ...dEncodingsForMBStringFunctionsUnitTest.php |   10 +-
 ...ForbiddenFinalPrivateMethodsUnitTest.1.inc |   20 +
 ...denFinalPrivateMethodsUnitTest.1.inc.fixed |   20 +
 .../ForbiddenFinalPrivateMethodsUnitTest.inc  |   27 -
 ...iddenFinalPrivateMethodsUnitTest.inc.fixed |   27 -
 .../ForbiddenFinalPrivateMethodsUnitTest.php  |   50 +-
 .../RemovedAssertStringAssertionUnitTest.php  |   77 +-
 ...ngDestructAfterConstructorExitUnitTest.php |  112 +-
 ...RemovedDollarBraceStringEmbedsUnitTest.php |  248 +-
 .../RemovedFunctionsUnitTest.inc              | 1236 ----
 .../RemovedFunctionsUnitTest.php              | 1552 -----
 ...dFunctionsExcludeDisabledFalseUnitTest.php |   69 +-
 ...vedOptionalBeforeRequiredParamUnitTest.php |  104 +-
 ...dSplAutoloadRegisterThrowFalseUnitTest.php |   69 +-
 Magento2/ruleset.xml                          |    4 +-
 .../AbstractFunctionCallParameterSniff.php    |  204 +
 PHPCompatibility/LICENSE                      |  165 +
 .../ForbiddenFinalPrivateMethodsSniff.php     |   96 +
 ...llingDestructAfterConstructorExitSniff.php |  214 +
 ...emovedOptionalBeforeRequiredParamSniff.php |  146 +
 .../ChangedIntToBoolParamTypeSniff.php        |  124 +
 .../RemovedAssertStringAssertionSniff.php     |  134 +
 ...inedFunctionsExcludeDisabledFalseSniff.php |   85 +
 ...ovedSplAutoloadRegisterThrowFalseSniff.php |   86 +
 .../RemovedDollarBraceStringEmbedsSniff.php   |  134 +
 .../Tests}/BaseSniffTest.php                  |   94 +-
 .../ForbiddenFinalPrivateMethodsUnitTest.inc  |   61 +
 ...ngDestructAfterConstructorExitUnitTest.inc |    8 +-
 ...ngDestructAfterConstructorExitUnitTest.php |  123 +
 ...vedOptionalBeforeRequiredParamUnitTest.inc |    0
 ...vedOptionalBeforeRequiredParamUnitTest.php |  119 +
 .../ChangedIntToBoolParamTypeUnitTest.inc     |    3 +-
 .../ChangedIntToBoolParamTypeUnitTest.php     |  115 +
 .../RemovedAssertStringAssertionUnitTest.inc  |    0
 .../RemovedAssertStringAssertionUnitTest.php  |   91 +
 ...dFunctionsExcludeDisabledFalseUnitTest.inc |    2 +-
 ...dFunctionsExcludeDisabledFalseUnitTest.php |   84 +
 ...dSplAutoloadRegisterThrowFalseUnitTest.inc |    2 +
 ...dSplAutoloadRegisterThrowFalseUnitTest.php |   85 +
 ...movedDollarBraceStringEmbedsUnitTest.1.inc |    2 +-
 ...movedDollarBraceStringEmbedsUnitTest.2.inc |    0
 ...RemovedDollarBraceStringEmbedsUnitTest.php |  256 +
 composer.json                                 |    6 +-
 composer.lock                                 |   62 +-
 56 files changed, 3077 insertions(+), 9716 deletions(-)
 create mode 100644 Magento2/Internal/FileProxy.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed
 delete mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
 create mode 100644 PHPCompatibility/AbstractFunctionCallParameterSniff.php
 create mode 100644 PHPCompatibility/LICENSE
 create mode 100644 PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php
 create mode 100644 PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php
 create mode 100644 PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php
 create mode 100644 PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php
 create mode 100644 PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php
 create mode 100644 PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
 create mode 100644 PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php
 create mode 100644 PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests}/BaseSniffTest.php (82%)
 create mode 100644 PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/FunctionDeclarations}/RemovedCallingDestructAfterConstructorExitUnitTest.inc (93%)
 create mode 100644 PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/FunctionDeclarations}/RemovedOptionalBeforeRequiredParamUnitTest.inc (100%)
 create mode 100644 PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/ParameterValues}/ChangedIntToBoolParamTypeUnitTest.inc (92%)
 create mode 100644 PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/ParameterValues}/RemovedAssertStringAssertionUnitTest.inc (100%)
 create mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/ParameterValues}/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc (72%)
 create mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/ParameterValues}/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc (68%)
 create mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/TextStrings}/RemovedDollarBraceStringEmbedsUnitTest.1.inc (97%)
 rename {Magento2/Tests/PHPCompatibility => PHPCompatibility/Tests/TextStrings}/RemovedDollarBraceStringEmbedsUnitTest.2.inc (100%)
 create mode 100644 PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php

diff --git a/Magento2/Internal/FileProxy.php b/Magento2/Internal/FileProxy.php
new file mode 100644
index 00000000..a95043d7
--- /dev/null
+++ b/Magento2/Internal/FileProxy.php
@@ -0,0 +1,465 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Internal;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Proxy class for \PHP_CodeSniffer\Files\File
+ *
+ * @internal
+ */
+class FileProxy extends \PHP_CodeSniffer\Files\File
+{
+    private \PHP_CodeSniffer\Files\File $file;
+
+    private array $proxies;
+
+    /**
+     * @param File $file
+     * @param callable[] $proxies associative array of method name => callable. For example: ['addError' => fn() => {}]
+     */
+    public function __construct(\PHP_CodeSniffer\Files\File $file, array $proxies = [])
+    {
+        $this->file = $file;
+        $this->proxies = $proxies;
+        // parent constructor is not called intentionally
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setContent($content)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($content);
+        }
+        return $this->file->setContent($content);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function reloadContent()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            ($this->proxies[__FUNCTION__])();
+        }
+        $this->file->reloadContent();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function disableCaching()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            ($this->proxies[__FUNCTION__])();
+        }
+        $this->file->disableCaching();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->process();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function parse()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->parse();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTokens()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getTokens();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function cleanUp()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            ($this->proxies[__FUNCTION__])();
+        }
+        $this->file->cleanUp();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addError($error, $stackPtr, $code, $data = [], $severity = 0, $fixable = false)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($error, $stackPtr, $code, $data, $severity, $fixable);
+        }
+        return $this->file->addError($error, $stackPtr, $code, $data, $severity, $fixable);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addWarning($warning, $stackPtr, $code, $data = [], $severity = 0, $fixable = false)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($warning, $stackPtr, $code, $data, $severity, $fixable);
+        }
+        return $this->file->addFixableWarning($warning, $stackPtr, $code, $data, $severity);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addErrorOnLine($error, $line, $code, $data = [], $severity = 0)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($error, $line, $code, $data, $severity);
+        }
+        return $this->file->addErrorOnLine($error, $line, $code, $data, $severity);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addWarningOnLine($warning, $line, $code, $data = [], $severity = 0)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($warning, $line, $code, $data, $severity);
+        }
+        return $this->file->addWarningOnLine($warning, $line, $code, $data, $severity);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFixableError($error, $stackPtr, $code, $data = [], $severity = 0)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($error, $stackPtr, $code, $data, $severity);
+        }
+        return $this->file->addFixableError($error, $stackPtr, $code, $data, $severity);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFixableWarning($warning, $stackPtr, $code, $data = [], $severity = 0)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($warning, $stackPtr, $code, $data, $severity);
+        }
+        return $this->file->addFixableWarning($warning, $stackPtr, $code, $data, $severity);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function recordMetric($stackPtr, $metric, $value)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr, $metric, $value);
+        }
+        return $this->file->recordMetric($stackPtr, $metric, $value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getErrorCount()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getErrorCount();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningCount()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getWarningCount();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFixableCount()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getFixableCount();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFixedCount()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getFixedCount();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIgnoredLines()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getIgnoredLines();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getErrors()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getErrors();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarnings()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getWarnings();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMetrics()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getMetrics();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFilename()
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])();
+        }
+        return $this->file->getFilename();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDeclarationName($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->getDeclarationName($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMethodParameters($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->getMethodParameters($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMethodProperties($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->getMethodProperties($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMemberProperties($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->getMemberProperties($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getClassProperties($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->getClassProperties($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isReference($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->isReference($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTokensAsString($start, $length, $origContent = false)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($start, $length, $origContent);
+        }
+        return $this->file->getTokensAsString($start, $length, $origContent);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function findPrevious($types, $start, $end = null, $exclude = false, $value = null, $local = false)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($types, $start, $end, $exclude, $value, $local);
+        }
+        return $this->file->findPrevious($types, $start, $end, $exclude, $value, $local);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function findNext($types, $start, $end = null, $exclude = false, $value = null, $local = false)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($types, $start, $end, $exclude, $value, $local);
+        }
+        return $this->file->findNext($types, $start, $end, $exclude, $value, $local);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function findStartOfStatement($start, $ignore = null)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($start, $ignore);
+        }
+        return $this->file->findStartOfStatement($start, $ignore);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function findEndOfStatement($start, $ignore = null)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($start, $ignore);
+        }
+        return $this->file->findEndOfStatement($start, $ignore);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function findFirstOnLine($types, $start, $exclude = false, $value = null)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($types, $start, $exclude, $value);
+        }
+        return $this->file->findFirstOnLine($types, $start, $exclude, $value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function hasCondition($stackPtr, $types)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr, $types);
+        }
+        return $this->file->hasCondition($stackPtr, $types);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCondition($stackPtr, $type, $first = true)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr, $type, $first);
+        }
+        return $this->file->getCondition($stackPtr, $type, $first);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function findExtendedClassName($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->findExtendedClassName($stackPtr);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    /**
+     * @inheritdoc
+     */
+    public function findImplementedInterfaceNames($stackPtr)
+    {
+        if (isset($this->proxies[__FUNCTION__])) {
+            return ($this->proxies[__FUNCTION__])($stackPtr);
+        }
+        return $this->file->findImplementedInterfaceNames($stackPtr);
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
index f01be4f6..e3aa6d87 100644
--- a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
@@ -1,123 +1,14 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHPCSUtils\BackCompat\BCTokens;
-
 /**
- * Detect calls to functions where the expected type of a parameter has been changed from integer to boolean.
- *
- * Throws an error when a hard-coded numeric value is passed.
- *
- * PHP version 8.0+
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class ChangedIntToBoolParamTypeSniff extends AbstractFunctionCallParameterSniff
+class ChangedIntToBoolParamTypeSniff extends \PHPCompatibility\Sniffs\ParameterValues\ChangedIntToBoolParamTypeSniff
 {
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'ob_implicit_flush' => [
-            1 => [
-                'name'  => 'flag',
-                'since' => '8.0',
-            ],
-        ],
-        'sem_get' => [
-            4 => [
-                'name'  => 'auto_release',
-                'since' => '8.0',
-            ],
-        ],
-    ];
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * Checks against the first PHP version listed in the above array.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('8.0') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        static $search;
-
-        if (isset($search) === false) {
-            $search  = [
-                \T_LNUMBER => \T_LNUMBER,
-                \T_DNUMBER => \T_DNUMBER,
-            ];
-            $search += BCTokens::arithmeticTokens();
-            $search += Tokens::$emptyTokens;
-        }
-
-        $functionLC   = \strtolower($functionName);
-        $functionInfo = $this->targetFunctions[$functionLC];
-        foreach ($functionInfo as $offset => $paramInfo) {
-            if (isset($parameters[$offset]) === false) {
-                continue;
-            }
-
-            if ($this->supportsAbove($paramInfo['since']) === false) {
-                continue;
-            }
-
-            $target = $parameters[$offset];
-
-            $hasNonNumeric = $phpcsFile->findNext($search, $target['start'], ($target['end'] + 1), true);
-            if ($hasNonNumeric !== false) {
-                // Not a purely numerical value. Ignore.
-                continue;
-            }
-
-            $error = 'The $%s parameter of %s() expects a boolean value instead of an integer since PHP %s. Found: %s';
-            $code  = $this->stringToErrorCode($functionName . '_' . $paramInfo['name']) . 'NumericFound';
-            $data  = [
-                $paramInfo['name'],
-                $functionLC,
-                $paramInfo['since'],
-                $target['raw'],
-            ];
-
-            $phpcsFile->addError($error, $target['start'], $code, $data);
-        }
-    }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
index 365942e7..bf5e4c6f 100644
--- a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
@@ -1,90 +1,36 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHPCompatibility\Sniff;
+use Magento2\Internal\FileProxy;
 use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\Scopes;
 
 /**
- * Applying the final modifier on a private method will produce a warning since PHP 8.0
- * unless that method is the constructor.
- *
- * Previously final private methods were allowed and overriding the method in a child class
- * would result in a fatal "Cannot override final method". This was inappropriate as
- * private methods are not inherited.
- *
- * > Due to how common the usage of `final private function __construct` is and given that
- * > the same results cannot be achieved with a protected visibility, an exception to this rule
- * > is made for constructors.
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/inheritance_private_methods
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class ForbiddenFinalPrivateMethodsSniff extends Sniff
+class ForbiddenFinalPrivateMethodsSniff extends \PHPCompatibility\Sniffs\FunctionDeclarations\ForbiddenFinalPrivateMethodsSniff
 {
-    private const MESSAGE_FINAL = 'Private methods should not be declared as final since PHP 8.0';
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_FUNCTION];
-    }
-
     /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        if (Scopes::isOOMethod($phpcsFile, $stackPtr) === false) {
-            // Function, not method.
-            return;
-        }
-
-        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
-        if (empty($name) === true) {
-            // Parse error or live coding.
-            return;
-        }
-
-        if (\strtolower($name) === '__construct') {
-            // The rule does not apply to constructors. Bow out.
-            return;
-        }
-
-        $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
-        if ($properties['scope'] !== 'private' || $properties['is_final'] === false) {
-            // Not a private final method.
-            return;
-        }
-
-        if ($phpcsFile->addFixableWarning(self::MESSAGE_FINAL, $stackPtr, 'Found') === true) {
+        $phpcsFile->fixer->enabled = true;
+        $warningCount = $phpcsFile->getWarningCount();
+        $phpcsFileProxy = new FileProxy(
+            $phpcsFile,
+            [
+                'addWarning' => function ($warning, $stackPtr, $code, $data = [], $severity = 0) use ($phpcsFile) {
+                    $phpcsFile->addFixableWarning($warning, $stackPtr, $code, $data, $severity);
+                },
+            ]
+        );
+        $result =  parent::process($phpcsFileProxy, $stackPtr);
+        if ($warningCount < $phpcsFile->getWarningCount() && $phpcsFile->fixer->enabled === true) {
             $phpcsFile->fixer->beginChangeset();
             $prev = $phpcsFile->findPrevious(\T_FINAL, ($stackPtr - 1));
             $phpcsFile->fixer->replaceToken($prev, null);
@@ -93,5 +39,7 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->fixer->replaceToken($next, null);
             $phpcsFile->fixer->endChangeset();
         }
+
+        return $result;
     }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
index 294a4106..c1f1984e 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
@@ -1,133 +1,14 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-
 /**
- * Detect the use of assertions passed as a string.
- *
- * PHP 7.2:
- * > Usage of a string as the assertion became deprecated. It now emits an E_DEPRECATED
- * > notice when both assert.active and zend.assertions are set to 1.
- *
- * PHP 8.0:
- * > assert() will no longer evaluate string arguments, instead they will be treated
- * > like any other argument. `assert($a == $b)` should be used instead of `assert('$a == $b')`.
- *
- * PHP version 7.2
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/deprecations_php_7_2#assert_with_string_argument
- * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L350-L354
- * @link https://www.php.net/manual/en/function.assert.php#refsect1-function.assert-changelog
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class RemovedAssertStringAssertionSniff extends AbstractFunctionCallParameterSniff
+class RemovedAssertStringAssertionSniff extends \PHPCompatibility\Sniffs\ParameterValues\RemovedAssertStringAssertionSniff
 {
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'assert' => true,
-    ];
-
-    /**
-     * Target tokens.
-     *
-     * If there is anything but any of these tokens in the parameter, we bow out as undetermined.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    private $targetTokens = [];
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        // Set $targetTokens only once.
-        $this->targetTokens                   = Tokens::$emptyTokens;
-        $this->targetTokens                  += Tokens::$stringTokens + Tokens::$heredocTokens;
-        $this->targetTokens[\T_STRING_CONCAT] = \T_STRING_CONCAT;
-
-        return parent::register();
-    }
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('7.2') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        if (isset($parameters[1]) === false) {
-            return;
-        }
-
-        $targetParam = $parameters[1];
-        $hasOther    = $phpcsFile->findNext($this->targetTokens, $targetParam['start'], ($targetParam['end'] + 1), true);
-        if ($hasOther !== false) {
-            // Some other token was found, unclear whether this is really a text string. Bow out.
-            return;
-        }
-
-        $error   = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2%s. Found: %s';
-        $code    = 'Deprecated';
-        $isError = false;
-        $data    = [
-            '',
-            $targetParam['raw'],
-        ];
-
-        if ($this->supportsAbove('8.0') === true) {
-            $data[0] = ' and removed since PHP 8.0';
-            $isError = true;
-            $code    = 'Removed';
-        }
-
-        $this->addMessage($phpcsFile, $error, $targetParam['start'], $isError, $code, $data);
-    }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
index 0c0dc944..b3d1c981 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
@@ -1,208 +1,14 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\MessageHelper;
-use PHPCSUtils\Utils\ObjectDeclarations;
-use PHPCSUtils\Utils\Scopes;
-use PHPCSUtils\Utils\UseStatements;
-
 /**
- * As of PHP 8.0, when an object constructor exit()s, the destructor will no longer be called.
- *
- * Note: shutdown functions registered with `register_shutdown_function()` will still be called.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/71bfa5344ab207072f4cd25745d7023096338385/UPGRADING#L200-L201
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class RemovedCallingDestructAfterConstructorExitSniff extends Sniff
+class RemovedCallingDestructAfterConstructorExitSniff extends \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedCallingDestructAfterConstructorExitSniff
 {
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_FUNCTION];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.0') === false) {
-            return;
-        }
-
-        $classPtr = Scopes::validDirectScope($phpcsFile, $stackPtr, [\T_CLASS, \T_ANON_CLASS, \T_TRAIT]);
-        if ($classPtr === false) {
-            // Function, not method.
-            return;
-        }
-
-        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
-        if (empty($name) === true) {
-            // Parse error or live coding.
-            return;
-        }
-
-        if (\strtolower($name) !== '__construct') {
-            // The rule only applies to constructors. Bow out.
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
-            // Parse error or live coding.
-            return;
-        }
-
-        $functionOpen  = $tokens[$stackPtr]['scope_opener'];
-        $functionClose = $tokens[$stackPtr]['scope_closer'];
-        $exits         = [];
-        for ($current = ($functionOpen + 1); $current < $functionClose; $current++) {
-            if (isset(Tokens::$emptyTokens[$tokens[$current]['code']]) === true) {
-                continue;
-            }
-
-            if ($tokens[$current]['code'] === \T_EXIT) {
-                $exits[] = $current;
-                continue;
-            }
-
-            // Skip over nested closed scopes as possible for efficiency.
-            // Ignore arrow functions as they aren't closed scopes.
-            if (isset(Collections::closedScopes()[$tokens[$current]['code']]) === true
-                && isset($tokens[$current]['scope_closer']) === true
-            ) {
-                $current = $tokens[$current]['scope_closer'];
-                continue;
-            }
-
-            // Skip over array access and short arrays/lists, but not control structures.
-            if (isset($tokens[$current]['bracket_closer']) === true
-                && isset($tokens[$current]['scope_closer']) === false
-            ) {
-                $current = $tokens[$current]['bracket_closer'];
-                continue;
-            }
-
-            // Skip over long array/lists as they can't contain an exit statement, except within a closed scope.
-            if (($tokens[$current]['code'] === \T_ARRAY || $tokens[$current]['code'] === \T_LIST)
-                && isset($tokens[$current]['parenthesis_closer']) === true
-            ) {
-                $current = $tokens[$current]['parenthesis_closer'];
-                continue;
-            }
-        }
-
-        if (empty($exits) === true) {
-            // No calls to exit or die found.
-            return;
-        }
-
-        if (isset($tokens[$classPtr]['scope_opener'], $tokens[$classPtr]['scope_closer']) === false) {
-            // Parse error, tokenizer error or live coding.
-            return;
-        }
-
-        $hasDestruct = false;
-        $usesTraits  = false;
-        $isError     = false;
-        $classOpen   = $tokens[$classPtr]['scope_opener'];
-        $classClose  = $tokens[$classPtr]['scope_closer'];
-        $nextFunc    = $classOpen;
-
-        while (($nextFunc = $phpcsFile->findNext([\T_FUNCTION, \T_DOC_COMMENT_OPEN_TAG, \T_USE], ($nextFunc + 1), $classClose)) !== false) {
-            // Skip over docblocks.
-            if ($tokens[$nextFunc]['code'] === \T_DOC_COMMENT_OPEN_TAG) {
-                $nextFunc = $tokens[$nextFunc]['comment_closer'];
-                continue;
-            }
-
-            if ($tokens[$nextFunc]['code'] === \T_USE
-                && UseStatements::isTraitUse($phpcsFile, $nextFunc) === true
-            ) {
-                $usesTraits = true;
-                continue;
-            }
-
-            $functionScopeCloser = $nextFunc;
-            if (isset($tokens[$nextFunc]['scope_closer'])) {
-                // Normal (non-abstract) method.
-                $functionScopeCloser = $tokens[$nextFunc]['scope_closer'];
-            }
-
-            $funcName = FunctionDeclarations::getName($phpcsFile, $nextFunc);
-            $nextFunc = $functionScopeCloser; // Set up to skip over the method content.
-
-            if (empty($funcName) === true) {
-                continue;
-            }
-
-            if (\strtolower($funcName) !== '__destruct') {
-                continue;
-            }
-
-            $hasDestruct = true;
-            $isError     = true;
-            break;
-        }
-
-        if ($hasDestruct === false && $usesTraits === false) {
-            /*
-             * No destruct method or trait use found, check if this class extends another one
-             * which may contain a destruct method.
-             */
-            $extends = ObjectDeclarations::findExtendedClassName($phpcsFile, $classPtr);
-            if (empty($extends) === true) {
-                // No destruct method and class doesn't extend nor uses traits, so the calls to exit can be ignored.
-                return;
-            }
-        }
-
-        /*
-         * Ok, either a destruct method has been found and we can throw an error, or either a class extends
-         * or trait use has been found and no destruct method, in which case, we throw a warning.
-         */
-        $error     = 'When %s() is called within an object constructor, the object destructor will no longer be called since PHP 8.0';
-        $errorCode = 'Found';
-        if ($isError === false) {
-            $error    .= ' While no __destruct() method was found in this class, one may be declared in the parent class or in a trait being used.';
-            $errorCode = 'NeedsInspection';
-        }
-
-        foreach ($exits as $ptr) {
-            MessageHelper::addMessage($phpcsFile, $error, $ptr, $isError, $errorCode, [$tokens[$ptr]['content']]);
-        }
-    }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
index 83588c2a..5e9daa81 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
@@ -1,134 +1,14 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2022 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHP_CodeSniffer\Files\File;
-use PHPCompatibility\Sniff;
-use PHPCSUtils\Utils\GetTokensAsString;
-use PHPCSUtils\Utils\TextStrings;
-
 /**
- * Detect use of select forms of variable embedding in heredocs and double strings as deprecated per PHP 8.2.
- *
- * > PHP allows embedding variables in strings with double-quotes (") and heredoc in various ways.
- * > 1. Directly embedding variables (`$foo`)
- * > 2. Braces outside the variable (`{$foo}`)
- * > 3. Braces after the dollar sign (`${foo}`)
- * > 4. Variable variables (`${expr}`, equivalent to `(string) ${expr}`)
- * >
- * > [...] to deprecate options 3 and 4 in PHP 8.2 and remove them in PHP 9.0.
- *
- * PHP version 8.2
- * PHP version 9.0
- *
- * @link https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class RemovedDollarBraceStringEmbedsSniff extends Sniff
+class RemovedDollarBraceStringEmbedsSniff extends \PHPCompatibility\Sniffs\TextStrings\RemovedDollarBraceStringEmbedsSniff
 {
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            \T_DOUBLE_QUOTED_STRING,
-            \T_START_HEREDOC,
-            \T_DOLLAR_OPEN_CURLY_BRACES,
-        ];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void|int Void or a stack pointer to skip forward.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.2') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        /*
-         * Defensive coding, this code is not expected to ever actually be hit since PHPCS#3604
-         * (included in 3.7.0), but _will_ be hit if a file containing a PHP 7.3 indented heredoc/nowdocs
-         * is scanned with PHPCS on PHP < 7.3. People shouldn't do that, but hey, we can't stop them.
-         */
-        if ($tokens[$stackPtr]['code'] === \T_DOLLAR_OPEN_CURLY_BRACES) {
-            // @codeCoverageIgnoreStart
-            if ($tokens[($stackPtr - 1)]['code'] === \T_DOUBLE_QUOTED_STRING) {
-                --$stackPtr;
-            } else {
-                // Throw an error anyway, though it won't be very informative.
-                $message = 'Using ${} in strings is deprecated since PHP 8.2, use {$var} or {${expr}} instead.';
-                $code    = 'DeprecatedDollarBraceEmbed';
-                $phpcsFile->addWarning($message, $stackPtr, $code);
-                return;
-            }
-            // @codeCoverageIgnoreEnd
-        }
-
-        $endOfString   = TextStrings::getEndOfCompleteTextString($phpcsFile, $stackPtr);
-        $startOfString = $stackPtr;
-        if ($tokens[$stackPtr]['code'] === \T_START_HEREDOC) {
-            $startOfString = ($stackPtr + 1);
-        }
-
-        $contents = GetTokensAsString::normal($phpcsFile, $startOfString, $endOfString);
-        if (\strpos($contents, '${') === false) {
-            // No interpolation found or only interpolations which are still supported.
-            return ($endOfString + 1);
-        }
-
-        $embeds = TextStrings::getEmbeds($contents);
-        foreach ($embeds as $offset => $embed) {
-            if (\strpos($embed, '${') !== 0) {
-                continue;
-            }
-
-            // Figure out the stack pointer to throw the warning on.
-            $errorPtr = $startOfString;
-            $length   = 0;
-            while (($length + $tokens[$errorPtr]['length']) < $offset) {
-                $length += $tokens[$errorPtr]['length'];
-                ++$errorPtr;
-            }
-
-            // Type 4.
-            $message = 'Using %s (variable variables) in strings is deprecated since PHP 8.2, use {${expr}} instead.';
-            $code    = 'DeprecatedExpressionSyntax';
-            if (\preg_match('`^\$\{(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:\[([\'"])?[^\$\{\}\]]+(?:\2)?\])?\}$`', $embed) === 1) {
-                // Type 3.
-                $message = 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: %s';
-                $code    = 'DeprecatedVariableSyntax';
-            }
-
-            $phpcsFile->addWarning($message, $errorPtr, $code, [$embed]);
-
-        }
-
-        return ($endOfString + 1);
-    }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
deleted file mode 100644
index d9b3ff6b..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
+++ /dev/null
@@ -1,5135 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\Sniff;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\MessageHelper;
-
-/**
- * Detect calls to deprecated/removed native PHP functions.
- *
- * Suggests alternative if available.
- *
- * PHP version All
- *
- * @since 5.5
- * @since 5.6    Now extends the base `Sniff` class instead of the upstream
- *               `Generic.PHP.ForbiddenFunctions` sniff.
- * @since 7.1.0  Now extends the `AbstractRemovedFeatureSniff` instead of the base `Sniff` class.
- * @since 9.0.0  Renamed from `DeprecatedFunctionsSniff` to `RemovedFunctionsSniff`.
- * @since 10.0.0 Now extends the base `Sniff` class and uses the `ComplexVersionDeprecatedRemovedFeatureTrait`.
- */
-class RemovedFunctionsSniff extends Sniff
-{
-    /**
-     * Basic error message template for deprecated/removed features.
-     *
-     * @var string
-     */
-    protected $msgTemplate = '%s is ';
-
-    /**
-     * Message template to use if an alternative is available for the deprecated/removed
-     * feature.
-     *
-     * @var string
-     */
-    protected $alternativeOptionTemplate = '; Use %s instead';
-
-    /**
-     * A list of deprecated and removed functions with their alternatives.
-     *
-     * The array lists : version number with false (deprecated) or true (removed) and an alternative function.
-     * If no alternative exists, it is NULL, i.e, the function should just not be used.
-     *
-     * @since 5.5
-     * @since 5.6   Visibility changed from `protected` to `public`.
-     * @since 7.0.2 Visibility changed back from `public` to `protected`.
-     *              The earlier change was made to be in line with the upstream sniff,
-     *              but that sniff is no longer being extended.
-     * @since 7.0.8 Property renamed from `$forbiddenFunctions` to `$removedFunctions`.
-     *
-     * @var array(string => array(string => bool|string|null))
-     */
-    protected $removedFunctions = [
-        'crack_check' => [
-            '5.0'       => true,
-            'extension' => 'crack',
-        ],
-        'crack_closedict' => [
-            '5.0'       => true,
-            'extension' => 'crack',
-        ],
-        'crack_getlastmessage' => [
-            '5.0'       => true,
-            'extension' => 'crack',
-        ],
-        'crack_opendict' => [
-            '5.0'       => true,
-            'extension' => 'crack',
-        ],
-
-        'php_check_syntax' => [
-            '5.0.5' => true,
-        ],
-
-        'pfpro_cleanup' => [
-            '5.1'       => true,
-            'extension' => 'pfpro',
-        ],
-        'pfpro_init' => [
-            '5.1'       => true,
-            'extension' => 'pfpro',
-        ],
-        'pfpro_process_raw' => [
-            '5.1'       => true,
-            'extension' => 'pfpro',
-        ],
-        'pfpro_process' => [
-            '5.1'       => true,
-            'extension' => 'pfpro',
-        ],
-        'pfpro_version' => [
-            '5.1'       => true,
-            'extension' => 'pfpro',
-        ],
-        'm_checkstatus' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_completeauthorizations' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_connect' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_connectionerror' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_deletetrans' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_destroyconn' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_destroyengine' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_getcell' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_getcellbynum' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_getcommadelimited' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_getheader' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_initconn' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_initengine' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_iscommadelimited' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_maxconntimeout' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_monitor' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_numcolumns' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_numrows' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_parsecommadelimited' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_responsekeys' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_responseparam' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_returnstatus' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_setblocking' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_setdropfile' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_setip' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_setssl_cafile' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_setssl_files' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_setssl' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_settimeout' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_sslcert_gen_hash' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_transactionssent' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_transinqueue' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_transkeyval' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_transnew' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_transsend' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_uwait' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_validateidentifier' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_verifyconnection' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'm_verifysslcert' => [
-            '5.1'       => true,
-            'extension' => 'mcve',
-        ],
-        'dio_close' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_fcntl' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_open' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_read' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_seek' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_stat' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_tcsetattr' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_truncate' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'dio_write' => [
-            '5.1'       => true,
-            'extension' => 'dio',
-        ],
-        'fam_cancel_monitor' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_close' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_monitor_collection' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_monitor_directory' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_monitor_file' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_next_event' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_open' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_pending' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_resume_monitor' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'fam_suspend_monitor' => [
-            '5.1'       => true,
-            'extension' => 'fam',
-        ],
-        'yp_all' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_cat' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_err_string' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_errno' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_first' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_get_default_domain' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_master' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_match' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_next' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'yp_order' => [
-            '5.1'       => true,
-            'extension' => 'yp',
-        ],
-        'udm_add_search_limit' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_alloc_agent_array' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_alloc_agent' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_api_version' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_cat_list' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_cat_path' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_check_charset' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_clear_search_limits' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_crc32' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_errno' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_error' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_find' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_free_agent' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_free_ispell_data' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_free_res' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_get_doc_count' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_get_res_field' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_get_res_param' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_hash32' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_load_ispell_data' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'udm_set_agent_param' => [
-            '5.1'       => true,
-            'extension' => 'mnogosearch',
-        ],
-        'w32api_deftype' => [
-            '5.1'       => true,
-            'extension' => 'w32api',
-        ],
-        'w32api_init_dtype' => [
-            '5.1'       => true,
-            'extension' => 'w32api',
-        ],
-        'w32api_invoke_function' => [
-            '5.1'       => true,
-            'extension' => 'w32api',
-        ],
-        'w32api_register_function' => [
-            '5.1'       => true,
-            'extension' => 'w32api',
-        ],
-        'w32api_set_call_method' => [
-            '5.1'       => true,
-            'extension' => 'w32api',
-        ],
-        'cpdf_add_annotation' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_add_outline' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_arc' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_begin_text' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_circle' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_clip' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_close' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_closepath_fill_stroke' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_closepath_stroke' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_closepath' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_continue_text' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_curveto' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_end_text' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_fill_stroke' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_fill' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_finalize_page' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_finalize' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_global_set_document_limits' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_import_jpeg' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_lineto' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_moveto' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_newpath' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_open' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_output_buffer' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_page_init' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_place_inline_image' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_rect' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_restore' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_rlineto' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_rmoveto' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_rotate_text' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_rotate' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_save_to_file' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_save' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_scale' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_action_url' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_char_spacing' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_creator' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_current_page' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_font_directories' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_font_map_file' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_font' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_horiz_scaling' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_keywords' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_leading' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_page_animation' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_subject' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_text_matrix' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_text_pos' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_text_rendering' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_text_rise' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_title' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_viewer_preferences' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_set_word_spacing' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setdash' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setflat' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setgray_fill' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setgray_stroke' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setgray' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setlinecap' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setlinejoin' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setlinewidth' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setmiterlimit' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setrgbcolor_fill' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setrgbcolor_stroke' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_setrgbcolor' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_show_xy' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_show' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_stringwidth' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_stroke' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_text' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'cpdf_translate' => [
-            '5.1'       => true,
-            'extension' => 'cpdf',
-        ],
-        'ircg_channel_mode' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_disconnect' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_eval_ecmascript_params' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_fetch_error_msg' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_get_username' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_html_encode' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_ignore_add' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_ignore_del' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_invite' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_is_conn_alive' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_join' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_kick' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_list' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_lookup_format_messages' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_lusers' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_msg' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_names' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_nick' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_nickname_escape' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_nickname_unescape' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_notice' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_oper' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_part' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_pconnect' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_register_format_messages' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_set_current' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_set_file' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_set_on_die' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_topic' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_who' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'ircg_whois' => [
-            '5.1'       => true,
-            'extension' => 'ircg',
-        ],
-        'dbx_close' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_compare' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_connect' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_error' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_escape_string' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_fetch_row' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_query' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'dbx_sort' => [
-            '5.1'       => true,
-            'extension' => 'dbx',
-        ],
-        'ingres_autocommit' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_close' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_commit' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_connect' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_fetch_array' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_fetch_object' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_fetch_row' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_field_length' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_field_name' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_field_nullable' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_field_precision' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_field_scale' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_field_type' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_num_fields' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_num_rows' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_pconnect' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_query' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ingres_rollback' => [
-            '5.1'       => true,
-            'extension' => 'ingres',
-        ],
-        'ovrimos_close' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_commit' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_connect' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_cursor' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_exec' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_execute' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_fetch_into' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_fetch_row' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_field_len' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_field_name' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_field_num' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_field_type' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_free_result' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_longreadlen' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_num_fields' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_num_rows' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_prepare' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_result_all' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_result' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_rollback' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ovrimos_close_all' => [
-            '5.1'       => true,
-            'extension' => 'ovrimos',
-        ],
-        'ora_bind' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_close' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_columnname' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_columnsize' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_columntype' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_commit' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_commitoff' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_commiton' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_do' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_error' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_errorcode' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_exec' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_fetch_into' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_fetch' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_getcolumn' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_logoff' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_logon' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_numcols' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_numrows' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_open' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_parse' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_plogon' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'ora_rollback' => [
-            '5.1'       => true,
-            'extension' => 'oracle',
-        ],
-        'mysqli_embedded_connect' => [
-            '5.1' => true,
-        ],
-        'mysqli_server_end' => [
-            '5.1' => true,
-        ],
-        'mysqli_server_init' => [
-            '5.1' => true,
-        ],
-
-        'msession_connect' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_count' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_create' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_destroy' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_disconnect' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_find' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_get_array' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_get_data' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_get' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_inc' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_list' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_listvar' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_lock' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_plugin' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_randstr' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_set_array' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_set_data' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_set' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_timeout' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_uniq' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-        'msession_unlock' => [
-            '5.1.3'     => true,
-            'extension' => 'msession',
-        ],
-
-        'mysqli_resource' => [
-            '5.1.4' => true,
-        ],
-
-        'mysql_createdb' => [
-            '5.1.7'     => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_dropdb' => [
-            '5.1.7'     => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_listtables' => [
-            '5.1.7'     => true,
-            'extension' => 'mysql',
-        ],
-
-        'hwapi_attribute_new' => [
-            '5.2'       => true,
-            'extension' => 'hwapi',
-        ],
-        'hwapi_content_new' => [
-            '5.2'       => true,
-            'extension' => 'hwapi',
-        ],
-        'hwapi_hgcsp' => [
-            '5.2'       => true,
-            'extension' => 'hwapi',
-        ],
-        'hwapi_object_new' => [
-            '5.2'       => true,
-            'extension' => 'hwapi',
-        ],
-        'filepro_fieldcount' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-        'filepro_fieldname' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-        'filepro_fieldtype' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-        'filepro_fieldwidth' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-        'filepro_retrieve' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-        'filepro_rowcount' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-        'filepro' => [
-            '5.2'       => true,
-            'extension' => 'filepro',
-        ],
-
-        'ifx_affected_rows' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_blobinfile_mode' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_byteasvarchar' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_close' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_connect' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_copy_blob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_create_blob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_create_char' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_do' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_error' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_errormsg' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_fetch_row' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_fieldproperties' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_fieldtypes' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_free_blob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_free_char' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_free_result' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_get_blob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_get_char' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_getsqlca' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_htmltbl_result' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_nullformat' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_num_fields' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_num_rows' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_pconnect' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_prepare' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_query' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_textasvarchar' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_update_blob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifx_update_char' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_close_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_create_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_free_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_open_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_read_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_seek_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_tell_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-        'ifxus_write_slob' => [
-            '5.2.1'     => true,
-            'extension' => 'ifx',
-        ],
-
-        'ncurses_addch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_addchnstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_addchstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_addnstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_addstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_assume_default_colors' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_attroff' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_attron' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_attrset' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_baudrate' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_beep' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_bkgd' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_bkgdset' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_border' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_bottom_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_can_change_color' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_cbreak' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_clear' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_clrtobot' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_clrtoeol' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_color_content' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_color_set' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_curs_set' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_def_prog_mode' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_def_shell_mode' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_define_key' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_del_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_delay_output' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_delch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_deleteln' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_delwin' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_doupdate' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_echo' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_echochar' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_end' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_erase' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_erasechar' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_filter' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_flash' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_flushinp' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_getch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_getmaxyx' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_getmouse' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_getyx' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_halfdelay' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_has_colors' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_has_ic' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_has_il' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_has_key' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_hide_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_hline' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_inch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_init_color' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_init_pair' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_init' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_insch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_insdelln' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_insertln' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_insstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_instr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_isendwin' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_keyok' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_keypad' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_killchar' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_longname' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_meta' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mouse_trafo' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mouseinterval' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mousemask' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_move_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_move' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvaddch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvaddchnstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvaddchstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvaddnstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvaddstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvcur' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvdelch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvgetch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvhline' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvinch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvvline' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_mvwaddstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_napms' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_new_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_newpad' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_newwin' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_nl' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_nocbreak' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_noecho' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_nonl' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_noqiflush' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_noraw' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_pair_content' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_panel_above' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_panel_below' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_panel_window' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_pnoutrefresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_prefresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_putp' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_qiflush' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_raw' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_refresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_replace_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_reset_prog_mode' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_reset_shell_mode' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_resetty' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_savetty' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_scr_dump' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_scr_init' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_scr_restore' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_scr_set' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_scrl' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_show_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_attr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_attroff' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_attron' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_attrset' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_clear' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_color' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_init' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_noutrefresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_refresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_restore' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_set' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_slk_touch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_standend' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_standout' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_start_color' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_termattrs' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_termname' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_timeout' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_top_panel' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_typeahead' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_ungetch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_ungetmouse' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_update_panels' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_use_default_colors' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_use_env' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_use_extended_names' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_vidattr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_vline' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_waddch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_waddstr' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wattroff' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wattron' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wattrset' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wborder' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wclear' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wcolor_set' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_werase' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wgetch' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_whline' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wmouse_trafo' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wmove' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wnoutrefresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wrefresh' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wstandend' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wstandout' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'ncurses_wvline' => [
-            '5.3'       => true,
-            'extension' => 'ncurses',
-        ],
-        'fdf_add_doc_javascript' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_add_template' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_close' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_create' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_enum_values' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_errno' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_error' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_ap' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_attachment' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_encoding' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_file' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_flags' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_opt' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_status' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_value' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_get_version' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_header' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_next_field_name' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_open_string' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_open' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_remove_item' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_save_string' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_save' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_ap' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_encoding' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_file' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_flags' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_javascript_action' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_on_import_javascript' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_opt' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_status' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_submit_form_action' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_target_frame' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_value' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'fdf_set_version' => [
-            '5.3'       => true,
-            'extension' => 'fdf',
-        ],
-        'ming_keypress' => [
-            '5.3'       => true,
-            'extension' => 'ming',
-        ],
-        'ming_setcubicthreshold' => [
-            '5.3'       => true,
-            'extension' => 'ming',
-        ],
-        'ming_setscale' => [
-            '5.3'       => true,
-            'extension' => 'ming',
-        ],
-        'ming_setswfcompression' => [
-            '5.3'       => true,
-            'extension' => 'ming',
-        ],
-        'ming_useconstants' => [
-            '5.3'       => true,
-            'extension' => 'ming',
-        ],
-        'ming_useswfversion' => [
-            '5.3'       => true,
-            'extension' => 'ming',
-        ],
-        'dbase_add_record' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_close' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_create' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_delete_record' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_get_header_info' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_get_record_with_names' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_get_record' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_numfields' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_numrecords' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_open' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_pack' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'dbase_replace_record' => [
-            '5.3'       => true,
-            'extension' => 'dbase',
-        ],
-        'fbsql_affected_rows' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_autocommit' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_blob_size' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_change_user' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_clob_size' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_close' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_commit' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_connect' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_create_blob' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_create_clob' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_create_db' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_data_seek' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_database_password' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_database' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_db_query' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_db_status' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_drop_db' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_errno' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_error' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_fetch_array' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_fetch_assoc' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_fetch_field' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_fetch_lengths' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_fetch_object' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_fetch_row' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_field_flags' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_field_len' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_field_name' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_field_seek' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_field_table' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_field_type' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_free_result' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_get_autostart_info' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_hostname' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_insert_id' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_list_dbs' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_list_fields' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_list_tables' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_next_result' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_num_fields' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_num_rows' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_password' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_pconnect' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_query' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_read_blob' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_read_clob' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_result' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_rollback' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_rows_fetched' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_select_db' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_set_characterset' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_set_lob_mode' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_set_password' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_set_transaction' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_start_db' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_stop_db' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_table_name' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_tablename' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_username' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'fbsql_warnings' => [
-            '5.3'       => true,
-            'extension' => 'fbsql',
-        ],
-        'msql_affected_rows' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_close' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_connect' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_create_db' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_createdb' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_data_seek' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_db_query' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_dbname' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_drop_db' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_error' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fetch_array' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fetch_field' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fetch_object' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fetch_row' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_field_flags' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_field_len' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_field_name' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_field_seek' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_field_table' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_field_type' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fieldflags' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fieldlen' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fieldname' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fieldtable' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_fieldtype' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_free_result' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_list_dbs' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_list_fields' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_list_tables' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_num_fields' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_num_rows' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_numfields' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_numrows' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_pconnect' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_query' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_regcase' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_result' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_select_db' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql_tablename' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'msql' => [
-            '5.3'       => true,
-            'extension' => 'msql',
-        ],
-        'mysqli_disable_reads_from_master' => [
-            '5.3' => true,
-        ],
-        'mysqli_disable_rpl_parse' => [
-            '5.3' => true,
-        ],
-        'mysqli_enable_reads_from_master' => [
-            '5.3' => true,
-        ],
-        'mysqli_enable_rpl_parse' => [
-            '5.3' => true,
-        ],
-        'mysqli_master_query' => [
-            '5.3' => true,
-        ],
-        'mysqli_rpl_parse_enabled' => [
-            '5.3' => true,
-        ],
-        'mysqli_rpl_probe' => [
-            '5.3' => true,
-        ],
-        'mysqli_slave_query' => [
-            '5.3' => true,
-        ],
-
-        'call_user_method' => [
-            '4.1'         => false,
-            '7.0'         => true,
-            'alternative' => 'call_user_func()',
-        ],
-        'call_user_method_array' => [
-            '4.1'         => false,
-            '7.0'         => true,
-            'alternative' => 'call_user_func_array()',
-        ],
-        'define_syslog_variables' => [
-            '5.3' => false,
-            '5.4' => true,
-        ],
-        'dl' => [
-            '5.3' => false,
-        ],
-        'ereg' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_match()',
-            'extension'   => 'ereg',
-        ],
-        'ereg_replace' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_replace()',
-            'extension'   => 'ereg',
-        ],
-        'eregi' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_match() (with the i modifier)',
-            'extension'   => 'ereg',
-        ],
-        'eregi_replace' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_replace() (with the i modifier)',
-            'extension'   => 'ereg',
-        ],
-        'imagepsbbox' => [
-            '7.0' => true,
-        ],
-        'imagepsencodefont' => [
-            '7.0' => true,
-        ],
-        'imagepsextendfont' => [
-            '7.0' => true,
-        ],
-        'imagepsfreefont' => [
-            '7.0' => true,
-        ],
-        'imagepsloadfont' => [
-            '7.0' => true,
-        ],
-        'imagepsslantfont' => [
-            '7.0' => true,
-        ],
-        'imagepstext' => [
-            '7.0' => true,
-        ],
-        'import_request_variables' => [
-            '5.3' => false,
-            '5.4' => true,
-        ],
-        'ldap_sort' => [
-            '7.0' => false,
-            '8.0' => true,
-        ],
-        'mcrypt_generic_end' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_generic_deinit()',
-            'extension'   => 'mcrypt',
-        ],
-        'mysql_db_query' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'mysqli::select_db() and mysqli::query()',
-            'extension'   => 'mysql',
-        ],
-        'mysql_escape_string' => [
-            '4.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'mysqli::real_escape_string()',
-            'extension'   => 'mysql',
-        ],
-        'mysql_list_dbs' => [
-            '5.4'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_list_fields' => [
-            '5.4'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysqli_bind_param' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::bind_param()',
-        ],
-        'mysqli_bind_result' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::bind_result()',
-        ],
-        'mysqli_client_encoding' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli::character_set_name()',
-        ],
-        'mysqli_fetch' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::fetch()',
-        ],
-        'mysqli_param_count' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt_param_count()',
-        ],
-        'mysqli_get_metadata' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::result_metadata()',
-        ],
-        'mysqli_send_long_data' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::send_long_data()',
-        ],
-        'magic_quotes_runtime' => [
-            '5.3' => false,
-            '7.0' => true,
-        ],
-        'session_register' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => '$_SESSION',
-        ],
-        'session_unregister' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => '$_SESSION',
-        ],
-        'session_is_registered' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => '$_SESSION',
-        ],
-        'set_magic_quotes_runtime' => [
-            '5.3' => false,
-            '7.0' => true,
-        ],
-        'set_socket_blocking' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'stream_set_blocking()',
-        ],
-        'split' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_split(), explode() or str_split()',
-            'extension'   => 'ereg',
-        ],
-        'spliti' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_split() (with the i modifier)',
-            'extension'   => 'ereg',
-        ],
-        'sql_regcase' => [
-            '5.3'       => false,
-            '7.0'       => true,
-            'extension' => 'ereg',
-        ],
-        'php_logo_guid' => [
-            '5.5' => true,
-        ],
-        'php_egg_logo_guid' => [
-            '5.5' => true,
-        ],
-        'php_real_logo_guid' => [
-            '5.5' => true,
-        ],
-        'zend_logo_guid' => [
-            '5.5'         => true,
-            'alternative' => 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"',
-        ],
-        'datefmt_set_timezone_id' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'IntlDateFormatter::setTimeZone()',
-        ],
-        'mcrypt_ecb' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_cbc' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_cfb' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_ofb' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-            'extension'   => 'mcrypt',
-        ],
-        'ocibindbyname' => [
-            '5.4'         => false,
-            'alternative' => 'oci_bind_by_name()',
-        ],
-        'ocicancel' => [
-            '5.4'         => false,
-            'alternative' => 'oci_cancel()',
-        ],
-        'ocicloselob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::close() / OCILob::close() (PHP 8+)',
-        ],
-        'ocicollappend' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::append() / OCICollection::append() (PHP 8+)',
-        ],
-        'ocicollassign' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)',
-        ],
-        'ocicollassignelem' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)',
-        ],
-        'ocicollgetelem' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)',
-        ],
-        'ocicollmax' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::max() / OCICollection::max() (PHP 8+)',
-        ],
-        'ocicollsize' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::size() / OCICollection::size() (PHP 8+)',
-        ],
-        'ocicolltrim' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)',
-        ],
-        'ocicolumnisnull' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_is_null()',
-        ],
-        'ocicolumnname' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_name()',
-        ],
-        'ocicolumnprecision' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_precision()',
-        ],
-        'ocicolumnscale' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_scale()',
-        ],
-        'ocicolumnsize' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_size()',
-        ],
-        'ocicolumntype' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_type()',
-        ],
-        'ocicolumntyperaw' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_type_raw()',
-        ],
-        'ocicommit' => [
-            '5.4'         => false,
-            'alternative' => 'oci_commit()',
-        ],
-        'ocidefinebyname' => [
-            '5.4'         => false,
-            'alternative' => 'oci_define_by_name()',
-        ],
-        'ocierror' => [
-            '5.4'         => false,
-            'alternative' => 'oci_error()',
-        ],
-        'ociexecute' => [
-            '5.4'         => false,
-            'alternative' => 'oci_execute()',
-        ],
-        'ocifetch' => [
-            '5.4'         => false,
-            'alternative' => 'oci_fetch()',
-        ],
-        'ocifetchinto' => [
-            '5.4' => false,
-        ],
-        'ocifetchstatement' => [
-            '5.4'         => false,
-            'alternative' => 'oci_fetch_all()',
-        ],
-        'ocifreecollection' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::free() / OCICollection::free() (PHP 8+)',
-        ],
-        'ocifreecursor' => [
-            '5.4'         => false,
-            'alternative' => 'oci_free_statement()',
-        ],
-        'ocifreedesc' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::free() / OCILob::free() (PHP 8+)',
-        ],
-        'ocifreestatement' => [
-            '5.4'         => false,
-            'alternative' => 'oci_free_statement()',
-        ],
-        'ociinternaldebug' => [
-            '5.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'oci_internal_debug() (PHP < 8.0)',
-        ],
-        'ociloadlob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::load() / OCILob::load() (PHP 8+)',
-        ],
-        'ocilogoff' => [
-            '5.4'         => false,
-            'alternative' => 'oci_close()',
-        ],
-        'ocilogon' => [
-            '5.4'         => false,
-            'alternative' => 'oci_connect()',
-        ],
-        'ocinewcollection' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_collection()',
-        ],
-        'ocinewcursor' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_cursor()',
-        ],
-        'ocinewdescriptor' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_descriptor()',
-        ],
-        'ocinlogon' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_connect()',
-        ],
-        'ocinumcols' => [
-            '5.4'         => false,
-            'alternative' => 'oci_num_fields()',
-        ],
-        'ociparse' => [
-            '5.4'         => false,
-            'alternative' => 'oci_parse()',
-        ],
-        'ociplogon' => [
-            '5.4'         => false,
-            'alternative' => 'oci_pconnect()',
-        ],
-        'ociresult' => [
-            '5.4'         => false,
-            'alternative' => 'oci_result()',
-        ],
-        'ocirollback' => [
-            '5.4'         => false,
-            'alternative' => 'oci_rollback()',
-        ],
-        'ocirowcount' => [
-            '5.4'         => false,
-            'alternative' => 'oci_num_rows()',
-        ],
-        'ocisavelob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::save() / OCILob::save() (PHP 8+)',
-        ],
-        'ocisavelobfile' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::import() / OCILob::import() (PHP 8+)',
-        ],
-        'ociserverversion' => [
-            '5.4'         => false,
-            'alternative' => 'oci_server_version()',
-        ],
-        'ocisetprefetch' => [
-            '5.4'         => false,
-            'alternative' => 'oci_set_prefetch()',
-        ],
-        'ocistatementtype' => [
-            '5.4'         => false,
-            'alternative' => 'oci_statement_type()',
-        ],
-        'ociwritelobtofile' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::export() / OCILob::export() (PHP 8+)',
-        ],
-        'ociwritetemporarylob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)',
-        ],
-        'mysqli_get_cache_stats' => [
-            '5.4' => true,
-        ],
-        'sqlite_array_query' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_busy_timeout' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_changes' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_close' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_column' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_create_aggregate' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_create_function' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_current' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_error_string' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_escape_string' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_exec' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_factory' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_fetch_all' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_fetch_array' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_fetch_column_types' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_fetch_object' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_fetch_single' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_fetch_string' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_field_name' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_has_more' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_has_prev' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_key' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_last_error' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_last_insert_rowid' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_libencoding' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_libversion' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_next' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_num_fields' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_num_rows' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_open' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_popen' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_prev' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_query' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_rewind' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_seek' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_single_query' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_udf_decode_binary' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_udf_encode_binary' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_unbuffered_query' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-        'sqlite_valid' => [
-            '5.4'       => true,
-            'extension' => 'sqlite',
-        ],
-
-        'mssql_bind' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_close' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_connect' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_data_seek' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_execute' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_fetch_array' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_fetch_assoc' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_fetch_batch' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_fetch_field' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_fetch_object' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_fetch_row' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_field_length' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_field_name' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_field_seek' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_field_type' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_free_result' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_free_statement' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_get_last_message' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_guid_string' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_init' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_min_error_severity' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_min_message_severity' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_next_result' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_num_fields' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_num_rows' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_pconnect' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_query' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_result' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_rows_affected' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mssql_select_db' => [
-            '7.0'       => true,
-            'extension' => 'mssql',
-        ],
-        'mysql_affected_rows' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_client_encoding' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_close' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_connect' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_create_db' => [
-            '4.3'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_data_seek' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_db_name' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_drop_db' => [
-            '4.3'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_errno' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_error' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fetch_array' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fetch_assoc' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fetch_field' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fetch_lengths' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fetch_object' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fetch_row' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_field_flags' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_field_len' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_field_name' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_field_seek' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_field_table' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_field_type' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_free_result' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_get_client_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_get_host_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_get_proto_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_get_server_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_insert_id' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_list_processes' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_list_tables' => [
-            '4.3.7'     => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_num_fields' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_num_rows' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_pconnect' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_ping' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_query' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_real_escape_string' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_result' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_select_db' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_set_charset' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_stat' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_tablename' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_thread_id' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_unbuffered_query' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fieldname' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fieldtable' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fieldlen' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fieldtype' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_fieldflags' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_selectdb' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_freeresult' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_numfields' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_numrows' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_listdbs' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_listfields' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_dbname' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'mysql_table_name' => [
-            '5.5'       => false,
-            '7.0'       => true,
-            'extension' => 'mysql',
-        ],
-        'sybase_affected_rows' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_close' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_connect' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_data_seek' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_deadlock_retry_count' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_fetch_array' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_fetch_assoc' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_fetch_field' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_fetch_object' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_fetch_row' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_field_seek' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_free_result' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_get_last_message' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_min_client_severity' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_min_error_severity' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_min_message_severity' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_min_server_severity' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_num_fields' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_num_rows' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_pconnect' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_query' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_result' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_select_db' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_set_message_handler' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-        'sybase_unbuffered_query' => [
-            '7.0'       => true,
-            'extension' => 'sybase',
-        ],
-
-        'mcrypt_create_iv' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'random_bytes() or OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_decrypt' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_get_algorithms_name' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_get_block_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_get_iv_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_get_key_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_get_modes_name' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_get_supported_key_sizes' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_is_block_algorithm_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_is_block_algorithm' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_is_block_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_enc_self_test' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_encrypt' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_generic_deinit' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_generic_init' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_generic' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_get_block_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_get_cipher_name' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_get_iv_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_get_key_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_list_algorithms' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_list_modes' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_close' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_get_algo_block_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_get_algo_key_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_get_supported_key_sizes' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_is_block_algorithm_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_is_block_algorithm' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_is_block_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_open' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mcrypt_module_self_test' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'mdecrypt_generic' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-            'extension'   => 'mcrypt',
-        ],
-        'jpeg2wbmp' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'imagecreatefromjpeg() and imagewbmp()',
-        ],
-        'png2wbmp' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'imagecreatefrompng() or imagewbmp()',
-        ],
-        '__autoload' => [
-            '7.2'         => false,
-            'alternative' => 'SPL autoload',
-        ],
-        'create_function' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'an anonymous function',
-        ],
-        'each' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'a foreach loop or ArrayIterator',
-        ],
-        'gmp_random' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'gmp_random_bits() or gmp_random_range()',
-        ],
-        'read_exif_data' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'exif_read_data()',
-        ],
-
-        'image2wbmp' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'imagewbmp()',
-        ],
-        'mbregex_encoding' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_regex_encoding()',
-        ],
-        'mbereg' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg()',
-        ],
-        'mberegi' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_eregi()',
-        ],
-        'mbereg_replace' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_replace()',
-        ],
-        'mberegi_replace' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_eregi_replace()',
-        ],
-        'mbsplit' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_split()',
-        ],
-        'mbereg_match' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_match()',
-        ],
-        'mbereg_search' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search()',
-        ],
-        'mbereg_search_pos' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_pos()',
-        ],
-        'mbereg_search_regs' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_regs()',
-        ],
-        'mbereg_search_init' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_init()',
-        ],
-        'mbereg_search_getregs' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_getregs()',
-        ],
-        'mbereg_search_getpos' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_getpos()',
-        ],
-        'mbereg_search_setpos' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_setpos()',
-        ],
-        'fgetss' => [
-            '7.3' => false,
-            '8.0' => true,
-        ],
-        'gzgetss' => [
-            '7.3' => false,
-            '8.0' => true,
-        ],
-
-        'convert_cyr_string' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_convert_encoding(), iconv() or UConverter',
-        ],
-        'ezmlm_hash' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'get_magic_quotes_gpc' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'get_magic_quotes_runtime' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'hebrevc' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'is_real' => [
-            '7.4'         => false,
-            'alternative' => 'is_float()',
-        ],
-        'money_format' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'NumberFormatter::formatCurrency()',
-        ],
-        'restore_include_path' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => "ini_restore('include_path')",
-        ],
-        'ibase_add_user' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_affected_rows' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_backup' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_add' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_cancel' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_close' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_create' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_echo' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_get' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_import' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_blob_open' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_close' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_commit_ret' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_commit' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_connect' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_db_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_delete_user' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_drop_db' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_errcode' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_errmsg' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_execute' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_fetch_assoc' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_fetch_object' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_fetch_row' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_field_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_free_event_handler' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_free_query' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_free_result' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_gen_id' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_maintain_db' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_modify_user' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_name_result' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_num_fields' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_num_params' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_param_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_pconnect' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_prepare' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_query' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_restore' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_rollback_ret' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_rollback' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_server_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_service_attach' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_service_detach' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_set_event_handler' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_trans' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'ibase_wait_event' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_add_user' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_affected_rows' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_backup' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_add' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_cancel' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_close' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_create' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_echo' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_get' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_import' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_blob_open' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_close' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_commit_ret' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_commit' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_connect' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_db_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_delete_user' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_drop_db' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_errcode' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_errmsg' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_execute' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_fetch_assoc' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_fetch_object' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_fetch_row' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_field_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_free_event_handler' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_free_query' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_free_result' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_gen_id' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_maintain_db' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_modify_user' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_name_result' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_num_fields' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_num_params' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_param_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_pconnect' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_prepare' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_query' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_restore' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_rollback_ret' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_rollback' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_server_info' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_service_attach' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_service_detach' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_set_event_handler' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_trans' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-        'fbird_wait_event' => [
-            '7.4'       => true,
-            'extension' => 'ibase',
-        ],
-
-        'ldap_control_paged_result_response' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'ldap_search()',
-        ],
-        'ldap_control_paged_result' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'ldap_search()',
-        ],
-        'recode_file' => [
-            '7.4'         => true,
-            'alternative' => 'the iconv or mbstring extension',
-            'extension'   => 'recode',
-        ],
-        'recode_string' => [
-            '7.4'         => true,
-            'alternative' => 'the iconv or mbstring extension',
-            'extension'   => 'recode',
-        ],
-        'recode' => [
-            '7.4'         => true,
-            'alternative' => 'the iconv or mbstring extension',
-            'extension'   => 'recode',
-        ],
-        'wddx_add_vars' => [
-            '7.4'       => true,
-            'extension' => 'wddx',
-        ],
-        'wddx_deserialize' => [
-            '7.4'       => true,
-            'extension' => 'wddx',
-        ],
-        'wddx_packet_end' => [
-            '7.4'       => true,
-            'extension' => 'wddx',
-        ],
-        'wddx_packet_start' => [
-            '7.4'       => true,
-            'extension' => 'wddx',
-        ],
-        'wddx_serialize_value' => [
-            '7.4'       => true,
-            'extension' => 'wddx',
-        ],
-        'wddx_serialize_vars' => [
-            '7.4'       => true,
-            'extension' => 'wddx',
-        ],
-        'mysqli_embedded_server_end' => [
-            '7.4' => true,
-        ],
-        'mysqli_embedded_server_start' => [
-            '7.4' => true,
-        ],
-
-        'enchant_broker_get_dict_path' => [
-            '8.0' => false,
-        ],
-        'enchant_broker_set_dict_path' => [
-            '8.0' => false,
-        ],
-        'enchant_broker_free' => [
-            '8.0'         => false,
-            'alternative' => 'unset the object',
-        ],
-        'enchant_broker_free_dict' => [
-            '8.0'         => false,
-            'alternative' => 'unset the object',
-        ],
-        'enchant_dict_add_to_personal' => [
-            '8.0'         => false,
-            'alternative' => 'enchant_dict_add()',
-        ],
-        'enchant_dict_is_in_session' => [
-            '8.0'         => false,
-            'alternative' => 'enchant_dict_is_added()',
-        ],
-        'imap_header' => [
-            '8.0'         => true,
-            'alternative' => 'imap_headerinfo()',
-        ],
-        'libxml_disable_entity_loader' => [
-            '8.0' => false,
-        ],
-        'oci_internal_debug' => [
-            '8.0' => true,
-        ],
-        'openssl_x509_free' => [
-            '8.0' => false,
-        ],
-        'openssl_pkey_free' => [
-            '8.0' => false,
-        ],
-        'openssl_free_key' => [
-            '8.0' => false,
-        ],
-        'pg_clientencoding' => [
-            '8.0'         => false,
-            'alternative' => 'pg_client_encoding()',
-        ],
-        'pg_cmdtuples' => [
-            '8.0'         => false,
-            'alternative' => 'pg_affected_rows()',
-        ],
-        'pg_errormessage' => [
-            '8.0'         => false,
-            'alternative' => 'pg_last_error()',
-        ],
-        'pg_fieldname' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_name()',
-        ],
-        'pg_fieldnum' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_num()',
-        ],
-        'pg_fieldisnull' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_is_null()',
-        ],
-        'pg_fieldprtlen' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_prtlen()',
-        ],
-        'pg_fieldsize' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_size()',
-        ],
-        'pg_fieldtype' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_type()',
-        ],
-        'pg_freeresult' => [
-            '8.0'         => false,
-            'alternative' => 'pg_free_result()',
-        ],
-        'pg_getlastoid' => [
-            '8.0'         => false,
-            'alternative' => 'pg_last_oid()',
-        ],
-        'pg_loclose' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_close()',
-        ],
-        'pg_locreate' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_create()',
-        ],
-        'pg_loexport' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_export()',
-        ],
-        'pg_loimport' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_import()',
-        ],
-        'pg_loopen' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_open()',
-        ],
-        'pg_loread' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_read()',
-        ],
-        'pg_loreadall' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_read_all()',
-        ],
-        'pg_lounlink' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_unlink()',
-        ],
-        'pg_lowrite' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_write()',
-        ],
-        'pg_numfields' => [
-            '8.0'         => false,
-            'alternative' => 'pg_num_fields()',
-        ],
-        'pg_numrows' => [
-            '8.0'         => false,
-            'alternative' => 'pg_num_rows()',
-        ],
-        'pg_result' => [
-            '8.0'         => false,
-            'alternative' => 'pg_fetch_result()',
-        ],
-        'pg_setclientencoding' => [
-            '8.0'         => false,
-            'alternative' => 'pg_set_client_encoding()',
-        ],
-        'shmop_close' => [
-            '8.0' => false,
-        ],
-        'xmlrpc_decode_request' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_decode' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_encode_request' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_encode' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_get_type' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_is_fault' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_parse_method_descriptions' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_server_add_introspection_data' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_server_call_method' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_server_create' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_server_destroy' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_server_register_introspection_callback' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_server_register_method' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'xmlrpc_set_type' => [
-            '8.0'       => true,
-            'extension' => 'xmlrpc',
-        ],
-        'zip_close' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive::close()',
-        ],
-        'zip_entry_close' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_compressedsize' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_compressionmethod' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_filesize' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_name' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_open' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_read' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_open' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive::open()',
-        ],
-        'zip_read' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-
-        'date_sunrise' => [
-            '8.1'         => false,
-            'alternative' => 'date_sun_info()',
-        ],
-        'date_sunset' => [
-            '8.1'         => false,
-            'alternative' => 'date_sun_info()',
-        ],
-        'strptime' => [
-            '8.1'         => false,
-            'alternative' => 'date_parse_from_format() or IntlDateFormatter::parse()',
-        ],
-        'strftime' => [
-            '8.1'         => false,
-            'alternative' => 'date() or IntlDateFormatter::format()',
-        ],
-        'gmstrftime' => [
-            '8.1'         => false,
-            'alternative' => 'date() or IntlDateFormatter::format()',
-        ],
-        'mhash_count' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash_get_block_size' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash_get_hash_name' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash_keygen_s2k' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'odbc_result_all' => [
-            '8.1' => false,
-        ],
-        'utf8_encode' => [
-            '8.2' => false,
-            'alternative' => 'iconv()',
-        ],
-        'utf8_decode' => [
-            '8.2' => false,
-            'alternative' => 'iconv()',
-        ],
-    ];
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 5.6
-     *
-     * @return array
-     */
-    public function register()
-    {
-        // Handle case-insensitivity of function names.
-        $this->removedFunctions = \array_change_key_case($this->removedFunctions, \CASE_LOWER);
-
-        return [\T_STRING];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = \strtolower($function);
-
-        if (isset($this->removedFunctions[$functionLc]) === false) {
-            return;
-        }
-
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($nextToken === false
-            || $tokens[$nextToken]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$nextToken]['parenthesis_owner']) === true
-        ) {
-            return;
-        }
-
-        $ignore  = [\T_NEW => true];
-        $ignore += Collections::objectOperators();
-
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
-            // Not a call to a PHP function.
-            return;
-
-        } elseif ($tokens[$prevToken]['code'] === \T_NS_SEPARATOR) {
-            $prevPrevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true);
-            if ($tokens[$prevPrevToken]['code'] === \T_STRING
-                || $tokens[$prevPrevToken]['code'] === \T_NAMESPACE
-            ) {
-                // Namespaced function.
-                return;
-            }
-        }
-
-        $itemInfo = [
-            'name'   => $function,
-            'nameLc' => $functionLc,
-        ];
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-    }
-
-    /**
-     * Handle the retrieval of relevant information and if necessary throwing of an error/warning for a matched item.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the relevant token in
-     *                                               the stack.
-     * @param array                       $itemInfo  Base information about the item.
-     *
-     * @return void
-     */
-    protected function handleFeature(File $phpcsFile, $stackPtr, array $itemInfo)
-    {
-        $itemArray   = $this->removedFunctions[$itemInfo['nameLc']];
-        $versionInfo = $this->getVersionInfo($itemArray);
-        $isError     = null;
-
-        if (empty($versionInfo['removed']) === false
-            && $this->supportsAbove($versionInfo['removed']) === true
-        ) {
-            $isError = true;
-        } elseif (empty($versionInfo['deprecated']) === false
-            && $this->supportsAbove($versionInfo['deprecated']) === true
-        ) {
-            $isError = false;
-
-            // Reset the 'removed' info as it is not relevant for the current notice.
-            $versionInfo['removed'] = '';
-        }
-
-        if (isset($isError) === false) {
-            return;
-        }
-
-        // Overrule the default message template.
-        $this->msgTemplate = 'Function %s() is ';
-
-        $msgInfo = $this->getMessageInfo($itemInfo['name'], $itemInfo['name'], $versionInfo);
-
-        MessageHelper::addMessage(
-            $phpcsFile,
-            $msgInfo['message'],
-            $stackPtr,
-            $isError,
-            $msgInfo['errorcode'],
-            $msgInfo['data']
-        );
-    }
-
-    /**
-     * Retrieve version numbers in which a feature was deprecated and/or removed from
-     * an array with arbitrary contents.
-     * Will also retrieve a potential "alternative" for the feature from the same array.
-     *
-     * The array is expected to have at least one entry with a PHP version number as a key
-     * and a boolean value.
-     *
-     * @param array $itemArray Sub-array for a specific matched item from a complex version array.
-     *
-     * @return string[] Array with three keys `'deprecated'`, `'removed'` and `'alternative'`.
-     *                  The array values will always be strings and will be either the values retrieved
-     *                  from the $itemArray or an empty string if the value for a key was unavailable
-     *                  or could not be determined.
-     */
-    protected function getVersionInfo(array $itemArray)
-    {
-        $versionInfo = [
-            'deprecated'  => '',
-            'removed'     => '',
-            'alternative' => '',
-        ];
-
-        foreach ($itemArray as $version => $removed) {
-            if (isset($itemArray['alternative']) === true) {
-                $versionInfo['alternative'] = (string) $itemArray['alternative'];
-            }
-
-            if (\preg_match('`^\d\.\d(\.\d{1,2})?$`', $version) !== 1) {
-                // Not a version key.
-                continue;
-            }
-
-            if ($removed === true && $versionInfo['removed'] === '') {
-                $versionInfo['removed'] = $version;
-            } elseif ($removed === false && $versionInfo['deprecated'] === '') {
-                $versionInfo['deprecated'] = $version;
-            }
-        }
-
-        return $versionInfo;
-    }
-
-    /**
-     * Convenience method to retrieve the information to be passed to a call to the PHPCS native
-     * `addError()` or `addWarning()` methods in a simple organized array.
-     *
-     * @param string   $itemName     Item name, normally name of the function or class detected.
-     * @param string   $itemBaseCode The basis for the error code.
-     * @param string[] $versionInfo  Array of version info as received from the getVersionInfo() method.
-     *
-     * @return array
-     */
-    protected function getMessageInfo($itemName, $itemBaseCode, array $versionInfo)
-    {
-        $message   = $this->msgTemplate;
-        $errorCode = MessageHelper::stringToErrorCode($itemBaseCode, true);
-        $data      = [$itemName];
-
-        if ($versionInfo['deprecated'] !== '') {
-            $message   .= 'deprecated since PHP %s and ';
-            $errorCode .= 'Deprecated';
-            $data[]     = $versionInfo['deprecated'];
-        }
-
-        if ($versionInfo['removed'] !== '') {
-            $message   .= 'removed since PHP %s and ';
-            $errorCode .= 'Removed';
-            $data[]     = $versionInfo['removed'];
-        }
-
-        // Remove the last 'and' from the message.
-        $message = \substr($message, 0, (\strlen($message) - 5));
-
-        if ($versionInfo['alternative'] !== '') {
-            $message .= $this->alternativeOptionTemplate;
-            $data[]   = $versionInfo['alternative'];
-        }
-
-        return [
-            'message'   => $message,
-            'errorcode' => $errorCode,
-            'data'      => $data,
-        ];
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
index 0b26ea5e..9a722cd3 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
@@ -1,83 +1,14 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHP_CodeSniffer\Files\File;
-
 /**
- * Detect: Passing `false` to `get_defined_functions()` is deprecated as of PHP 8.0.
- *
- * > Calling `get_defined_functions()` with `$exclude_disabled` explicitly set to `false`
- * > is deprecated. `get_defined_functions()` will never include disabled functions.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L514-L516
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class RemovedGetDefinedFunctionsExcludeDisabledFalseSniff extends AbstractFunctionCallParameterSniff
+class RemovedGetDefinedFunctionsExcludeDisabledFalseSniff extends \PHPCompatibility\Sniffs\ParameterValues\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
 {
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'get_defined_functions' => true,
-    ];
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('8.0') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        if (isset($parameters[1]) === false) {
-            return;
-        }
-
-        if ($parameters[1]['raw'] !== 'false') {
-            return;
-        }
-
-        $phpcsFile->addWarning(
-            'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.',
-            $parameters[1]['start'],
-            'Deprecated'
-        );
-    }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
index 5adff7ee..021da412 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
@@ -1,146 +1,14 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\Sniff;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
-
 /**
- * Declaring a required function parameter after an optional parameter is deprecated since PHP 8.0.
- *
- * > Declaring a required parameter after an optional one is deprecated. As an
- * > exception, declaring a parameter of the form "Type $param = null" before
- * > a required one continues to be allowed, because this pattern was sometimes
- * > used to achieve nullable types in older PHP versions.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L145-L151
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class RemovedOptionalBeforeRequiredParamSniff extends Sniff
+class RemovedOptionalBeforeRequiredParamSniff extends \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedOptionalBeforeRequiredParamSniff
 {
-
-    /**
-     * Tokens allowed in the default value.
-     *
-     * This property will be enriched in the register() method.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    private $allowedInDefault = [
-        \T_NULL => \T_NULL,
-    ];
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->allowedInDefault += Tokens::$emptyTokens;
-
-        return Collections::functionDeclarationTokens();
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.0') === false) {
-            return;
-        }
-
-        // Get all parameters from the function signature.
-        $parameters = FunctionDeclarations::getParameters($phpcsFile, $stackPtr);
-        if (empty($parameters)) {
-            return;
-        }
-
-        $error = 'Declaring a required parameter after an optional one is deprecated since PHP 8.0. Parameter %s is optional, while parameter %s is required.';
-
-        $paramCount    = \count($parameters);
-        $lastKey       = ($paramCount - 1);
-        $firstOptional = null;
-
-        foreach ($parameters as $key => $param) {
-            /*
-             * Ignore variadic parameters, which are optional by nature.
-             * These always have to be declared last and this has been this way since their introduction.
-             */
-            if ($param['variable_length'] === true) {
-                continue;
-            }
-
-            // Handle optional parameters.
-            if (isset($param['default']) === true) {
-                if ($key === $lastKey) {
-                    // This is the last parameter and it's optional, no further checking needed.
-                    break;
-                }
-
-                if (isset($firstOptional) === false) {
-                    // Check if it's typed and has a null default value, in which case we can ignore it.
-                    if ($param['type_hint'] !== '') {
-                        $hasNull    = $phpcsFile->findNext(\T_NULL, $param['default_token'], $param['comma_token']);
-                        $hasNonNull = $phpcsFile->findNext(
-                            $this->allowedInDefault,
-                            $param['default_token'],
-                            $param['comma_token'],
-                            true
-                        );
-
-                        if ($hasNull !== false && $hasNonNull === false) {
-                            continue;
-                        }
-                    }
-
-                    // Non-null default value. This is an optional param we need to take into account.
-                    $firstOptional = $param['name'];
-                }
-
-                continue;
-            }
-
-            // Found a required parameter.
-            if (isset($firstOptional) === false) {
-                // No optional params found yet.
-                continue;
-            }
-
-            // Found a required parameter with an optional param before it.
-            $data = [
-                $firstOptional,
-                $param['name'],
-            ];
-
-            $phpcsFile->addWarning($error, $param['token'], 'Deprecated', $data);
-        }
-    }
 }
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
index 4f42c01f..e5233d13 100644
--- a/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Sniffs\PHPCompatibility;
@@ -14,71 +10,8 @@
 use PHP_CodeSniffer\Files\File;
 
 /**
- * Detect: Passing `false` to `spl_autoload_register()` is deprecated as of PHP 8.0.
- *
- * > spl_autoload_register() will now always throw a TypeError on invalid
- * > arguments, therefore the second argument $throw is ignored and a
- * > notice will be emitted if it is set to false.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/c0172aa2bdb9ea223c8491bdb300995b93a857a0/UPGRADING#L393-L395
- *
- * @since 10.0.0
+ * @inheritdoc
  */
-class RemovedSplAutoloadRegisterThrowFalseSniff extends AbstractFunctionCallParameterSniff
+class RemovedSplAutoloadRegisterThrowFalseSniff extends \PHPCompatibility\Sniffs\ParameterValues\RemovedSplAutoloadRegisterThrowFalseSniff
 {
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'spl_autoload_register' => true,
-    ];
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('8.0') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        if (isset($parameters[2]) === false) {
-            return;
-        }
-
-        if ($parameters[2]['raw'] !== 'false') {
-            return;
-        }
-
-        $phpcsFile->addWarning(
-            'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.',
-            $parameters[2]['start'],
-            'Deprecated'
-        );
-    }
 }
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
index a346b649..79a63b41 100644
--- a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,98 +9,15 @@
 /**
  * Test the ChangedIntToBoolParamType sniff.
  *
- * @group changedIntToBoolParamType
- * @group parameterValues
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\ChangedIntToBoolParamTypeSniff
- *
- * @since 10.0.0
  */
-class ChangedIntToBoolParamTypeUnitTest extends BaseSniffTest
+class ChangedIntToBoolParamTypeUnitTest extends \PHPCompatibility\Tests\ParameterValues\ChangedIntToBoolParamTypeUnitTest
 {
-
-    /**
-     * Test that numeric values being passed as $auto_release to sem_get() throw an error.
-     *
-     * @dataProvider dataChangedIntToBoolParamType
-     *
-     * @param int    $line         Line number where the error should occur.
-     * @param string $since        The PHP version in which the change was made.
-     * @param string $paramName    The name of the parameter the error relates to.
-     * @param string $functionName The name of the function the error relates to.
-     *
-     * @return void
-     */
-    public function testChangedIntToBoolParamType($line, $since, $paramName, $functionName)
-    {
-        $file  = $this->sniffFile(__FILE__, $since);
-        $error = "The {$paramName} parameter of {$functionName}() expects a boolean value instead of an integer since PHP {$since}";
-
-        $this->assertError($file, $line, $error);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testChangedIntToBoolParamType)
-     *
-     * @return array
-     */
-    public function dataChangedIntToBoolParamType()
-    {
-        return [
-            [21, '8.0', '$auto_release', 'sem_get'],
-            [22, '8.0', '$auto_release', 'sem_get'],
-            [23, '8.0', '$auto_release', 'sem_get'],
-            [24, '8.0', '$auto_release', 'sem_get'],
-            [25, '8.0', '$auto_release', 'sem_get'],
-            [26, '8.0', '$auto_release', 'sem_get'],
-            [27, '8.0', '$flag', 'ob_implicit_flush'],
-        ];
-    }
-
-    /**
-     * Verify no false positives are thrown for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line Line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '99.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $data = [];
-
-        // No errors expected on the first 19 lines.
-        for ($line = 1; $line <= 19; $line++) {
-            $data[] = [$line];
-        }
-
-        return $data;
-    }
-
     /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
+     * @inheritdoc
      */
-    public function testNoViolationsInFileOnValidVersion()
+    protected function getSniffCode()
     {
-        $file = $this->sniffFile(__FILE__, '7.4'); // Version before first change.
-        $this->assertNoViolation($file);
+        return 'Magento2.PHPCompatibility.ChangedIntToBoolParamType';
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
index b6f207d8..49983b7f 100644
--- a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
@@ -11,7 +11,7 @@
  *
  * @covers \Magento2\Sniffs\PHPCompatibility\DeprecatedEncodingsForMBStringFunctionsSniff
  */
-class DeprecatedDynamicPropertyUnitTest extends BaseSniffTest
+class DeprecatedDynamicPropertyUnitTest extends \PHPCompatibility\Tests\BaseSniffTest
 {
     const TEST_FILE_WITH_AUTOLOADABLE_CLASS = 'DeprecatedDynamicPropertyUnitTest.autoload.inc';
 
@@ -110,4 +110,12 @@ public function dataProvider()
             ]
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getSniffCode()
+    {
+        return 'Magento2.PHPCompatibility.DeprecatedDynamicProperty';
+    }
 }
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
index f7cfc1b6..1f477928 100644
--- a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
@@ -11,7 +11,7 @@
  *
  * @covers \Magento2\Sniffs\PHPCompatibility\DeprecatedEncodingsForMBStringFunctionsSniff
  */
-class DeprecatedEncodingsForMBStringFunctionsUnitTest extends BaseSniffTest
+class DeprecatedEncodingsForMBStringFunctionsUnitTest extends \PHPCompatibility\Tests\BaseSniffTest
 {
     /**
      * Message per encoding
@@ -95,4 +95,12 @@ public function testNoViolationsInFileOnValidVersion()
         $file = $this->sniffFile(__FILE__, '8.1');
         $this->assertNoViolation($file);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getSniffCode()
+    {
+        return 'Magento2.PHPCompatibility.DeprecatedEncodingsForMBStringFunctions';
+    }
 }
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc
new file mode 100644
index 00000000..9757ecfc
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc
@@ -0,0 +1,20 @@
+<?php
+class ForbiddenFinalPrivateMethodsUnitTest1
+{
+    private final function __construct() {}
+    private final function privateFinalMethod() {}
+    final private function finalPrivateMethod() {}
+    protected final function protectedFinalMethod() {}
+    final protected function finalProtectedMethod() {}
+    public final function publicFinalMethod() {}
+    final public function finaPublicMethod() {}
+    final private static function finalPrivateStaticMethod() {}
+    private final static function privateFinalStaticMethod() {}
+    private static final function privateStaticFinalMethod() {}
+    final protected static function finalProtectedStaticMethod() {}
+    protected final static function protectedFinalStaticMethod() {}
+    protected static final function protectedStaticFinalMethod() {}
+    final public static function finalPublicStaticMethod() {}
+    public final static function publicFinalStaticMethod() {}
+    public static final function publicStaticFinalMethod() {}
+}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed
new file mode 100644
index 00000000..6822b808
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed
@@ -0,0 +1,20 @@
+<?php
+class ForbiddenFinalPrivateMethodsUnitTest1
+{
+    private final function __construct() {}
+    private function privateFinalMethod() {}
+    private function finalPrivateMethod() {}
+    protected final function protectedFinalMethod() {}
+    final protected function finalProtectedMethod() {}
+    public final function publicFinalMethod() {}
+    final public function finaPublicMethod() {}
+    private static function finalPrivateStaticMethod() {}
+    private static function privateFinalStaticMethod() {}
+    private static function privateStaticFinalMethod() {}
+    final protected static function finalProtectedStaticMethod() {}
+    protected final static function protectedFinalStaticMethod() {}
+    protected static final function protectedStaticFinalMethod() {}
+    final public static function finalPublicStaticMethod() {}
+    public final static function publicFinalStaticMethod() {}
+    public static final function publicStaticFinalMethod() {}
+}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
deleted file mode 100644
index 660c6b57..00000000
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-final class CrossVersionInValid
-{
-    private final function __construct() {}
-    final private function privateFinal();
-    static private final function privateStaticFinal();
-    static protected final function protectedStaticFinal();
-    final protected function protectedFinal();
-}
-
-$anon = new class() {
-    private final function __construct() {}
-    final private function privateFinal();
-    static final private function privateStaticFinal();
-    final protected function protectedFinal();
-    static final protected function protectedStaticFinal();
-};
-
-trait CrossVersionInValidTrait
-{
-    private final function __construct() {}
-    final private function privateFinal();
-    final protected function protectedFinal();
-    static private final function privateStaticFinal();
-    static protected final function protectedStaticFinal();
-}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
deleted file mode 100644
index 6fdca790..00000000
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.inc.fixed
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-final class CrossVersionInValid
-{
-    private final function __construct() {}
-    private function privateFinal();
-    static private function privateStaticFinal();
-    static protected final function protectedStaticFinal();
-    final protected function protectedFinal();
-}
-
-$anon = new class() {
-    private final function __construct() {}
-    private function privateFinal();
-    static private function privateStaticFinal();
-    final protected function protectedFinal();
-    static final protected function protectedStaticFinal();
-};
-
-trait CrossVersionInValidTrait
-{
-    private final function __construct() {}
-    private function privateFinal();
-    final protected function protectedFinal();
-    static private function privateStaticFinal();
-    static protected final function protectedStaticFinal();
-}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
index 2024685f..2c572c26 100644
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -15,12 +11,7 @@
 /**
  * Test the ForbiddenFinalPrivateMethods sniff.
  *
- * @group forbiddenFinalPrivateMethods
- * @group functiondeclarations
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\ForbiddenFinalPrivateMethodsSniff
- *
- * @since 10.0.0
  */
 class ForbiddenFinalPrivateMethodsUnitTest extends AbstractSniffUnitTest
 {
@@ -35,15 +26,40 @@ public function getErrorList()
     /**
      * @inheritdoc
      */
-    public function getWarningList()
+    public function getWarningList($testFile = '')
     {
+        if ($testFile === 'ForbiddenFinalPrivateMethodsUnitTest.inc') {
+            return [
+                34 => 1,
+                35 => 1,
+                39 => 1,
+                40 => 1,
+                45 => 1,
+                46 => 1,
+                54 => 1,
+                60 => 1,
+            ];
+        }
         return [
+            5 => 1,
             6 => 1,
-            7 => 1,
-            14 => 1,
-            15 => 1,
-            23 => 1,
-            25 => 1,
+            11 => 1,
+            12 => 1,
+            13 => 1,
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getTestFiles($testFileBase)
+    {
+        $files = parent::getTestFiles($testFileBase);
+        return array_merge(
+            $files,
+            [
+                dirname(__FILE__, 4) . '/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc',
+            ]
+        );
+    }
 }
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
index abb322c3..7d03b4c3 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,76 +9,15 @@
 /**
  * Test the RemovedAssertStringAssertion sniff.
  *
- * @group removedAssertStringAssertion
- * @group parameterValues
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\RemovedAssertStringAssertionSniff
- *
- * @since 10.0.0
  */
-class RemovedAssertStringAssertionUnitTest extends BaseSniffTest
+class RemovedAssertStringAssertionUnitTest extends \PHPCompatibility\Tests\ParameterValues\RemovedAssertStringAssertionUnitTest
 {
-
-    /**
-     * Test the sniff correctly detects assertions passed as strings.
-     *
-     * @dataProvider dataRemovedAssertStringAssertion
-     *
-     * @param int $line Line number where the warning should occur.
-     *
-     * @return void
-     */
-    public function testRemovedAssertStringAssertion($line)
-    {
-        $file  = $this->sniffFile(__FILE__, '7.2');
-        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2';
-        $this->assertWarning($file, $line, $error);
-
-        $file  = $this->sniffFile(__FILE__, '8.0');
-        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2 and removed since PHP 8.0';
-        $this->assertError($file, $line, $error);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedAssertStringAssertion()
-     *
-     * @return array
-     */
-    public function dataRemovedAssertStringAssertion()
-    {
-        return [
-            [18],
-            [19],
-            [20],
-            [25],
-        ];
-    }
-
-    /**
-     * Verify there are no false positives on code this sniff should ignore.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '7.2');
-
-        // No errors expected on the first 16 lines.
-        for ($line = 1; $line <= 16; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
     /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
+     * @inheritdoc
      */
-    public function testNoViolationsInFileOnValidVersion()
+    protected function getSniffCode()
     {
-        $file = $this->sniffFile(__FILE__, '7.1');
-        $this->assertNoViolation($file);
+        return 'Magento2.PHPCompatibility.RemovedAssertStringAssertion';
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
index e22ff211..6a6687f1 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,106 +9,14 @@
 /**
  * Test the RemovedCallingDestructAfterConstructorExit sniff.
  *
- * @group removedCallingDestructAfterConstructorExit
- * @group functiondeclarations
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\RemovedCallingDestructAfterConstructorExitSniff
- *
- * @since 10.0.0
  */
-class RemovedCallingDestructAfterConstructorExitUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Verify that the sniff throws an error when an exit/die is encountered in a class constructor for PHP 8.0+.
-     *
-     * @dataProvider dataRemovedCallingDestructAfterConstructorExit
-     *
-     * @param int    $line    The line number where an error is expected.
-     * @param string $name    The name of the exit type used.
-     * @param bool   $isError Whether to expect an error or a warning. Defaults to true (= error).
-     *
-     * @return void
-     */
-    public function testRemovedCallingDestructAfterConstructorExit($line, $name, $isError = true)
-    {
-        $file  = $this->sniffFile(__FILE__, '8.0');
-        $error = "When $name() is called within an object constructor, the object destructor will no longer be called since PHP 8.0";
-
-        if ($isError === true) {
-            $this->assertError($file, $line, $error);
-        } else {
-            $this->assertWarning($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedCallingDestructAfterConstructorExit()
-     *
-     * @return array
-     */
-    public function dataRemovedCallingDestructAfterConstructorExit()
-    {
-        return [
-            [33, 'exit'],
-            [44, 'die', false],
-            [46, 'exit', false],
-            [69, 'die'],
-            [85, 'exit'],
-            [97, 'die', false],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $cases = [];
-        // No errors expected on the first 26 lines.
-        for ($line = 1; $line <= 26; $line++) {
-            $cases[] = [$line];
-        }
-
-        $cases[] = [56];
-        $cases[] = [61];
-        $cases[] = [66];
-        $cases[] = [106];
-        $cases[] = [112];
-        $cases[] = [119];
-
-        return $cases;
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
+class RemovedCallingDestructAfterConstructorExitUnitTest extends \PHPCompatibility\Tests\FunctionDeclarations\RemovedCallingDestructAfterConstructorExitUnitTest
+{    /**
+ * @inheritdoc
+ */
+    protected function getSniffCode()
     {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
+        return 'Magento2.PHPCompatibility.RemovedCallingDestructAfterConstructorExit';
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
index c3a29985..edb1d4a8 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2022 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,242 +9,14 @@
 /**
  * Test the RemovedDollarBraceStringEmbeds sniff.
  *
- * @group removedDollarBraceStringEmbeds
- * @group textstrings
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\RemovedDollarBraceStringEmbedsSniff
- *
- * @since 10.0.0
  */
-class RemovedDollarBraceStringEmbedsUnitTest extends BaseSniffTest
-{
-
-    /**
-     * The name of the primary test case file.
-     *
-     * @var string
-     */
-    const TEST_FILE = 'RemovedDollarBraceStringEmbedsUnitTest.1.inc';
-
-    /**
-     * The name of a secondary test case file containing PHP 7.3+ indented heredocs.
-     *
-     * @var string
-     */
-    const TEST_FILE_PHP73HEREDOCS = 'RemovedDollarBraceStringEmbedsUnitTest.2.inc';
-
-    /**
-     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
-     * are correctly detected.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType3
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded variable found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType3($line, $found)
-    {
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
-        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType3()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType3()
-    {
-        return [
-            [57, '${foo}'],
-            [58, '${foo[\'bar\']}'],
-            [59, '${foo}'],
-            [59, '${t}'],
-            [62, '${foo}'],
-            [65, '${foo}'],
-        ];
-    }
-
-
-    /**
-     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
-     * (string) ${expr}) - are correctly detected.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType4
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded expression found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType4($line, $found)
-    {
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
-        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType4()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType4()
-    {
-        return [
-            [68, '${$bar}'],
-            [69, '${(foo)}'],
-            [70, '${foo->bar}'],
-            [71, '${$object->getMethod()}'],
-            [72, '${(foo)}'],
-            [73, '${substr(\'laruence\', 0, 2)}'],
-            [75, '${foo["${bar}"]}'],
-            [76, '${foo["${bar[\'baz\']}"]}'],
-            [77, '${foo->{$baz}}'],
-            [78, '${foo->{${\'a\'}}}'],
-            [79, '${foo->{"${\'a\'}"}}'],
-            [83, '${foo["${bar}"]}'],
-            [84, '${foo["${bar[\'baz\']}"]}'],
-            [85, '${foo->{${\'a\'}}}'],
-            [89, '${(foo)}'],
-        ];
-    }
-
-
-    /**
-     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
-     * are correctly detected in PHP 7.3+ indented heredocs.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded variable found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc($line, $found)
-    {
-        if (\PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
-        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
-    {
-        return [
-            [33, '${foo[\'bar\']}'],
-        ];
-    }
-
-
-    /**
-     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
-     * (string) ${expr}) - are correctly detected in PHP 7.3+ indented heredocs.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded expression found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc($line, $found)
-    {
-        if (\PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
-        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
-    {
-        return [
-            [39, '${$object->getMethod()}'],
-            [40, '${foo["${bar[\'baz\']}"]}'],
-            [41, '${foo->{${\'a\'}}}'],
-        ];
-    }
-
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataTestFiles
-     *
-     * @param string $testFile File name for the test case file to use.
-     * @param int    $lines    Number of lines at the top of the file for which we don't expect errors.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($testFile, $lines)
-    {
-        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.2');
-
-        // No errors expected on the first # lines.
-        for ($line = 1; $line <= $lines; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @dataProvider dataTestFiles
-     *
-     * @param string $testFile File name for the test case file to use.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion($testFile)
-    {
-        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.1');
-        $this->assertNoViolation($file);
-    }
-
-
-    /**
-     * Data provider.
-     *
-     * @return array
-     */
-    public function dataTestFiles()
+class RemovedDollarBraceStringEmbedsUnitTest extends \PHPCompatibility\Tests\TextStrings\RemovedDollarBraceStringEmbedsUnitTest
+{    /**
+ * @inheritdoc
+ */
+    protected function getSniffCode()
     {
-        return [
-            [self::TEST_FILE, 51],
-            [self::TEST_FILE_PHP73HEREDOCS, 26],
-        ];
+        return 'Magento2.PHPCompatibility.RemovedDollarBraceStringEmbeds';
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc
deleted file mode 100644
index ebca6c67..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.inc
+++ /dev/null
@@ -1,1236 +0,0 @@
-<?php
-
-call_user_method();
-call_user_method_array();
-define_syslog_variables();
-dl();
-ereg();
-ereg_replace();
-eregi();
-eregi_replace();
-import_request_variables();
-mcrypt_generic_end();
-mysql_db_query();
-mysql_escape_string();
-mysql_list_dbs();
-mysqli_bind_param();
-mysqli_bind_result();
-mysqli_client_encoding();
-mysqli_fetch();
-mysqli_param_count();
-mysqli_get_metadata();
-mysqli_send_long_data();
-magic_quotes_runtime();
-session_register();
-session_unregister();
-session_is_registered();
-set_magic_quotes_runtime();
-set_socket_blocking();
-split();
-spliti();
-sql_regcase();
-php_logo_guid();
-php_egg_logo_guid();
-php_real_logo_guid();
-zend_logo_guid();
-datefmt_set_timezone_id();
-mcrypt_ecb();
-mcrypt_cbc();
-mcrypt_cfb();
-mcrypt_ofb();
-ocibindbyname();
-ocicancel();
-ocicloselob();
-ocicollappend();
-ocicollassign();
-ocicollassignelem();
-ocicollgetelem();
-ocicollmax();
-ocicollsize();
-ocicolltrim();
-ocicolumnisnull();
-ocicolumnname();
-ocicolumnprecision();
-ocicolumnscale();
-ocicolumnsize();
-ocicolumntype();
-ocicolumntyperaw();
-ocicommit();
-ocidefinebyname();
-ocierror();
-ociexecute();
-ocifetch();
-ocifetchinto();
-ocifetchstatement();
-ocifreecollection();
-ocifreecursor();
-ocifreedesc();
-ocifreestatement();
-ociinternaldebug();
-ociloadlob();
-ocilogoff();
-ocilogon();
-ocinewcollection();
-ocinewcursor();
-ocinewdescriptor();
-ocinlogon();
-ocinumcols();
-ociparse();
-ociplogon();
-ociresult();
-ocirollback();
-ocirowcount();
-ocisavelob();
-ocisavelobfile();
-ociserverversion();
-ocisetprefetch();
-ocistatementtype();
-ociwritelobtofile();
-ociwritetemporarylob();
-imagepsbbox();
-imagepsencodefont();
-imagepsextendfont();
-imagepsfreefont();
-imagepsloadfont();
-imagepsslantfont();
-imagepstext();
-ldap_sort();
-php_check_syntax();
-mysqli_get_cache_stats();
-mcrypt_create_iv();
-mcrypt_decrypt();
-mcrypt_enc_get_algorithms_name();
-mcrypt_enc_get_block_size();
-mcrypt_enc_get_iv_size();
-mcrypt_enc_get_key_size();
-mcrypt_enc_get_modes_name();
-mcrypt_enc_get_supported_key_sizes();
-mcrypt_enc_is_block_algorithm_mode();
-mcrypt_enc_is_block_algorithm();
-mcrypt_enc_is_block_mode();
-mcrypt_enc_self_test();
-mcrypt_encrypt();
-mcrypt_generic_deinit();
-mcrypt_generic_init();
-mcrypt_generic();
-mcrypt_get_block_size();
-mcrypt_get_cipher_name();
-mcrypt_get_iv_size();
-mcrypt_get_key_size();
-mcrypt_list_algorithms();
-mcrypt_list_modes();
-mcrypt_module_close();
-mcrypt_module_get_algo_block_size();
-mcrypt_module_get_algo_key_size();
-mcrypt_module_get_supported_key_sizes();
-mcrypt_module_is_block_algorithm_mode();
-mcrypt_module_is_block_algorithm();
-mcrypt_module_is_block_mode();
-mcrypt_module_open();
-mcrypt_module_self_test();
-mdecrypt_generic();
-
-// Test against false positives.
-$class->php_check_syntax();
-MyClass::php_check_syntax();
-MyNamespace\php_check_syntax();
-echo PHP_CHECK_SYNTAX; // Constant.
-const php_check_syntax = 'abc';
-use php_check_syntax;
-function php_check_syntax() {}
-abstract class Split {}
-
-// More deprecated functions, PHP 7.2
-jpeg2wbmp();
-png2wbmp();
-create_function();
-while (list($key, $val) = each($array)) {}
-gmp_random(2);
-read_exif_data();
-
-// PHP 7.3.
-image2wbmp();
-mbregex_encoding();
-mbereg();
-mberegi();
-mbereg_replace();
-mberegi_replace();
-mbsplit();
-mbereg_match();
-mbereg_search();
-mbereg_search_pos();
-mbereg_search_regs();
-mbereg_search_init();
-mbereg_search_getregs();
-mbereg_search_getpos();
-mbereg_search_setpos();
-fgetss();
-gzgetss();
-
-// PHP 7.4.
-ibase_add_user();
-ibase_affected_rows();
-ibase_backup();
-ibase_blob_add();
-ibase_blob_cancel();
-ibase_blob_close();
-ibase_blob_create();
-ibase_blob_echo();
-ibase_blob_get();
-ibase_blob_import();
-ibase_blob_info();
-ibase_blob_open();
-ibase_close();
-ibase_commit_ret();
-ibase_commit();
-ibase_connect();
-ibase_db_info();
-ibase_delete_user();
-ibase_drop_db();
-ibase_errcode();
-ibase_errmsg();
-ibase_execute();
-ibase_fetch_assoc();
-ibase_fetch_object();
-ibase_fetch_row();
-ibase_field_info();
-ibase_free_event_handler();
-ibase_free_query();
-ibase_free_result();
-ibase_gen_id();
-ibase_maintain_db();
-ibase_modify_user();
-ibase_name_result();
-ibase_num_fields();
-ibase_num_params();
-ibase_param_info();
-ibase_pconnect();
-ibase_prepare();
-ibase_query();
-ibase_restore();
-ibase_rollback_ret();
-ibase_rollback();
-ibase_server_info();
-ibase_service_attach();
-ibase_service_detach();
-ibase_set_event_handler();
-ibase_trans();
-ibase_wait_event();
-
-// Pfpro extension - PHP 5.1
-pfpro_cleanup();
-pfpro_init();
-pfpro_process_raw();
-pfpro_process();
-pfpro_version();
-
-// PHP 7.4.
-wddx_add_vars();
-wddx_deserialize();
-wddx_packet_end();
-wddx_packet_start();
-wddx_serialize_value();
-wddx_serialize_vars();
-ldap_control_paged_result_response();
-ldap_control_paged_result();
-recode_file();
-recode_string();
-recode();
-is_real();
-get_magic_quotes_gpc();
-get_magic_quotes_runtime();
-hebrevc($str));
-convert_cyr_string($str, 'k', 'i');
-money_format();
-ezmlm_hash();
-restore_include_path();
-
-// These calls should *not* trigger an error.
-$myobject -> php_check_syntax (); // Method, not the native PHP function.
-myNamespace \ /*comment*/ php_check_syntax(); // Namespaced function, not the native PHP function.
-namespace\php_check_syntax(); // Namespaced function, not the native PHP function.
-$obj = new php_check_syntax /*comment*/ (); // Class not method.
-
-// PHP 5.3 Ncurses extension.
-ncurses_addch();
-ncurses_addchnstr();
-ncurses_addchstr();
-ncurses_addnstr();
-ncurses_addstr();
-ncurses_assume_default_colors();
-ncurses_attroff();
-ncurses_attron();
-ncurses_attrset();
-ncurses_baudrate();
-ncurses_beep();
-ncurses_bkgd();
-ncurses_bkgdset();
-ncurses_border();
-ncurses_bottom_panel();
-ncurses_can_change_color();
-ncurses_cbreak();
-ncurses_clear();
-ncurses_clrtobot();
-ncurses_clrtoeol();
-ncurses_color_content();
-ncurses_color_set();
-ncurses_curs_set();
-ncurses_def_prog_mode();
-ncurses_def_shell_mode();
-ncurses_define_key();
-ncurses_del_panel();
-ncurses_delay_output();
-ncurses_delch();
-ncurses_deleteln();
-ncurses_delwin();
-ncurses_doupdate();
-ncurses_echo();
-ncurses_echochar();
-ncurses_end();
-ncurses_erase();
-ncurses_erasechar();
-ncurses_filter();
-ncurses_flash();
-ncurses_flushinp();
-ncurses_getch();
-ncurses_getmaxyx();
-ncurses_getmouse();
-ncurses_getyx();
-ncurses_halfdelay();
-ncurses_has_colors();
-ncurses_has_ic();
-ncurses_has_il();
-ncurses_has_key();
-ncurses_hide_panel();
-ncurses_hline();
-ncurses_inch();
-ncurses_init_color();
-ncurses_init_pair();
-ncurses_init();
-ncurses_insch();
-ncurses_insdelln();
-ncurses_insertln();
-ncurses_insstr();
-ncurses_instr();
-ncurses_isendwin();
-ncurses_keyok();
-ncurses_keypad();
-ncurses_killchar();
-ncurses_longname();
-ncurses_meta();
-ncurses_mouse_trafo();
-ncurses_mouseinterval();
-ncurses_mousemask();
-ncurses_move_panel();
-ncurses_move();
-ncurses_mvaddch();
-ncurses_mvaddchnstr();
-ncurses_mvaddchstr();
-ncurses_mvaddnstr();
-ncurses_mvaddstr();
-ncurses_mvcur();
-ncurses_mvdelch();
-ncurses_mvgetch();
-ncurses_mvhline();
-ncurses_mvinch();
-ncurses_mvvline();
-ncurses_mvwaddstr();
-ncurses_napms();
-ncurses_new_panel();
-ncurses_newpad();
-ncurses_newwin();
-ncurses_nl();
-ncurses_nocbreak();
-ncurses_noecho();
-ncurses_nonl();
-ncurses_noqiflush();
-ncurses_noraw();
-ncurses_pair_content();
-ncurses_panel_above();
-ncurses_panel_below();
-ncurses_panel_window();
-ncurses_pnoutrefresh();
-ncurses_prefresh();
-ncurses_putp();
-ncurses_qiflush();
-ncurses_raw();
-ncurses_refresh();
-ncurses_replace_panel();
-ncurses_reset_prog_mode();
-ncurses_reset_shell_mode();
-ncurses_resetty();
-ncurses_savetty();
-ncurses_scr_dump();
-ncurses_scr_init();
-ncurses_scr_restore();
-ncurses_scr_set();
-ncurses_scrl();
-ncurses_show_panel();
-ncurses_slk_attr();
-ncurses_slk_attroff();
-ncurses_slk_attron();
-ncurses_slk_attrset();
-ncurses_slk_clear();
-ncurses_slk_color();
-ncurses_slk_init();
-ncurses_slk_noutrefresh();
-ncurses_slk_refresh();
-ncurses_slk_restore();
-ncurses_slk_set();
-ncurses_slk_touch();
-ncurses_standend();
-ncurses_standout();
-ncurses_start_color();
-ncurses_termattrs();
-ncurses_termname();
-ncurses_timeout();
-ncurses_top_panel();
-ncurses_typeahead();
-ncurses_ungetch();
-ncurses_ungetmouse();
-ncurses_update_panels();
-ncurses_use_default_colors();
-ncurses_use_env();
-ncurses_use_extended_names();
-ncurses_vidattr();
-ncurses_vline();
-ncurses_waddch();
-ncurses_waddstr();
-ncurses_wattroff();
-ncurses_wattron();
-ncurses_wattrset();
-ncurses_wborder();
-ncurses_wclear();
-ncurses_wcolor_set();
-ncurses_werase();
-ncurses_wgetch();
-ncurses_whline();
-ncurses_wmouse_trafo();
-ncurses_wmove();
-ncurses_wnoutrefresh();
-ncurses_wrefresh();
-ncurses_wstandend();
-ncurses_wstandout();
-ncurses_wvline();
-
-// PHP 5.1 MCVE extension.
-m_checkstatus();
-m_completeauthorizations();
-m_connect();
-m_connectionerror();
-m_deletetrans();
-m_destroyconn();
-m_destroyengine();
-m_getcell();
-m_getcellbynum();
-m_getcommadelimited();
-m_getheader();
-m_initconn();
-m_initengine();
-m_iscommadelimited();
-m_maxconntimeout();
-m_monitor();
-m_numcolumns();
-m_numrows();
-m_parsecommadelimited();
-m_responsekeys();
-m_responseparam();
-m_returnstatus();
-m_setblocking();
-m_setdropfile();
-m_setip();
-m_setssl_cafile();
-m_setssl_files();
-m_setssl();
-m_settimeout();
-m_sslcert_gen_hash();
-m_transactionssent();
-m_transinqueue();
-m_transkeyval();
-m_transnew();
-m_transsend();
-m_uwait();
-m_validateidentifier();
-m_verifyconnection();
-m_verifysslcert();
-
-// PHP 5.1 DIO extension.
-dio_close();
-dio_fcntl();
-dio_open();
-dio_read();
-dio_seek();
-dio_stat();
-dio_tcsetattr();
-dio_truncate();
-dio_write();
-
-// PHP 5.3 FDF extension.
-fdf_add_doc_javascript();
-fdf_add_template();
-fdf_close();
-fdf_create();
-fdf_enum_values();
-fdf_errno();
-fdf_error();
-fdf_get_ap();
-fdf_get_attachment();
-fdf_get_encoding();
-fdf_get_file();
-fdf_get_flags();
-fdf_get_opt();
-fdf_get_status();
-fdf_get_value();
-fdf_get_version();
-fdf_header();
-fdf_next_field_name();
-fdf_open_string();
-fdf_open();
-fdf_remove_item();
-fdf_save_string();
-fdf_save();
-fdf_set_ap();
-fdf_set_encoding();
-fdf_set_file();
-fdf_set_flags();
-fdf_set_javascript_action();
-fdf_set_on_import_javascript();
-fdf_set_opt();
-fdf_set_status();
-fdf_set_submit_form_action();
-fdf_set_target_frame();
-fdf_set_value();
-fdf_set_version();
-
-// PHP 5.3 Ming extension.
-ming_keypress();
-ming_setcubicthreshold();
-ming_setscale();
-ming_setswfcompression();
-ming_useconstants();
-ming_useswfversion();
-
-// PHP 5.1 Fam extension.
-fam_cancel_monitor();
-fam_close();
-fam_monitor_collection();
-fam_monitor_directory();
-fam_monitor_file();
-fam_next_event();
-fam_open();
-fam_pending();
-fam_resume_monitor();
-fam_suspend_monitor();
-
-// PHP 5.2 HWAPI extension.
-hwapi_attribute_new();
-hwapi_content_new();
-hwapi_hgcsp();
-hwapi_object_new();
-
-// PHP 5.1 YP/NIS extension.
-yp_all();
-yp_cat();
-yp_err_string();
-yp_errno();
-yp_first();
-yp_get_default_domain();
-yp_master();
-yp_match();
-yp_next();
-yp_order();
-
-// PHP 5.1 Mnogosearch extension.
-udm_add_search_limit();
-udm_alloc_agent_array();
-udm_alloc_agent();
-udm_api_version();
-udm_cat_list();
-udm_cat_path();
-udm_check_charset();
-udm_clear_search_limits();
-udm_crc32();
-udm_errno();
-udm_error();
-udm_find();
-udm_free_agent();
-udm_free_ispell_data();
-udm_free_res();
-udm_get_doc_count();
-udm_get_res_field();
-udm_get_res_param();
-udm_hash32();
-udm_load_ispell_data();
-udm_set_agent_param();
-
-// PHP 5.1.3 Msession extension.
-msession_connect();
-msession_count();
-msession_create();
-msession_destroy();
-msession_disconnect();
-msession_find();
-msession_get_array();
-msession_get_data();
-msession_get();
-msession_inc();
-msession_list();
-msession_listvar();
-msession_lock();
-msession_plugin();
-msession_randstr();
-msession_set_array();
-msession_set_data();
-msession_set();
-msession_timeout();
-msession_uniq();
-msession_unlock();
-
-__autoload($class);
-
-// PHP 5.0 Crack extension.
-crack_check();
-crack_closedict();
-crack_getlastmessage();
-crack_opendict();
-
-// PHP 5.1 W32API extension.
-w32api_deftype();
-w32api_init_dtype();
-w32api_invoke_function();
-w32api_register_function();
-w32api_set_call_method();
-
-// PHP 5.1 CPDF extension.
-cpdf_add_annotation();
-cpdf_add_outline();
-cpdf_arc();
-cpdf_begin_text();
-cpdf_circle();
-cpdf_clip();
-cpdf_close();
-cpdf_closepath_fill_stroke();
-cpdf_closepath_stroke();
-cpdf_closepath();
-cpdf_continue_text();
-cpdf_curveto();
-cpdf_end_text();
-cpdf_fill_stroke();
-cpdf_fill();
-cpdf_finalize_page();
-cpdf_finalize();
-cpdf_global_set_document_limits();
-cpdf_import_jpeg();
-cpdf_lineto();
-cpdf_moveto();
-cpdf_newpath();
-cpdf_open();
-cpdf_output_buffer();
-cpdf_page_init();
-cpdf_place_inline_image();
-cpdf_rect();
-cpdf_restore();
-cpdf_rlineto();
-cpdf_rmoveto();
-cpdf_rotate_text();
-cpdf_rotate();
-cpdf_save_to_file();
-cpdf_save();
-cpdf_scale();
-cpdf_set_action_url();
-cpdf_set_char_spacing();
-cpdf_set_creator();
-cpdf_set_current_page();
-cpdf_set_font_directories();
-cpdf_set_font_map_file();
-cpdf_set_font();
-cpdf_set_horiz_scaling();
-cpdf_set_keywords();
-cpdf_set_leading();
-cpdf_set_page_animation();
-cpdf_set_subject();
-cpdf_set_text_matrix();
-cpdf_set_text_pos();
-cpdf_set_text_rendering();
-cpdf_set_text_rise();
-cpdf_set_title();
-cpdf_set_viewer_preferences();
-cpdf_set_word_spacing();
-cpdf_setdash();
-cpdf_setflat();
-cpdf_setgray_fill();
-cpdf_setgray_stroke();
-cpdf_setgray();
-cpdf_setlinecap();
-cpdf_setlinejoin();
-cpdf_setlinewidth();
-cpdf_setmiterlimit();
-cpdf_setrgbcolor_fill();
-cpdf_setrgbcolor_stroke();
-cpdf_setrgbcolor();
-cpdf_show_xy();
-cpdf_show();
-cpdf_stringwidth();
-cpdf_stroke();
-cpdf_text();
-cpdf_translate();
-ircg_channel_mode();
-ircg_disconnect();
-ircg_eval_ecmascript_params();
-ircg_fetch_error_msg();
-ircg_get_username();
-ircg_html_encode();
-ircg_ignore_add();
-ircg_ignore_del();
-ircg_invite();
-ircg_is_conn_alive();
-ircg_join();
-ircg_kick();
-ircg_list();
-ircg_lookup_format_messages();
-ircg_lusers();
-ircg_msg();
-ircg_names();
-ircg_nick();
-ircg_nickname_escape();
-ircg_nickname_unescape();
-ircg_notice();
-ircg_oper();
-ircg_part();
-ircg_pconnect();
-ircg_register_format_messages();
-ircg_set_current();
-ircg_set_file();
-ircg_set_on_die();
-ircg_topic();
-ircg_who();
-ircg_whois();
-dbase_add_record();
-dbase_close();
-dbase_create();
-dbase_delete_record();
-dbase_get_header_info();
-dbase_get_record_with_names();
-dbase_get_record();
-dbase_numfields();
-dbase_numrecords();
-dbase_open();
-dbase_pack();
-dbase_replace_record();
-dbx_close();
-dbx_compare();
-dbx_connect();
-dbx_error();
-dbx_escape_string();
-dbx_fetch_row();
-dbx_query();
-dbx_sort();
-fbsql_affected_rows();
-fbsql_autocommit();
-fbsql_blob_size();
-fbsql_change_user();
-fbsql_clob_size();
-fbsql_close();
-fbsql_commit();
-fbsql_connect();
-fbsql_create_blob();
-fbsql_create_clob();
-fbsql_create_db();
-fbsql_data_seek();
-fbsql_database_password();
-fbsql_database();
-fbsql_db_query();
-fbsql_db_status();
-fbsql_drop_db();
-fbsql_errno();
-fbsql_error();
-fbsql_fetch_array();
-fbsql_fetch_assoc();
-fbsql_fetch_field();
-fbsql_fetch_lengths();
-fbsql_fetch_object();
-fbsql_fetch_row();
-fbsql_field_flags();
-fbsql_field_len();
-fbsql_field_name();
-fbsql_field_seek();
-fbsql_field_table();
-fbsql_field_type();
-fbsql_free_result();
-fbsql_get_autostart_info();
-fbsql_hostname();
-fbsql_insert_id();
-fbsql_list_dbs();
-fbsql_list_fields();
-fbsql_list_tables();
-fbsql_next_result();
-fbsql_num_fields();
-fbsql_num_rows();
-fbsql_password();
-fbsql_pconnect();
-fbsql_query();
-fbsql_read_blob();
-fbsql_read_clob();
-fbsql_result();
-fbsql_rollback();
-fbsql_rows_fetched();
-fbsql_select_db();
-fbsql_set_characterset();
-fbsql_set_lob_mode();
-fbsql_set_password();
-fbsql_set_transaction();
-fbsql_start_db();
-fbsql_stop_db();
-fbsql_table_name();
-fbsql_tablename();
-fbsql_username();
-fbsql_warnings();
-filepro_fieldcount();
-filepro_fieldname();
-filepro_fieldtype();
-filepro_fieldwidth();
-filepro_retrieve();
-filepro_rowcount();
-filepro();
-ingres_autocommit();
-ingres_close();
-ingres_commit();
-ingres_connect();
-ingres_fetch_array();
-ingres_fetch_object();
-ingres_fetch_row();
-ingres_field_length();
-ingres_field_name();
-ingres_field_nullable();
-ingres_field_precision();
-ingres_field_scale();
-ingres_field_type();
-ingres_num_fields();
-ingres_num_rows();
-ingres_pconnect();
-ingres_query();
-ingres_rollback();
-msql_affected_rows();
-msql_close();
-msql_connect();
-msql_create_db();
-msql_createdb();
-msql_data_seek();
-msql_db_query();
-msql_dbname();
-msql_drop_db();
-msql_error();
-msql_fetch_array();
-msql_fetch_field();
-msql_fetch_object();
-msql_fetch_row();
-msql_field_flags();
-msql_field_len();
-msql_field_name();
-msql_field_seek();
-msql_field_table();
-msql_field_type();
-msql_fieldflags();
-msql_fieldlen();
-msql_fieldname();
-msql_fieldtable();
-msql_fieldtype();
-msql_free_result();
-msql_list_dbs();
-msql_list_fields();
-msql_list_tables();
-msql_num_fields();
-msql_num_rows();
-msql_numfields();
-msql_numrows();
-msql_pconnect();
-msql_query();
-msql_regcase();
-msql_result();
-msql_select_db();
-msql_tablename();
-msql();
-mssql_bind();
-mssql_close();
-mssql_connect();
-mssql_data_seek();
-mssql_execute();
-mssql_fetch_array();
-mssql_fetch_assoc();
-mssql_fetch_batch();
-mssql_fetch_field();
-mssql_fetch_object();
-mssql_fetch_row();
-mssql_field_length();
-mssql_field_name();
-mssql_field_seek();
-mssql_field_type();
-mssql_free_result();
-mssql_free_statement();
-mssql_get_last_message();
-mssql_guid_string();
-mssql_init();
-mssql_min_error_severity();
-mssql_min_message_severity();
-mssql_next_result();
-mssql_num_fields();
-mssql_num_rows();
-mssql_pconnect();
-mssql_query();
-mssql_result();
-mssql_rows_affected();
-mssql_select_db();
-sqlite_array_query();
-sqlite_busy_timeout();
-sqlite_changes();
-sqlite_close();
-sqlite_column();
-sqlite_create_aggregate();
-sqlite_create_function();
-sqlite_current();
-sqlite_error_string();
-sqlite_escape_string();
-sqlite_exec();
-sqlite_factory();
-sqlite_fetch_all();
-sqlite_fetch_array();
-sqlite_fetch_column_types();
-sqlite_fetch_object();
-sqlite_fetch_single();
-sqlite_fetch_string();
-sqlite_field_name();
-sqlite_has_more();
-sqlite_has_prev();
-sqlite_key();
-sqlite_last_error();
-sqlite_last_insert_rowid();
-sqlite_libencoding();
-sqlite_libversion();
-sqlite_next();
-sqlite_num_fields();
-sqlite_num_rows();
-sqlite_open();
-sqlite_popen();
-sqlite_prev();
-sqlite_query();
-sqlite_rewind();
-sqlite_seek();
-sqlite_single_query();
-sqlite_udf_decode_binary();
-sqlite_udf_encode_binary();
-sqlite_unbuffered_query();
-sqlite_valid();
-mysql_affected_rows();
-mysql_client_encoding();
-mysql_close();
-mysql_connect();
-mysql_create_db();
-mysql_data_seek();
-mysql_db_name();
-mysql_drop_db();
-mysql_errno();
-mysql_error();
-mysql_fetch_array();
-mysql_fetch_assoc();
-mysql_fetch_field();
-mysql_fetch_lengths();
-mysql_fetch_object();
-mysql_fetch_row();
-mysql_field_flags();
-mysql_field_len();
-mysql_field_name();
-mysql_field_seek();
-mysql_field_table();
-mysql_field_type();
-mysql_free_result();
-mysql_get_client_info();
-mysql_get_host_info();
-mysql_get_proto_info();
-mysql_get_server_info();
-mysql_info();
-mysql_insert_id();
-mysql_list_fields();
-mysql_list_processes();
-mysql_list_tables();
-mysql_num_fields();
-mysql_num_rows();
-mysql_pconnect();
-mysql_ping();
-mysql_query();
-mysql_real_escape_string();
-mysql_result();
-mysql_select_db();
-mysql_set_charset();
-mysql_stat();
-mysql_tablename();
-mysql_thread_id();
-mysql_unbuffered_query();
-mysql();
-mysql_fieldname();
-mysql_fieldtable();
-mysql_fieldlen();
-mysql_fieldtype();
-mysql_fieldflags();
-mysql_selectdb();
-mysql_createdb();
-mysql_dropdb();
-mysql_freeresult();
-mysql_numfields();
-mysql_numrows();
-mysql_listdbs();
-mysql_listtables();
-mysql_listfields();
-mysql_dbname();
-mysql_table_name();
-
-// PHP 7.4 ibase extension aliases.
-fbird_add_user();
-fbird_affected_rows();
-fbird_backup();
-fbird_blob_add();
-fbird_blob_cancel();
-fbird_blob_close();
-fbird_blob_create();
-fbird_blob_echo();
-fbird_blob_get();
-fbird_blob_import();
-fbird_blob_info();
-fbird_blob_open();
-fbird_close();
-fbird_commit_ret();
-fbird_commit();
-fbird_connect();
-fbird_db_info();
-fbird_delete_user();
-fbird_drop_db();
-fbird_errcode();
-fbird_errmsg();
-fbird_execute();
-fbird_fetch_assoc();
-fbird_fetch_object();
-fbird_fetch_row();
-fbird_field_info();
-fbird_free_event_handler();
-fbird_free_query();
-fbird_free_result();
-fbird_gen_id();
-fbird_maintain_db();
-fbird_modify_user();
-fbird_name_result();
-fbird_num_fields();
-fbird_num_params();
-fbird_param_info();
-fbird_pconnect();
-fbird_prepare();
-fbird_query();
-fbird_restore();
-fbird_rollback_ret();
-fbird_rollback();
-fbird_server_info();
-fbird_service_attach();
-fbird_service_detach();
-fbird_set_event_handler();
-fbird_trans();
-fbird_wait_event();
-
-ovrimos_close();
-ovrimos_commit();
-ovrimos_connect();
-ovrimos_cursor();
-ovrimos_exec();
-ovrimos_execute();
-ovrimos_fetch_into();
-ovrimos_fetch_row();
-ovrimos_field_len();
-ovrimos_field_name();
-ovrimos_field_num();
-ovrimos_field_type();
-ovrimos_free_result();
-ovrimos_longreadlen();
-ovrimos_num_fields();
-ovrimos_num_rows();
-ovrimos_prepare();
-ovrimos_result_all();
-ovrimos_result();
-ovrimos_rollback();
-ovrimos_close_all();
-
-ora_bind();
-ora_close();
-ora_columnname();
-ora_columnsize();
-ora_columntype();
-ora_commit();
-ora_commitoff();
-ora_commiton();
-ora_do();
-ora_error();
-ora_errorcode();
-ora_exec();
-ora_fetch_into();
-ora_fetch();
-ora_getcolumn();
-ora_logoff();
-ora_logon();
-ora_numcols();
-ora_numrows();
-ora_open();
-ora_parse();
-ora_plogon();
-ora_rollback();
-sybase_affected_rows();
-sybase_close();
-sybase_connect();
-sybase_data_seek();
-sybase_deadlock_retry_count();
-sybase_fetch_array();
-sybase_fetch_assoc();
-sybase_fetch_field();
-sybase_fetch_object();
-sybase_fetch_row();
-sybase_field_seek();
-sybase_free_result();
-sybase_get_last_message();
-sybase_min_client_severity();
-sybase_min_error_severity();
-sybase_min_message_severity();
-sybase_min_server_severity();
-sybase_num_fields();
-sybase_num_rows();
-sybase_pconnect();
-sybase_query();
-sybase_result();
-sybase_select_db();
-sybase_set_message_handler();
-sybase_unbuffered_query();
-ifx_affected_rows();
-ifx_blobinfile_mode();
-ifx_byteasvarchar();
-ifx_close();
-ifx_connect();
-ifx_copy_blob();
-ifx_create_blob();
-ifx_create_char();
-ifx_do();
-ifx_error();
-ifx_errormsg();
-ifx_fetch_row();
-ifx_fieldproperties();
-ifx_fieldtypes();
-ifx_free_blob();
-ifx_free_char();
-ifx_free_result();
-ifx_get_blob();
-ifx_get_char();
-ifx_getsqlca();
-ifx_htmltbl_result();
-ifx_nullformat();
-ifx_num_fields();
-ifx_num_rows();
-ifx_pconnect();
-ifx_prepare();
-ifx_query();
-ifx_textasvarchar();
-ifx_update_blob();
-ifx_update_char();
-ifxus_close_slob();
-ifxus_create_slob();
-ifxus_free_slob();
-ifxus_open_slob();
-ifxus_read_slob();
-ifxus_seek_slob();
-ifxus_tell_slob();
-ifxus_write_slob();
-mysqli_disable_reads_from_master();
-mysqli_disable_rpl_parse();
-mysqli_embedded_connect();
-mysqli_embedded_server_end();
-mysqli_embedded_server_start();
-mysqli_enable_reads_from_master();
-mysqli_enable_rpl_parse();
-mysqli_master_query();
-mysqli_resource();
-mysqli_rpl_parse_enabled();
-mysqli_rpl_probe();
-mysqli_server_end();
-mysqli_server_init();
-mysqli_slave_query();
-xmlrpc_decode_request();
-xmlrpc_decode();
-xmlrpc_encode_request();
-xmlrpc_encode();
-xmlrpc_get_type();
-xmlrpc_is_fault();
-xmlrpc_parse_method_descriptions();
-xmlrpc_server_add_introspection_data();
-xmlrpc_server_call_method();
-xmlrpc_server_create();
-xmlrpc_server_destroy();
-xmlrpc_server_register_introspection_callback();
-xmlrpc_server_register_method();
-xmlrpc_set_type();
-enchant_broker_get_dict_path();
-enchant_broker_set_dict_path();
-enchant_broker_free();
-enchant_broker_free_dict();
-enchant_dict_add_to_personal();
-enchant_dict_is_in_session();
-oci_internal_debug();
-zip_close();
-zip_entry_close();
-zip_entry_compressedsize();
-zip_entry_compressionmethod();
-zip_entry_filesize();
-zip_entry_name();
-zip_entry_open();
-zip_entry_read();
-zip_open();
-zip_read();
-openssl_x509_free();
-openssl_pkey_free();
-libxml_disable_entity_loader();
-pg_clientencoding();
-pg_cmdtuples();
-pg_errormessage();
-pg_fieldname();
-pg_fieldnum();
-pg_fieldisnull();
-pg_fieldprtlen();
-pg_fieldsize();
-pg_fieldtype();
-pg_freeresult();
-pg_getlastoid();
-pg_loclose();
-pg_locreate();
-pg_loexport();
-pg_loimport();
-pg_loopen();
-pg_loread();
-pg_loreadall();
-pg_lounlink();
-pg_lowrite();
-pg_numfields();
-pg_numrows();
-pg_result();
-pg_setclientencoding();
-imap_header();
-shmop_close();
-openssl_free_key();
-date_sunrise();
-date_sunset();
-strptime();
-strftime();
-gmstrftime();
-mhash_count();
-mhash_get_block_size();
-mhash_get_hash_name();
-mhash_keygen_s2k();
-mhash();
-odbc_result_all();
-
-// Prevent false positives on PHP 8.0+ nullsafe method calls.
-$obj?->php_check_syntax(); // OK.
-
-//PHP 8.2 deprecations
-utf8_encode();
-utf8_decode();
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
deleted file mode 100644
index 6c409bfa..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
+++ /dev/null
@@ -1,1552 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedFunctions sniff.
- *
- * @group removedFunctions
- * @group functionUse
- *
- * @covers \RemovedFunctionsSniff
- *
- * @since 5.5
- */
-class RemovedFunctionsUnitTest extends BaseSniffTest
-{
-    /**
-     * testDeprecatedFunction
-     *
-     * @dataProvider dataDeprecatedFunction
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedFunction($functionName, $deprecatedIn, $lines, $okVersion, $deprecatedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedFunction()
-     *
-     * @return array
-     */
-    public function dataDeprecatedFunction()
-    {
-        return [
-            ['dl', '5.3', [6], '5.2'],
-            ['ocifetchinto', '5.4', [63], '5.3'],
-            ['enchant_broker_get_dict_path', '8.0', [1172], '7.4'],
-            ['enchant_broker_set_dict_path', '8.0', [1173], '7.4'],
-            ['libxml_disable_entity_loader', '8.0', [1191], '7.4'],
-            ['openssl_x509_free', '8.0', [1189], '7.4'],
-            ['openssl_pkey_free', '8.0', [1190], '7.4'],
-            ['shmop_close', '8.0', [1217], '7.4'],
-            ['openssl_free_key', '8.0', [1218], '7.4'],
-            ['odbc_result_all', '8.1', [1229], '8.0'],
-        ];
-    }
-
-
-    /**
-     * testDeprecatedFunctionWithAlternative
-     *
-     * @dataProvider dataDeprecatedFunctionWithAlternative
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param string $alternative       An alternative function.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedFunctionWithAlternative($functionName, $deprecatedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedFunctionWithAlternative()
-     *
-     * @return array
-     */
-    public function dataDeprecatedFunctionWithAlternative()
-    {
-        return [
-            ['ocibindbyname', '5.4', 'oci_bind_by_name()', [41], '5.3'],
-            ['ocicancel', '5.4', 'oci_cancel()', [42], '5.3'],
-            ['ocicloselob', '5.4', 'OCI-Lob::close() / OCILob::close() (PHP 8+)', [43], '5.3'],
-            ['ocicollappend', '5.4', 'OCI-Collection::append() / OCICollection::append() (PHP 8+)', [44], '5.3'],
-            ['ocicollassign', '5.4', 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)', [45], '5.3'],
-            ['ocicollassignelem', '5.4', 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)', [46], '5.3'],
-            ['ocicollgetelem', '5.4', 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)', [47], '5.3'],
-            ['ocicollmax', '5.4', 'OCI-Collection::max() / OCICollection::max() (PHP 8+)', [48], '5.3'],
-            ['ocicollsize', '5.4', 'OCI-Collection::size() / OCICollection::size() (PHP 8+)', [49], '5.3'],
-            ['ocicolltrim', '5.4', 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)', [50], '5.3'],
-            ['ocicolumnisnull', '5.4', 'oci_field_is_null()', [51], '5.3'],
-            ['ocicolumnname', '5.4', 'oci_field_name()', [52], '5.3'],
-            ['ocicolumnprecision', '5.4', 'oci_field_precision()', [53], '5.3'],
-            ['ocicolumnscale', '5.4', 'oci_field_scale()', [54], '5.3'],
-            ['ocicolumnsize', '5.4', 'oci_field_size()', [55], '5.3'],
-            ['ocicolumntype', '5.4', 'oci_field_type()', [56], '5.3'],
-            ['ocicolumntyperaw', '5.4', 'oci_field_type_raw()', [57], '5.3'],
-            ['ocicommit', '5.4', 'oci_commit()', [58], '5.3'],
-            ['ocidefinebyname', '5.4', 'oci_define_by_name()', [59], '5.3'],
-            ['ocierror', '5.4', 'oci_error()', [60], '5.3'],
-            ['ociexecute', '5.4', 'oci_execute()', [61], '5.3'],
-            ['ocifetch', '5.4', 'oci_fetch()', [62], '5.3'],
-            ['ocifetchstatement', '5.4', 'oci_fetch_all()', [64], '5.3'],
-            ['ocifreecollection', '5.4', 'OCI-Collection::free() / OCICollection::free() (PHP 8+)', [65], '5.3'],
-            ['ocifreecursor', '5.4', 'oci_free_statement()', [66], '5.3'],
-            ['ocifreedesc', '5.4', 'OCI-Lob::free() / OCILob::free() (PHP 8+)', [67], '5.3'],
-            ['ocifreestatement', '5.4', 'oci_free_statement()', [68], '5.3'],
-            ['ociloadlob', '5.4', 'OCI-Lob::load() / OCILob::load() (PHP 8+)', [70], '5.3'],
-            ['ocilogoff', '5.4', 'oci_close()', [71], '5.3'],
-            ['ocilogon', '5.4', 'oci_connect()', [72], '5.3'],
-            ['ocinewcollection', '5.4', 'oci_new_collection()', [73], '5.3'],
-            ['ocinewcursor', '5.4', 'oci_new_cursor()', [74], '5.3'],
-            ['ocinewdescriptor', '5.4', 'oci_new_descriptor()', [75], '5.3'],
-            ['ocinlogon', '5.4', 'oci_new_connect()', [76], '5.3'],
-            ['ocinumcols', '5.4', 'oci_num_fields()', [77], '5.3'],
-            ['ociparse', '5.4', 'oci_parse()', [78], '5.3'],
-            ['ociplogon', '5.4', 'oci_pconnect()', [79], '5.3'],
-            ['ociresult', '5.4', 'oci_result()', [80], '5.3'],
-            ['ocirollback', '5.4', 'oci_rollback()', [81], '5.3'],
-            ['ocirowcount', '5.4', 'oci_num_rows()', [82], '5.3'],
-            ['ocisavelob', '5.4', 'OCI-Lob::save() / OCILob::save() (PHP 8+)', [83], '5.3'],
-            ['ocisavelobfile', '5.4', 'OCI-Lob::import() / OCILob::import() (PHP 8+)', [84], '5.3'],
-            ['ociserverversion', '5.4', 'oci_server_version()', [85], '5.3'],
-            ['ocisetprefetch', '5.4', 'oci_set_prefetch()', [86], '5.3'],
-            ['ocistatementtype', '5.4', 'oci_statement_type()', [87], '5.3'],
-            ['ociwritelobtofile', '5.4', 'OCI-Lob::export() / OCILob::export() (PHP 8+)', [88], '5.3'],
-            ['ociwritetemporarylob', '5.4', 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)', [89], '5.3'],
-
-            ['__autoload', '7.2', 'SPL autoload', [589], '7.1'],
-            ['is_real', '7.4', 'is_float()', [239], '7.3'],
-
-            ['enchant_broker_free', '8.0', 'unset the object', [1174], '7.4'],
-            ['enchant_broker_free_dict', '8.0', 'unset the object', [1175], '7.4'],
-            ['enchant_dict_add_to_personal', '8.0', 'enchant_dict_add()', [1176], '7.4'],
-            ['enchant_dict_is_in_session', '8.0', 'enchant_dict_is_added()', [1177], '7.4'],
-            ['zip_close', '8.0', 'ZipArchive::close()', [1179], '7.4'],
-            ['zip_entry_close', '8.0', 'ZipArchive', [1180], '7.4'],
-            ['zip_entry_compressedsize', '8.0', 'ZipArchive', [1181], '7.4'],
-            ['zip_entry_compressionmethod', '8.0', 'ZipArchive', [1182], '7.4'],
-            ['zip_entry_filesize', '8.0', 'ZipArchive', [1183], '7.4'],
-            ['zip_entry_name', '8.0', 'ZipArchive', [1184], '7.4'],
-            ['zip_entry_open', '8.0', 'ZipArchive', [1185], '7.4'],
-            ['zip_entry_read', '8.0', 'ZipArchive', [1186], '7.4'],
-            ['zip_open', '8.0', 'ZipArchive::open()', [1187], '7.4'],
-            ['zip_read', '8.0', 'ZipArchive', [1188], '7.4'],
-            ['pg_clientencoding', '8.0', 'pg_client_encoding()', [1192], '7.4'],
-            ['pg_cmdtuples', '8.0', 'pg_affected_rows()', [1193], '7.4'],
-            ['pg_errormessage', '8.0', 'pg_last_error()', [1194], '7.4'],
-            ['pg_fieldname', '8.0', 'pg_field_name()', [1195], '7.4'],
-            ['pg_fieldnum', '8.0', 'pg_field_num()', [1196], '7.4'],
-            ['pg_fieldisnull', '8.0', 'pg_field_is_null()', [1197], '7.4'],
-            ['pg_fieldprtlen', '8.0', 'pg_field_prtlen()', [1198], '7.4'],
-            ['pg_fieldsize', '8.0', 'pg_field_size()', [1199], '7.4'],
-            ['pg_fieldtype', '8.0', 'pg_field_type()', [1200], '7.4'],
-            ['pg_freeresult', '8.0', 'pg_free_result()', [1201], '7.4'],
-            ['pg_getlastoid', '8.0', 'pg_last_oid()', [1202], '7.4'],
-            ['pg_loclose', '8.0', 'pg_lo_close()', [1203], '7.4'],
-            ['pg_locreate', '8.0', 'pg_lo_create()', [1204], '7.4'],
-            ['pg_loexport', '8.0', 'pg_lo_export()', [1205], '7.4'],
-            ['pg_loimport', '8.0', 'pg_lo_import()', [1206], '7.4'],
-            ['pg_loopen', '8.0', 'pg_lo_open()', [1207], '7.4'],
-            ['pg_loread', '8.0', 'pg_lo_read()', [1208], '7.4'],
-            ['pg_loreadall', '8.0', 'pg_lo_read_all()', [1209], '7.4'],
-            ['pg_lounlink', '8.0', 'pg_lo_unlink()', [1210], '7.4'],
-            ['pg_lowrite', '8.0', 'pg_lo_write()', [1211], '7.4'],
-            ['pg_numfields', '8.0', 'pg_num_fields()', [1212], '7.4'],
-            ['pg_numrows', '8.0', 'pg_num_rows()', [1213], '7.4'],
-            ['pg_result', '8.0', 'pg_fetch_result()', [1214], '7.4'],
-            ['pg_setclientencoding', '8.0', 'pg_set_client_encoding()', [1215], '7.4'],
-
-            ['date_sunrise', '8.1', 'date_sun_info()', [1219], '8.0'],
-            ['date_sunset', '8.1', 'date_sun_info()', [1220], '8.0'],
-            ['strptime', '8.1', 'date_parse_from_format() or IntlDateFormatter::parse()', [1221], '8.0'],
-            ['strftime', '8.1', 'date() or IntlDateFormatter::format()', [1222], '8.0'],
-            ['gmstrftime', '8.1', 'date() or IntlDateFormatter::format()', [1223], '8.0'],
-            ['mhash_count', '8.1', 'the hash_*() functions', [1224], '8.0'],
-            ['mhash_get_block_size', '8.1', 'the hash_*() functions', [1225], '8.0'],
-            ['mhash_get_hash_name', '8.1', 'the hash_*() functions', [1226], '8.0'],
-            ['mhash_keygen_s2k', '8.1', 'the hash_*() functions', [1227], '8.0'],
-            ['mhash', '8.1', 'the hash_*() functions', [1228], '8.0'],
-            ['utf8_encode', '8.2', 'iconv()', [1235], '8.0'],
-            ['utf8_decode', '8.2', 'iconv()', [1236], '8.0'],
-        ];
-    }
-
-
-    /**
-     * testRemovedFunction
-     *
-     * @dataProvider dataRemovedFunction
-     *
-     * @param string $functionName   Name of the function.
-     * @param string $removedIn      The PHP version in which the function was removed.
-     * @param array  $lines          The line numbers in the test file which apply to this function.
-     * @param string $okVersion      A PHP version in which the function was still valid.
-     * @param string $removedVersion Optional PHP version to test removed message with -
-     *                               if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testRemovedFunction($functionName, $removedIn, $lines, $okVersion, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is removed since PHP {$removedIn}";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedFunction()
-     *
-     * @return array
-     */
-    public function dataRemovedFunction()
-    {
-        return [
-            ['crack_check', '5.0', [592], '4.4'],
-            ['crack_closedict', '5.0', [593], '4.4'],
-            ['crack_getlastmessage', '5.0', [594], '4.4'],
-            ['crack_opendict', '5.0', [595], '4.4'],
-
-            ['pfpro_cleanup', '5.1', [221], '5.0'],
-            ['pfpro_init', '5.1', [222], '5.0'],
-            ['pfpro_process_raw', '5.1', [223], '5.0'],
-            ['pfpro_process', '5.1', [224], '5.0'],
-            ['pfpro_version', '5.1', [225], '5.0'],
-            ['m_checkstatus', '5.1', [417], '5.0'],
-            ['m_completeauthorizations', '5.1', [418], '5.0'],
-            ['m_connect', '5.1', [419], '5.0'],
-            ['m_connectionerror', '5.1', [420], '5.0'],
-            ['m_deletetrans', '5.1', [421], '5.0'],
-            ['m_destroyconn', '5.1', [422], '5.0'],
-            ['m_destroyengine', '5.1', [423], '5.0'],
-            ['m_getcell', '5.1', [424], '5.0'],
-            ['m_getcellbynum', '5.1', [425], '5.0'],
-            ['m_getcommadelimited', '5.1', [426], '5.0'],
-            ['m_getheader', '5.1', [427], '5.0'],
-            ['m_initconn', '5.1', [428], '5.0'],
-            ['m_initengine', '5.1', [429], '5.0'],
-            ['m_iscommadelimited', '5.1', [430], '5.0'],
-            ['m_maxconntimeout', '5.1', [431], '5.0'],
-            ['m_monitor', '5.1', [432], '5.0'],
-            ['m_numcolumns', '5.1', [433], '5.0'],
-            ['m_numrows', '5.1', [434], '5.0'],
-            ['m_parsecommadelimited', '5.1', [435], '5.0'],
-            ['m_responsekeys', '5.1', [436], '5.0'],
-            ['m_responseparam', '5.1', [437], '5.0'],
-            ['m_returnstatus', '5.1', [438], '5.0'],
-            ['m_setblocking', '5.1', [439], '5.0'],
-            ['m_setdropfile', '5.1', [440], '5.0'],
-            ['m_setip', '5.1', [441], '5.0'],
-            ['m_setssl_cafile', '5.1', [442], '5.0'],
-            ['m_setssl_files', '5.1', [443], '5.0'],
-            ['m_setssl', '5.1', [444], '5.0'],
-            ['m_settimeout', '5.1', [445], '5.0'],
-            ['m_sslcert_gen_hash', '5.1', [446], '5.0'],
-            ['m_transactionssent', '5.1', [447], '5.0'],
-            ['m_transinqueue', '5.1', [448], '5.0'],
-            ['m_transkeyval', '5.1', [449], '5.0'],
-            ['m_transnew', '5.1', [450], '5.0'],
-            ['m_transsend', '5.1', [451], '5.0'],
-            ['m_uwait', '5.1', [452], '5.0'],
-            ['m_validateidentifier', '5.1', [453], '5.0'],
-            ['m_verifyconnection', '5.1', [454], '5.0'],
-            ['m_verifysslcert', '5.1', [455], '5.0'],
-            ['dio_close', '5.1', [458], '5.0'],
-            ['dio_fcntl', '5.1', [459], '5.0'],
-            ['dio_open', '5.1', [460], '5.0'],
-            ['dio_read', '5.1', [461], '5.0'],
-            ['dio_seek', '5.1', [462], '5.0'],
-            ['dio_stat', '5.1', [463], '5.0'],
-            ['dio_tcsetattr', '5.1', [464], '5.0'],
-            ['dio_truncate', '5.1', [465], '5.0'],
-            ['dio_write', '5.1', [466], '5.0'],
-            ['fam_cancel_monitor', '5.1', [514], '5.0'],
-            ['fam_close', '5.1', [515], '5.0'],
-            ['fam_monitor_collection', '5.1', [516], '5.0'],
-            ['fam_monitor_directory', '5.1', [517], '5.0'],
-            ['fam_monitor_file', '5.1', [518], '5.0'],
-            ['fam_next_event', '5.1', [519], '5.0'],
-            ['fam_open', '5.1', [520], '5.0'],
-            ['fam_pending', '5.1', [521], '5.0'],
-            ['fam_resume_monitor', '5.1', [522], '5.0'],
-            ['fam_suspend_monitor', '5.1', [523], '5.0'],
-            ['yp_all', '5.1', [532], '5.0'],
-            ['yp_cat', '5.1', [533], '5.0'],
-            ['yp_err_string', '5.1', [534], '5.0'],
-            ['yp_errno', '5.1', [535], '5.0'],
-            ['yp_first', '5.1', [536], '5.0'],
-            ['yp_get_default_domain', '5.1', [537], '5.0'],
-            ['yp_master', '5.1', [538], '5.0'],
-            ['yp_match', '5.1', [539], '5.0'],
-            ['yp_next', '5.1', [540], '5.0'],
-            ['yp_order', '5.1', [541], '5.0'],
-            ['udm_add_search_limit', '5.1', [544], '5.0'],
-            ['udm_alloc_agent_array', '5.1', [545], '5.0'],
-            ['udm_alloc_agent', '5.1', [546], '5.0'],
-            ['udm_api_version', '5.1', [547], '5.0'],
-            ['udm_cat_list', '5.1', [548], '5.0'],
-            ['udm_cat_path', '5.1', [549], '5.0'],
-            ['udm_check_charset', '5.1', [550], '5.0'],
-            ['udm_clear_search_limits', '5.1', [551], '5.0'],
-            ['udm_crc32', '5.1', [552], '5.0'],
-            ['udm_errno', '5.1', [553], '5.0'],
-            ['udm_error', '5.1', [554], '5.0'],
-            ['udm_find', '5.1', [555], '5.0'],
-            ['udm_free_agent', '5.1', [556], '5.0'],
-            ['udm_free_ispell_data', '5.1', [557], '5.0'],
-            ['udm_free_res', '5.1', [558], '5.0'],
-            ['udm_get_doc_count', '5.1', [559], '5.0'],
-            ['udm_get_res_field', '5.1', [560], '5.0'],
-            ['udm_get_res_param', '5.1', [561], '5.0'],
-            ['udm_hash32', '5.1', [562], '5.0'],
-            ['udm_load_ispell_data', '5.1', [563], '5.0'],
-            ['udm_set_agent_param', '5.1', [564], '5.0'],
-            ['w32api_deftype', '5.1', [598], '5.0'],
-            ['w32api_init_dtype', '5.1', [599], '5.0'],
-            ['w32api_invoke_function', '5.1', [600], '5.0'],
-            ['w32api_register_function', '5.1', [601], '5.0'],
-            ['w32api_set_call_method', '5.1', [602], '5.0'],
-            ['cpdf_add_annotation', '5.1', [605], '5.0'],
-            ['cpdf_add_outline', '5.1', [606], '5.0'],
-            ['cpdf_arc', '5.1', [607], '5.0'],
-            ['cpdf_begin_text', '5.1', [608], '5.0'],
-            ['cpdf_circle', '5.1', [609], '5.0'],
-            ['cpdf_clip', '5.1', [610], '5.0'],
-            ['cpdf_close', '5.1', [611], '5.0'],
-            ['cpdf_closepath_fill_stroke', '5.1', [612], '5.0'],
-            ['cpdf_closepath_stroke', '5.1', [613], '5.0'],
-            ['cpdf_closepath', '5.1', [614], '5.0'],
-            ['cpdf_continue_text', '5.1', [615], '5.0'],
-            ['cpdf_curveto', '5.1', [616], '5.0'],
-            ['cpdf_end_text', '5.1', [617], '5.0'],
-            ['cpdf_fill_stroke', '5.1', [618], '5.0'],
-            ['cpdf_fill', '5.1', [619], '5.0'],
-            ['cpdf_finalize_page', '5.1', [620], '5.0'],
-            ['cpdf_finalize', '5.1', [621], '5.0'],
-            ['cpdf_global_set_document_limits', '5.1', [622], '5.0'],
-            ['cpdf_import_jpeg', '5.1', [623], '5.0'],
-            ['cpdf_lineto', '5.1', [624], '5.0'],
-            ['cpdf_moveto', '5.1', [625], '5.0'],
-            ['cpdf_newpath', '5.1', [626], '5.0'],
-            ['cpdf_open', '5.1', [627], '5.0'],
-            ['cpdf_output_buffer', '5.1', [628], '5.0'],
-            ['cpdf_page_init', '5.1', [629], '5.0'],
-            ['cpdf_place_inline_image', '5.1', [630], '5.0'],
-            ['cpdf_rect', '5.1', [631], '5.0'],
-            ['cpdf_restore', '5.1', [632], '5.0'],
-            ['cpdf_rlineto', '5.1', [633], '5.0'],
-            ['cpdf_rmoveto', '5.1', [634], '5.0'],
-            ['cpdf_rotate_text', '5.1', [635], '5.0'],
-            ['cpdf_rotate', '5.1', [636], '5.0'],
-            ['cpdf_save_to_file', '5.1', [637], '5.0'],
-            ['cpdf_save', '5.1', [638], '5.0'],
-            ['cpdf_scale', '5.1', [639], '5.0'],
-            ['cpdf_set_action_url', '5.1', [640], '5.0'],
-            ['cpdf_set_char_spacing', '5.1', [641], '5.0'],
-            ['cpdf_set_creator', '5.1', [642], '5.0'],
-            ['cpdf_set_current_page', '5.1', [643], '5.0'],
-            ['cpdf_set_font_directories', '5.1', [644], '5.0'],
-            ['cpdf_set_font_map_file', '5.1', [645], '5.0'],
-            ['cpdf_set_font', '5.1', [646], '5.0'],
-            ['cpdf_set_horiz_scaling', '5.1', [647], '5.0'],
-            ['cpdf_set_keywords', '5.1', [648], '5.0'],
-            ['cpdf_set_leading', '5.1', [649], '5.0'],
-            ['cpdf_set_page_animation', '5.1', [650], '5.0'],
-            ['cpdf_set_subject', '5.1', [651], '5.0'],
-            ['cpdf_set_text_matrix', '5.1', [652], '5.0'],
-            ['cpdf_set_text_pos', '5.1', [653], '5.0'],
-            ['cpdf_set_text_rendering', '5.1', [654], '5.0'],
-            ['cpdf_set_text_rise', '5.1', [655], '5.0'],
-            ['cpdf_set_title', '5.1', [656], '5.0'],
-            ['cpdf_set_viewer_preferences', '5.1', [657], '5.0'],
-            ['cpdf_set_word_spacing', '5.1', [658], '5.0'],
-            ['cpdf_setdash', '5.1', [659], '5.0'],
-            ['cpdf_setflat', '5.1', [660], '5.0'],
-            ['cpdf_setgray_fill', '5.1', [661], '5.0'],
-            ['cpdf_setgray_stroke', '5.1', [662], '5.0'],
-            ['cpdf_setgray', '5.1', [663], '5.0'],
-            ['cpdf_setlinecap', '5.1', [664], '5.0'],
-            ['cpdf_setlinejoin', '5.1', [665], '5.0'],
-            ['cpdf_setlinewidth', '5.1', [666], '5.0'],
-            ['cpdf_setmiterlimit', '5.1', [667], '5.0'],
-            ['cpdf_setrgbcolor_fill', '5.1', [668], '5.0'],
-            ['cpdf_setrgbcolor_stroke', '5.1', [669], '5.0'],
-            ['cpdf_setrgbcolor', '5.1', [670], '5.0'],
-            ['cpdf_show_xy', '5.1', [671], '5.0'],
-            ['cpdf_show', '5.1', [672], '5.0'],
-            ['cpdf_stringwidth', '5.1', [673], '5.0'],
-            ['cpdf_stroke', '5.1', [674], '5.0'],
-            ['cpdf_text', '5.1', [675], '5.0'],
-            ['cpdf_translate', '5.1', [676], '5.0'],
-            ['ircg_channel_mode', '5.1', [677], '5.0'],
-            ['ircg_disconnect', '5.1', [678], '5.0'],
-            ['ircg_eval_ecmascript_params', '5.1', [679], '5.0'],
-            ['ircg_fetch_error_msg', '5.1', [680], '5.0'],
-            ['ircg_get_username', '5.1', [681], '5.0'],
-            ['ircg_html_encode', '5.1', [682], '5.0'],
-            ['ircg_ignore_add', '5.1', [683], '5.0'],
-            ['ircg_ignore_del', '5.1', [684], '5.0'],
-            ['ircg_invite', '5.1', [685], '5.0'],
-            ['ircg_is_conn_alive', '5.1', [686], '5.0'],
-            ['ircg_join', '5.1', [687], '5.0'],
-            ['ircg_kick', '5.1', [688], '5.0'],
-            ['ircg_list', '5.1', [689], '5.0'],
-            ['ircg_lookup_format_messages', '5.1', [690], '5.0'],
-            ['ircg_lusers', '5.1', [691], '5.0'],
-            ['ircg_msg', '5.1', [692], '5.0'],
-            ['ircg_names', '5.1', [693], '5.0'],
-            ['ircg_nick', '5.1', [694], '5.0'],
-            ['ircg_nickname_escape', '5.1', [695], '5.0'],
-            ['ircg_nickname_unescape', '5.1', [696], '5.0'],
-            ['ircg_notice', '5.1', [697], '5.0'],
-            ['ircg_oper', '5.1', [698], '5.0'],
-            ['ircg_part', '5.1', [699], '5.0'],
-            ['ircg_pconnect', '5.1', [700], '5.0'],
-            ['ircg_register_format_messages', '5.1', [701], '5.0'],
-            ['ircg_set_current', '5.1', [702], '5.0'],
-            ['ircg_set_file', '5.1', [703], '5.0'],
-            ['ircg_set_on_die', '5.1', [704], '5.0'],
-            ['ircg_topic', '5.1', [705], '5.0'],
-            ['ircg_who', '5.1', [706], '5.0'],
-            ['ircg_whois', '5.1', [707], '5.0'],
-            ['dbx_close', '5.1', [720], '5.0'],
-            ['dbx_compare', '5.1', [721], '5.0'],
-            ['dbx_connect', '5.1', [722], '5.0'],
-            ['dbx_error', '5.1', [723], '5.0'],
-            ['dbx_escape_string', '5.1', [724], '5.0'],
-            ['dbx_fetch_row', '5.1', [725], '5.0'],
-            ['dbx_query', '5.1', [726], '5.0'],
-            ['dbx_sort', '5.1', [727], '5.0'],
-            ['ingres_autocommit', '5.1', [795], '5.0'],
-            ['ingres_close', '5.1', [796], '5.0'],
-            ['ingres_commit', '5.1', [797], '5.0'],
-            ['ingres_connect', '5.1', [798], '5.0'],
-            ['ingres_fetch_array', '5.1', [799], '5.0'],
-            ['ingres_fetch_object', '5.1', [800], '5.0'],
-            ['ingres_fetch_row', '5.1', [801], '5.0'],
-            ['ingres_field_length', '5.1', [802], '5.0'],
-            ['ingres_field_name', '5.1', [803], '5.0'],
-            ['ingres_field_nullable', '5.1', [804], '5.0'],
-            ['ingres_field_precision', '5.1', [805], '5.0'],
-            ['ingres_field_scale', '5.1', [806], '5.0'],
-            ['ingres_field_type', '5.1', [807], '5.0'],
-            ['ingres_num_fields', '5.1', [808], '5.0'],
-            ['ingres_num_rows', '5.1', [809], '5.0'],
-            ['ingres_pconnect', '5.1', [810], '5.0'],
-            ['ingres_query', '5.1', [811], '5.0'],
-            ['ingres_rollback', '5.1', [812], '5.0'],
-            ['ovrimos_close', '5.1', [1036], '5.0'],
-            ['ovrimos_commit', '5.1', [1037], '5.0'],
-            ['ovrimos_connect', '5.1', [1038], '5.0'],
-            ['ovrimos_cursor', '5.1', [1039], '5.0'],
-            ['ovrimos_exec', '5.1', [1040], '5.0'],
-            ['ovrimos_execute', '5.1', [1041], '5.0'],
-            ['ovrimos_fetch_into', '5.1', [1042], '5.0'],
-            ['ovrimos_fetch_row', '5.1', [1043], '5.0'],
-            ['ovrimos_field_len', '5.1', [1044], '5.0'],
-            ['ovrimos_field_name', '5.1', [1045], '5.0'],
-            ['ovrimos_field_num', '5.1', [1046], '5.0'],
-            ['ovrimos_field_type', '5.1', [1047], '5.0'],
-            ['ovrimos_free_result', '5.1', [1048], '5.0'],
-            ['ovrimos_longreadlen', '5.1', [1049], '5.0'],
-            ['ovrimos_num_fields', '5.1', [1050], '5.0'],
-            ['ovrimos_num_rows', '5.1', [1051], '5.0'],
-            ['ovrimos_prepare', '5.1', [1052], '5.0'],
-            ['ovrimos_result_all', '5.1', [1053], '5.0'],
-            ['ovrimos_result', '5.1', [1054], '5.0'],
-            ['ovrimos_rollback', '5.1', [1055], '5.0'],
-            ['ovrimos_close_all', '5.1', [1056], '5.0'],
-            ['ora_bind', '5.1', [1058], '5.0'],
-            ['ora_close', '5.1', [1059], '5.0'],
-            ['ora_columnname', '5.1', [1060], '5.0'],
-            ['ora_columnsize', '5.1', [1061], '5.0'],
-            ['ora_columntype', '5.1', [1062], '5.0'],
-            ['ora_commit', '5.1', [1063], '5.0'],
-            ['ora_commitoff', '5.1', [1064], '5.0'],
-            ['ora_commiton', '5.1', [1065], '5.0'],
-            ['ora_do', '5.1', [1066], '5.0'],
-            ['ora_error', '5.1', [1067], '5.0'],
-            ['ora_errorcode', '5.1', [1068], '5.0'],
-            ['ora_exec', '5.1', [1069], '5.0'],
-            ['ora_fetch_into', '5.1', [1070], '5.0'],
-            ['ora_fetch', '5.1', [1071], '5.0'],
-            ['ora_getcolumn', '5.1', [1072], '5.0'],
-            ['ora_logoff', '5.1', [1073], '5.0'],
-            ['ora_logon', '5.1', [1074], '5.0'],
-            ['ora_numcols', '5.1', [1075], '5.0'],
-            ['ora_numrows', '5.1', [1076], '5.0'],
-            ['ora_open', '5.1', [1077], '5.0'],
-            ['ora_parse', '5.1', [1078], '5.0'],
-            ['ora_plogon', '5.1', [1079], '5.0'],
-            ['ora_rollback', '5.1', [1080], '5.0'],
-            ['mysqli_embedded_connect', '5.1', [1146], '5.0'],
-            ['mysqli_server_end', '5.1', [1155], '5.0'],
-            ['mysqli_server_init', '5.1', [1156], '5.0'],
-
-            ['msession_connect', '5.1.3', [567], '5.1', '5.2'],
-            ['msession_count', '5.1.3', [568], '5.1', '5.2'],
-            ['msession_create', '5.1.3', [569], '5.1', '5.2'],
-            ['msession_destroy', '5.1.3', [570], '5.1', '5.2'],
-            ['msession_disconnect', '5.1.3', [571], '5.1', '5.2'],
-            ['msession_find', '5.1.3', [572], '5.1', '5.2'],
-            ['msession_get_array', '5.1.3', [573], '5.1', '5.2'],
-            ['msession_get_data', '5.1.3', [574], '5.1', '5.2'],
-            ['msession_get', '5.1.3', [575], '5.1', '5.2'],
-            ['msession_inc', '5.1.3', [576], '5.1', '5.2'],
-            ['msession_list', '5.1.3', [577], '5.1', '5.2'],
-            ['msession_listvar', '5.1.3', [578], '5.1', '5.2'],
-            ['msession_lock', '5.1.3', [579], '5.1', '5.2'],
-            ['msession_plugin', '5.1.3', [580], '5.1', '5.2'],
-            ['msession_randstr', '5.1.3', [581], '5.1', '5.2'],
-            ['msession_set_array', '5.1.3', [582], '5.1', '5.2'],
-            ['msession_set_data', '5.1.3', [583], '5.1', '5.2'],
-            ['msession_set', '5.1.3', [584], '5.1', '5.2'],
-            ['msession_timeout', '5.1.3', [585], '5.1', '5.2'],
-            ['msession_uniq', '5.1.3', [586], '5.1', '5.2'],
-            ['msession_unlock', '5.1.3', [587], '5.1', '5.2'],
-
-            ['mysqli_resource', '5.1.4', [1152], '5.1', '5.2'],
-
-            ['mysql_createdb', '5.1.7', [975], '5.1', '5.2'],
-            ['mysql_dropdb', '5.1.7', [976], '5.1', '5.2'],
-            ['mysql_listtables', '5.1.7', [981], '5.1', '5.2'],
-
-            ['hwapi_attribute_new', '5.2', [526], '5.1'],
-            ['hwapi_content_new', '5.2', [527], '5.1'],
-            ['hwapi_hgcsp', '5.2', [528], '5.1'],
-            ['hwapi_object_new', '5.2', [529], '5.1'],
-            ['filepro_fieldcount', '5.2', [788], '5.1'],
-            ['filepro_fieldname', '5.2', [789], '5.1'],
-            ['filepro_fieldtype', '5.2', [790], '5.1'],
-            ['filepro_fieldwidth', '5.2', [791], '5.1'],
-            ['filepro_retrieve', '5.2', [792], '5.1'],
-            ['filepro_rowcount', '5.2', [793], '5.1'],
-            ['filepro', '5.2', [794], '5.1'],
-
-            ['ifx_affected_rows', '5.2.1', [1106], '5.2', '5.3'],
-            ['ifx_blobinfile_mode', '5.2.1', [1107], '5.2', '5.3'],
-            ['ifx_byteasvarchar', '5.2.1', [1108], '5.2', '5.3'],
-            ['ifx_close', '5.2.1', [1109], '5.2', '5.3'],
-            ['ifx_connect', '5.2.1', [1110], '5.2', '5.3'],
-            ['ifx_copy_blob', '5.2.1', [1111], '5.2', '5.3'],
-            ['ifx_create_blob', '5.2.1', [1112], '5.2', '5.3'],
-            ['ifx_create_char', '5.2.1', [1113], '5.2', '5.3'],
-            ['ifx_do', '5.2.1', [1114], '5.2', '5.3'],
-            ['ifx_error', '5.2.1', [1115], '5.2', '5.3'],
-            ['ifx_errormsg', '5.2.1', [1116], '5.2', '5.3'],
-            ['ifx_fetch_row', '5.2.1', [1117], '5.2', '5.3'],
-            ['ifx_fieldproperties', '5.2.1', [1118], '5.2', '5.3'],
-            ['ifx_fieldtypes', '5.2.1', [1119], '5.2', '5.3'],
-            ['ifx_free_blob', '5.2.1', [1120], '5.2', '5.3'],
-            ['ifx_free_char', '5.2.1', [1121], '5.2', '5.3'],
-            ['ifx_free_result', '5.2.1', [1122], '5.2', '5.3'],
-            ['ifx_get_blob', '5.2.1', [1123], '5.2', '5.3'],
-            ['ifx_get_char', '5.2.1', [1124], '5.2', '5.3'],
-            ['ifx_getsqlca', '5.2.1', [1125], '5.2', '5.3'],
-            ['ifx_htmltbl_result', '5.2.1', [1126], '5.2', '5.3'],
-            ['ifx_nullformat', '5.2.1', [1127], '5.2', '5.3'],
-            ['ifx_num_fields', '5.2.1', [1128], '5.2', '5.3'],
-            ['ifx_num_rows', '5.2.1', [1129], '5.2', '5.3'],
-            ['ifx_pconnect', '5.2.1', [1130], '5.2', '5.3'],
-            ['ifx_prepare', '5.2.1', [1131], '5.2', '5.3'],
-            ['ifx_query', '5.2.1', [1132], '5.2', '5.3'],
-            ['ifx_textasvarchar', '5.2.1', [1133], '5.2', '5.3'],
-            ['ifx_update_blob', '5.2.1', [1134], '5.2', '5.3'],
-            ['ifx_update_char', '5.2.1', [1135], '5.2', '5.3'],
-            ['ifxus_close_slob', '5.2.1', [1136], '5.2', '5.3'],
-            ['ifxus_create_slob', '5.2.1', [1137], '5.2', '5.3'],
-            ['ifxus_free_slob', '5.2.1', [1138], '5.2', '5.3'],
-            ['ifxus_open_slob', '5.2.1', [1139], '5.2', '5.3'],
-            ['ifxus_read_slob', '5.2.1', [1140], '5.2', '5.3'],
-            ['ifxus_seek_slob', '5.2.1', [1141], '5.2', '5.3'],
-            ['ifxus_tell_slob', '5.2.1', [1142], '5.2', '5.3'],
-            ['ifxus_write_slob', '5.2.1', [1143], '5.2', '5.3'],
-
-            ['ncurses_addch', '5.3', [255], '5.2'],
-            ['ncurses_addchnstr', '5.3', [256], '5.2'],
-            ['ncurses_addchstr', '5.3', [257], '5.2'],
-            ['ncurses_addnstr', '5.3', [258], '5.2'],
-            ['ncurses_addstr', '5.3', [259], '5.2'],
-            ['ncurses_assume_default_colors', '5.3', [260], '5.2'],
-            ['ncurses_attroff', '5.3', [261], '5.2'],
-            ['ncurses_attron', '5.3', [262], '5.2'],
-            ['ncurses_attrset', '5.3', [263], '5.2'],
-            ['ncurses_baudrate', '5.3', [264], '5.2'],
-            ['ncurses_beep', '5.3', [265], '5.2'],
-            ['ncurses_bkgd', '5.3', [266], '5.2'],
-            ['ncurses_bkgdset', '5.3', [267], '5.2'],
-            ['ncurses_border', '5.3', [268], '5.2'],
-            ['ncurses_bottom_panel', '5.3', [269], '5.2'],
-            ['ncurses_can_change_color', '5.3', [270], '5.2'],
-            ['ncurses_cbreak', '5.3', [271], '5.2'],
-            ['ncurses_clear', '5.3', [272], '5.2'],
-            ['ncurses_clrtobot', '5.3', [273], '5.2'],
-            ['ncurses_clrtoeol', '5.3', [274], '5.2'],
-            ['ncurses_color_content', '5.3', [275], '5.2'],
-            ['ncurses_color_set', '5.3', [276], '5.2'],
-            ['ncurses_curs_set', '5.3', [277], '5.2'],
-            ['ncurses_def_prog_mode', '5.3', [278], '5.2'],
-            ['ncurses_def_shell_mode', '5.3', [279], '5.2'],
-            ['ncurses_define_key', '5.3', [280], '5.2'],
-            ['ncurses_del_panel', '5.3', [281], '5.2'],
-            ['ncurses_delay_output', '5.3', [282], '5.2'],
-            ['ncurses_delch', '5.3', [283], '5.2'],
-            ['ncurses_deleteln', '5.3', [284], '5.2'],
-            ['ncurses_delwin', '5.3', [285], '5.2'],
-            ['ncurses_doupdate', '5.3', [286], '5.2'],
-            ['ncurses_echo', '5.3', [287], '5.2'],
-            ['ncurses_echochar', '5.3', [288], '5.2'],
-            ['ncurses_end', '5.3', [289], '5.2'],
-            ['ncurses_erase', '5.3', [290], '5.2'],
-            ['ncurses_erasechar', '5.3', [291], '5.2'],
-            ['ncurses_filter', '5.3', [292], '5.2'],
-            ['ncurses_flash', '5.3', [293], '5.2'],
-            ['ncurses_flushinp', '5.3', [294], '5.2'],
-            ['ncurses_getch', '5.3', [295], '5.2'],
-            ['ncurses_getmaxyx', '5.3', [296], '5.2'],
-            ['ncurses_getmouse', '5.3', [297], '5.2'],
-            ['ncurses_getyx', '5.3', [298], '5.2'],
-            ['ncurses_halfdelay', '5.3', [299], '5.2'],
-            ['ncurses_has_colors', '5.3', [300], '5.2'],
-            ['ncurses_has_ic', '5.3', [301], '5.2'],
-            ['ncurses_has_il', '5.3', [302], '5.2'],
-            ['ncurses_has_key', '5.3', [303], '5.2'],
-            ['ncurses_hide_panel', '5.3', [304], '5.2'],
-            ['ncurses_hline', '5.3', [305], '5.2'],
-            ['ncurses_inch', '5.3', [306], '5.2'],
-            ['ncurses_init_color', '5.3', [307], '5.2'],
-            ['ncurses_init_pair', '5.3', [308], '5.2'],
-            ['ncurses_init', '5.3', [309], '5.2'],
-            ['ncurses_insch', '5.3', [310], '5.2'],
-            ['ncurses_insdelln', '5.3', [311], '5.2'],
-            ['ncurses_insertln', '5.3', [312], '5.2'],
-            ['ncurses_insstr', '5.3', [313], '5.2'],
-            ['ncurses_instr', '5.3', [314], '5.2'],
-            ['ncurses_isendwin', '5.3', [315], '5.2'],
-            ['ncurses_keyok', '5.3', [316], '5.2'],
-            ['ncurses_keypad', '5.3', [317], '5.2'],
-            ['ncurses_killchar', '5.3', [318], '5.2'],
-            ['ncurses_longname', '5.3', [319], '5.2'],
-            ['ncurses_meta', '5.3', [320], '5.2'],
-            ['ncurses_mouse_trafo', '5.3', [321], '5.2'],
-            ['ncurses_mouseinterval', '5.3', [322], '5.2'],
-            ['ncurses_mousemask', '5.3', [323], '5.2'],
-            ['ncurses_move_panel', '5.3', [324], '5.2'],
-            ['ncurses_move', '5.3', [325], '5.2'],
-            ['ncurses_mvaddch', '5.3', [326], '5.2'],
-            ['ncurses_mvaddchnstr', '5.3', [327], '5.2'],
-            ['ncurses_mvaddchstr', '5.3', [328], '5.2'],
-            ['ncurses_mvaddnstr', '5.3', [329], '5.2'],
-            ['ncurses_mvaddstr', '5.3', [330], '5.2'],
-            ['ncurses_mvcur', '5.3', [331], '5.2'],
-            ['ncurses_mvdelch', '5.3', [332], '5.2'],
-            ['ncurses_mvgetch', '5.3', [333], '5.2'],
-            ['ncurses_mvhline', '5.3', [334], '5.2'],
-            ['ncurses_mvinch', '5.3', [335], '5.2'],
-            ['ncurses_mvvline', '5.3', [336], '5.2'],
-            ['ncurses_mvwaddstr', '5.3', [337], '5.2'],
-            ['ncurses_napms', '5.3', [338], '5.2'],
-            ['ncurses_new_panel', '5.3', [339], '5.2'],
-            ['ncurses_newpad', '5.3', [340], '5.2'],
-            ['ncurses_newwin', '5.3', [341], '5.2'],
-            ['ncurses_nl', '5.3', [342], '5.2'],
-            ['ncurses_nocbreak', '5.3', [343], '5.2'],
-            ['ncurses_noecho', '5.3', [344], '5.2'],
-            ['ncurses_nonl', '5.3', [345], '5.2'],
-            ['ncurses_noqiflush', '5.3', [346], '5.2'],
-            ['ncurses_noraw', '5.3', [347], '5.2'],
-            ['ncurses_pair_content', '5.3', [348], '5.2'],
-            ['ncurses_panel_above', '5.3', [349], '5.2'],
-            ['ncurses_panel_below', '5.3', [350], '5.2'],
-            ['ncurses_panel_window', '5.3', [351], '5.2'],
-            ['ncurses_pnoutrefresh', '5.3', [352], '5.2'],
-            ['ncurses_prefresh', '5.3', [353], '5.2'],
-            ['ncurses_putp', '5.3', [354], '5.2'],
-            ['ncurses_qiflush', '5.3', [355], '5.2'],
-            ['ncurses_raw', '5.3', [356], '5.2'],
-            ['ncurses_refresh', '5.3', [357], '5.2'],
-            ['ncurses_replace_panel', '5.3', [358], '5.2'],
-            ['ncurses_reset_prog_mode', '5.3', [359], '5.2'],
-            ['ncurses_reset_shell_mode', '5.3', [360], '5.2'],
-            ['ncurses_resetty', '5.3', [361], '5.2'],
-            ['ncurses_savetty', '5.3', [362], '5.2'],
-            ['ncurses_scr_dump', '5.3', [363], '5.2'],
-            ['ncurses_scr_init', '5.3', [364], '5.2'],
-            ['ncurses_scr_restore', '5.3', [365], '5.2'],
-            ['ncurses_scr_set', '5.3', [366], '5.2'],
-            ['ncurses_scrl', '5.3', [367], '5.2'],
-            ['ncurses_show_panel', '5.3', [368], '5.2'],
-            ['ncurses_slk_attr', '5.3', [369], '5.2'],
-            ['ncurses_slk_attroff', '5.3', [370], '5.2'],
-            ['ncurses_slk_attron', '5.3', [371], '5.2'],
-            ['ncurses_slk_attrset', '5.3', [372], '5.2'],
-            ['ncurses_slk_clear', '5.3', [373], '5.2'],
-            ['ncurses_slk_color', '5.3', [374], '5.2'],
-            ['ncurses_slk_init', '5.3', [375], '5.2'],
-            ['ncurses_slk_noutrefresh', '5.3', [376], '5.2'],
-            ['ncurses_slk_refresh', '5.3', [377], '5.2'],
-            ['ncurses_slk_restore', '5.3', [378], '5.2'],
-            ['ncurses_slk_set', '5.3', [379], '5.2'],
-            ['ncurses_slk_touch', '5.3', [380], '5.2'],
-            ['ncurses_standend', '5.3', [381], '5.2'],
-            ['ncurses_standout', '5.3', [382], '5.2'],
-            ['ncurses_start_color', '5.3', [383], '5.2'],
-            ['ncurses_termattrs', '5.3', [384], '5.2'],
-            ['ncurses_termname', '5.3', [385], '5.2'],
-            ['ncurses_timeout', '5.3', [386], '5.2'],
-            ['ncurses_top_panel', '5.3', [387], '5.2'],
-            ['ncurses_typeahead', '5.3', [388], '5.2'],
-            ['ncurses_ungetch', '5.3', [389], '5.2'],
-            ['ncurses_ungetmouse', '5.3', [390], '5.2'],
-            ['ncurses_update_panels', '5.3', [391], '5.2'],
-            ['ncurses_use_default_colors', '5.3', [392], '5.2'],
-            ['ncurses_use_env', '5.3', [393], '5.2'],
-            ['ncurses_use_extended_names', '5.3', [394], '5.2'],
-            ['ncurses_vidattr', '5.3', [395], '5.2'],
-            ['ncurses_vline', '5.3', [396], '5.2'],
-            ['ncurses_waddch', '5.3', [397], '5.2'],
-            ['ncurses_waddstr', '5.3', [398], '5.2'],
-            ['ncurses_wattroff', '5.3', [399], '5.2'],
-            ['ncurses_wattron', '5.3', [400], '5.2'],
-            ['ncurses_wattrset', '5.3', [401], '5.2'],
-            ['ncurses_wborder', '5.3', [402], '5.2'],
-            ['ncurses_wclear', '5.3', [403], '5.2'],
-            ['ncurses_wcolor_set', '5.3', [404], '5.2'],
-            ['ncurses_werase', '5.3', [405], '5.2'],
-            ['ncurses_wgetch', '5.3', [406], '5.2'],
-            ['ncurses_whline', '5.3', [407], '5.2'],
-            ['ncurses_wmouse_trafo', '5.3', [408], '5.2'],
-            ['ncurses_wmove', '5.3', [409], '5.2'],
-            ['ncurses_wnoutrefresh', '5.3', [410], '5.2'],
-            ['ncurses_wrefresh', '5.3', [411], '5.2'],
-            ['ncurses_wstandend', '5.3', [412], '5.2'],
-            ['ncurses_wstandout', '5.3', [413], '5.2'],
-            ['ncurses_wvline', '5.3', [414], '5.2'],
-            ['fdf_add_doc_javascript', '5.3', [469], '5.2'],
-            ['fdf_add_template', '5.3', [470], '5.2'],
-            ['fdf_close', '5.3', [471], '5.2'],
-            ['fdf_create', '5.3', [472], '5.2'],
-            ['fdf_enum_values', '5.3', [473], '5.2'],
-            ['fdf_errno', '5.3', [474], '5.2'],
-            ['fdf_error', '5.3', [475], '5.2'],
-            ['fdf_get_ap', '5.3', [476], '5.2'],
-            ['fdf_get_attachment', '5.3', [477], '5.2'],
-            ['fdf_get_encoding', '5.3', [478], '5.2'],
-            ['fdf_get_file', '5.3', [479], '5.2'],
-            ['fdf_get_flags', '5.3', [480], '5.2'],
-            ['fdf_get_opt', '5.3', [481], '5.2'],
-            ['fdf_get_status', '5.3', [482], '5.2'],
-            ['fdf_get_value', '5.3', [483], '5.2'],
-            ['fdf_get_version', '5.3', [484], '5.2'],
-            ['fdf_header', '5.3', [485], '5.2'],
-            ['fdf_next_field_name', '5.3', [486], '5.2'],
-            ['fdf_open_string', '5.3', [487], '5.2'],
-            ['fdf_open', '5.3', [488], '5.2'],
-            ['fdf_remove_item', '5.3', [489], '5.2'],
-            ['fdf_save_string', '5.3', [490], '5.2'],
-            ['fdf_save', '5.3', [491], '5.2'],
-            ['fdf_set_ap', '5.3', [492], '5.2'],
-            ['fdf_set_encoding', '5.3', [493], '5.2'],
-            ['fdf_set_file', '5.3', [494], '5.2'],
-            ['fdf_set_flags', '5.3', [495], '5.2'],
-            ['fdf_set_javascript_action', '5.3', [496], '5.2'],
-            ['fdf_set_on_import_javascript', '5.3', [497], '5.2'],
-            ['fdf_set_opt', '5.3', [498], '5.2'],
-            ['fdf_set_status', '5.3', [499], '5.2'],
-            ['fdf_set_submit_form_action', '5.3', [500], '5.2'],
-            ['fdf_set_target_frame', '5.3', [501], '5.2'],
-            ['fdf_set_value', '5.3', [502], '5.2'],
-            ['fdf_set_version', '5.3', [503], '5.2'],
-            ['ming_keypress', '5.3', [506], '5.2'],
-            ['ming_setcubicthreshold', '5.3', [507], '5.2'],
-            ['ming_setscale', '5.3', [508], '5.2'],
-            ['ming_setswfcompression', '5.3', [509], '5.2'],
-            ['ming_useconstants', '5.3', [510], '5.2'],
-            ['ming_useswfversion', '5.3', [511], '5.2'],
-            ['dbase_add_record', '5.3', [708], '5.2'],
-            ['dbase_close', '5.3', [709], '5.2'],
-            ['dbase_create', '5.3', [710], '5.2'],
-            ['dbase_delete_record', '5.3', [711], '5.2'],
-            ['dbase_get_header_info', '5.3', [712], '5.2'],
-            ['dbase_get_record_with_names', '5.3', [713], '5.2'],
-            ['dbase_get_record', '5.3', [714], '5.2'],
-            ['dbase_numfields', '5.3', [715], '5.2'],
-            ['dbase_numrecords', '5.3', [716], '5.2'],
-            ['dbase_open', '5.3', [717], '5.2'],
-            ['dbase_pack', '5.3', [718], '5.2'],
-            ['dbase_replace_record', '5.3', [719], '5.2'],
-            ['fbsql_affected_rows', '5.3', [728], '5.2'],
-            ['fbsql_autocommit', '5.3', [729], '5.2'],
-            ['fbsql_blob_size', '5.3', [730], '5.2'],
-            ['fbsql_change_user', '5.3', [731], '5.2'],
-            ['fbsql_clob_size', '5.3', [732], '5.2'],
-            ['fbsql_close', '5.3', [733], '5.2'],
-            ['fbsql_commit', '5.3', [734], '5.2'],
-            ['fbsql_connect', '5.3', [735], '5.2'],
-            ['fbsql_create_blob', '5.3', [736], '5.2'],
-            ['fbsql_create_clob', '5.3', [737], '5.2'],
-            ['fbsql_create_db', '5.3', [738], '5.2'],
-            ['fbsql_data_seek', '5.3', [739], '5.2'],
-            ['fbsql_database_password', '5.3', [740], '5.2'],
-            ['fbsql_database', '5.3', [741], '5.2'],
-            ['fbsql_db_query', '5.3', [742], '5.2'],
-            ['fbsql_db_status', '5.3', [743], '5.2'],
-            ['fbsql_drop_db', '5.3', [744], '5.2'],
-            ['fbsql_errno', '5.3', [745], '5.2'],
-            ['fbsql_error', '5.3', [746], '5.2'],
-            ['fbsql_fetch_array', '5.3', [747], '5.2'],
-            ['fbsql_fetch_assoc', '5.3', [748], '5.2'],
-            ['fbsql_fetch_field', '5.3', [749], '5.2'],
-            ['fbsql_fetch_lengths', '5.3', [750], '5.2'],
-            ['fbsql_fetch_object', '5.3', [751], '5.2'],
-            ['fbsql_fetch_row', '5.3', [752], '5.2'],
-            ['fbsql_field_flags', '5.3', [753], '5.2'],
-            ['fbsql_field_len', '5.3', [754], '5.2'],
-            ['fbsql_field_name', '5.3', [755], '5.2'],
-            ['fbsql_field_seek', '5.3', [756], '5.2'],
-            ['fbsql_field_table', '5.3', [757], '5.2'],
-            ['fbsql_field_type', '5.3', [758], '5.2'],
-            ['fbsql_free_result', '5.3', [759], '5.2'],
-            ['fbsql_get_autostart_info', '5.3', [760], '5.2'],
-            ['fbsql_hostname', '5.3', [761], '5.2'],
-            ['fbsql_insert_id', '5.3', [762], '5.2'],
-            ['fbsql_list_dbs', '5.3', [763], '5.2'],
-            ['fbsql_list_fields', '5.3', [764], '5.2'],
-            ['fbsql_list_tables', '5.3', [765], '5.2'],
-            ['fbsql_next_result', '5.3', [766], '5.2'],
-            ['fbsql_num_fields', '5.3', [767], '5.2'],
-            ['fbsql_num_rows', '5.3', [768], '5.2'],
-            ['fbsql_password', '5.3', [769], '5.2'],
-            ['fbsql_pconnect', '5.3', [770], '5.2'],
-            ['fbsql_query', '5.3', [771], '5.2'],
-            ['fbsql_read_blob', '5.3', [772], '5.2'],
-            ['fbsql_read_clob', '5.3', [773], '5.2'],
-            ['fbsql_result', '5.3', [774], '5.2'],
-            ['fbsql_rollback', '5.3', [775], '5.2'],
-            ['fbsql_rows_fetched', '5.3', [776], '5.2'],
-            ['fbsql_select_db', '5.3', [777], '5.2'],
-            ['fbsql_set_characterset', '5.3', [778], '5.2'],
-            ['fbsql_set_lob_mode', '5.3', [779], '5.2'],
-            ['fbsql_set_password', '5.3', [780], '5.2'],
-            ['fbsql_set_transaction', '5.3', [781], '5.2'],
-            ['fbsql_start_db', '5.3', [782], '5.2'],
-            ['fbsql_stop_db', '5.3', [783], '5.2'],
-            ['fbsql_table_name', '5.3', [784], '5.2'],
-            ['fbsql_tablename', '5.3', [785], '5.2'],
-            ['fbsql_username', '5.3', [786], '5.2'],
-            ['fbsql_warnings', '5.3', [787], '5.2'],
-            ['msql_affected_rows', '5.3', [813], '5.2'],
-            ['msql_close', '5.3', [814], '5.2'],
-            ['msql_connect', '5.3', [815], '5.2'],
-            ['msql_create_db', '5.3', [816], '5.2'],
-            ['msql_createdb', '5.3', [817], '5.2'],
-            ['msql_data_seek', '5.3', [818], '5.2'],
-            ['msql_db_query', '5.3', [819], '5.2'],
-            ['msql_dbname', '5.3', [820], '5.2'],
-            ['msql_drop_db', '5.3', [821], '5.2'],
-            ['msql_error', '5.3', [822], '5.2'],
-            ['msql_fetch_array', '5.3', [823], '5.2'],
-            ['msql_fetch_field', '5.3', [824], '5.2'],
-            ['msql_fetch_object', '5.3', [825], '5.2'],
-            ['msql_fetch_row', '5.3', [826], '5.2'],
-            ['msql_field_flags', '5.3', [827], '5.2'],
-            ['msql_field_len', '5.3', [828], '5.2'],
-            ['msql_field_name', '5.3', [829], '5.2'],
-            ['msql_field_seek', '5.3', [830], '5.2'],
-            ['msql_field_table', '5.3', [831], '5.2'],
-            ['msql_field_type', '5.3', [832], '5.2'],
-            ['msql_fieldflags', '5.3', [833], '5.2'],
-            ['msql_fieldlen', '5.3', [834], '5.2'],
-            ['msql_fieldname', '5.3', [835], '5.2'],
-            ['msql_fieldtable', '5.3', [836], '5.2'],
-            ['msql_fieldtype', '5.3', [837], '5.2'],
-            ['msql_free_result', '5.3', [838], '5.2'],
-            ['msql_list_dbs', '5.3', [839], '5.2'],
-            ['msql_list_fields', '5.3', [840], '5.2'],
-            ['msql_list_tables', '5.3', [841], '5.2'],
-            ['msql_num_fields', '5.3', [842], '5.2'],
-            ['msql_num_rows', '5.3', [843], '5.2'],
-            ['msql_numfields', '5.3', [844], '5.2'],
-            ['msql_numrows', '5.3', [845], '5.2'],
-            ['msql_pconnect', '5.3', [846], '5.2'],
-            ['msql_query', '5.3', [847], '5.2'],
-            ['msql_regcase', '5.3', [848], '5.2'],
-            ['msql_result', '5.3', [849], '5.2'],
-            ['msql_select_db', '5.3', [850], '5.2'],
-            ['msql_tablename', '5.3', [851], '5.2'],
-            ['msql', '5.3', [852], '5.2'],
-            ['mysqli_disable_reads_from_master', '5.3', [1144], '5.2'],
-            ['mysqli_disable_rpl_parse', '5.3', [1145], '5.2'],
-            ['mysqli_enable_reads_from_master', '5.3', [1149], '5.2'],
-            ['mysqli_enable_rpl_parse', '5.3', [1150], '5.2'],
-            ['mysqli_master_query', '5.3', [1151], '5.2'],
-            ['mysqli_rpl_parse_enabled', '5.3', [1153], '5.2'],
-            ['mysqli_rpl_probe', '5.3', [1154], '5.2'],
-            ['mysqli_slave_query', '5.3', [1157], '5.2'],
-
-            ['sqlite_array_query', '5.4', [883], '5.3'],
-            ['sqlite_busy_timeout', '5.4', [884], '5.3'],
-            ['sqlite_changes', '5.4', [885], '5.3'],
-            ['sqlite_close', '5.4', [886], '5.3'],
-            ['sqlite_column', '5.4', [887], '5.3'],
-            ['sqlite_create_aggregate', '5.4', [888], '5.3'],
-            ['sqlite_create_function', '5.4', [889], '5.3'],
-            ['sqlite_current', '5.4', [890], '5.3'],
-            ['sqlite_error_string', '5.4', [891], '5.3'],
-            ['sqlite_escape_string', '5.4', [892], '5.3'],
-            ['sqlite_exec', '5.4', [893], '5.3'],
-            ['sqlite_factory', '5.4', [894], '5.3'],
-            ['sqlite_fetch_all', '5.4', [895], '5.3'],
-            ['sqlite_fetch_array', '5.4', [896], '5.3'],
-            ['sqlite_fetch_column_types', '5.4', [897], '5.3'],
-            ['sqlite_fetch_object', '5.4', [898], '5.3'],
-            ['sqlite_fetch_single', '5.4', [899], '5.3'],
-            ['sqlite_fetch_string', '5.4', [900], '5.3'],
-            ['sqlite_field_name', '5.4', [901], '5.3'],
-            ['sqlite_has_more', '5.4', [902], '5.3'],
-            ['sqlite_has_prev', '5.4', [903], '5.3'],
-            ['sqlite_key', '5.4', [904], '5.3'],
-            ['sqlite_last_error', '5.4', [905], '5.3'],
-            ['sqlite_last_insert_rowid', '5.4', [906], '5.3'],
-            ['sqlite_libencoding', '5.4', [907], '5.3'],
-            ['sqlite_libversion', '5.4', [908], '5.3'],
-            ['sqlite_next', '5.4', [909], '5.3'],
-            ['sqlite_num_fields', '5.4', [910], '5.3'],
-            ['sqlite_num_rows', '5.4', [911], '5.3'],
-            ['sqlite_open', '5.4', [912], '5.3'],
-            ['sqlite_popen', '5.4', [913], '5.3'],
-            ['sqlite_prev', '5.4', [914], '5.3'],
-            ['sqlite_query', '5.4', [915], '5.3'],
-            ['sqlite_rewind', '5.4', [916], '5.3'],
-            ['sqlite_seek', '5.4', [917], '5.3'],
-            ['sqlite_single_query', '5.4', [918], '5.3'],
-            ['sqlite_udf_decode_binary', '5.4', [919], '5.3'],
-            ['sqlite_udf_encode_binary', '5.4', [920], '5.3'],
-            ['sqlite_unbuffered_query', '5.4', [921], '5.3'],
-            ['sqlite_valid', '5.4', [922], '5.3'],
-
-            ['php_logo_guid', '5.5', [32], '5.4'],
-            ['php_egg_logo_guid', '5.5', [33], '5.4'],
-            ['php_real_logo_guid', '5.5', [34], '5.4'],
-            ['imagepsbbox', '7.0', [90], '5.6'],
-            ['imagepsencodefont', '7.0', [91], '5.6'],
-            ['imagepsextendfont', '7.0', [92], '5.6'],
-            ['imagepsfreefont', '7.0', [93], '5.6'],
-            ['imagepsloadfont', '7.0', [94], '5.6'],
-            ['imagepsslantfont', '7.0', [95], '5.6'],
-            ['imagepstext', '7.0', [96], '5.6'],
-            ['mssql_bind', '7.0', [853], '5.6'],
-            ['mssql_close', '7.0', [854], '5.6'],
-            ['mssql_connect', '7.0', [855], '5.6'],
-            ['mssql_data_seek', '7.0', [856], '5.6'],
-            ['mssql_execute', '7.0', [857], '5.6'],
-            ['mssql_fetch_array', '7.0', [858], '5.6'],
-            ['mssql_fetch_assoc', '7.0', [859], '5.6'],
-            ['mssql_fetch_batch', '7.0', [860], '5.6'],
-            ['mssql_fetch_field', '7.0', [861], '5.6'],
-            ['mssql_fetch_object', '7.0', [862], '5.6'],
-            ['mssql_fetch_row', '7.0', [863], '5.6'],
-            ['mssql_field_length', '7.0', [864], '5.6'],
-            ['mssql_field_name', '7.0', [865], '5.6'],
-            ['mssql_field_seek', '7.0', [866], '5.6'],
-            ['mssql_field_type', '7.0', [867], '5.6'],
-            ['mssql_free_result', '7.0', [868], '5.6'],
-            ['mssql_free_statement', '7.0', [869], '5.6'],
-            ['mssql_get_last_message', '7.0', [870], '5.6'],
-            ['mssql_guid_string', '7.0', [871], '5.6'],
-            ['mssql_init', '7.0', [872], '5.6'],
-            ['mssql_min_error_severity', '7.0', [873], '5.6'],
-            ['mssql_min_message_severity', '7.0', [874], '5.6'],
-            ['mssql_next_result', '7.0', [875], '5.6'],
-            ['mssql_num_fields', '7.0', [876], '5.6'],
-            ['mssql_num_rows', '7.0', [877], '5.6'],
-            ['mssql_pconnect', '7.0', [878], '5.6'],
-            ['mssql_query', '7.0', [879], '5.6'],
-            ['mssql_result', '7.0', [880], '5.6'],
-            ['mssql_rows_affected', '7.0', [881], '5.6'],
-            ['mssql_select_db', '7.0', [882], '5.6'],
-            ['sybase_affected_rows', '7.0', [1081], '5.6'],
-            ['sybase_close', '7.0', [1082], '5.6'],
-            ['sybase_connect', '7.0', [1083], '5.6'],
-            ['sybase_data_seek', '7.0', [1084], '5.6'],
-            ['sybase_deadlock_retry_count', '7.0', [1085], '5.6'],
-            ['sybase_fetch_array', '7.0', [1086], '5.6'],
-            ['sybase_fetch_assoc', '7.0', [1087], '5.6'],
-            ['sybase_fetch_field', '7.0', [1088], '5.6'],
-            ['sybase_fetch_object', '7.0', [1089], '5.6'],
-            ['sybase_fetch_row', '7.0', [1090], '5.6'],
-            ['sybase_field_seek', '7.0', [1091], '5.6'],
-            ['sybase_free_result', '7.0', [1092], '5.6'],
-            ['sybase_get_last_message', '7.0', [1093], '5.6'],
-            ['sybase_min_client_severity', '7.0', [1094], '5.6'],
-            ['sybase_min_error_severity', '7.0', [1095], '5.6'],
-            ['sybase_min_message_severity', '7.0', [1096], '5.6'],
-            ['sybase_min_server_severity', '7.0', [1097], '5.6'],
-            ['sybase_num_fields', '7.0', [1098], '5.6'],
-            ['sybase_num_rows', '7.0', [1099], '5.6'],
-            ['sybase_pconnect', '7.0', [1100], '5.6'],
-            ['sybase_query', '7.0', [1101], '5.6'],
-            ['sybase_result', '7.0', [1102], '5.6'],
-            ['sybase_select_db', '7.0', [1103], '5.6'],
-            ['sybase_set_message_handler', '7.0', [1104], '5.6'],
-            ['sybase_unbuffered_query', '7.0', [1105], '5.6'],
-
-            ['php_check_syntax', '5.0.5', [98], '5.0', '5.1'],
-            ['mysqli_get_cache_stats', '5.4', [99], '5.3'],
-            ['ibase_add_user', '7.4', [171], '7.3'],
-            ['ibase_affected_rows', '7.4', [172], '7.3'],
-            ['ibase_backup', '7.4', [173], '7.3'],
-            ['ibase_blob_add', '7.4', [174], '7.3'],
-            ['ibase_blob_cancel', '7.4', [175], '7.3'],
-            ['ibase_blob_close', '7.4', [176], '7.3'],
-            ['ibase_blob_create', '7.4', [177], '7.3'],
-            ['ibase_blob_echo', '7.4', [178], '7.3'],
-            ['ibase_blob_get', '7.4', [179], '7.3'],
-            ['ibase_blob_import', '7.4', [180], '7.3'],
-            ['ibase_blob_info', '7.4', [181], '7.3'],
-            ['ibase_blob_open', '7.4', [182], '7.3'],
-            ['ibase_close', '7.4', [183], '7.3'],
-            ['ibase_commit_ret', '7.4', [184], '7.3'],
-            ['ibase_commit', '7.4', [185], '7.3'],
-            ['ibase_connect', '7.4', [186], '7.3'],
-            ['ibase_db_info', '7.4', [187], '7.3'],
-            ['ibase_delete_user', '7.4', [188], '7.3'],
-            ['ibase_drop_db', '7.4', [189], '7.3'],
-            ['ibase_errcode', '7.4', [190], '7.3'],
-            ['ibase_errmsg', '7.4', [191], '7.3'],
-            ['ibase_execute', '7.4', [192], '7.3'],
-            ['ibase_fetch_assoc', '7.4', [193], '7.3'],
-            ['ibase_fetch_object', '7.4', [194], '7.3'],
-            ['ibase_fetch_row', '7.4', [195], '7.3'],
-            ['ibase_field_info', '7.4', [196], '7.3'],
-            ['ibase_free_event_handler', '7.4', [197], '7.3'],
-            ['ibase_free_query', '7.4', [198], '7.3'],
-            ['ibase_free_result', '7.4', [199], '7.3'],
-            ['ibase_gen_id', '7.4', [200], '7.3'],
-            ['ibase_maintain_db', '7.4', [201], '7.3'],
-            ['ibase_modify_user', '7.4', [202], '7.3'],
-            ['ibase_name_result', '7.4', [203], '7.3'],
-            ['ibase_num_fields', '7.4', [204], '7.3'],
-            ['ibase_num_params', '7.4', [205], '7.3'],
-            ['ibase_param_info', '7.4', [206], '7.3'],
-            ['ibase_pconnect', '7.4', [207], '7.3'],
-            ['ibase_prepare', '7.4', [208], '7.3'],
-            ['ibase_query', '7.4', [209], '7.3'],
-            ['ibase_restore', '7.4', [210], '7.3'],
-            ['ibase_rollback_ret', '7.4', [211], '7.3'],
-            ['ibase_rollback', '7.4', [212], '7.3'],
-            ['ibase_server_info', '7.4', [213], '7.3'],
-            ['ibase_service_attach', '7.4', [214], '7.3'],
-            ['ibase_service_detach', '7.4', [215], '7.3'],
-            ['ibase_set_event_handler', '7.4', [216], '7.3'],
-            ['ibase_trans', '7.4', [217], '7.3'],
-            ['ibase_wait_event', '7.4', [218], '7.3'],
-            ['fbird_add_user', '7.4', [987], '7.3'],
-            ['fbird_affected_rows', '7.4', [988], '7.3'],
-            ['fbird_backup', '7.4', [989], '7.3'],
-            ['fbird_blob_add', '7.4', [990], '7.3'],
-            ['fbird_blob_cancel', '7.4', [991], '7.3'],
-            ['fbird_blob_close', '7.4', [992], '7.3'],
-            ['fbird_blob_create', '7.4', [993], '7.3'],
-            ['fbird_blob_echo', '7.4', [994], '7.3'],
-            ['fbird_blob_get', '7.4', [995], '7.3'],
-            ['fbird_blob_import', '7.4', [996], '7.3'],
-            ['fbird_blob_info', '7.4', [997], '7.3'],
-            ['fbird_blob_open', '7.4', [998], '7.3'],
-            ['fbird_close', '7.4', [999], '7.3'],
-            ['fbird_commit_ret', '7.4', [1000], '7.3'],
-            ['fbird_commit', '7.4', [1001], '7.3'],
-            ['fbird_connect', '7.4', [1002], '7.3'],
-            ['fbird_db_info', '7.4', [1003], '7.3'],
-            ['fbird_delete_user', '7.4', [1004], '7.3'],
-            ['fbird_drop_db', '7.4', [1005], '7.3'],
-            ['fbird_errcode', '7.4', [1006], '7.3'],
-            ['fbird_errmsg', '7.4', [1007], '7.3'],
-            ['fbird_execute', '7.4', [1008], '7.3'],
-            ['fbird_fetch_assoc', '7.4', [1009], '7.3'],
-            ['fbird_fetch_object', '7.4', [1010], '7.3'],
-            ['fbird_fetch_row', '7.4', [1011], '7.3'],
-            ['fbird_field_info', '7.4', [1012], '7.3'],
-            ['fbird_free_event_handler', '7.4', [1013], '7.3'],
-            ['fbird_free_query', '7.4', [1014], '7.3'],
-            ['fbird_free_result', '7.4', [1015], '7.3'],
-            ['fbird_gen_id', '7.4', [1016], '7.3'],
-            ['fbird_maintain_db', '7.4', [1017], '7.3'],
-            ['fbird_modify_user', '7.4', [1018], '7.3'],
-            ['fbird_name_result', '7.4', [1019], '7.3'],
-            ['fbird_num_fields', '7.4', [1020], '7.3'],
-            ['fbird_num_params', '7.4', [1021], '7.3'],
-            ['fbird_param_info', '7.4', [1022], '7.3'],
-            ['fbird_pconnect', '7.4', [1023], '7.3'],
-            ['fbird_prepare', '7.4', [1024], '7.3'],
-            ['fbird_query', '7.4', [1025], '7.3'],
-            ['fbird_restore', '7.4', [1026], '7.3'],
-            ['fbird_rollback_ret', '7.4', [1027], '7.3'],
-            ['fbird_rollback', '7.4', [1028], '7.3'],
-            ['fbird_server_info', '7.4', [1029], '7.3'],
-            ['fbird_service_attach', '7.4', [1030], '7.3'],
-            ['fbird_service_detach', '7.4', [1031], '7.3'],
-            ['fbird_set_event_handler', '7.4', [1032], '7.3'],
-            ['fbird_trans', '7.4', [1033], '7.3'],
-            ['fbird_wait_event', '7.4', [1034], '7.3'],
-
-            ['wddx_add_vars', '7.4', [228], '7.3'],
-            ['wddx_deserialize', '7.4', [229], '7.3'],
-            ['wddx_packet_end', '7.4', [230], '7.3'],
-            ['wddx_packet_start', '7.4', [231], '7.3'],
-            ['wddx_serialize_value', '7.4', [232], '7.3'],
-            ['wddx_serialize_vars', '7.4', [233], '7.3'],
-            ['mysqli_embedded_server_end', '7.4', [1147], '7.3'],
-            ['mysqli_embedded_server_start', '7.4', [1148], '7.3'],
-
-            ['oci_internal_debug', '8.0', [1178], '7.4'],
-            ['xmlrpc_decode_request', '8.0', [1158], '7.4'],
-            ['xmlrpc_decode', '8.0', [1159], '7.4'],
-            ['xmlrpc_encode_request', '8.0', [1160], '7.4'],
-            ['xmlrpc_encode', '8.0', [1161], '7.4'],
-            ['xmlrpc_get_type', '8.0', [1162], '7.4'],
-            ['xmlrpc_is_fault', '8.0', [1163], '7.4'],
-            ['xmlrpc_parse_method_descriptions', '8.0', [1164], '7.4'],
-            ['xmlrpc_server_add_introspection_data', '8.0', [1165], '7.4'],
-            ['xmlrpc_server_call_method', '8.0', [1166], '7.4'],
-            ['xmlrpc_server_create', '8.0', [1167], '7.4'],
-            ['xmlrpc_server_destroy', '8.0', [1168], '7.4'],
-            ['xmlrpc_server_register_introspection_callback', '8.0', [1169], '7.4'],
-            ['xmlrpc_server_register_method', '8.0', [1170], '7.4'],
-            ['xmlrpc_set_type', '8.0', [1171], '7.4'],
-        ];
-    }
-
-
-    /**
-     * testRemovedFunctionWithAlternative
-     *
-     * @dataProvider dataRemovedFunctionWithAlternative
-     *
-     * @param string $functionName   Name of the function.
-     * @param string $removedIn      The PHP version in which the function was removed.
-     * @param string $alternative    An alternative function.
-     * @param array  $lines          The line numbers in the test file which apply to this function.
-     * @param string $okVersion      A PHP version in which the function was still valid.
-     * @param string $removedVersion Optional PHP version to test removed message with -
-     *                               if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testRemovedFunctionWithAlternative($functionName, $removedIn, $alternative, $lines, $okVersion, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is removed since PHP {$removedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedFunctionWithAlternative()
-     *
-     * @return array
-     */
-    public function dataRemovedFunctionWithAlternative()
-    {
-        return [
-            ['zend_logo_guid', '5.5', 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"', [35], '5.4'],
-
-            ['recode_file', '7.4', 'the iconv or mbstring extension', [236], '7.3'],
-            ['recode_string', '7.4', 'the iconv or mbstring extension', [237], '7.3'],
-            ['recode', '7.4', 'the iconv or mbstring extension', [238], '7.3'],
-
-            ['imap_header', '8.0', 'imap_headerinfo()', [1216], '7.4'],
-        ];
-    }
-
-
-    /**
-     * testDeprecatedRemovedFunction
-     *
-     * @dataProvider dataDeprecatedRemovedFunction
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param string $removedIn         The PHP version in which the function was removed.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     * @param string $removedVersion    Optional PHP version to test removed message with -
-     *                                  if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedRemovedFunction($functionName, $deprecatedIn, $removedIn, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedRemovedFunction()
-     *
-     * @return array
-     */
-    public function dataDeprecatedRemovedFunction()
-    {
-        return [
-            ['define_syslog_variables', '5.3', '5.4', [5], '5.2'],
-            ['import_request_variables', '5.3', '5.4', [11], '5.2'],
-            ['mysql_list_dbs', '5.4', '7.0', [15], '5.3'],
-            ['magic_quotes_runtime', '5.3', '7.0', [23], '5.2'],
-            ['set_magic_quotes_runtime', '5.3', '7.0', [27], '5.2'],
-            ['sql_regcase', '5.3', '7.0', [31], '5.2'],
-            ['mysql_affected_rows', '5.5', '7.0', [923], '5.4'],
-            ['mysql_client_encoding', '5.5', '7.0', [924], '5.4'],
-            ['mysql_close', '5.5', '7.0', [925], '5.4'],
-            ['mysql_connect', '5.5', '7.0', [926], '5.4'],
-            ['mysql_create_db', '4.3', '7.0', [927], '4.2'],
-            ['mysql_data_seek', '5.5', '7.0', [928], '5.4'],
-            ['mysql_db_name', '5.5', '7.0', [929], '5.4'],
-            ['mysql_drop_db', '4.3', '7.0', [930], '4.2'],
-            ['mysql_errno', '5.5', '7.0', [931], '5.4'],
-            ['mysql_error', '5.5', '7.0', [932], '5.4'],
-            ['mysql_fetch_array', '5.5', '7.0', [933], '5.4'],
-            ['mysql_fetch_assoc', '5.5', '7.0', [934], '5.4'],
-            ['mysql_fetch_field', '5.5', '7.0', [935], '5.4'],
-            ['mysql_fetch_lengths', '5.5', '7.0', [936], '5.4'],
-            ['mysql_fetch_object', '5.5', '7.0', [937], '5.4'],
-            ['mysql_fetch_row', '5.5', '7.0', [938], '5.4'],
-            ['mysql_field_flags', '5.5', '7.0', [939], '5.4'],
-            ['mysql_field_len', '5.5', '7.0', [940], '5.4'],
-            ['mysql_field_name', '5.5', '7.0', [941], '5.4'],
-            ['mysql_field_seek', '5.5', '7.0', [942], '5.4'],
-            ['mysql_field_table', '5.5', '7.0', [943], '5.4'],
-            ['mysql_field_type', '5.5', '7.0', [944], '5.4'],
-            ['mysql_free_result', '5.5', '7.0', [945], '5.4'],
-            ['mysql_get_client_info', '5.5', '7.0', [946], '5.4'],
-            ['mysql_get_host_info', '5.5', '7.0', [947], '5.4'],
-            ['mysql_get_proto_info', '5.5', '7.0', [948], '5.4'],
-            ['mysql_get_server_info', '5.5', '7.0', [949], '5.4'],
-            ['mysql_info', '5.5', '7.0', [950], '5.4'],
-            ['mysql_insert_id', '5.5', '7.0', [951], '5.4'],
-            ['mysql_list_fields', '5.4', '7.0', [952], '5.3'],
-            ['mysql_list_processes', '5.5', '7.0', [953], '5.4'],
-            ['mysql_list_tables', '4.3.7', '7.0', [954], '4.3', '4.4'],
-            ['mysql_num_fields', '5.5', '7.0', [955], '5.4'],
-            ['mysql_num_rows', '5.5', '7.0', [956], '5.4'],
-            ['mysql_pconnect', '5.5', '7.0', [957], '5.4'],
-            ['mysql_ping', '5.5', '7.0', [958], '5.4'],
-            ['mysql_query', '5.5', '7.0', [959], '5.4'],
-            ['mysql_real_escape_string', '5.5', '7.0', [960], '5.4'],
-            ['mysql_result', '5.5', '7.0', [961], '5.4'],
-            ['mysql_select_db', '5.5', '7.0', [962], '5.4'],
-            ['mysql_set_charset', '5.5', '7.0', [963], '5.4'],
-            ['mysql_stat', '5.5', '7.0', [964], '5.4'],
-            ['mysql_tablename', '5.5', '7.0', [965], '5.4'],
-            ['mysql_thread_id', '5.5', '7.0', [966], '5.4'],
-            ['mysql_unbuffered_query', '5.5', '7.0', [967], '5.4'],
-            ['mysql', '5.5', '7.0', [968], '5.4'],
-            ['mysql_fieldname', '5.5', '7.0', [969], '5.4'],
-            ['mysql_fieldtable', '5.5', '7.0', [970], '5.4'],
-            ['mysql_fieldlen', '5.5', '7.0', [971], '5.4'],
-            ['mysql_fieldtype', '5.5', '7.0', [972], '5.4'],
-            ['mysql_fieldflags', '5.5', '7.0', [973], '5.4'],
-            ['mysql_selectdb', '5.5', '7.0', [974], '5.4'],
-            ['mysql_freeresult', '5.5', '7.0', [977], '5.4'],
-            ['mysql_numfields', '5.5', '7.0', [978], '5.4'],
-            ['mysql_numrows', '5.5', '7.0', [979], '5.4'],
-            ['mysql_listdbs', '5.5', '7.0', [980], '5.4'],
-            ['mysql_listfields', '5.5', '7.0', [982], '5.4'],
-            ['mysql_dbname', '5.5', '7.0', [983], '5.4'],
-            ['mysql_table_name', '5.5', '7.0', [984], '5.4'],
-
-            ['ldap_sort', '7.0', '8.0', [97], '5.6'],
-            ['fgetss', '7.3', '8.0', [167], '7.2'],
-            ['gzgetss', '7.3', '8.0', [168], '7.2'],
-            ['ezmlm_hash', '7.4', '8.0', [245], '7.3'],
-            ['get_magic_quotes_gpc', '7.4', '8.0', [240], '7.3'],
-            ['get_magic_quotes_runtime', '7.4', '8.0', [241], '7.3'],
-            ['hebrevc', '7.4', '8.0', [242], '7.3'],
-        ];
-    }
-
-
-    /**
-     * testDeprecatedRemovedFunctionWithAlternative
-     *
-     * @dataProvider dataDeprecatedRemovedFunctionWithAlternative
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param string $removedIn         The PHP version in which the function was removed.
-     * @param string $alternative       An alternative function.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     * @param string $removedVersion    Optional PHP version to test removed message with -
-     *                                  if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedRemovedFunctionWithAlternative($functionName, $deprecatedIn, $removedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedRemovedFunctionWithAlternative()
-     *
-     * @return array
-     */
-    public function dataDeprecatedRemovedFunctionWithAlternative()
-    {
-        return [
-            ['call_user_method', '4.1', '7.0', 'call_user_func()', [3], '4.0'],
-            ['call_user_method_array', '4.1', '7.0', 'call_user_func_array()', [4], '4.0'],
-            ['ereg', '5.3', '7.0', 'preg_match()', [7], '5.2'],
-            ['ereg_replace', '5.3', '7.0', 'preg_replace()', [8], '5.2'],
-            ['eregi', '5.3', '7.0', 'preg_match() (with the i modifier)', [9], '5.2'],
-            ['eregi_replace', '5.3', '7.0', 'preg_replace() (with the i modifier)', [10], '5.2'],
-            ['mcrypt_generic_end', '5.3', '7.0', 'mcrypt_generic_deinit()', [12], '5.2'],
-            ['mcrypt_ecb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [37], '5.4'],
-            ['mcrypt_cbc', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [38], '5.4'],
-            ['mcrypt_cfb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [39], '5.4'],
-            ['mcrypt_ofb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [40], '5.4'],
-            ['mysql_db_query', '5.3', '7.0', 'mysqli::select_db() and mysqli::query()', [13], '5.2'],
-            ['mysql_escape_string', '4.3', '7.0', 'mysqli::real_escape_string()', [14], '4.2'],
-            ['mysqli_bind_param', '5.3', '5.4', 'mysqli_stmt::bind_param()', [16], '5.2'],
-            ['mysqli_bind_result', '5.3', '5.4', 'mysqli_stmt::bind_result()', [17], '5.2'],
-            ['mysqli_client_encoding', '5.3', '5.4', 'mysqli::character_set_name()', [18], '5.2'],
-            ['mysqli_fetch', '5.3', '5.4', 'mysqli_stmt::fetch()', [19], '5.2'],
-            ['mysqli_param_count', '5.3', '5.4', 'mysqli_stmt_param_count()', [20], '5.2'],
-            ['mysqli_get_metadata', '5.3', '5.4', 'mysqli_stmt::result_metadata()', [21], '5.2'],
-            ['mysqli_send_long_data', '5.3', '5.4', 'mysqli_stmt::send_long_data()', [22], '5.2'],
-            ['session_register', '5.3', '5.4', '$_SESSION', [24], '5.2'],
-            ['session_unregister', '5.3', '5.4', '$_SESSION', [25], '5.2'],
-            ['session_is_registered', '5.3', '5.4', '$_SESSION', [26], '5.2'],
-            ['set_socket_blocking', '5.3', '7.0', 'stream_set_blocking()', [28], '5.2'],
-            ['split', '5.3', '7.0', 'preg_split(), explode() or str_split()', [29], '5.2'],
-            ['spliti', '5.3', '7.0', 'preg_split() (with the i modifier)', [30], '5.2'],
-            ['datefmt_set_timezone_id', '5.5', '7.0', 'IntlDateFormatter::setTimeZone()', [36], '5.4'],
-
-            ['mcrypt_create_iv', '7.1', '7.2', 'random_bytes() or OpenSSL', [100], '7.0'],
-            ['mcrypt_decrypt', '7.1', '7.2', 'OpenSSL', [101], '7.0'],
-            ['mcrypt_enc_get_algorithms_name', '7.1', '7.2', 'OpenSSL', [102], '7.0'],
-            ['mcrypt_enc_get_block_size', '7.1', '7.2', 'OpenSSL', [103], '7.0'],
-            ['mcrypt_enc_get_iv_size', '7.1', '7.2', 'OpenSSL', [104], '7.0'],
-            ['mcrypt_enc_get_key_size', '7.1', '7.2', 'OpenSSL', [105], '7.0'],
-            ['mcrypt_enc_get_modes_name', '7.1', '7.2', 'OpenSSL', [106], '7.0'],
-            ['mcrypt_enc_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [107], '7.0'],
-            ['mcrypt_enc_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [108], '7.0'],
-            ['mcrypt_enc_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [109], '7.0'],
-            ['mcrypt_enc_is_block_mode', '7.1', '7.2', 'OpenSSL', [110], '7.0'],
-            ['mcrypt_enc_self_test', '7.1', '7.2', 'OpenSSL', [111], '7.0'],
-            ['mcrypt_encrypt', '7.1', '7.2', 'OpenSSL', [112], '7.0'],
-            ['mcrypt_generic_deinit', '7.1', '7.2', 'OpenSSL', [113], '7.0'],
-            ['mcrypt_generic_init', '7.1', '7.2', 'OpenSSL', [114], '7.0'],
-            ['mcrypt_generic', '7.1', '7.2', 'OpenSSL', [115], '7.0'],
-            ['mcrypt_get_block_size', '7.1', '7.2', 'OpenSSL', [116], '7.0'],
-            ['mcrypt_get_cipher_name', '7.1', '7.2', 'OpenSSL', [117], '7.0'],
-            ['mcrypt_get_iv_size', '7.1', '7.2', 'OpenSSL', [118], '7.0'],
-            ['mcrypt_get_key_size', '7.1', '7.2', 'OpenSSL', [119], '7.0'],
-            ['mcrypt_list_algorithms', '7.1', '7.2', 'OpenSSL', [120], '7.0'],
-            ['mcrypt_list_modes', '7.1', '7.2', 'OpenSSL', [121], '7.0'],
-            ['mcrypt_module_close', '7.1', '7.2', 'OpenSSL', [122], '7.0'],
-            ['mcrypt_module_get_algo_block_size', '7.1', '7.2', 'OpenSSL', [123], '7.0'],
-            ['mcrypt_module_get_algo_key_size', '7.1', '7.2', 'OpenSSL', [124], '7.0'],
-            ['mcrypt_module_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [125], '7.0'],
-            ['mcrypt_module_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [126], '7.0'],
-            ['mcrypt_module_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [127], '7.0'],
-            ['mcrypt_module_is_block_mode', '7.1', '7.2', 'OpenSSL', [128], '7.0'],
-            ['mcrypt_module_open', '7.1', '7.2', 'OpenSSL', [129], '7.0'],
-            ['mcrypt_module_self_test', '7.1', '7.2', 'OpenSSL', [130], '7.0'],
-            ['mdecrypt_generic', '7.1', '7.2', 'OpenSSL', [131], '7.0'],
-
-            ['create_function', '7.2', '8.0', 'an anonymous function', [146], '7.1'],
-            ['each', '7.2', '8.0', 'a foreach loop or ArrayIterator', [147], '7.1'],
-            ['read_exif_data', '7.2', '8.0', 'exif_read_data()', [149], '7.1'],
-            ['jpeg2wbmp', '7.2', '8.0', 'imagecreatefromjpeg() and imagewbmp()', [144], '7.1'],
-            ['png2wbmp', '7.2', '8.0', 'imagecreatefrompng() or imagewbmp()', [145], '7.1'],
-            ['gmp_random', '7.2', '8.0', 'gmp_random_bits() or gmp_random_range()', [148], '7.1'],
-
-            ['image2wbmp', '7.3', '8.0', 'imagewbmp()', [152], '7.2'],
-            ['mbregex_encoding', '7.3', '8.0', 'mb_regex_encoding()', [153], '7.2'],
-            ['mbereg', '7.3', '8.0', 'mb_ereg()', [154], '7.2'],
-            ['mberegi', '7.3', '8.0', 'mb_eregi()', [155], '7.2'],
-            ['mbereg_replace', '7.3', '8.0', 'mb_ereg_replace()', [156], '7.2'],
-            ['mberegi_replace', '7.3', '8.0', 'mb_eregi_replace()', [157], '7.2'],
-            ['mbsplit', '7.3', '8.0', 'mb_split()', [158], '7.2'],
-            ['mbereg_match', '7.3', '8.0', 'mb_ereg_match()', [159], '7.2'],
-            ['mbereg_search', '7.3', '8.0', 'mb_ereg_search()', [160], '7.2'],
-            ['mbereg_search_pos', '7.3', '8.0', 'mb_ereg_search_pos()', [161], '7.2'],
-            ['mbereg_search_regs', '7.3', '8.0', 'mb_ereg_search_regs()', [162], '7.2'],
-            ['mbereg_search_init', '7.3', '8.0', 'mb_ereg_search_init()', [163], '7.2'],
-            ['mbereg_search_getregs', '7.3', '8.0', 'mb_ereg_search_getregs()', [164], '7.2'],
-            ['mbereg_search_getpos', '7.3', '8.0', 'mb_ereg_search_getpos()', [165], '7.2'],
-            ['mbereg_search_setpos', '7.3', '8.0', 'mb_ereg_search_setpos()', [166], '7.2'],
-
-            ['convert_cyr_string', '7.4', '8.0', 'mb_convert_encoding(), iconv() or UConverter', [243], '7.3'],
-            ['money_format', '7.4', '8.0', 'NumberFormatter::formatCurrency()', [244], '7.3'],
-            ['restore_include_path', '7.4', '8.0', "ini_restore('include_path')", [246], '7.3'],
-            ['ociinternaldebug', '5.4', '8.0', 'oci_internal_debug() (PHP < 8.0)', [69], '5.3'],
-            ['ldap_control_paged_result_response', '7.4', '8.0', 'ldap_search()', [234], '7.3'],
-            ['ldap_control_paged_result', '7.4', '8.0', 'ldap_search()', [235], '7.3'],
-        ];
-    }
-
-
-    /**
-     * testNoFalsePositives
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '99.0'); // High version beyond latest deprecation.
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            [134],
-            [135],
-            [136],
-            [137],
-            [138],
-            [139],
-            [140],
-            [141],
-            [249],
-            [250],
-            [251],
-            [252],
-            [1232],
-        ];
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '4.0'); // Low version below the first deprecation.
-        $this->assertNoViolation($file);
-    }
-}
\ No newline at end of file
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
index bedde7fb..260afb14 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,68 +9,15 @@
 /**
  * Test the RemovedGetDefinedFunctionsExcludeDisabledFalse sniff.
  *
- * @group removedGetDefinedFunctionsExcludeDisabledFalse
- * @group parameterValues
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
- *
- * @since 10.0.0
  */
-class RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest extends BaseSniffTest
+class RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest extends \PHPCompatibility\Tests\ParameterValues\RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest
 {
-
-    /**
-     * testRemovedGetDefinedFunctionsExcludeDisabledFalse
-     *
-     * @dataProvider dataRemovedGetDefinedFunctionsExcludeDisabledFalse
-     *
-     * @param int $line Line number where the error should occur.
-     *
-     * @return void
-     */
-    public function testRemovedGetDefinedFunctionsExcludeDisabledFalse($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedGetDefinedFunctionsExcludeDisabledFalse()
-     *
-     * @return array
-     */
-    public function dataRemovedGetDefinedFunctionsExcludeDisabledFalse()
-    {
-        return [
-            [11],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-
-        // No errors expected on the first 9 lines.
-        for ($line = 1; $line <= 9; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
     /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
+     * @inheritdoc
      */
-    public function testNoViolationsInFileOnValidVersion()
+    protected function getSniffCode()
     {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
+        return 'Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse';
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
index 3f558fdb..0d0979ec 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,103 +9,15 @@
 /**
  * Test the RemovedOptionalBeforeRequiredParam sniff.
  *
- * @group removedOptionalBeforeRequiredParam
- * @group functiondeclarations
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\RemovedOptionalBeforeRequiredParamSniff
- *
- * @since 10.0.0
  */
-class RemovedOptionalBeforeRequiredParamUnitTest extends BaseSniffTest
+class RemovedOptionalBeforeRequiredParamUnitTest extends \PHPCompatibility\Tests\FunctionDeclarations\RemovedOptionalBeforeRequiredParamUnitTest
 {
-
-    /**
-     * Verify that the sniff throws a warning for optional parameters before required.
-     *
-     * @dataProvider dataRemovedOptionalBeforeRequiredParam
-     *
-     * @param int $line The line number where a warning is expected.
-     *
-     * @return void
-     */
-    public function testRemovedOptionalBeforeRequiredParam($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Declaring a required parameter after an optional one is deprecated since PHP 8.0');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedOptionalBeforeRequiredParam()
-     *
-     * @return array
-     */
-    public function dataRemovedOptionalBeforeRequiredParam()
-    {
-        return [
-            [13], // Warning x 2.
-            [14],
-            [16],
-            [17],
-            [20],
-            [32],
-            [39],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $cases = [];
-        // No errors expected on the first 9 lines.
-        for ($line = 1; $line <= 9; $line++) {
-            $cases[] = [$line];
-        }
-
-        // Don't error on variadic parameters.
-        $cases[] = [23];
-        $cases[] = [24];
-        $cases[] = [26];
-
-        // Constructor property promotion - valid example.
-        $cases[] = [46];
-
-        // Add parse error test case.
-        $cases[] = [51];
-
-        return $cases;
-    }
-
     /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
+     * @inheritdoc
      */
-    public function testNoViolationsInFileOnValidVersion()
+    protected function getSniffCode()
     {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
+        return 'Magento2.PHPCompatibility.RemovedOptionalBeforeRequiredParam';
     }
 }
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
index 40c60766..2cccd297 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
+++ b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
@@ -1,11 +1,7 @@
 <?php
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento2\Tests\PHPCompatibility;
@@ -13,68 +9,15 @@
 /**
  * Test the RemovedSplAutoloadRegisterThrowFalse sniff.
  *
- * @group removedSplAutoloadRegisterThrowFalse
- * @group parameterValues
- *
  * @covers \Magento2\Sniffs\PHPCompatibility\RemovedSplAutoloadRegisterThrowFalseSniff
- *
- * @since 10.0.0
  */
-class RemovedSplAutoloadRegisterThrowFalseUnitTest extends BaseSniffTest
+class RemovedSplAutoloadRegisterThrowFalseUnitTest extends \PHPCompatibility\Tests\ParameterValues\RemovedSplAutoloadRegisterThrowFalseUnitTest
 {
-
-    /**
-     * Verify a warning is thrown when an explicit false is passed as the second parameter.
-     *
-     * @dataProvider dataRemovedSplAutoloadRegisterThrowFalse
-     *
-     * @param int $line Line number where the error should occur.
-     *
-     * @return void
-     */
-    public function testRemovedSplAutoloadRegisterThrowFalse($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedSplAutoloadRegisterThrowFalse()
-     *
-     * @return array
-     */
-    public function dataRemovedSplAutoloadRegisterThrowFalse()
-    {
-        return [
-            [13],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-
-        // No errors expected on the first 11 lines.
-        for ($line = 1; $line <= 11; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
     /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
+     * @inheritdoc
      */
-    public function testNoViolationsInFileOnValidVersion()
+    protected function getSniffCode()
     {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
+        return 'Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse';
     }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 6234fb1b..b26c8a73 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -168,7 +168,7 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
-    <rule ref="Magento2.PHPCompatibility.RemovedFunctions">
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions">
         <severity>10</severity>
         <type>error</type>
     </rule>
@@ -771,8 +771,6 @@
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
-        <!-- Following sniffs have an equivalent in Magento2 -->
-        <exclude name="PHPCompatibility.FunctionUse.RemovedFunctions" />
     </rule>
     <!--
      All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is
diff --git a/PHPCompatibility/AbstractFunctionCallParameterSniff.php b/PHPCompatibility/AbstractFunctionCallParameterSniff.php
new file mode 100644
index 00000000..b2660e8b
--- /dev/null
+++ b/PHPCompatibility/AbstractFunctionCallParameterSniff.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\PassedParameters;
+
+/**
+ * Abstract class to use as a base for examining the parameter values passed to function calls.
+ *
+ * @since 8.2.0
+ */
+abstract class AbstractFunctionCallParameterSniff extends Sniff
+{
+
+    /**
+     * Is the sniff looking for a function call or a method call ?
+     *
+     * Note: the child class may need to do additional checks to make sure that
+     * the method called is of the right class/object.
+     * Checking that is outside of the scope of this abstract sniff.
+     *
+     * @since 8.2.0
+     *
+     * @var bool False (default) if the sniff is looking for function calls.
+     *           True if the sniff is looking for method calls.
+     */
+    protected $isMethod = false;
+
+    /**
+     * Functions the sniff is looking for. Should be defined in the child class.
+     *
+     * @since 8.2.0
+     *
+     * @var array The only requirement for this array is that the top level
+     *            array keys are the names of the functions you're looking for.
+     *            Other than that, the array can have arbitrary content
+     *            depending on your needs.
+     */
+    protected $targetFunctions = [];
+
+    /**
+     * List of tokens which when they preceed the $stackPtr indicate that this
+     * is not a function call.
+     *
+     * {@internal The object operators are added to the array in the register() method.}
+     *
+     * @since 8.2.0
+     *
+     * @var array
+     */
+    private $ignoreTokens = [
+        \T_NEW => true,
+    ];
+
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 8.2.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        $this->ignoreTokens += Collections::objectOperators();
+
+        // Handle case-insensitivity of function names.
+        $this->targetFunctions = \array_change_key_case($this->targetFunctions, \CASE_LOWER);
+
+        return [\T_STRING];
+    }
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 8.2.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in
+     *                                               the stack passed in $tokens.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->bowOutEarly() === true) {
+            return;
+        }
+
+        $tokens     = $phpcsFile->getTokens();
+        $function   = $tokens[$stackPtr]['content'];
+        $functionLc = \strtolower($function);
+
+        if (isset($this->targetFunctions[$functionLc]) === false) {
+            return;
+        }
+
+        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($nextToken === false
+            || $tokens[$nextToken]['code'] !== \T_OPEN_PARENTHESIS
+            || isset($tokens[$nextToken]['parenthesis_owner']) === true
+        ) {
+            return;
+        }
+
+        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+
+        if ($this->isMethod === true) {
+            if (isset(Collections::objectOperators()[$tokens[$prevNonEmpty]['code']]) === false) {
+                // Not a call to a PHP method.
+                return;
+            }
+        } else {
+            if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
+                // Not a call to a PHP function.
+                return;
+            }
+
+            if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR) {
+                $prevPrevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevNonEmpty - 1), null, true);
+                if ($tokens[$prevPrevToken]['code'] === \T_STRING
+                    || $tokens[$prevPrevToken]['code'] === \T_NAMESPACE
+                ) {
+                    // Namespaced function.
+                    return;
+                }
+            }
+        }
+
+        $parameters = PassedParameters::getParameters($phpcsFile, $stackPtr);
+
+        if (empty($parameters)) {
+            return $this->processNoParameters($phpcsFile, $stackPtr, $function);
+        } else {
+            return $this->processParameters($phpcsFile, $stackPtr, $function, $parameters);
+        }
+    }
+
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 8.2.0
+     *
+     * If the check done in a child class is not specific to one PHP version,
+     * this function should return `false`.
+     *
+     * @return bool
+     */
+    abstract protected function bowOutEarly();
+
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * This method has to be made concrete in child classes.
+     *
+     * @since 8.2.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    abstract public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters);
+
+
+    /**
+     * Process the function if no parameters were found.
+     *
+     * Defaults to doing nothing. Can be overloaded in child classes to handle functions
+     * were parameters are expected, but none found.
+     *
+     * @since 8.2.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
+    {
+        return;
+    }
+}
diff --git a/PHPCompatibility/LICENSE b/PHPCompatibility/LICENSE
new file mode 100644
index 00000000..65c5ca88
--- /dev/null
+++ b/PHPCompatibility/LICENSE
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php b/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php
new file mode 100644
index 00000000..40954070
--- /dev/null
+++ b/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\FunctionDeclarations;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\Scopes;
+
+/**
+ * Applying the final modifier on a private method will produce a warning since PHP 8.0
+ * unless that method is the constructor.
+ *
+ * Previously final private methods were allowed and overriding the method in a child class
+ * would result in a fatal "Cannot override final method". This was inappropriate as
+ * private methods are not inherited.
+ *
+ * > Due to how common the usage of `final private function __construct` is and given that
+ * > the same results cannot be achieved with a protected visibility, an exception to this rule
+ * > is made for constructors.
+ *
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/inheritance_private_methods
+ *
+ * @since 10.0.0
+ */
+class ForbiddenFinalPrivateMethodsSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_FUNCTION];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.0') === false) {
+            return;
+        }
+
+        if (Scopes::isOOMethod($phpcsFile, $stackPtr) === false) {
+            // Function, not method.
+            return;
+        }
+
+        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
+        if (empty($name) === true) {
+            // Parse error or live coding.
+            return;
+        }
+
+        if (\strtolower($name) === '__construct') {
+            // The rule does not apply to constructors. Bow out.
+            return;
+        }
+
+        $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
+        if ($properties['scope'] !== 'private' || $properties['is_final'] === false) {
+            // Not an private final method.
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'Private methods should not be declared as final since PHP 8.0',
+            $stackPtr,
+            'Found'
+        );
+    }
+}
diff --git a/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php b/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php
new file mode 100644
index 00000000..c59343d0
--- /dev/null
+++ b/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\FunctionDeclarations;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\UseStatements;
+
+/**
+ * As of PHP 8.0, when an object constructor exit()s, the destructor will no longer be called.
+ *
+ * Note: shutdown functions registered with `register_shutdown_function()` will still be called.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/71bfa5344ab207072f4cd25745d7023096338385/UPGRADING#L200-L201
+ *
+ * @since 10.0.0
+ */
+class RemovedCallingDestructAfterConstructorExitSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [\T_FUNCTION];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.0') === false) {
+            return;
+        }
+
+        // Note: interface constructors cannot contain code, enums cannot contain constructors or destructors.
+        $classPtr = Scopes::validDirectScope($phpcsFile, $stackPtr, [\T_CLASS, \T_ANON_CLASS, \T_TRAIT]);
+        if ($classPtr === false) {
+            // Function, not method.
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false
+            || isset($tokens[$classPtr]['scope_opener'], $tokens[$classPtr]['scope_closer']) === false
+        ) {
+            // Parse error, tokenizer error or live coding.
+            return;
+        }
+
+        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
+        if (empty($name) === true) {
+            // Parse error or live coding.
+            return;
+        }
+
+        if (\strtolower($name) !== '__construct') {
+            // The rule only applies to constructors. Bow out.
+            return;
+        }
+
+        $functionOpen  = $tokens[$stackPtr]['scope_opener'];
+        $functionClose = $tokens[$stackPtr]['scope_closer'];
+        $exits         = [];
+        for ($current = ($functionOpen + 1); $current < $functionClose; $current++) {
+            if (isset(Tokens::$emptyTokens[$tokens[$current]['code']]) === true) {
+                continue;
+            }
+
+            if ($tokens[$current]['code'] === \T_EXIT) {
+                $exits[] = $current;
+                continue;
+            }
+
+            // Skip over nested closed scopes as much as possible for efficiency.
+            // Ignore arrow functions as they aren't closed scopes.
+            if (isset(Collections::closedScopes()[$tokens[$current]['code']]) === true
+                && isset($tokens[$current]['scope_closer']) === true
+            ) {
+                $current = $tokens[$current]['scope_closer'];
+                continue;
+            }
+
+            // Skip over array access and short arrays/lists, but not control structures.
+            if (isset($tokens[$current]['bracket_closer']) === true
+                && isset($tokens[$current]['scope_closer']) === false
+            ) {
+                $current = $tokens[$current]['bracket_closer'];
+                continue;
+            }
+
+            // Skip over long array/lists as they can't contain an exit statement, except within a closed scope.
+            if (($tokens[$current]['code'] === \T_ARRAY || $tokens[$current]['code'] === \T_LIST)
+                && isset($tokens[$current]['parenthesis_closer']) === true
+            ) {
+                $current = $tokens[$current]['parenthesis_closer'];
+                continue;
+            }
+        }
+
+        if (empty($exits) === true) {
+            // No calls to exit or die found.
+            return;
+        }
+
+        $hasDestruct = false;
+        $usesTraits  = false;
+        $isError     = false;
+        $classOpen   = $tokens[$classPtr]['scope_opener'];
+        $classClose  = $tokens[$classPtr]['scope_closer'];
+        $nextFunc    = $classOpen;
+
+        while (($nextFunc = $phpcsFile->findNext([\T_FUNCTION, \T_DOC_COMMENT_OPEN_TAG, \T_ATTRIBUTE, \T_USE], ($nextFunc + 1), $classClose)) !== false) {
+            // Skip over docblocks.
+            if ($tokens[$nextFunc]['code'] === \T_DOC_COMMENT_OPEN_TAG) {
+                $nextFunc = $tokens[$nextFunc]['comment_closer'];
+                continue;
+            }
+
+            // Skip over attributes.
+            if ($tokens[$nextFunc]['code'] === \T_ATTRIBUTE
+                && isset($tokens[$nextFunc]['attribute_closer'])
+            ) {
+                $nextFunc = $tokens[$nextFunc]['attribute_closer'];
+                continue;
+            }
+
+            if ($tokens[$nextFunc]['code'] === \T_USE
+                && UseStatements::isTraitUse($phpcsFile, $nextFunc) === true
+            ) {
+                $usesTraits = true;
+                continue;
+            }
+
+            $functionScopeCloser = $nextFunc;
+            if (isset($tokens[$nextFunc]['scope_closer'])) {
+                // Normal (non-abstract) method.
+                $functionScopeCloser = $tokens[$nextFunc]['scope_closer'];
+            }
+
+            $funcName = FunctionDeclarations::getName($phpcsFile, $nextFunc);
+            $nextFunc = $functionScopeCloser; // Set up to skip over the method content.
+
+            if (empty($funcName) === true) {
+                continue;
+            }
+
+            if (\strtolower($funcName) !== '__destruct') {
+                continue;
+            }
+
+            $hasDestruct = true;
+            $isError     = true;
+            break;
+        }
+
+        if ($hasDestruct === false && $usesTraits === false) {
+            /*
+             * No destruct method or trait use found, check if this class extends another one
+             * which may contain a destruct method.
+             */
+            $extends = ObjectDeclarations::findExtendedClassName($phpcsFile, $classPtr);
+            if (empty($extends) === true) {
+                // No destruct method and class doesn't extend nor uses traits, so the calls to exit can be ignored.
+                return;
+            }
+        }
+
+        /*
+         * Ok, either a destruct method has been found and we can throw an error, or either a class extends
+         * or trait use has been found and no destruct method, in which case, we throw a warning.
+         */
+        $error     = 'When %s() is called within an object constructor, the object destructor will no longer be called since PHP 8.0';
+        $errorCode = 'Found';
+        if ($isError === false) {
+            $error    .= ' While no __destruct() method was found in this class, one may be declared in the parent class or in a trait being used.';
+            $errorCode = 'NeedsInspection';
+        }
+
+        foreach ($exits as $ptr) {
+            MessageHelper::addMessage($phpcsFile, $error, $ptr, $isError, $errorCode, [$tokens[$ptr]['content']]);
+        }
+    }
+}
diff --git a/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php b/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php
new file mode 100644
index 00000000..07b93d12
--- /dev/null
+++ b/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\FunctionDeclarations;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\Sniff;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+
+/**
+ * Declaring a required function parameter after an optional parameter is deprecated since PHP 8.0.
+ *
+ * > Declaring a required parameter after an optional one is deprecated. As an
+ * > exception, declaring a parameter of the form "Type $param = null" before
+ * > a required one continues to be allowed, because this pattern was sometimes
+ * > used to achieve nullable types in older PHP versions.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L145-L151
+ *
+ * @since 10.0.0
+ */
+class RemovedOptionalBeforeRequiredParamSniff extends Sniff
+{
+
+    /**
+     * Tokens allowed in the default value.
+     *
+     * This property will be enriched in the register() method.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    private $allowedInDefault = [
+        \T_NULL => \T_NULL,
+    ];
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        $this->allowedInDefault += Tokens::$emptyTokens;
+
+        return Collections::functionDeclarationTokens();
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.0') === false) {
+            return;
+        }
+
+        // Get all parameters from the function signature.
+        $parameters = FunctionDeclarations::getParameters($phpcsFile, $stackPtr);
+        if (empty($parameters)) {
+            return;
+        }
+
+        $error = 'Declaring a required parameter after an optional one is deprecated since PHP 8.0. Parameter %s is optional, while parameter %s is required.';
+
+        $paramCount    = \count($parameters);
+        $lastKey       = ($paramCount - 1);
+        $firstOptional = null;
+
+        foreach ($parameters as $key => $param) {
+            /*
+             * Ignore variadic parameters, which are optional by nature.
+             * These always have to be declared last and this has been this way since their introduction.
+             */
+            if ($param['variable_length'] === true) {
+                continue;
+            }
+
+            // Handle optional parameters.
+            if (isset($param['default']) === true) {
+                if ($key === $lastKey) {
+                    // This is the last parameter and it's optional, no further checking needed.
+                    break;
+                }
+
+                if (isset($firstOptional) === false) {
+                    // Check if it's typed and has a null default value, in which case we can ignore it.
+                    if ($param['type_hint'] !== '') {
+                        $hasNull    = $phpcsFile->findNext(\T_NULL, $param['default_token'], $param['comma_token']);
+                        $hasNonNull = $phpcsFile->findNext(
+                            $this->allowedInDefault,
+                            $param['default_token'],
+                            $param['comma_token'],
+                            true
+                        );
+
+                        if ($hasNull !== false && $hasNonNull === false) {
+                            continue;
+                        }
+                    }
+
+                    // Non-null default value. This is an optional param we need to take into account.
+                    $firstOptional = $param['name'];
+                }
+
+                continue;
+            }
+
+            // Found a required parameter.
+            if (isset($firstOptional) === false) {
+                // No optional params found yet.
+                continue;
+            }
+
+            // Found a required parameter with an optional param before it.
+            $data = [
+                $firstOptional,
+                $param['name'],
+            ];
+
+            $phpcsFile->addWarning($error, $param['token'], 'Deprecated', $data);
+        }
+    }
+}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php b/PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php
new file mode 100644
index 00000000..7428b97b
--- /dev/null
+++ b/PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\ParameterValues;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHPCSUtils\BackCompat\BCTokens;
+use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
+
+/**
+ * Detect calls to functions where the expected type of a parameter has been changed from integer to boolean.
+ *
+ * Throws an error when a hard-coded numeric value is passed.
+ *
+ * PHP version 8.0+
+ *
+ * @since 10.0.0
+ */
+class ChangedIntToBoolParamTypeSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'ob_implicit_flush' => [
+            1 => [
+                'name'  => 'enable',
+                'since' => '8.0',
+            ],
+        ],
+        'sem_get' => [
+            4 => [
+                'name'  => 'auto_release',
+                'since' => '8.0',
+            ],
+        ],
+    ];
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * Checks against the first PHP version listed in the above array.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('8.0') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        static $search;
+
+        if (isset($search) === false) {
+            $search  = [
+                \T_LNUMBER => \T_LNUMBER,
+                \T_DNUMBER => \T_DNUMBER,
+            ];
+            $search += BCTokens::arithmeticTokens();
+            $search += Tokens::$emptyTokens;
+        }
+
+        $functionLC   = \strtolower($functionName);
+        $functionInfo = $this->targetFunctions[$functionLC];
+        foreach ($functionInfo as $offset => $paramInfo) {
+            if ($this->supportsAbove($paramInfo['since']) === false) {
+                continue;
+            }
+
+            $target = PassedParameters::getParameterFromStack($parameters, $offset, $paramInfo['name']);
+            if ($target === false) {
+                continue;
+            }
+
+            $hasNonNumeric = $phpcsFile->findNext($search, $target['start'], ($target['end'] + 1), true);
+            if ($hasNonNumeric !== false) {
+                // Not a purely numerical value. Ignore.
+                continue;
+            }
+
+            $error = 'The $%s parameter of %s() expects a boolean value instead of an integer since PHP %s. Found: %s';
+            $code  = MessageHelper::stringToErrorCode($functionLC . '_' . $paramInfo['name'], true) . 'NumericFound';
+            $data  = [
+                $paramInfo['name'],
+                $functionLC,
+                $paramInfo['since'],
+                $target['clean'],
+            ];
+
+            $phpcsFile->addError($error, $target['start'], $code, $data);
+        }
+    }
+}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php b/PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php
new file mode 100644
index 00000000..c71dd722
--- /dev/null
+++ b/PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\ParameterValues;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHPCSUtils\Utils\MessageHelper;
+
+/**
+ * Detect the use of assertions passed as a string.
+ *
+ * PHP 7.2:
+ * > Usage of a string as the assertion became deprecated. It now emits an E_DEPRECATED
+ * > notice when both assert.active and zend.assertions are set to 1.
+ *
+ * PHP 8.0:
+ * > assert() will no longer evaluate string arguments, instead they will be treated
+ * > like any other argument. `assert($a == $b)` should be used instead of `assert('$a == $b')`.
+ *
+ * PHP version 7.2
+ * PHP version 8.0
+ *
+ * @link https://wiki.php.net/rfc/deprecations_php_7_2#assert_with_string_argument
+ * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L350-L354
+ * @link https://www.php.net/manual/en/function.assert.php#refsect1-function.assert-changelog
+ *
+ * @since 10.0.0
+ */
+class RemovedAssertStringAssertionSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'assert' => true,
+    ];
+
+    /**
+     * Target tokens.
+     *
+     * If there is anything but any of these tokens in the parameter, we bow out as undetermined.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    private $targetTokens = [];
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        // Set $targetTokens only once.
+        $this->targetTokens                   = Tokens::$emptyTokens;
+        $this->targetTokens                  += Tokens::$stringTokens + Tokens::$heredocTokens;
+        $this->targetTokens[\T_STRING_CONCAT] = \T_STRING_CONCAT;
+
+        return parent::register();
+    }
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('7.2') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        if (isset($parameters[1]) === false) {
+            return;
+        }
+
+        $targetParam = $parameters[1];
+        $hasOther    = $phpcsFile->findNext($this->targetTokens, $targetParam['start'], ($targetParam['end'] + 1), true);
+        if ($hasOther !== false) {
+            // Some other token was found, unclear whether this is really a text string. Bow out.
+            return;
+        }
+
+        $error   = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2%s. Found: %s';
+        $code    = 'Deprecated';
+        $isError = false;
+        $data    = [
+            '',
+            $targetParam['clean'],
+        ];
+
+        if ($this->supportsAbove('8.0') === true) {
+            $data[0] = ' and removed since PHP 8.0';
+            $isError = true;
+            $code    = 'Removed';
+        }
+
+        MessageHelper::addMessage($phpcsFile, $error, $targetParam['start'], $isError, $code, $data);
+    }
+}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php b/PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
new file mode 100644
index 00000000..32971c1c
--- /dev/null
+++ b/PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\ParameterValues;
+
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\PassedParameters;
+
+/**
+ * Detect: Passing `false` to `get_defined_functions()` is deprecated as of PHP 8.0.
+ *
+ * > Calling `get_defined_functions()` with `$exclude_disabled` explicitly set to `false`
+ * > is deprecated. `get_defined_functions()` will never include disabled functions.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L514-L516
+ *
+ * @since 10.0.0
+ */
+class RemovedGetDefinedFunctionsExcludeDisabledFalseSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'get_defined_functions' => true,
+    ];
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('8.0') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        $targetParam = PassedParameters::getParameterFromStack($parameters, 1, 'exclude_disabled');
+        if ($targetParam === false) {
+            return;
+        }
+
+        if ($targetParam['clean'] !== 'false') {
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.',
+            $targetParam['start'],
+            'Deprecated'
+        );
+    }
+}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php b/PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php
new file mode 100644
index 00000000..fc98b1fa
--- /dev/null
+++ b/PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\ParameterValues;
+
+use PHPCompatibility\AbstractFunctionCallParameterSniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\PassedParameters;
+
+/**
+ * Detect: Passing `false` to `spl_autoload_register()` is deprecated as of PHP 8.0.
+ *
+ * > spl_autoload_register() will now always throw a TypeError on invalid
+ * > arguments, therefore the second argument $throw is ignored and a
+ * > notice will be emitted if it is set to false.
+ *
+ * PHP version 8.0
+ *
+ * @link https://github.com/php/php-src/blob/c0172aa2bdb9ea223c8491bdb300995b93a857a0/UPGRADING#L393-L395
+ *
+ * @since 10.0.0
+ */
+class RemovedSplAutoloadRegisterThrowFalseSniff extends AbstractFunctionCallParameterSniff
+{
+
+    /**
+     * Functions to check for.
+     *
+     * @since 10.0.0
+     *
+     * @var array
+     */
+    protected $targetFunctions = [
+        'spl_autoload_register' => true,
+    ];
+
+    /**
+     * Do a version check to determine if this sniff needs to run at all.
+     *
+     * @since 10.0.0
+     *
+     * @return bool
+     */
+    protected function bowOutEarly()
+    {
+        return ($this->supportsAbove('8.0') === false);
+    }
+
+    /**
+     * Process the parameters of a matched function.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
+     * @param int                         $stackPtr     The position of the current token in the stack.
+     * @param string                      $functionName The token content (function name) which was matched.
+     * @param array                       $parameters   Array with information about the parameters.
+     *
+     * @return int|void Integer stack pointer to skip forward or void to continue
+     *                  normal file processing.
+     */
+    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
+    {
+        $targetParam = PassedParameters::getParameterFromStack($parameters, 2, 'throw');
+        if ($targetParam === false) {
+            return;
+        }
+
+        if ($targetParam['clean'] !== 'false') {
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.',
+            $targetParam['start'],
+            'Deprecated'
+        );
+    }
+}
diff --git a/PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php b/PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php
new file mode 100644
index 00000000..468ebed1
--- /dev/null
+++ b/PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2022 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Sniffs\TextStrings;
+
+use PHPCompatibility\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\GetTokensAsString;
+use PHPCSUtils\Utils\TextStrings;
+
+/**
+ * Detect use of select forms of variable embedding in heredocs and double strings as deprecated per PHP 8.2.
+ *
+ * > PHP allows embedding variables in strings with double-quotes (") and heredoc in various ways.
+ * > 1. Directly embedding variables (`$foo`)
+ * > 2. Braces outside the variable (`{$foo}`)
+ * > 3. Braces after the dollar sign (`${foo}`)
+ * > 4. Variable variables (`${expr}`, equivalent to `(string) ${expr}`)
+ * >
+ * > [...] to deprecate options 3 and 4 in PHP 8.2 and remove them in PHP 9.0.
+ *
+ * PHP version 8.2
+ * PHP version 9.0
+ *
+ * @link https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
+ *
+ * @since 10.0.0
+ */
+class RemovedDollarBraceStringEmbedsSniff extends Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @since 10.0.0
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [
+            \T_DOUBLE_QUOTED_STRING,
+            \T_START_HEREDOC,
+            \T_DOLLAR_OPEN_CURLY_BRACES,
+        ];
+    }
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @since 10.0.0
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void|int Void or a stack pointer to skip forward.
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($this->supportsAbove('8.2') === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        /*
+         * Defensive coding, this code is not expected to ever actually be hit since PHPCS#3604
+         * (included in 3.7.0), but _will_ be hit if a file containing a PHP 7.3 indented heredoc/nowdocs
+         * is scanned with PHPCS on PHP < 7.3. People shouldn't do that, but hey, we can't stop them.
+         */
+        if ($tokens[$stackPtr]['code'] === \T_DOLLAR_OPEN_CURLY_BRACES) {
+            // @codeCoverageIgnoreStart
+            if ($tokens[($stackPtr - 1)]['code'] === \T_DOUBLE_QUOTED_STRING) {
+                --$stackPtr;
+            } else {
+                // Throw an error anyway, though it won't be very informative.
+                $message = 'Using ${} in strings is deprecated since PHP 8.2, use {$var} or {${expr}} instead.';
+                $code    = 'DeprecatedDollarBraceEmbed';
+                $phpcsFile->addWarning($message, $stackPtr, $code);
+                return;
+            }
+            // @codeCoverageIgnoreEnd
+        }
+
+        $endOfString   = TextStrings::getEndOfCompleteTextString($phpcsFile, $stackPtr);
+        $startOfString = $stackPtr;
+        if ($tokens[$stackPtr]['code'] === \T_START_HEREDOC) {
+            $startOfString = ($stackPtr + 1);
+        }
+
+        $contents = GetTokensAsString::normal($phpcsFile, $startOfString, $endOfString);
+        if (\strpos($contents, '${') === false) {
+            // No interpolation found or only interpolations which are still supported.
+            return ($endOfString + 1);
+        }
+
+        $embeds = TextStrings::getEmbeds($contents);
+        foreach ($embeds as $offset => $embed) {
+            if (\strpos($embed, '${') !== 0) {
+                continue;
+            }
+
+            // Figure out the stack pointer to throw the warning on.
+            $errorPtr = $startOfString;
+            $length   = 0;
+            while (($length + $tokens[$errorPtr]['length']) < $offset) {
+                $length += $tokens[$errorPtr]['length'];
+                ++$errorPtr;
+            }
+
+            // Type 4.
+            $message = 'Using %s (variable variables) in strings is deprecated since PHP 8.2, use {${expr}} instead.';
+            $code    = 'DeprecatedExpressionSyntax';
+            if (\preg_match('`^\$\{(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)(?:\[([\'"])?[^\$\{\}\]]+(?:\2)?\])?\}$`', $embed) === 1) {
+                // Type 3.
+                $message = 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: %s';
+                $code    = 'DeprecatedVariableSyntax';
+            }
+
+            $phpcsFile->addWarning($message, $errorPtr, $code, [$embed]);
+
+        }
+
+        return ($endOfString + 1);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/PHPCompatibility/Tests/BaseSniffTest.php
similarity index 82%
rename from Magento2/Tests/PHPCompatibility/BaseSniffTest.php
rename to PHPCompatibility/Tests/BaseSniffTest.php
index 6c84e617..68c9d605 100644
--- a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
+++ b/PHPCompatibility/Tests/BaseSniffTest.php
@@ -8,11 +8,12 @@
  * @link      https://github.com/PHPCompatibility/PHPCompatibility
  */
 
-namespace Magento2\Tests\PHPCompatibility;
+namespace PHPCompatibility\Tests;
 
 use PHPUnit\Framework\TestCase;
 use PHP_CodeSniffer\Files\File;
 use PHPCSUtils\BackCompat\Helper;
+use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains;
 
 /**
  * Base sniff test class file.
@@ -27,10 +28,11 @@
  * @since 8.0.0  Compatible with PHP_CodeSniffer 3+.
  * @since 8.2.0  Allows for sniffs in multiple categories.
  * @since 9.0.0  Dropped support for PHP_CodeSniffer 1.x.
- * @since 10.0.0 Updated for preliminary support of PHP_CodeSniffer 4.
+ * @since 10.0.0 Updated for preliminary support of PHP_CodeSniffer 4 and dropped support for PHPCS 2.x.
  */
-abstract class BaseSniffTest extends TestCase
+class BaseSniffTest extends TestCase
 {
+    use AssertStringContains;
 
     /**
      * The name of the standard as registered with PHPCS.
@@ -39,18 +41,7 @@ abstract class BaseSniffTest extends TestCase
      *
      * @var string
      */
-    private const STANDARD_NAME = 'Magento2';
-
-    /**
-     * The PHP_CodeSniffer object used for testing.
-     *
-     * Used by PHPCS 2.x.
-     *
-     * @since 5.5
-     *
-     * @var \PHP_CodeSniffer
-     */
-    protected static $phpcs = null;
+    const STANDARD_NAME = 'PHPCompatibility';
 
     /**
      * An array of PHPCS results by filename and PHP version.
@@ -88,43 +79,13 @@ public static function resetSniffFiles()
         self::$sniffFiles = [];
     }
 
-    /**
-     * Sets up this unit test.
-     *
-     * @before
-     *
-     * @since 5.5
-     * @since 10.0.0 Renamed the method from `setUp()` to `setUpPHPCS()` and now using
-     *               the `@before` annotation to allow for PHPUnit cross-version compatibility.
-     *
-     * @return void
-     */
-    protected function setUpPHPCS()
-    {
-        if (\class_exists('\PHP_CodeSniffer') === true) {
-            /*
-             * PHPCS 2.x.
-             */
-            if (self::$phpcs === null) {
-                self::$phpcs = new \PHP_CodeSniffer();
-            }
-
-            self::$phpcs->cli->setCommandLineValues(['-pq', '--colors']);
-
-            // Restrict the sniffing of the test case files to the particular sniff being tested.
-            self::$phpcs->initStandard(self::STANDARD_NAME, [$this->getSniffCode()]);
-
-            self::$phpcs->setIgnorePatterns([]);
-        }
-    }
-
     /**
      * Reset the testVersion after each test.
      *
      * @after
      *
      * @since 5.5
-     * @since 10.0.0 Renamed the method from `tearDwon()` to `resetTestVersion()` and now using
+     * @since 10.0.0 Renamed the method from `tearDown()` to `resetTestVersion()` and now using
      *               the `@after` annotation to allow for PHPUnit cross-version compatibility.
      *
      * @return void
@@ -180,8 +141,9 @@ public function sniffFile($pathToFile, $targetPhpVersion = 'none')
             return self::$sniffFiles[$pathToFile][$targetPhpVersion];
         }
 
-        try {
-            if (\class_exists('\PHP_CodeSniffer\Files\LocalFile')) {
+        // Set up the Config and tokenize the test case file only once.
+        if (isset(self::$sniffFiles[$pathToFile]['only_parsed']) === false) {
+            try {
                 // PHPCS 3.x, 4.x.
                 $config            = new \PHP_CodeSniffer\Config();
                 $config->cache     = false;
@@ -189,28 +151,29 @@ public function sniffFile($pathToFile, $targetPhpVersion = 'none')
                 $config->sniffs    = [$this->getSniffCode()];
                 $config->ignored   = [];
 
-                if ($targetPhpVersion !== 'none') {
-                    Helper::setConfigData('testVersion', $targetPhpVersion, true, $config);
-                }
-
                 self::$lastConfig = $config;
 
                 $ruleset = new \PHP_CodeSniffer\Ruleset($config);
 
-                self::$sniffFiles[$pathToFile][$targetPhpVersion] = new \PHP_CodeSniffer\Files\LocalFile($pathToFile, $ruleset, $config);
-                self::$sniffFiles[$pathToFile][$targetPhpVersion]->process();
-            } else {
-                // PHPCS 2.x.
-                self::$lastConfig = null;
+                self::$sniffFiles[$pathToFile]['only_parsed'] = new \PHP_CodeSniffer\Files\LocalFile($pathToFile, $ruleset, $config);
+                self::$sniffFiles[$pathToFile]['only_parsed']->parse();
+            } catch (\Exception $e) {
+                $this->fail('An unexpected exception has been caught when parsing file "' . $pathToFile . '" : ' . $e->getMessage());
+                return false;
+            }
+        }
 
-                if ($targetPhpVersion !== 'none') {
-                    Helper::setConfigData('testVersion', $targetPhpVersion, true);
-                }
+        // Now process the file against the target testVersion setting and cache the results.
+        self::$sniffFiles[$pathToFile][$targetPhpVersion] = clone self::$sniffFiles[$pathToFile]['only_parsed'];
 
-                self::$sniffFiles[$pathToFile][$targetPhpVersion] = self::$phpcs->processFile($pathToFile);
-            }
+        if ($targetPhpVersion !== 'none') {
+            Helper::setConfigData('testVersion', $targetPhpVersion, true, self::$sniffFiles[$pathToFile][$targetPhpVersion]->config);
+        }
+
+        try {
+            self::$sniffFiles[$pathToFile][$targetPhpVersion]->process();
         } catch (\Exception $e) {
-            $this->fail('An unexpected exception has been caught when loading file "' . $pathToFile . '" : ' . $e->getMessage());
+            $this->fail('An unexpected exception has been caught when processing file "' . $pathToFile . '" : ' . $e->getMessage());
             return false;
         }
 
@@ -285,11 +248,6 @@ private function assertForType($issues, $type, $lineNumber, $expectedMessage)
 
         $msg = "Expected $type message '$expectedMessage' on line $lineNumber not found. Instead found: $insteadMessagesString.";
 
-        if (\method_exists($this, 'assertStringContainsString') === false) {
-            // PHPUnit < 7.
-            return $this->assertContains($expectedMessage, $insteadMessagesString, $msg);
-        }
-
         return $this->assertStringContainsString($expectedMessage, $insteadMessagesString, $msg);
     }
 
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc b/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc
new file mode 100644
index 00000000..b8acbecd
--- /dev/null
+++ b/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * OK cross version.
+ */
+class CrossVersionValid
+{
+    private final function __construct() {}
+    final public function publicFinal() {}
+    final protected static function protectedFinal() {}
+    private function privateNonOverloadable() {}
+}
+
+trait CrossVersionValidTrait
+{
+    final private function __CONSTRUCT() {}
+    final public static function publicFinal() {}
+    final protected function protectedFinal() {}
+    private function privateStillOverloadable() {} // Open question in RFC PR https://github.com/php/php-src/pull/5401
+}
+
+$anon = new class() {
+    final private function __Construct() {}
+    final public static function publicFinal();
+    final protected function protectedFinal();
+    private function privateNonOverloadable() {}
+};
+
+/*
+ * PHP 8.0: private methods cannot be final as they are never overridden by other classes.
+ */
+class CrossVersionInValid
+{
+    final private function privateFinal();
+    static private final function privateStaticFinal();
+}
+
+$anon = new class() {
+    final private function privateFinal();
+    static final private function privateStaticFinal();
+};
+
+trait CrossVersionInValidTrait
+{
+    final private function privateFinal();
+    static private final function privateStaticFinal();
+}
+
+// Global function cannot have final nor private keyword.
+static function globalFunction() {}
+
+// Interface cannot have private methods, nor final methods, but that's not the concern of this sniff.
+interface IllegalPrivate {
+    final private function privateToImplement();
+}
+
+// Safeguard handling of PHP 8.1+ enums.
+enum MyEnum {
+    final public static function publicFinal();
+    final private function privateFinal() {}
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc b/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc
similarity index 93%
rename from Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc
rename to PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc
index db453a1d..f0d583a8 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.inc
+++ b/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc
@@ -73,7 +73,7 @@ abstract class HasDestructAndExtends extends ClassWhichMayOrMayNotContainADestru
      * This should be easily skipped over.
      */
     abstract function something();
-
+    #[AttributeWhichCouldBeLong, ShouldBeSkippedOver( 10, self::CONST_VALUE)]
     public function __DeStruct() {
         // Destructor will not be called on exit() in constructor.
     }
@@ -122,3 +122,9 @@ class ExitNotInFunctionScope {
 
     public function __destruct() {}
 }
+
+function __construct() {}
+
+interface DoesntHaveCodeInFunctions {
+    public function __construct();
+}
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php b/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php
new file mode 100644
index 00000000..43d1bd0b
--- /dev/null
+++ b/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\FunctionDeclarations;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedCallingDestructAfterConstructorExit sniff.
+ *
+ * @group removedCallingDestructAfterConstructorExit
+ * @group functiondeclarations
+ *
+ * @covers \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedCallingDestructAfterConstructorExitSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedCallingDestructAfterConstructorExitUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that the sniff throws an error when an exit/die is encountered in a class constructor for PHP 8.0+.
+     *
+     * @dataProvider dataRemovedCallingDestructAfterConstructorExit
+     *
+     * @param int    $line    The line number where an error is expected.
+     * @param string $name    The name of the exit type used.
+     * @param bool   $isError Whether to expect an error or a warning. Defaults to true (= error).
+     *
+     * @return void
+     */
+    public function testRemovedCallingDestructAfterConstructorExit($line, $name, $isError = true)
+    {
+        $file  = $this->sniffFile(__FILE__, '8.0');
+        $error = "When $name() is called within an object constructor, the object destructor will no longer be called since PHP 8.0";
+
+        if ($isError === true) {
+            $this->assertError($file, $line, $error);
+        } else {
+            $this->assertWarning($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedCallingDestructAfterConstructorExit()
+     *
+     * @return array
+     */
+    public function dataRemovedCallingDestructAfterConstructorExit()
+    {
+        return [
+            [33, 'exit'],
+            [44, 'die', false],
+            [46, 'exit', false],
+            [69, 'die'],
+            [85, 'exit'],
+            [97, 'die', false],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $cases = [];
+        // No errors expected on the first 26 lines.
+        for ($line = 1; $line <= 26; $line++) {
+            $cases[] = [$line];
+        }
+
+        $cases[] = [56];
+        $cases[] = [61];
+        $cases[] = [66];
+
+        for ($line = 101; $line <= 130; $line++) {
+            $cases[] = [$line];
+        }
+
+        return $cases;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.inc b/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.inc
similarity index 100%
rename from Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.inc
rename to PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.inc
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php b/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php
new file mode 100644
index 00000000..af0e9063
--- /dev/null
+++ b/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\FunctionDeclarations;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedOptionalBeforeRequiredParam sniff.
+ *
+ * @group removedOptionalBeforeRequiredParam
+ * @group functiondeclarations
+ *
+ * @covers \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedOptionalBeforeRequiredParamSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedOptionalBeforeRequiredParamUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify that the sniff throws a warning for optional parameters before required.
+     *
+     * @dataProvider dataRemovedOptionalBeforeRequiredParam
+     *
+     * @param int $line The line number where a warning is expected.
+     *
+     * @return void
+     */
+    public function testRemovedOptionalBeforeRequiredParam($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Declaring a required parameter after an optional one is deprecated since PHP 8.0');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedOptionalBeforeRequiredParam()
+     *
+     * @return array
+     */
+    public function dataRemovedOptionalBeforeRequiredParam()
+    {
+        return [
+            [13], // Warning x 2.
+            [14],
+            [16],
+            [17],
+            [20],
+            [32],
+            [39],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $cases = [];
+        // No errors expected on the first 9 lines.
+        for ($line = 1; $line <= 9; $line++) {
+            $cases[] = [$line];
+        }
+
+        // Don't error on variadic parameters.
+        $cases[] = [23];
+        $cases[] = [24];
+        $cases[] = [26];
+
+        // Constructor property promotion - valid example.
+        $cases[] = [46];
+
+        // Add parse error test case.
+        $cases[] = [51];
+
+        return $cases;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc
similarity index 92%
rename from Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc
rename to PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc
index 31d6511c..1690d84c 100644
--- a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.inc
+++ b/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc
@@ -23,5 +23,6 @@ sem_get( $key, $max_acquire, $perm, 1 );
 sem_get( $key, $max_acquire, $perm, -1 );
 Sem_Get( $key, $max_acquire, $perm, 0 );
 sem_get( $key, $max_acquire, $perm, 1.0 );
-sem_get( $key, $max_acquire, $perm, 1 * 1);
+sem_get( $key, auto_release: 1 * 1);
 ob_implicit_flush(0);
+ob_implicit_flush(enable: 1);
diff --git a/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php b/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php
new file mode 100644
index 00000000..e8e0643f
--- /dev/null
+++ b/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\ParameterValues;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the ChangedIntToBoolParamType sniff.
+ *
+ * @group changedIntToBoolParamType
+ * @group parameterValues
+ *
+ * @covers \PHPCompatibility\Sniffs\ParameterValues\ChangedIntToBoolParamTypeSniff
+ *
+ * @since 10.0.0
+ */
+class ChangedIntToBoolParamTypeUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test that numeric values being passed as $auto_release to sem_get() throw an error.
+     *
+     * @dataProvider dataChangedIntToBoolParamType
+     *
+     * @param int    $line         Line number where the error should occur.
+     * @param string $since        The PHP version in which the change was made.
+     * @param string $paramName    The name of the parameter the error relates to.
+     * @param string $functionName The name of the function the error relates to.
+     *
+     * @return void
+     */
+    public function testChangedIntToBoolParamType($line, $since, $paramName, $functionName)
+    {
+        $file  = $this->sniffFile(__FILE__, $since);
+        $error = "The {$paramName} parameter of {$functionName}() expects a boolean value instead of an integer since PHP {$since}";
+
+        $this->assertError($file, $line, $error);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testChangedIntToBoolParamType)
+     *
+     * @return array
+     */
+    public function dataChangedIntToBoolParamType()
+    {
+        return [
+            [21, '8.0', '$auto_release', 'sem_get'],
+            [22, '8.0', '$auto_release', 'sem_get'],
+            [23, '8.0', '$auto_release', 'sem_get'],
+            [24, '8.0', '$auto_release', 'sem_get'],
+            [25, '8.0', '$auto_release', 'sem_get'],
+            [26, '8.0', '$auto_release', 'sem_get'],
+            [27, '8.0', '$enable', 'ob_implicit_flush'],
+            [28, '8.0', '$enable', 'ob_implicit_flush'],
+        ];
+    }
+
+
+    /**
+     * Verify no false positives are thrown for valid code.
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line Line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '99.0');
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        $data = [];
+
+        // No errors expected on the first 19 lines.
+        for ($line = 1; $line <= 19; $line++) {
+            $data[] = [$line];
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4'); // Version before first change.
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.inc
similarity index 100%
rename from Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.inc
rename to PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.inc
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php b/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php
new file mode 100644
index 00000000..fd6326e1
--- /dev/null
+++ b/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\ParameterValues;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedAssertStringAssertion sniff.
+ *
+ * @group removedAssertStringAssertion
+ * @group parameterValues
+ *
+ * @covers \PHPCompatibility\Sniffs\ParameterValues\RemovedAssertStringAssertionSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedAssertStringAssertionUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Test the sniff correctly detects assertions passed as strings.
+     *
+     * @dataProvider dataRemovedAssertStringAssertion
+     *
+     * @param int $line Line number where the warning should occur.
+     *
+     * @return void
+     */
+    public function testRemovedAssertStringAssertion($line)
+    {
+        $file  = $this->sniffFile(__FILE__, '7.2');
+        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2';
+        $this->assertWarning($file, $line, $error);
+
+        $file  = $this->sniffFile(__FILE__, '8.0');
+        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2 and removed since PHP 8.0';
+        $this->assertError($file, $line, $error);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedAssertStringAssertion()
+     *
+     * @return array
+     */
+    public function dataRemovedAssertStringAssertion()
+    {
+        return [
+            [18],
+            [19],
+            [20],
+            [25],
+        ];
+    }
+
+
+    /**
+     * Verify there are no false positives on code this sniff should ignore.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '7.2');
+
+        // No errors expected on the first 16 lines.
+        for ($line = 1; $line <= 16; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.1');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
similarity index 72%
rename from Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
rename to PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
index 40353bc7..257e89fd 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
+++ b/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
@@ -5,7 +5,7 @@
 
 // OK.
 get_defined_functions();
-get_defined_functions($exclude_disabled);
+get_defined_functions(exclude_disabled: $exclude_disabled);
 
 // Not OK.
 get_defined_functions(false);
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
new file mode 100644
index 00000000..4e738ed9
--- /dev/null
+++ b/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\ParameterValues;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedGetDefinedFunctionsExcludeDisabledFalse sniff.
+ *
+ * @group removedGetDefinedFunctionsExcludeDisabledFalse
+ * @group parameterValues
+ *
+ * @covers \PHPCompatibility\Sniffs\ParameterValues\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest extends BaseSniffTest
+{
+
+    /**
+     * testRemovedGetDefinedFunctionsExcludeDisabledFalse
+     *
+     * @dataProvider dataRemovedGetDefinedFunctionsExcludeDisabledFalse
+     *
+     * @param int $line Line number where the error should occur.
+     *
+     * @return void
+     */
+    public function testRemovedGetDefinedFunctionsExcludeDisabledFalse($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedGetDefinedFunctionsExcludeDisabledFalse()
+     *
+     * @return array
+     */
+    public function dataRemovedGetDefinedFunctionsExcludeDisabledFalse()
+    {
+        return [
+            [11],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+
+        // No errors expected on the first 9 lines.
+        for ($line = 1; $line <= 9; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
similarity index 68%
rename from Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
rename to PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
index 7e7f3e09..7703e396 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
+++ b/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
@@ -8,6 +8,8 @@ spl_autoload_register();
 spl_autoload_register($autoload_function);
 spl_autoload_register($autoload_function, true, false);
 spl_autoload_register($autoload_function, $throw, $prepend);
+spl_autoload_register(callback: $autoload_function, prepend: false);
 
 // Not OK.
 spl_autoload_register($autoload_function, false);
+spl_autoload_register(prepend: false, callback: $autoload_function, throw: false);
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
new file mode 100644
index 00000000..8bec42c5
--- /dev/null
+++ b/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\ParameterValues;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedSplAutoloadRegisterThrowFalse sniff.
+ *
+ * @group removedSplAutoloadRegisterThrowFalse
+ * @group parameterValues
+ *
+ * @covers \PHPCompatibility\Sniffs\ParameterValues\RemovedSplAutoloadRegisterThrowFalseSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedSplAutoloadRegisterThrowFalseUnitTest extends BaseSniffTest
+{
+
+    /**
+     * Verify a warning is thrown when an explicit false is passed as the second parameter.
+     *
+     * @dataProvider dataRemovedSplAutoloadRegisterThrowFalse
+     *
+     * @param int $line Line number where the error should occur.
+     *
+     * @return void
+     */
+    public function testRemovedSplAutoloadRegisterThrowFalse($line)
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.');
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedSplAutoloadRegisterThrowFalse()
+     *
+     * @return array
+     */
+    public function dataRemovedSplAutoloadRegisterThrowFalse()
+    {
+        return [
+            [14],
+            [15],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives()
+    {
+        $file = $this->sniffFile(__FILE__, '8.0');
+
+        // No errors expected on the first 12 lines.
+        for ($line = 1; $line <= 12; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '7.4');
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc
similarity index 97%
rename from Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
rename to PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc
index b3221a88..4ec71d18 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.1.inc
+++ b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc
@@ -56,7 +56,7 @@ echo "$\{foo} and $foo";
 // Type 3: Braces after the dollar sign.
 echo "${foo}";
 echo "${foo['bar']}";
-$text = "some text ${foo} some ${t}";
+$text = "some text ${foo} some ${text}";
 
 $heredoc = <<<EOD
 some text ${foo} some text
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.2.inc b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.2.inc
similarity index 100%
rename from Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.2.inc
rename to PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.2.inc
diff --git a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php
new file mode 100644
index 00000000..25d0c939
--- /dev/null
+++ b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2022 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\TextStrings;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedDollarBraceStringEmbeds sniff.
+ *
+ * @group removedDollarBraceStringEmbeds
+ * @group textstrings
+ *
+ * @covers \PHPCompatibility\Sniffs\TextStrings\RemovedDollarBraceStringEmbedsSniff
+ *
+ * @since 10.0.0
+ */
+class RemovedDollarBraceStringEmbedsUnitTest extends BaseSniffTest
+{
+
+    /**
+     * The name of the primary test case file.
+     *
+     * @var string
+     */
+    const TEST_FILE = 'RemovedDollarBraceStringEmbedsUnitTest.1.inc';
+
+    /**
+     * The name of a secondary test case file containing PHP 7.3+ indented heredocs.
+     *
+     * @var string
+     */
+    const TEST_FILE_PHP73HEREDOCS = 'RemovedDollarBraceStringEmbedsUnitTest.2.inc';
+
+    /**
+     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
+     * are correctly detected.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType3
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded variable found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType3($line, $found)
+    {
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
+        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType3()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType3()
+    {
+        return [
+            [57, '${foo}'],
+            [58, '${foo[\'bar\']}'],
+            [59, '${foo}'],
+            [59, '${text}'],
+            [62, '${foo}'],
+            [65, '${foo}'],
+        ];
+    }
+
+
+    /**
+     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
+     * (string) ${expr}) - are correctly detected.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType4
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded expression found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType4($line, $found)
+    {
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
+        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType4()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType4()
+    {
+        return [
+            [68, '${$bar}'],
+            [69, '${(foo)}'],
+            [70, '${foo->bar}'],
+            [71, '${$object->getMethod()}'],
+            [72, '${(foo)}'],
+            [73, '${substr(\'laruence\', 0, 2)}'],
+            [75, '${foo["${bar}"]}'],
+            [76, '${foo["${bar[\'baz\']}"]}'],
+            [77, '${foo->{$baz}}'],
+            [78, '${foo->{${\'a\'}}}'],
+            [79, '${foo->{"${\'a\'}"}}'],
+            [83, '${foo["${bar}"]}'],
+            [84, '${foo["${bar[\'baz\']}"]}'],
+            [85, '${foo->{${\'a\'}}}'],
+            [89, '${(foo)}'],
+        ];
+    }
+
+
+    /**
+     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
+     * are correctly detected in PHP 7.3+ indented heredocs.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded variable found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc($line, $found)
+    {
+        if (\PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
+        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
+    {
+        return [
+            [33, '${foo[\'bar\']}'],
+        ];
+    }
+
+
+    /**
+     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
+     * (string) ${expr}) - are correctly detected in PHP 7.3+ indented heredocs.
+     *
+     * @dataProvider dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc
+     *
+     * @param int    $line  The line number.
+     * @param string $found The embedded expression found.
+     *
+     * @return void
+     */
+    public function testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc($line, $found)
+    {
+        if (\PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
+        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
+     *
+     * @return array
+     */
+    public function dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
+    {
+        return [
+            [39, '${$object->getMethod()}'],
+            [40, '${foo["${bar[\'baz\']}"]}'],
+            [41, '${foo->{${\'a\'}}}'],
+        ];
+    }
+
+
+    /**
+     * Verify the sniff does not throw false positives for valid code.
+     *
+     * @dataProvider dataTestFiles
+     *
+     * @param string $testFile File name for the test case file to use.
+     * @param int    $lines    Number of lines at the top of the file for which we don't expect errors.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($testFile, $lines)
+    {
+        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.2');
+
+        // No errors expected on the first # lines.
+        for ($line = 1; $line <= $lines; $line++) {
+            $this->assertNoViolation($file, $line);
+        }
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @dataProvider dataTestFiles
+     *
+     * @param string $testFile File name for the test case file to use.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion($testFile)
+    {
+        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
+            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
+        }
+
+        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.1');
+        $this->assertNoViolation($file);
+    }
+
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function dataTestFiles()
+    {
+        return [
+            [self::TEST_FILE, 51],
+            [self::TEST_FILE_PHP73HEREDOCS, 26],
+        ];
+    }
+}
diff --git a/composer.json b/composer.json
index 6b46479f..c5d67202 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
         "phpcsstandards/phpcsutils": "~1.0.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.8"
+        "phpunit/phpunit": "^9.5.8",
+        "yoast/phpunit-polyfills": "^1.0"
     },
     "autoload-dev": {
         "files": [
@@ -28,7 +29,8 @@
     },
     "autoload": {
         "classmap": [
-            "PHP_CodeSniffer/Tokenizers/"
+            "PHP_CodeSniffer/Tokenizers/",
+            "PHPCompatibility/"
         ],
         "psr-4": {
             "Magento2\\": "Magento2/",
diff --git a/composer.lock b/composer.lock
index f276bf23..56d67192 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e29ee133b6cf81aa67686db10288783b",
+    "content-hash": "9ddd67b442b71fc7f10119eac7e40140",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2309,6 +2309,66 @@
                 }
             ],
             "time": "2021-07-28T10:34:58+00:00"
+        },
+        {
+            "name": "yoast/phpunit-polyfills",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
+                "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/3b59adeef77fb1c03ff5381dbb9d68b0aaff3171",
+                "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "require-dev": {
+                "yoast/yoastcs": "^2.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "phpunitpolyfills-autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Team Yoast",
+                    "email": "support@yoast.com",
+                    "homepage": "https://yoast.com"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/Yoast/PHPUnit-Polyfills/graphs/contributors"
+                }
+            ],
+            "description": "Set of polyfills for changed PHPUnit functionality to allow for creating PHPUnit cross-version compatible tests",
+            "homepage": "https://github.com/Yoast/PHPUnit-Polyfills",
+            "keywords": [
+                "phpunit",
+                "polyfill",
+                "testing"
+            ],
+            "support": {
+                "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
+                "source": "https://github.com/Yoast/PHPUnit-Polyfills"
+            },
+            "time": "2023-03-30T23:39:05+00:00"
         }
     ],
     "aliases": [],

From 6e5c5a72fa556271eafdd4caa09325a2aa811525 Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Fri, 12 May 2023 14:00:58 -0500
Subject: [PATCH 558/630] ACP2E-1946: Move PHPCompatibility/PHPCompatibility
 sniffs into separate namespace

---
 Magento2/Helpers/Assert.php                   |   53 +
 ...atedEncodingsForMBStringFunctionsSniff.php |   59 +-
 .../RemovedFunctionsSniff.php                 | 3915 +++++++++++++++++
 .../RemovedFunctionsUnitTest.82.inc           |    4 +
 .../RemovedFunctionsUnitTest.php              |   61 +
 Magento2/ruleset.xml                          |    4 +-
 .../FunctionUse/RemovedFunctionsUnitTest.inc  | 1232 ++++++
 .../FunctionUse/RemovedFunctionsUnitTest.php  | 1553 +++++++
 composer.json                                 |    6 +-
 9 files changed, 6837 insertions(+), 50 deletions(-)
 create mode 100644 Magento2/Helpers/Assert.php
 create mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
 create mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
 create mode 100644 PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc
 create mode 100644 PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php

diff --git a/Magento2/Helpers/Assert.php b/Magento2/Helpers/Assert.php
new file mode 100644
index 00000000..a29ebdb2
--- /dev/null
+++ b/Magento2/Helpers/Assert.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+
+/**
+ * phpcs:disable Magento2.Functions.StaticFunction.StaticFunction
+ */
+class Assert
+{
+    /**
+     * Checks whether the function call is a built-in function call.
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return bool
+     */
+    public static function isBuiltinFunctionCall(File $phpcsFile, int $stackPtr): bool
+    {
+        $tokens = $phpcsFile->getTokens();
+        $nextPtr = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($nextPtr === false
+            || $tokens[$nextPtr]['code'] !== \T_OPEN_PARENTHESIS
+            || isset($tokens[$nextPtr]['parenthesis_owner'])
+        ) {
+            return false;
+        }
+
+        $prevPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $ignorePrevToken = [\T_NEW => true] + Collections::objectOperators();
+        if (isset($ignorePrevToken[$tokens[$prevPtr]['code']])) {
+            return false;
+        }
+
+        if ($tokens[$prevPtr]['code'] === \T_NS_SEPARATOR) {
+            $prevPrevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevPtr - 1), null, true);
+            if ($tokens[$prevPrevToken]['code'] === \T_STRING || $tokens[$prevPrevToken]['code'] === \T_NAMESPACE
+            ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
index 7889d01a..a2c1dc38 100644
--- a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
+++ b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
@@ -6,6 +6,7 @@
 
 namespace Magento2\Sniffs\PHPCompatibility;
 
+use Magento2\Helpers\Assert;
 use PHP_CodeSniffer\Files\File;
 use PHPCompatibility\Sniff;
 use PHP_CodeSniffer_Tokens as Tokens;
@@ -19,40 +20,12 @@
  */
 class DeprecatedEncodingsForMBStringFunctionsSniff extends Sniff
 {
-    /**
-     * List of tokens which when they precede the $stackPtr indicate that this
-     * is not a function call.
-     *
-     * @var array
-     */
-    private $ignoreTokens = [
-        \T_DOUBLE_COLON => true,
-        \T_OBJECT_OPERATOR => true,
-        \T_FUNCTION => true,
-        \T_NEW => true,
-        \T_CONST => true,
-        \T_USE => true,
-    ];
-
-    /**
-     * Text string tokens to examine.
-     *
-     * @var array
-     */
-    private $textStringTokens = [
-        \T_CONSTANT_ENCAPSED_STRING => true,
-        \T_DOUBLE_QUOTED_STRING => true,
-        \T_INLINE_HTML => true,
-        \T_HEREDOC => true,
-        \T_NOWDOC => true,
-    ];
-
     /**
      * A list of MBString functions that emits deprecation notice
      *
      * @var \int[][]
      */
-    protected $targetFunctions = [
+    private $targetFunctions = [
         'mb_check_encoding' => [2],
         'mb_chr' => [2],
         'mb_convert_case' => [3],
@@ -124,21 +97,7 @@ public function process(File $phpcsFile, $stackPtr)
         $function = $tokens[$stackPtr]['content'];
         $functionLc = strtolower($function);
 
-        if (strpos($functionLc, 'mb_') !== 0) {
-            return;
-        }
-
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-
-        if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
-            // Not a call to a PHP function.
-            return;
-        }
-
-        if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR
-            && $tokens[$prevNonEmpty - 1]['code'] === \T_STRING
-        ) {
-            // Namespaced function.
+        if (!isset($this->targetFunctions[$functionLc]) || !Assert::isBuiltinFunctionCall($phpcsFile, $stackPtr)) {
             return;
         }
 
@@ -161,7 +120,7 @@ public function process(File $phpcsFile, $stackPtr)
     public function processParameter(File $phpcsFile, string $function, int $index, array $parameter)
     {
         $functionLc = strtolower($function);
-        if (!isset($this->targetFunctions[$functionLc]) || !in_array($index, $this->targetFunctions[$functionLc])) {
+        if (!in_array($index, $this->targetFunctions[$functionLc])) {
             return;
         }
 
@@ -175,6 +134,14 @@ public function processParameter(File $phpcsFile, string $function, int $index,
             $items = [$parameter];
         }
 
+        $textStringTokens = [
+            \T_CONSTANT_ENCAPSED_STRING => true,
+            \T_DOUBLE_QUOTED_STRING => true,
+            \T_INLINE_HTML => true,
+            \T_HEREDOC => true,
+            \T_NOWDOC => true,
+        ];
+
         foreach ($items as $item) {
             for ($i = $item['start']; $i <= $item['end']; $i++) {
                 if ($tokens[$i]['code'] === \T_STRING
@@ -184,7 +151,7 @@ public function processParameter(File $phpcsFile, string $function, int $index,
                     break;
                 }
 
-                if (isset($this->textStringTokens[$tokens[$i]['code']]) === true) {
+                if (isset($textStringTokens[$tokens[$i]['code']]) === true) {
                     $encoding = $this->stripQuotes(strtolower(trim($tokens[$i]['content'])));
                     $encodings = array_flip(explode(',', $encoding));
                     if (count(array_intersect_key($encodings, $this->messages)) > 0) {
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
new file mode 100644
index 00000000..6a7a6f78
--- /dev/null
+++ b/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
@@ -0,0 +1,3915 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\PHPCompatibility;
+
+use Magento2\Helpers\Assert;
+use PHP_CodeSniffer_File as File;
+
+/**
+ * @inheritdoc
+ */
+class RemovedFunctionsSniff extends \PHPCompatibility\Sniffs\FunctionUse\RemovedFunctionsSniff
+{
+    /**
+     * {@inheritdoc}
+     * @var array
+     */
+    protected $removedFunctions = [
+        'crack_check' => [
+            '5.0'       => true,
+        ],
+        'crack_closedict' => [
+            '5.0'       => true,
+        ],
+        'crack_getlastmessage' => [
+            '5.0'       => true,
+        ],
+        'crack_opendict' => [
+            '5.0'       => true,
+        ],
+
+        'php_check_syntax' => [
+            '5.0.5' => true,
+        ],
+
+        'pfpro_cleanup' => [
+            '5.1'       => true,
+        ],
+        'pfpro_init' => [
+            '5.1'       => true,
+        ],
+        'pfpro_process_raw' => [
+            '5.1'       => true,
+        ],
+        'pfpro_process' => [
+            '5.1'       => true,
+        ],
+        'pfpro_version' => [
+            '5.1'       => true,
+        ],
+        'm_checkstatus' => [
+            '5.1'       => true,
+        ],
+        'm_completeauthorizations' => [
+            '5.1'       => true,
+        ],
+        'm_connect' => [
+            '5.1'       => true,
+        ],
+        'm_connectionerror' => [
+            '5.1'       => true,
+        ],
+        'm_deletetrans' => [
+            '5.1'       => true,
+        ],
+        'm_destroyconn' => [
+            '5.1'       => true,
+        ],
+        'm_destroyengine' => [
+            '5.1'       => true,
+        ],
+        'm_getcell' => [
+            '5.1'       => true,
+        ],
+        'm_getcellbynum' => [
+            '5.1'       => true,
+        ],
+        'm_getcommadelimited' => [
+            '5.1'       => true,
+        ],
+        'm_getheader' => [
+            '5.1'       => true,
+        ],
+        'm_initconn' => [
+            '5.1'       => true,
+        ],
+        'm_initengine' => [
+            '5.1'       => true,
+        ],
+        'm_iscommadelimited' => [
+            '5.1'       => true,
+        ],
+        'm_maxconntimeout' => [
+            '5.1'       => true,
+        ],
+        'm_monitor' => [
+            '5.1'       => true,
+        ],
+        'm_numcolumns' => [
+            '5.1'       => true,
+        ],
+        'm_numrows' => [
+            '5.1'       => true,
+        ],
+        'm_parsecommadelimited' => [
+            '5.1'       => true,
+        ],
+        'm_responsekeys' => [
+            '5.1'       => true,
+        ],
+        'm_responseparam' => [
+            '5.1'       => true,
+        ],
+        'm_returnstatus' => [
+            '5.1'       => true,
+        ],
+        'm_setblocking' => [
+            '5.1'       => true,
+        ],
+        'm_setdropfile' => [
+            '5.1'       => true,
+        ],
+        'm_setip' => [
+            '5.1'       => true,
+        ],
+        'm_setssl_cafile' => [
+            '5.1'       => true,
+        ],
+        'm_setssl_files' => [
+            '5.1'       => true,
+        ],
+        'm_setssl' => [
+            '5.1'       => true,
+        ],
+        'm_settimeout' => [
+            '5.1'       => true,
+        ],
+        'm_sslcert_gen_hash' => [
+            '5.1'       => true,
+        ],
+        'm_transactionssent' => [
+            '5.1'       => true,
+        ],
+        'm_transinqueue' => [
+            '5.1'       => true,
+        ],
+        'm_transkeyval' => [
+            '5.1'       => true,
+        ],
+        'm_transnew' => [
+            '5.1'       => true,
+        ],
+        'm_transsend' => [
+            '5.1'       => true,
+        ],
+        'm_uwait' => [
+            '5.1'       => true,
+        ],
+        'm_validateidentifier' => [
+            '5.1'       => true,
+        ],
+        'm_verifyconnection' => [
+            '5.1'       => true,
+        ],
+        'm_verifysslcert' => [
+            '5.1'       => true,
+        ],
+        'dio_close' => [
+            '5.1'       => true,
+        ],
+        'dio_fcntl' => [
+            '5.1'       => true,
+        ],
+        'dio_open' => [
+            '5.1'       => true,
+        ],
+        'dio_read' => [
+            '5.1'       => true,
+        ],
+        'dio_seek' => [
+            '5.1'       => true,
+        ],
+        'dio_stat' => [
+            '5.1'       => true,
+        ],
+        'dio_tcsetattr' => [
+            '5.1'       => true,
+        ],
+        'dio_truncate' => [
+            '5.1'       => true,
+        ],
+        'dio_write' => [
+            '5.1'       => true,
+        ],
+        'fam_cancel_monitor' => [
+            '5.1'       => true,
+        ],
+        'fam_close' => [
+            '5.1'       => true,
+        ],
+        'fam_monitor_collection' => [
+            '5.1'       => true,
+        ],
+        'fam_monitor_directory' => [
+            '5.1'       => true,
+        ],
+        'fam_monitor_file' => [
+            '5.1'       => true,
+        ],
+        'fam_next_event' => [
+            '5.1'       => true,
+        ],
+        'fam_open' => [
+            '5.1'       => true,
+        ],
+        'fam_pending' => [
+            '5.1'       => true,
+        ],
+        'fam_resume_monitor' => [
+            '5.1'       => true,
+        ],
+        'fam_suspend_monitor' => [
+            '5.1'       => true,
+        ],
+        'yp_all' => [
+            '5.1'       => true,
+        ],
+        'yp_cat' => [
+            '5.1'       => true,
+        ],
+        'yp_err_string' => [
+            '5.1'       => true,
+        ],
+        'yp_errno' => [
+            '5.1'       => true,
+        ],
+        'yp_first' => [
+            '5.1'       => true,
+        ],
+        'yp_get_default_domain' => [
+            '5.1'       => true,
+        ],
+        'yp_master' => [
+            '5.1'       => true,
+        ],
+        'yp_match' => [
+            '5.1'       => true,
+        ],
+        'yp_next' => [
+            '5.1'       => true,
+        ],
+        'yp_order' => [
+            '5.1'       => true,
+        ],
+        'udm_add_search_limit' => [
+            '5.1'       => true,
+        ],
+        'udm_alloc_agent_array' => [
+            '5.1'       => true,
+        ],
+        'udm_alloc_agent' => [
+            '5.1'       => true,
+        ],
+        'udm_api_version' => [
+            '5.1'       => true,
+        ],
+        'udm_cat_list' => [
+            '5.1'       => true,
+        ],
+        'udm_cat_path' => [
+            '5.1'       => true,
+        ],
+        'udm_check_charset' => [
+            '5.1'       => true,
+        ],
+        'udm_clear_search_limits' => [
+            '5.1'       => true,
+        ],
+        'udm_crc32' => [
+            '5.1'       => true,
+        ],
+        'udm_errno' => [
+            '5.1'       => true,
+        ],
+        'udm_error' => [
+            '5.1'       => true,
+        ],
+        'udm_find' => [
+            '5.1'       => true,
+        ],
+        'udm_free_agent' => [
+            '5.1'       => true,
+        ],
+        'udm_free_ispell_data' => [
+            '5.1'       => true,
+        ],
+        'udm_free_res' => [
+            '5.1'       => true,
+        ],
+        'udm_get_doc_count' => [
+            '5.1'       => true,
+        ],
+        'udm_get_res_field' => [
+            '5.1'       => true,
+        ],
+        'udm_get_res_param' => [
+            '5.1'       => true,
+        ],
+        'udm_hash32' => [
+            '5.1'       => true,
+        ],
+        'udm_load_ispell_data' => [
+            '5.1'       => true,
+        ],
+        'udm_set_agent_param' => [
+            '5.1'       => true,
+        ],
+        'w32api_deftype' => [
+            '5.1'       => true,
+        ],
+        'w32api_init_dtype' => [
+            '5.1'       => true,
+        ],
+        'w32api_invoke_function' => [
+            '5.1'       => true,
+        ],
+        'w32api_register_function' => [
+            '5.1'       => true,
+        ],
+        'w32api_set_call_method' => [
+            '5.1'       => true,
+        ],
+        'cpdf_add_annotation' => [
+            '5.1'       => true,
+        ],
+        'cpdf_add_outline' => [
+            '5.1'       => true,
+        ],
+        'cpdf_arc' => [
+            '5.1'       => true,
+        ],
+        'cpdf_begin_text' => [
+            '5.1'       => true,
+        ],
+        'cpdf_circle' => [
+            '5.1'       => true,
+        ],
+        'cpdf_clip' => [
+            '5.1'       => true,
+        ],
+        'cpdf_close' => [
+            '5.1'       => true,
+        ],
+        'cpdf_closepath_fill_stroke' => [
+            '5.1'       => true,
+        ],
+        'cpdf_closepath_stroke' => [
+            '5.1'       => true,
+        ],
+        'cpdf_closepath' => [
+            '5.1'       => true,
+        ],
+        'cpdf_continue_text' => [
+            '5.1'       => true,
+        ],
+        'cpdf_curveto' => [
+            '5.1'       => true,
+        ],
+        'cpdf_end_text' => [
+            '5.1'       => true,
+        ],
+        'cpdf_fill_stroke' => [
+            '5.1'       => true,
+        ],
+        'cpdf_fill' => [
+            '5.1'       => true,
+        ],
+        'cpdf_finalize_page' => [
+            '5.1'       => true,
+        ],
+        'cpdf_finalize' => [
+            '5.1'       => true,
+        ],
+        'cpdf_global_set_document_limits' => [
+            '5.1'       => true,
+        ],
+        'cpdf_import_jpeg' => [
+            '5.1'       => true,
+        ],
+        'cpdf_lineto' => [
+            '5.1'       => true,
+        ],
+        'cpdf_moveto' => [
+            '5.1'       => true,
+        ],
+        'cpdf_newpath' => [
+            '5.1'       => true,
+        ],
+        'cpdf_open' => [
+            '5.1'       => true,
+        ],
+        'cpdf_output_buffer' => [
+            '5.1'       => true,
+        ],
+        'cpdf_page_init' => [
+            '5.1'       => true,
+        ],
+        'cpdf_place_inline_image' => [
+            '5.1'       => true,
+        ],
+        'cpdf_rect' => [
+            '5.1'       => true,
+        ],
+        'cpdf_restore' => [
+            '5.1'       => true,
+        ],
+        'cpdf_rlineto' => [
+            '5.1'       => true,
+        ],
+        'cpdf_rmoveto' => [
+            '5.1'       => true,
+        ],
+        'cpdf_rotate_text' => [
+            '5.1'       => true,
+        ],
+        'cpdf_rotate' => [
+            '5.1'       => true,
+        ],
+        'cpdf_save_to_file' => [
+            '5.1'       => true,
+        ],
+        'cpdf_save' => [
+            '5.1'       => true,
+        ],
+        'cpdf_scale' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_action_url' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_char_spacing' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_creator' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_current_page' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_font_directories' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_font_map_file' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_font' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_horiz_scaling' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_keywords' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_leading' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_page_animation' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_subject' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_text_matrix' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_text_pos' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_text_rendering' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_text_rise' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_title' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_viewer_preferences' => [
+            '5.1'       => true,
+        ],
+        'cpdf_set_word_spacing' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setdash' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setflat' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setgray_fill' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setgray_stroke' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setgray' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setlinecap' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setlinejoin' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setlinewidth' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setmiterlimit' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setrgbcolor_fill' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setrgbcolor_stroke' => [
+            '5.1'       => true,
+        ],
+        'cpdf_setrgbcolor' => [
+            '5.1'       => true,
+        ],
+        'cpdf_show_xy' => [
+            '5.1'       => true,
+        ],
+        'cpdf_show' => [
+            '5.1'       => true,
+        ],
+        'cpdf_stringwidth' => [
+            '5.1'       => true,
+        ],
+        'cpdf_stroke' => [
+            '5.1'       => true,
+        ],
+        'cpdf_text' => [
+            '5.1'       => true,
+        ],
+        'cpdf_translate' => [
+            '5.1'       => true,
+        ],
+        'ircg_channel_mode' => [
+            '5.1'       => true,
+        ],
+        'ircg_disconnect' => [
+            '5.1'       => true,
+        ],
+        'ircg_eval_ecmascript_params' => [
+            '5.1'       => true,
+        ],
+        'ircg_fetch_error_msg' => [
+            '5.1'       => true,
+        ],
+        'ircg_get_username' => [
+            '5.1'       => true,
+        ],
+        'ircg_html_encode' => [
+            '5.1'       => true,
+        ],
+        'ircg_ignore_add' => [
+            '5.1'       => true,
+        ],
+        'ircg_ignore_del' => [
+            '5.1'       => true,
+        ],
+        'ircg_invite' => [
+            '5.1'       => true,
+        ],
+        'ircg_is_conn_alive' => [
+            '5.1'       => true,
+        ],
+        'ircg_join' => [
+            '5.1'       => true,
+        ],
+        'ircg_kick' => [
+            '5.1'       => true,
+        ],
+        'ircg_list' => [
+            '5.1'       => true,
+        ],
+        'ircg_lookup_format_messages' => [
+            '5.1'       => true,
+        ],
+        'ircg_lusers' => [
+            '5.1'       => true,
+        ],
+        'ircg_msg' => [
+            '5.1'       => true,
+        ],
+        'ircg_names' => [
+            '5.1'       => true,
+        ],
+        'ircg_nick' => [
+            '5.1'       => true,
+        ],
+        'ircg_nickname_escape' => [
+            '5.1'       => true,
+        ],
+        'ircg_nickname_unescape' => [
+            '5.1'       => true,
+        ],
+        'ircg_notice' => [
+            '5.1'       => true,
+        ],
+        'ircg_oper' => [
+            '5.1'       => true,
+        ],
+        'ircg_part' => [
+            '5.1'       => true,
+        ],
+        'ircg_pconnect' => [
+            '5.1'       => true,
+        ],
+        'ircg_register_format_messages' => [
+            '5.1'       => true,
+        ],
+        'ircg_set_current' => [
+            '5.1'       => true,
+        ],
+        'ircg_set_file' => [
+            '5.1'       => true,
+        ],
+        'ircg_set_on_die' => [
+            '5.1'       => true,
+        ],
+        'ircg_topic' => [
+            '5.1'       => true,
+        ],
+        'ircg_who' => [
+            '5.1'       => true,
+        ],
+        'ircg_whois' => [
+            '5.1'       => true,
+        ],
+        'dbx_close' => [
+            '5.1'       => true,
+        ],
+        'dbx_compare' => [
+            '5.1'       => true,
+        ],
+        'dbx_connect' => [
+            '5.1'       => true,
+        ],
+        'dbx_error' => [
+            '5.1'       => true,
+        ],
+        'dbx_escape_string' => [
+            '5.1'       => true,
+        ],
+        'dbx_fetch_row' => [
+            '5.1'       => true,
+        ],
+        'dbx_query' => [
+            '5.1'       => true,
+        ],
+        'dbx_sort' => [
+            '5.1'       => true,
+        ],
+        'ingres_autocommit' => [
+            '5.1'       => true,
+        ],
+        'ingres_close' => [
+            '5.1'       => true,
+        ],
+        'ingres_commit' => [
+            '5.1'       => true,
+        ],
+        'ingres_connect' => [
+            '5.1'       => true,
+        ],
+        'ingres_fetch_array' => [
+            '5.1'       => true,
+        ],
+        'ingres_fetch_object' => [
+            '5.1'       => true,
+        ],
+        'ingres_fetch_row' => [
+            '5.1'       => true,
+        ],
+        'ingres_field_length' => [
+            '5.1'       => true,
+        ],
+        'ingres_field_name' => [
+            '5.1'       => true,
+        ],
+        'ingres_field_nullable' => [
+            '5.1'       => true,
+        ],
+        'ingres_field_precision' => [
+            '5.1'       => true,
+        ],
+        'ingres_field_scale' => [
+            '5.1'       => true,
+        ],
+        'ingres_field_type' => [
+            '5.1'       => true,
+        ],
+        'ingres_num_fields' => [
+            '5.1'       => true,
+        ],
+        'ingres_num_rows' => [
+            '5.1'       => true,
+        ],
+        'ingres_pconnect' => [
+            '5.1'       => true,
+        ],
+        'ingres_query' => [
+            '5.1'       => true,
+        ],
+        'ingres_rollback' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_close' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_commit' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_connect' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_cursor' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_exec' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_execute' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_fetch_into' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_fetch_row' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_field_len' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_field_name' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_field_num' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_field_type' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_free_result' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_longreadlen' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_num_fields' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_num_rows' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_prepare' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_result_all' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_result' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_rollback' => [
+            '5.1'       => true,
+        ],
+        'ovrimos_close_all' => [
+            '5.1'       => true,
+        ],
+        'ora_bind' => [
+            '5.1'       => true,
+        ],
+        'ora_close' => [
+            '5.1'       => true,
+        ],
+        'ora_columnname' => [
+            '5.1'       => true,
+        ],
+        'ora_columnsize' => [
+            '5.1'       => true,
+        ],
+        'ora_columntype' => [
+            '5.1'       => true,
+        ],
+        'ora_commit' => [
+            '5.1'       => true,
+        ],
+        'ora_commitoff' => [
+            '5.1'       => true,
+        ],
+        'ora_commiton' => [
+            '5.1'       => true,
+        ],
+        'ora_do' => [
+            '5.1'       => true,
+        ],
+        'ora_error' => [
+            '5.1'       => true,
+        ],
+        'ora_errorcode' => [
+            '5.1'       => true,
+        ],
+        'ora_exec' => [
+            '5.1'       => true,
+        ],
+        'ora_fetch_into' => [
+            '5.1'       => true,
+        ],
+        'ora_fetch' => [
+            '5.1'       => true,
+        ],
+        'ora_getcolumn' => [
+            '5.1'       => true,
+        ],
+        'ora_logoff' => [
+            '5.1'       => true,
+        ],
+        'ora_logon' => [
+            '5.1'       => true,
+        ],
+        'ora_numcols' => [
+            '5.1'       => true,
+        ],
+        'ora_numrows' => [
+            '5.1'       => true,
+        ],
+        'ora_open' => [
+            '5.1'       => true,
+        ],
+        'ora_parse' => [
+            '5.1'       => true,
+        ],
+        'ora_plogon' => [
+            '5.1'       => true,
+        ],
+        'ora_rollback' => [
+            '5.1'       => true,
+        ],
+        'mysqli_embedded_connect' => [
+            '5.1' => true,
+        ],
+        'mysqli_server_end' => [
+            '5.1' => true,
+        ],
+        'mysqli_server_init' => [
+            '5.1' => true,
+        ],
+
+        'msession_connect' => [
+            '5.1.3'     => true,
+        ],
+        'msession_count' => [
+            '5.1.3'     => true,
+        ],
+        'msession_create' => [
+            '5.1.3'     => true,
+        ],
+        'msession_destroy' => [
+            '5.1.3'     => true,
+        ],
+        'msession_disconnect' => [
+            '5.1.3'     => true,
+        ],
+        'msession_find' => [
+            '5.1.3'     => true,
+        ],
+        'msession_get_array' => [
+            '5.1.3'     => true,
+        ],
+        'msession_get_data' => [
+            '5.1.3'     => true,
+        ],
+        'msession_get' => [
+            '5.1.3'     => true,
+        ],
+        'msession_inc' => [
+            '5.1.3'     => true,
+        ],
+        'msession_list' => [
+            '5.1.3'     => true,
+        ],
+        'msession_listvar' => [
+            '5.1.3'     => true,
+        ],
+        'msession_lock' => [
+            '5.1.3'     => true,
+        ],
+        'msession_plugin' => [
+            '5.1.3'     => true,
+        ],
+        'msession_randstr' => [
+            '5.1.3'     => true,
+        ],
+        'msession_set_array' => [
+            '5.1.3'     => true,
+        ],
+        'msession_set_data' => [
+            '5.1.3'     => true,
+        ],
+        'msession_set' => [
+            '5.1.3'     => true,
+        ],
+        'msession_timeout' => [
+            '5.1.3'     => true,
+        ],
+        'msession_uniq' => [
+            '5.1.3'     => true,
+        ],
+        'msession_unlock' => [
+            '5.1.3'     => true,
+        ],
+
+        'mysqli_resource' => [
+            '5.1.4' => true,
+        ],
+
+        'mysql_createdb' => [
+            '5.1.7'     => true,
+        ],
+        'mysql_dropdb' => [
+            '5.1.7'     => true,
+        ],
+        'mysql_listtables' => [
+            '5.1.7'     => true,
+        ],
+
+        'hwapi_attribute_new' => [
+            '5.2'       => true,
+        ],
+        'hwapi_content_new' => [
+            '5.2'       => true,
+        ],
+        'hwapi_hgcsp' => [
+            '5.2'       => true,
+        ],
+        'hwapi_object_new' => [
+            '5.2'       => true,
+        ],
+        'filepro_fieldcount' => [
+            '5.2'       => true,
+        ],
+        'filepro_fieldname' => [
+            '5.2'       => true,
+        ],
+        'filepro_fieldtype' => [
+            '5.2'       => true,
+        ],
+        'filepro_fieldwidth' => [
+            '5.2'       => true,
+        ],
+        'filepro_retrieve' => [
+            '5.2'       => true,
+        ],
+        'filepro_rowcount' => [
+            '5.2'       => true,
+        ],
+        'filepro' => [
+            '5.2'       => true,
+        ],
+
+        'ifx_affected_rows' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_blobinfile_mode' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_byteasvarchar' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_close' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_connect' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_copy_blob' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_create_blob' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_create_char' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_do' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_error' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_errormsg' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_fetch_row' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_fieldproperties' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_fieldtypes' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_free_blob' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_free_char' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_free_result' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_get_blob' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_get_char' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_getsqlca' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_htmltbl_result' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_nullformat' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_num_fields' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_num_rows' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_pconnect' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_prepare' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_query' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_textasvarchar' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_update_blob' => [
+            '5.2.1'     => true,
+        ],
+        'ifx_update_char' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_close_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_create_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_free_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_open_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_read_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_seek_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_tell_slob' => [
+            '5.2.1'     => true,
+        ],
+        'ifxus_write_slob' => [
+            '5.2.1'     => true,
+        ],
+
+        'ncurses_addch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_addchnstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_addchstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_addnstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_addstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_assume_default_colors' => [
+            '5.3'       => true,
+        ],
+        'ncurses_attroff' => [
+            '5.3'       => true,
+        ],
+        'ncurses_attron' => [
+            '5.3'       => true,
+        ],
+        'ncurses_attrset' => [
+            '5.3'       => true,
+        ],
+        'ncurses_baudrate' => [
+            '5.3'       => true,
+        ],
+        'ncurses_beep' => [
+            '5.3'       => true,
+        ],
+        'ncurses_bkgd' => [
+            '5.3'       => true,
+        ],
+        'ncurses_bkgdset' => [
+            '5.3'       => true,
+        ],
+        'ncurses_border' => [
+            '5.3'       => true,
+        ],
+        'ncurses_bottom_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_can_change_color' => [
+            '5.3'       => true,
+        ],
+        'ncurses_cbreak' => [
+            '5.3'       => true,
+        ],
+        'ncurses_clear' => [
+            '5.3'       => true,
+        ],
+        'ncurses_clrtobot' => [
+            '5.3'       => true,
+        ],
+        'ncurses_clrtoeol' => [
+            '5.3'       => true,
+        ],
+        'ncurses_color_content' => [
+            '5.3'       => true,
+        ],
+        'ncurses_color_set' => [
+            '5.3'       => true,
+        ],
+        'ncurses_curs_set' => [
+            '5.3'       => true,
+        ],
+        'ncurses_def_prog_mode' => [
+            '5.3'       => true,
+        ],
+        'ncurses_def_shell_mode' => [
+            '5.3'       => true,
+        ],
+        'ncurses_define_key' => [
+            '5.3'       => true,
+        ],
+        'ncurses_del_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_delay_output' => [
+            '5.3'       => true,
+        ],
+        'ncurses_delch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_deleteln' => [
+            '5.3'       => true,
+        ],
+        'ncurses_delwin' => [
+            '5.3'       => true,
+        ],
+        'ncurses_doupdate' => [
+            '5.3'       => true,
+        ],
+        'ncurses_echo' => [
+            '5.3'       => true,
+        ],
+        'ncurses_echochar' => [
+            '5.3'       => true,
+        ],
+        'ncurses_end' => [
+            '5.3'       => true,
+        ],
+        'ncurses_erase' => [
+            '5.3'       => true,
+        ],
+        'ncurses_erasechar' => [
+            '5.3'       => true,
+        ],
+        'ncurses_filter' => [
+            '5.3'       => true,
+        ],
+        'ncurses_flash' => [
+            '5.3'       => true,
+        ],
+        'ncurses_flushinp' => [
+            '5.3'       => true,
+        ],
+        'ncurses_getch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_getmaxyx' => [
+            '5.3'       => true,
+        ],
+        'ncurses_getmouse' => [
+            '5.3'       => true,
+        ],
+        'ncurses_getyx' => [
+            '5.3'       => true,
+        ],
+        'ncurses_halfdelay' => [
+            '5.3'       => true,
+        ],
+        'ncurses_has_colors' => [
+            '5.3'       => true,
+        ],
+        'ncurses_has_ic' => [
+            '5.3'       => true,
+        ],
+        'ncurses_has_il' => [
+            '5.3'       => true,
+        ],
+        'ncurses_has_key' => [
+            '5.3'       => true,
+        ],
+        'ncurses_hide_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_hline' => [
+            '5.3'       => true,
+        ],
+        'ncurses_inch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_init_color' => [
+            '5.3'       => true,
+        ],
+        'ncurses_init_pair' => [
+            '5.3'       => true,
+        ],
+        'ncurses_init' => [
+            '5.3'       => true,
+        ],
+        'ncurses_insch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_insdelln' => [
+            '5.3'       => true,
+        ],
+        'ncurses_insertln' => [
+            '5.3'       => true,
+        ],
+        'ncurses_insstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_instr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_isendwin' => [
+            '5.3'       => true,
+        ],
+        'ncurses_keyok' => [
+            '5.3'       => true,
+        ],
+        'ncurses_keypad' => [
+            '5.3'       => true,
+        ],
+        'ncurses_killchar' => [
+            '5.3'       => true,
+        ],
+        'ncurses_longname' => [
+            '5.3'       => true,
+        ],
+        'ncurses_meta' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mouse_trafo' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mouseinterval' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mousemask' => [
+            '5.3'       => true,
+        ],
+        'ncurses_move_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_move' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvaddch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvaddchnstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvaddchstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvaddnstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvaddstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvcur' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvdelch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvgetch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvhline' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvinch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvvline' => [
+            '5.3'       => true,
+        ],
+        'ncurses_mvwaddstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_napms' => [
+            '5.3'       => true,
+        ],
+        'ncurses_new_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_newpad' => [
+            '5.3'       => true,
+        ],
+        'ncurses_newwin' => [
+            '5.3'       => true,
+        ],
+        'ncurses_nl' => [
+            '5.3'       => true,
+        ],
+        'ncurses_nocbreak' => [
+            '5.3'       => true,
+        ],
+        'ncurses_noecho' => [
+            '5.3'       => true,
+        ],
+        'ncurses_nonl' => [
+            '5.3'       => true,
+        ],
+        'ncurses_noqiflush' => [
+            '5.3'       => true,
+        ],
+        'ncurses_noraw' => [
+            '5.3'       => true,
+        ],
+        'ncurses_pair_content' => [
+            '5.3'       => true,
+        ],
+        'ncurses_panel_above' => [
+            '5.3'       => true,
+        ],
+        'ncurses_panel_below' => [
+            '5.3'       => true,
+        ],
+        'ncurses_panel_window' => [
+            '5.3'       => true,
+        ],
+        'ncurses_pnoutrefresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_prefresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_putp' => [
+            '5.3'       => true,
+        ],
+        'ncurses_qiflush' => [
+            '5.3'       => true,
+        ],
+        'ncurses_raw' => [
+            '5.3'       => true,
+        ],
+        'ncurses_refresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_replace_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_reset_prog_mode' => [
+            '5.3'       => true,
+        ],
+        'ncurses_reset_shell_mode' => [
+            '5.3'       => true,
+        ],
+        'ncurses_resetty' => [
+            '5.3'       => true,
+        ],
+        'ncurses_savetty' => [
+            '5.3'       => true,
+        ],
+        'ncurses_scr_dump' => [
+            '5.3'       => true,
+        ],
+        'ncurses_scr_init' => [
+            '5.3'       => true,
+        ],
+        'ncurses_scr_restore' => [
+            '5.3'       => true,
+        ],
+        'ncurses_scr_set' => [
+            '5.3'       => true,
+        ],
+        'ncurses_scrl' => [
+            '5.3'       => true,
+        ],
+        'ncurses_show_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_attr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_attroff' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_attron' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_attrset' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_clear' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_color' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_init' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_noutrefresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_refresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_restore' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_set' => [
+            '5.3'       => true,
+        ],
+        'ncurses_slk_touch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_standend' => [
+            '5.3'       => true,
+        ],
+        'ncurses_standout' => [
+            '5.3'       => true,
+        ],
+        'ncurses_start_color' => [
+            '5.3'       => true,
+        ],
+        'ncurses_termattrs' => [
+            '5.3'       => true,
+        ],
+        'ncurses_termname' => [
+            '5.3'       => true,
+        ],
+        'ncurses_timeout' => [
+            '5.3'       => true,
+        ],
+        'ncurses_top_panel' => [
+            '5.3'       => true,
+        ],
+        'ncurses_typeahead' => [
+            '5.3'       => true,
+        ],
+        'ncurses_ungetch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_ungetmouse' => [
+            '5.3'       => true,
+        ],
+        'ncurses_update_panels' => [
+            '5.3'       => true,
+        ],
+        'ncurses_use_default_colors' => [
+            '5.3'       => true,
+        ],
+        'ncurses_use_env' => [
+            '5.3'       => true,
+        ],
+        'ncurses_use_extended_names' => [
+            '5.3'       => true,
+        ],
+        'ncurses_vidattr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_vline' => [
+            '5.3'       => true,
+        ],
+        'ncurses_waddch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_waddstr' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wattroff' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wattron' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wattrset' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wborder' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wclear' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wcolor_set' => [
+            '5.3'       => true,
+        ],
+        'ncurses_werase' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wgetch' => [
+            '5.3'       => true,
+        ],
+        'ncurses_whline' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wmouse_trafo' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wmove' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wnoutrefresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wrefresh' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wstandend' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wstandout' => [
+            '5.3'       => true,
+        ],
+        'ncurses_wvline' => [
+            '5.3'       => true,
+        ],
+        'fdf_add_doc_javascript' => [
+            '5.3'       => true,
+        ],
+        'fdf_add_template' => [
+            '5.3'       => true,
+        ],
+        'fdf_close' => [
+            '5.3'       => true,
+        ],
+        'fdf_create' => [
+            '5.3'       => true,
+        ],
+        'fdf_enum_values' => [
+            '5.3'       => true,
+        ],
+        'fdf_errno' => [
+            '5.3'       => true,
+        ],
+        'fdf_error' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_ap' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_attachment' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_encoding' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_file' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_flags' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_opt' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_status' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_value' => [
+            '5.3'       => true,
+        ],
+        'fdf_get_version' => [
+            '5.3'       => true,
+        ],
+        'fdf_header' => [
+            '5.3'       => true,
+        ],
+        'fdf_next_field_name' => [
+            '5.3'       => true,
+        ],
+        'fdf_open_string' => [
+            '5.3'       => true,
+        ],
+        'fdf_open' => [
+            '5.3'       => true,
+        ],
+        'fdf_remove_item' => [
+            '5.3'       => true,
+        ],
+        'fdf_save_string' => [
+            '5.3'       => true,
+        ],
+        'fdf_save' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_ap' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_encoding' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_file' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_flags' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_javascript_action' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_on_import_javascript' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_opt' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_status' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_submit_form_action' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_target_frame' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_value' => [
+            '5.3'       => true,
+        ],
+        'fdf_set_version' => [
+            '5.3'       => true,
+        ],
+        'ming_keypress' => [
+            '5.3'       => true,
+        ],
+        'ming_setcubicthreshold' => [
+            '5.3'       => true,
+        ],
+        'ming_setscale' => [
+            '5.3'       => true,
+        ],
+        'ming_setswfcompression' => [
+            '5.3'       => true,
+        ],
+        'ming_useconstants' => [
+            '5.3'       => true,
+        ],
+        'ming_useswfversion' => [
+            '5.3'       => true,
+        ],
+        'dbase_add_record' => [
+            '5.3'       => true,
+        ],
+        'dbase_close' => [
+            '5.3'       => true,
+        ],
+        'dbase_create' => [
+            '5.3'       => true,
+        ],
+        'dbase_delete_record' => [
+            '5.3'       => true,
+        ],
+        'dbase_get_header_info' => [
+            '5.3'       => true,
+        ],
+        'dbase_get_record_with_names' => [
+            '5.3'       => true,
+        ],
+        'dbase_get_record' => [
+            '5.3'       => true,
+        ],
+        'dbase_numfields' => [
+            '5.3'       => true,
+        ],
+        'dbase_numrecords' => [
+            '5.3'       => true,
+        ],
+        'dbase_open' => [
+            '5.3'       => true,
+        ],
+        'dbase_pack' => [
+            '5.3'       => true,
+        ],
+        'dbase_replace_record' => [
+            '5.3'       => true,
+        ],
+        'fbsql_affected_rows' => [
+            '5.3'       => true,
+        ],
+        'fbsql_autocommit' => [
+            '5.3'       => true,
+        ],
+        'fbsql_blob_size' => [
+            '5.3'       => true,
+        ],
+        'fbsql_change_user' => [
+            '5.3'       => true,
+        ],
+        'fbsql_clob_size' => [
+            '5.3'       => true,
+        ],
+        'fbsql_close' => [
+            '5.3'       => true,
+        ],
+        'fbsql_commit' => [
+            '5.3'       => true,
+        ],
+        'fbsql_connect' => [
+            '5.3'       => true,
+        ],
+        'fbsql_create_blob' => [
+            '5.3'       => true,
+        ],
+        'fbsql_create_clob' => [
+            '5.3'       => true,
+        ],
+        'fbsql_create_db' => [
+            '5.3'       => true,
+        ],
+        'fbsql_data_seek' => [
+            '5.3'       => true,
+        ],
+        'fbsql_database_password' => [
+            '5.3'       => true,
+        ],
+        'fbsql_database' => [
+            '5.3'       => true,
+        ],
+        'fbsql_db_query' => [
+            '5.3'       => true,
+        ],
+        'fbsql_db_status' => [
+            '5.3'       => true,
+        ],
+        'fbsql_drop_db' => [
+            '5.3'       => true,
+        ],
+        'fbsql_errno' => [
+            '5.3'       => true,
+        ],
+        'fbsql_error' => [
+            '5.3'       => true,
+        ],
+        'fbsql_fetch_array' => [
+            '5.3'       => true,
+        ],
+        'fbsql_fetch_assoc' => [
+            '5.3'       => true,
+        ],
+        'fbsql_fetch_field' => [
+            '5.3'       => true,
+        ],
+        'fbsql_fetch_lengths' => [
+            '5.3'       => true,
+        ],
+        'fbsql_fetch_object' => [
+            '5.3'       => true,
+        ],
+        'fbsql_fetch_row' => [
+            '5.3'       => true,
+        ],
+        'fbsql_field_flags' => [
+            '5.3'       => true,
+        ],
+        'fbsql_field_len' => [
+            '5.3'       => true,
+        ],
+        'fbsql_field_name' => [
+            '5.3'       => true,
+        ],
+        'fbsql_field_seek' => [
+            '5.3'       => true,
+        ],
+        'fbsql_field_table' => [
+            '5.3'       => true,
+        ],
+        'fbsql_field_type' => [
+            '5.3'       => true,
+        ],
+        'fbsql_free_result' => [
+            '5.3'       => true,
+        ],
+        'fbsql_get_autostart_info' => [
+            '5.3'       => true,
+        ],
+        'fbsql_hostname' => [
+            '5.3'       => true,
+        ],
+        'fbsql_insert_id' => [
+            '5.3'       => true,
+        ],
+        'fbsql_list_dbs' => [
+            '5.3'       => true,
+        ],
+        'fbsql_list_fields' => [
+            '5.3'       => true,
+        ],
+        'fbsql_list_tables' => [
+            '5.3'       => true,
+        ],
+        'fbsql_next_result' => [
+            '5.3'       => true,
+        ],
+        'fbsql_num_fields' => [
+            '5.3'       => true,
+        ],
+        'fbsql_num_rows' => [
+            '5.3'       => true,
+        ],
+        'fbsql_password' => [
+            '5.3'       => true,
+        ],
+        'fbsql_pconnect' => [
+            '5.3'       => true,
+        ],
+        'fbsql_query' => [
+            '5.3'       => true,
+        ],
+        'fbsql_read_blob' => [
+            '5.3'       => true,
+        ],
+        'fbsql_read_clob' => [
+            '5.3'       => true,
+        ],
+        'fbsql_result' => [
+            '5.3'       => true,
+        ],
+        'fbsql_rollback' => [
+            '5.3'       => true,
+        ],
+        'fbsql_rows_fetched' => [
+            '5.3'       => true,
+        ],
+        'fbsql_select_db' => [
+            '5.3'       => true,
+        ],
+        'fbsql_set_characterset' => [
+            '5.3'       => true,
+        ],
+        'fbsql_set_lob_mode' => [
+            '5.3'       => true,
+        ],
+        'fbsql_set_password' => [
+            '5.3'       => true,
+        ],
+        'fbsql_set_transaction' => [
+            '5.3'       => true,
+        ],
+        'fbsql_start_db' => [
+            '5.3'       => true,
+        ],
+        'fbsql_stop_db' => [
+            '5.3'       => true,
+        ],
+        'fbsql_table_name' => [
+            '5.3'       => true,
+        ],
+        'fbsql_tablename' => [
+            '5.3'       => true,
+        ],
+        'fbsql_username' => [
+            '5.3'       => true,
+        ],
+        'fbsql_warnings' => [
+            '5.3'       => true,
+        ],
+        'msql_affected_rows' => [
+            '5.3'       => true,
+        ],
+        'msql_close' => [
+            '5.3'       => true,
+        ],
+        'msql_connect' => [
+            '5.3'       => true,
+        ],
+        'msql_create_db' => [
+            '5.3'       => true,
+        ],
+        'msql_createdb' => [
+            '5.3'       => true,
+        ],
+        'msql_data_seek' => [
+            '5.3'       => true,
+        ],
+        'msql_db_query' => [
+            '5.3'       => true,
+        ],
+        'msql_dbname' => [
+            '5.3'       => true,
+        ],
+        'msql_drop_db' => [
+            '5.3'       => true,
+        ],
+        'msql_error' => [
+            '5.3'       => true,
+        ],
+        'msql_fetch_array' => [
+            '5.3'       => true,
+        ],
+        'msql_fetch_field' => [
+            '5.3'       => true,
+        ],
+        'msql_fetch_object' => [
+            '5.3'       => true,
+        ],
+        'msql_fetch_row' => [
+            '5.3'       => true,
+        ],
+        'msql_field_flags' => [
+            '5.3'       => true,
+        ],
+        'msql_field_len' => [
+            '5.3'       => true,
+        ],
+        'msql_field_name' => [
+            '5.3'       => true,
+        ],
+        'msql_field_seek' => [
+            '5.3'       => true,
+        ],
+        'msql_field_table' => [
+            '5.3'       => true,
+        ],
+        'msql_field_type' => [
+            '5.3'       => true,
+        ],
+        'msql_fieldflags' => [
+            '5.3'       => true,
+        ],
+        'msql_fieldlen' => [
+            '5.3'       => true,
+        ],
+        'msql_fieldname' => [
+            '5.3'       => true,
+        ],
+        'msql_fieldtable' => [
+            '5.3'       => true,
+        ],
+        'msql_fieldtype' => [
+            '5.3'       => true,
+        ],
+        'msql_free_result' => [
+            '5.3'       => true,
+        ],
+        'msql_list_dbs' => [
+            '5.3'       => true,
+        ],
+        'msql_list_fields' => [
+            '5.3'       => true,
+        ],
+        'msql_list_tables' => [
+            '5.3'       => true,
+        ],
+        'msql_num_fields' => [
+            '5.3'       => true,
+        ],
+        'msql_num_rows' => [
+            '5.3'       => true,
+        ],
+        'msql_numfields' => [
+            '5.3'       => true,
+        ],
+        'msql_numrows' => [
+            '5.3'       => true,
+        ],
+        'msql_pconnect' => [
+            '5.3'       => true,
+        ],
+        'msql_query' => [
+            '5.3'       => true,
+        ],
+        'msql_regcase' => [
+            '5.3'       => true,
+        ],
+        'msql_result' => [
+            '5.3'       => true,
+        ],
+        'msql_select_db' => [
+            '5.3'       => true,
+        ],
+        'msql_tablename' => [
+            '5.3'       => true,
+        ],
+        'msql' => [
+            '5.3'       => true,
+        ],
+        'mysqli_disable_reads_from_master' => [
+            '5.3' => true,
+        ],
+        'mysqli_disable_rpl_parse' => [
+            '5.3' => true,
+        ],
+        'mysqli_enable_reads_from_master' => [
+            '5.3' => true,
+        ],
+        'mysqli_enable_rpl_parse' => [
+            '5.3' => true,
+        ],
+        'mysqli_master_query' => [
+            '5.3' => true,
+        ],
+        'mysqli_rpl_parse_enabled' => [
+            '5.3' => true,
+        ],
+        'mysqli_rpl_probe' => [
+            '5.3' => true,
+        ],
+        'mysqli_slave_query' => [
+            '5.3' => true,
+        ],
+
+        'call_user_method' => [
+            '4.1'         => false,
+            '7.0'         => true,
+            'alternative' => 'call_user_func()',
+        ],
+        'call_user_method_array' => [
+            '4.1'         => false,
+            '7.0'         => true,
+            'alternative' => 'call_user_func_array()',
+        ],
+        'define_syslog_variables' => [
+            '5.3' => false,
+            '5.4' => true,
+        ],
+        'dl' => [
+            '5.3' => false,
+        ],
+        'ereg' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_match()',
+        ],
+        'ereg_replace' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_replace()',
+        ],
+        'eregi' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_match() (with the i modifier)',
+        ],
+        'eregi_replace' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_replace() (with the i modifier)',
+        ],
+        'imagepsbbox' => [
+            '7.0' => true,
+        ],
+        'imagepsencodefont' => [
+            '7.0' => true,
+        ],
+        'imagepsextendfont' => [
+            '7.0' => true,
+        ],
+        'imagepsfreefont' => [
+            '7.0' => true,
+        ],
+        'imagepsloadfont' => [
+            '7.0' => true,
+        ],
+        'imagepsslantfont' => [
+            '7.0' => true,
+        ],
+        'imagepstext' => [
+            '7.0' => true,
+        ],
+        'import_request_variables' => [
+            '5.3' => false,
+            '5.4' => true,
+        ],
+        'ldap_sort' => [
+            '7.0' => false,
+            '8.0' => true,
+        ],
+        'mcrypt_generic_end' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_generic_deinit()',
+        ],
+        'mysql_db_query' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'mysqli::select_db() and mysqli::query()',
+        ],
+        'mysql_escape_string' => [
+            '4.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'mysqli::real_escape_string()',
+        ],
+        'mysql_list_dbs' => [
+            '5.4'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_list_fields' => [
+            '5.4'       => false,
+            '7.0'       => true,
+        ],
+        'mysqli_bind_param' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::bind_param()',
+        ],
+        'mysqli_bind_result' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::bind_result()',
+        ],
+        'mysqli_client_encoding' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli::character_set_name()',
+        ],
+        'mysqli_fetch' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::fetch()',
+        ],
+        'mysqli_param_count' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt_param_count()',
+        ],
+        'mysqli_get_metadata' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::result_metadata()',
+        ],
+        'mysqli_send_long_data' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => 'mysqli_stmt::send_long_data()',
+        ],
+        'magic_quotes_runtime' => [
+            '5.3' => false,
+            '7.0' => true,
+        ],
+        'session_register' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => '$_SESSION',
+        ],
+        'session_unregister' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => '$_SESSION',
+        ],
+        'session_is_registered' => [
+            '5.3'         => false,
+            '5.4'         => true,
+            'alternative' => '$_SESSION',
+        ],
+        'set_magic_quotes_runtime' => [
+            '5.3' => false,
+            '7.0' => true,
+        ],
+        'set_socket_blocking' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'stream_set_blocking()',
+        ],
+        'split' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_split(), explode() or str_split()',
+        ],
+        'spliti' => [
+            '5.3'         => false,
+            '7.0'         => true,
+            'alternative' => 'preg_split() (with the i modifier)',
+        ],
+        'sql_regcase' => [
+            '5.3'       => false,
+            '7.0'       => true,
+        ],
+        'php_logo_guid' => [
+            '5.5' => true,
+        ],
+        'php_egg_logo_guid' => [
+            '5.5' => true,
+        ],
+        'php_real_logo_guid' => [
+            '5.5' => true,
+        ],
+        'zend_logo_guid' => [
+            '5.5'         => true,
+            'alternative' => 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"',
+        ],
+        'datefmt_set_timezone_id' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'IntlDateFormatter::setTimeZone()',
+        ],
+        'mcrypt_ecb' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+        ],
+        'mcrypt_cbc' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+        ],
+        'mcrypt_cfb' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+        ],
+        'mcrypt_ofb' => [
+            '5.5'         => false,
+            '7.0'         => true,
+            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
+        ],
+        'ocibindbyname' => [
+            '5.4'         => false,
+            'alternative' => 'oci_bind_by_name()',
+        ],
+        'ocicancel' => [
+            '5.4'         => false,
+            'alternative' => 'oci_cancel()',
+        ],
+        'ocicloselob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::close() / OCILob::close() (PHP 8+)',
+        ],
+        'ocicollappend' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::append() / OCICollection::append() (PHP 8+)',
+        ],
+        'ocicollassign' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)',
+        ],
+        'ocicollassignelem' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)',
+        ],
+        'ocicollgetelem' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)',
+        ],
+        'ocicollmax' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::max() / OCICollection::max() (PHP 8+)',
+        ],
+        'ocicollsize' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::size() / OCICollection::size() (PHP 8+)',
+        ],
+        'ocicolltrim' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)',
+        ],
+        'ocicolumnisnull' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_is_null()',
+        ],
+        'ocicolumnname' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_name()',
+        ],
+        'ocicolumnprecision' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_precision()',
+        ],
+        'ocicolumnscale' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_scale()',
+        ],
+        'ocicolumnsize' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_size()',
+        ],
+        'ocicolumntype' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_type()',
+        ],
+        'ocicolumntyperaw' => [
+            '5.4'         => false,
+            'alternative' => 'oci_field_type_raw()',
+        ],
+        'ocicommit' => [
+            '5.4'         => false,
+            'alternative' => 'oci_commit()',
+        ],
+        'ocidefinebyname' => [
+            '5.4'         => false,
+            'alternative' => 'oci_define_by_name()',
+        ],
+        'ocierror' => [
+            '5.4'         => false,
+            'alternative' => 'oci_error()',
+        ],
+        'ociexecute' => [
+            '5.4'         => false,
+            'alternative' => 'oci_execute()',
+        ],
+        'ocifetch' => [
+            '5.4'         => false,
+            'alternative' => 'oci_fetch()',
+        ],
+        'ocifetchinto' => [
+            '5.4' => false,
+        ],
+        'ocifetchstatement' => [
+            '5.4'         => false,
+            'alternative' => 'oci_fetch_all()',
+        ],
+        'ocifreecollection' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Collection::free() / OCICollection::free() (PHP 8+)',
+        ],
+        'ocifreecursor' => [
+            '5.4'         => false,
+            'alternative' => 'oci_free_statement()',
+        ],
+        'ocifreedesc' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::free() / OCILob::free() (PHP 8+)',
+        ],
+        'ocifreestatement' => [
+            '5.4'         => false,
+            'alternative' => 'oci_free_statement()',
+        ],
+        'ociinternaldebug' => [
+            '5.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'oci_internal_debug() (PHP < 8.0)',
+        ],
+        'ociloadlob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::load() / OCILob::load() (PHP 8+)',
+        ],
+        'ocilogoff' => [
+            '5.4'         => false,
+            'alternative' => 'oci_close()',
+        ],
+        'ocilogon' => [
+            '5.4'         => false,
+            'alternative' => 'oci_connect()',
+        ],
+        'ocinewcollection' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_collection()',
+        ],
+        'ocinewcursor' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_cursor()',
+        ],
+        'ocinewdescriptor' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_descriptor()',
+        ],
+        'ocinlogon' => [
+            '5.4'         => false,
+            'alternative' => 'oci_new_connect()',
+        ],
+        'ocinumcols' => [
+            '5.4'         => false,
+            'alternative' => 'oci_num_fields()',
+        ],
+        'ociparse' => [
+            '5.4'         => false,
+            'alternative' => 'oci_parse()',
+        ],
+        'ociplogon' => [
+            '5.4'         => false,
+            'alternative' => 'oci_pconnect()',
+        ],
+        'ociresult' => [
+            '5.4'         => false,
+            'alternative' => 'oci_result()',
+        ],
+        'ocirollback' => [
+            '5.4'         => false,
+            'alternative' => 'oci_rollback()',
+        ],
+        'ocirowcount' => [
+            '5.4'         => false,
+            'alternative' => 'oci_num_rows()',
+        ],
+        'ocisavelob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::save() / OCILob::save() (PHP 8+)',
+        ],
+        'ocisavelobfile' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::import() / OCILob::import() (PHP 8+)',
+        ],
+        'ociserverversion' => [
+            '5.4'         => false,
+            'alternative' => 'oci_server_version()',
+        ],
+        'ocisetprefetch' => [
+            '5.4'         => false,
+            'alternative' => 'oci_set_prefetch()',
+        ],
+        'ocistatementtype' => [
+            '5.4'         => false,
+            'alternative' => 'oci_statement_type()',
+        ],
+        'ociwritelobtofile' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::export() / OCILob::export() (PHP 8+)',
+        ],
+        'ociwritetemporarylob' => [
+            '5.4'         => false,
+            'alternative' => 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)',
+        ],
+        'mysqli_get_cache_stats' => [
+            '5.4' => true,
+        ],
+        'sqlite_array_query' => [
+            '5.4'       => true,
+        ],
+        'sqlite_busy_timeout' => [
+            '5.4'       => true,
+        ],
+        'sqlite_changes' => [
+            '5.4'       => true,
+        ],
+        'sqlite_close' => [
+            '5.4'       => true,
+        ],
+        'sqlite_column' => [
+            '5.4'       => true,
+        ],
+        'sqlite_create_aggregate' => [
+            '5.4'       => true,
+        ],
+        'sqlite_create_function' => [
+            '5.4'       => true,
+        ],
+        'sqlite_current' => [
+            '5.4'       => true,
+        ],
+        'sqlite_error_string' => [
+            '5.4'       => true,
+        ],
+        'sqlite_escape_string' => [
+            '5.4'       => true,
+        ],
+        'sqlite_exec' => [
+            '5.4'       => true,
+        ],
+        'sqlite_factory' => [
+            '5.4'       => true,
+        ],
+        'sqlite_fetch_all' => [
+            '5.4'       => true,
+        ],
+        'sqlite_fetch_array' => [
+            '5.4'       => true,
+        ],
+        'sqlite_fetch_column_types' => [
+            '5.4'       => true,
+        ],
+        'sqlite_fetch_object' => [
+            '5.4'       => true,
+        ],
+        'sqlite_fetch_single' => [
+            '5.4'       => true,
+        ],
+        'sqlite_fetch_string' => [
+            '5.4'       => true,
+        ],
+        'sqlite_field_name' => [
+            '5.4'       => true,
+        ],
+        'sqlite_has_more' => [
+            '5.4'       => true,
+        ],
+        'sqlite_has_prev' => [
+            '5.4'       => true,
+        ],
+        'sqlite_key' => [
+            '5.4'       => true,
+        ],
+        'sqlite_last_error' => [
+            '5.4'       => true,
+        ],
+        'sqlite_last_insert_rowid' => [
+            '5.4'       => true,
+        ],
+        'sqlite_libencoding' => [
+            '5.4'       => true,
+        ],
+        'sqlite_libversion' => [
+            '5.4'       => true,
+        ],
+        'sqlite_next' => [
+            '5.4'       => true,
+        ],
+        'sqlite_num_fields' => [
+            '5.4'       => true,
+        ],
+        'sqlite_num_rows' => [
+            '5.4'       => true,
+        ],
+        'sqlite_open' => [
+            '5.4'       => true,
+        ],
+        'sqlite_popen' => [
+            '5.4'       => true,
+        ],
+        'sqlite_prev' => [
+            '5.4'       => true,
+        ],
+        'sqlite_query' => [
+            '5.4'       => true,
+        ],
+        'sqlite_rewind' => [
+            '5.4'       => true,
+        ],
+        'sqlite_seek' => [
+            '5.4'       => true,
+        ],
+        'sqlite_single_query' => [
+            '5.4'       => true,
+        ],
+        'sqlite_udf_decode_binary' => [
+            '5.4'       => true,
+        ],
+        'sqlite_udf_encode_binary' => [
+            '5.4'       => true,
+        ],
+        'sqlite_unbuffered_query' => [
+            '5.4'       => true,
+        ],
+        'sqlite_valid' => [
+            '5.4'       => true,
+        ],
+
+        'mssql_bind' => [
+            '7.0'       => true,
+        ],
+        'mssql_close' => [
+            '7.0'       => true,
+        ],
+        'mssql_connect' => [
+            '7.0'       => true,
+        ],
+        'mssql_data_seek' => [
+            '7.0'       => true,
+        ],
+        'mssql_execute' => [
+            '7.0'       => true,
+        ],
+        'mssql_fetch_array' => [
+            '7.0'       => true,
+        ],
+        'mssql_fetch_assoc' => [
+            '7.0'       => true,
+        ],
+        'mssql_fetch_batch' => [
+            '7.0'       => true,
+        ],
+        'mssql_fetch_field' => [
+            '7.0'       => true,
+        ],
+        'mssql_fetch_object' => [
+            '7.0'       => true,
+        ],
+        'mssql_fetch_row' => [
+            '7.0'       => true,
+        ],
+        'mssql_field_length' => [
+            '7.0'       => true,
+        ],
+        'mssql_field_name' => [
+            '7.0'       => true,
+        ],
+        'mssql_field_seek' => [
+            '7.0'       => true,
+        ],
+        'mssql_field_type' => [
+            '7.0'       => true,
+        ],
+        'mssql_free_result' => [
+            '7.0'       => true,
+        ],
+        'mssql_free_statement' => [
+            '7.0'       => true,
+        ],
+        'mssql_get_last_message' => [
+            '7.0'       => true,
+        ],
+        'mssql_guid_string' => [
+            '7.0'       => true,
+        ],
+        'mssql_init' => [
+            '7.0'       => true,
+        ],
+        'mssql_min_error_severity' => [
+            '7.0'       => true,
+        ],
+        'mssql_min_message_severity' => [
+            '7.0'       => true,
+        ],
+        'mssql_next_result' => [
+            '7.0'       => true,
+        ],
+        'mssql_num_fields' => [
+            '7.0'       => true,
+        ],
+        'mssql_num_rows' => [
+            '7.0'       => true,
+        ],
+        'mssql_pconnect' => [
+            '7.0'       => true,
+        ],
+        'mssql_query' => [
+            '7.0'       => true,
+        ],
+        'mssql_result' => [
+            '7.0'       => true,
+        ],
+        'mssql_rows_affected' => [
+            '7.0'       => true,
+        ],
+        'mssql_select_db' => [
+            '7.0'       => true,
+        ],
+        'mysql_affected_rows' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_client_encoding' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_close' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_connect' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_create_db' => [
+            '4.3'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_data_seek' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_db_name' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_drop_db' => [
+            '4.3'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_errno' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_error' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fetch_array' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fetch_assoc' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fetch_field' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fetch_lengths' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fetch_object' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fetch_row' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_field_flags' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_field_len' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_field_name' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_field_seek' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_field_table' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_field_type' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_free_result' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_get_client_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_get_host_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_get_proto_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_get_server_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_info' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_insert_id' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_list_processes' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_list_tables' => [
+            '4.3.7'     => false,
+            '7.0'       => true,
+        ],
+        'mysql_num_fields' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_num_rows' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_pconnect' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_ping' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_query' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_real_escape_string' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_result' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_select_db' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_set_charset' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_stat' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_tablename' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_thread_id' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_unbuffered_query' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fieldname' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fieldtable' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fieldlen' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fieldtype' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_fieldflags' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_selectdb' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_freeresult' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_numfields' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_numrows' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_listdbs' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_listfields' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_dbname' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'mysql_table_name' => [
+            '5.5'       => false,
+            '7.0'       => true,
+        ],
+        'sybase_affected_rows' => [
+            '7.0'       => true,
+        ],
+        'sybase_close' => [
+            '7.0'       => true,
+        ],
+        'sybase_connect' => [
+            '7.0'       => true,
+        ],
+        'sybase_data_seek' => [
+            '7.0'       => true,
+        ],
+        'sybase_deadlock_retry_count' => [
+            '7.0'       => true,
+        ],
+        'sybase_fetch_array' => [
+            '7.0'       => true,
+        ],
+        'sybase_fetch_assoc' => [
+            '7.0'       => true,
+        ],
+        'sybase_fetch_field' => [
+            '7.0'       => true,
+        ],
+        'sybase_fetch_object' => [
+            '7.0'       => true,
+        ],
+        'sybase_fetch_row' => [
+            '7.0'       => true,
+        ],
+        'sybase_field_seek' => [
+            '7.0'       => true,
+        ],
+        'sybase_free_result' => [
+            '7.0'       => true,
+        ],
+        'sybase_get_last_message' => [
+            '7.0'       => true,
+        ],
+        'sybase_min_client_severity' => [
+            '7.0'       => true,
+        ],
+        'sybase_min_error_severity' => [
+            '7.0'       => true,
+        ],
+        'sybase_min_message_severity' => [
+            '7.0'       => true,
+        ],
+        'sybase_min_server_severity' => [
+            '7.0'       => true,
+        ],
+        'sybase_num_fields' => [
+            '7.0'       => true,
+        ],
+        'sybase_num_rows' => [
+            '7.0'       => true,
+        ],
+        'sybase_pconnect' => [
+            '7.0'       => true,
+        ],
+        'sybase_query' => [
+            '7.0'       => true,
+        ],
+        'sybase_result' => [
+            '7.0'       => true,
+        ],
+        'sybase_select_db' => [
+            '7.0'       => true,
+        ],
+        'sybase_set_message_handler' => [
+            '7.0'       => true,
+        ],
+        'sybase_unbuffered_query' => [
+            '7.0'       => true,
+        ],
+
+        'mcrypt_create_iv' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'random_bytes() or OpenSSL',
+        ],
+        'mcrypt_decrypt' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_get_algorithms_name' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_get_block_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_get_iv_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_get_key_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_get_modes_name' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_get_supported_key_sizes' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_is_block_algorithm_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_is_block_algorithm' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_is_block_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_enc_self_test' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_encrypt' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_generic_deinit' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_generic_init' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_generic' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_get_block_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_get_cipher_name' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_get_iv_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_get_key_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_list_algorithms' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_list_modes' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_close' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_get_algo_block_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_get_algo_key_size' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_get_supported_key_sizes' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_is_block_algorithm_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_is_block_algorithm' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_is_block_mode' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_open' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mcrypt_module_self_test' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'mdecrypt_generic' => [
+            '7.1'         => false,
+            '7.2'         => true,
+            'alternative' => 'OpenSSL',
+        ],
+        'jpeg2wbmp' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'imagecreatefromjpeg() and imagewbmp()',
+        ],
+        'png2wbmp' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'imagecreatefrompng() or imagewbmp()',
+        ],
+        '__autoload' => [
+            '7.2'         => false,
+            'alternative' => 'SPL autoload',
+        ],
+        'create_function' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'an anonymous function',
+        ],
+        'each' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'a foreach loop or ArrayIterator',
+        ],
+        'gmp_random' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'gmp_random_bits() or gmp_random_range()',
+        ],
+        'read_exif_data' => [
+            '7.2'         => false,
+            '8.0'         => true,
+            'alternative' => 'exif_read_data()',
+        ],
+
+        'image2wbmp' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'imagewbmp()',
+        ],
+        'mbregex_encoding' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_regex_encoding()',
+        ],
+        'mbereg' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg()',
+        ],
+        'mberegi' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_eregi()',
+        ],
+        'mbereg_replace' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_replace()',
+        ],
+        'mberegi_replace' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_eregi_replace()',
+        ],
+        'mbsplit' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_split()',
+        ],
+        'mbereg_match' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_match()',
+        ],
+        'mbereg_search' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search()',
+        ],
+        'mbereg_search_pos' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_pos()',
+        ],
+        'mbereg_search_regs' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_regs()',
+        ],
+        'mbereg_search_init' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_init()',
+        ],
+        'mbereg_search_getregs' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_getregs()',
+        ],
+        'mbereg_search_getpos' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_getpos()',
+        ],
+        'mbereg_search_setpos' => [
+            '7.3'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_ereg_search_setpos()',
+        ],
+        'fgetss' => [
+            '7.3' => false,
+            '8.0' => true,
+        ],
+        'gzgetss' => [
+            '7.3' => false,
+            '8.0' => true,
+        ],
+
+        'convert_cyr_string' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'mb_convert_encoding(), iconv() or UConverter',
+        ],
+        'ezmlm_hash' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'get_magic_quotes_gpc' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'get_magic_quotes_runtime' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'hebrevc' => [
+            '7.4' => false,
+            '8.0' => true,
+        ],
+        'is_real' => [
+            '7.4'         => false,
+            'alternative' => 'is_float()',
+        ],
+        'money_format' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'NumberFormatter::formatCurrency()',
+        ],
+        'restore_include_path' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => "ini_restore('include_path')",
+        ],
+        'ibase_add_user' => [
+            '7.4'       => true,
+        ],
+        'ibase_affected_rows' => [
+            '7.4'       => true,
+        ],
+        'ibase_backup' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_add' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_cancel' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_close' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_create' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_echo' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_get' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_import' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_info' => [
+            '7.4'       => true,
+        ],
+        'ibase_blob_open' => [
+            '7.4'       => true,
+        ],
+        'ibase_close' => [
+            '7.4'       => true,
+        ],
+        'ibase_commit_ret' => [
+            '7.4'       => true,
+        ],
+        'ibase_commit' => [
+            '7.4'       => true,
+        ],
+        'ibase_connect' => [
+            '7.4'       => true,
+        ],
+        'ibase_db_info' => [
+            '7.4'       => true,
+        ],
+        'ibase_delete_user' => [
+            '7.4'       => true,
+        ],
+        'ibase_drop_db' => [
+            '7.4'       => true,
+        ],
+        'ibase_errcode' => [
+            '7.4'       => true,
+        ],
+        'ibase_errmsg' => [
+            '7.4'       => true,
+        ],
+        'ibase_execute' => [
+            '7.4'       => true,
+        ],
+        'ibase_fetch_assoc' => [
+            '7.4'       => true,
+        ],
+        'ibase_fetch_object' => [
+            '7.4'       => true,
+        ],
+        'ibase_fetch_row' => [
+            '7.4'       => true,
+        ],
+        'ibase_field_info' => [
+            '7.4'       => true,
+        ],
+        'ibase_free_event_handler' => [
+            '7.4'       => true,
+        ],
+        'ibase_free_query' => [
+            '7.4'       => true,
+        ],
+        'ibase_free_result' => [
+            '7.4'       => true,
+        ],
+        'ibase_gen_id' => [
+            '7.4'       => true,
+        ],
+        'ibase_maintain_db' => [
+            '7.4'       => true,
+        ],
+        'ibase_modify_user' => [
+            '7.4'       => true,
+        ],
+        'ibase_name_result' => [
+            '7.4'       => true,
+        ],
+        'ibase_num_fields' => [
+            '7.4'       => true,
+        ],
+        'ibase_num_params' => [
+            '7.4'       => true,
+        ],
+        'ibase_param_info' => [
+            '7.4'       => true,
+        ],
+        'ibase_pconnect' => [
+            '7.4'       => true,
+        ],
+        'ibase_prepare' => [
+            '7.4'       => true,
+        ],
+        'ibase_query' => [
+            '7.4'       => true,
+        ],
+        'ibase_restore' => [
+            '7.4'       => true,
+        ],
+        'ibase_rollback_ret' => [
+            '7.4'       => true,
+        ],
+        'ibase_rollback' => [
+            '7.4'       => true,
+        ],
+        'ibase_server_info' => [
+            '7.4'       => true,
+        ],
+        'ibase_service_attach' => [
+            '7.4'       => true,
+        ],
+        'ibase_service_detach' => [
+            '7.4'       => true,
+        ],
+        'ibase_set_event_handler' => [
+            '7.4'       => true,
+        ],
+        'ibase_trans' => [
+            '7.4'       => true,
+        ],
+        'ibase_wait_event' => [
+            '7.4'       => true,
+        ],
+        'fbird_add_user' => [
+            '7.4'       => true,
+        ],
+        'fbird_affected_rows' => [
+            '7.4'       => true,
+        ],
+        'fbird_backup' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_add' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_cancel' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_close' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_create' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_echo' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_get' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_import' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_info' => [
+            '7.4'       => true,
+        ],
+        'fbird_blob_open' => [
+            '7.4'       => true,
+        ],
+        'fbird_close' => [
+            '7.4'       => true,
+        ],
+        'fbird_commit_ret' => [
+            '7.4'       => true,
+        ],
+        'fbird_commit' => [
+            '7.4'       => true,
+        ],
+        'fbird_connect' => [
+            '7.4'       => true,
+        ],
+        'fbird_db_info' => [
+            '7.4'       => true,
+        ],
+        'fbird_delete_user' => [
+            '7.4'       => true,
+        ],
+        'fbird_drop_db' => [
+            '7.4'       => true,
+        ],
+        'fbird_errcode' => [
+            '7.4'       => true,
+        ],
+        'fbird_errmsg' => [
+            '7.4'       => true,
+        ],
+        'fbird_execute' => [
+            '7.4'       => true,
+        ],
+        'fbird_fetch_assoc' => [
+            '7.4'       => true,
+        ],
+        'fbird_fetch_object' => [
+            '7.4'       => true,
+        ],
+        'fbird_fetch_row' => [
+            '7.4'       => true,
+        ],
+        'fbird_field_info' => [
+            '7.4'       => true,
+        ],
+        'fbird_free_event_handler' => [
+            '7.4'       => true,
+        ],
+        'fbird_free_query' => [
+            '7.4'       => true,
+        ],
+        'fbird_free_result' => [
+            '7.4'       => true,
+        ],
+        'fbird_gen_id' => [
+            '7.4'       => true,
+        ],
+        'fbird_maintain_db' => [
+            '7.4'       => true,
+        ],
+        'fbird_modify_user' => [
+            '7.4'       => true,
+        ],
+        'fbird_name_result' => [
+            '7.4'       => true,
+        ],
+        'fbird_num_fields' => [
+            '7.4'       => true,
+        ],
+        'fbird_num_params' => [
+            '7.4'       => true,
+        ],
+        'fbird_param_info' => [
+            '7.4'       => true,
+        ],
+        'fbird_pconnect' => [
+            '7.4'       => true,
+        ],
+        'fbird_prepare' => [
+            '7.4'       => true,
+        ],
+        'fbird_query' => [
+            '7.4'       => true,
+        ],
+        'fbird_restore' => [
+            '7.4'       => true,
+        ],
+        'fbird_rollback_ret' => [
+            '7.4'       => true,
+        ],
+        'fbird_rollback' => [
+            '7.4'       => true,
+        ],
+        'fbird_server_info' => [
+            '7.4'       => true,
+        ],
+        'fbird_service_attach' => [
+            '7.4'       => true,
+        ],
+        'fbird_service_detach' => [
+            '7.4'       => true,
+        ],
+        'fbird_set_event_handler' => [
+            '7.4'       => true,
+        ],
+        'fbird_trans' => [
+            '7.4'       => true,
+        ],
+        'fbird_wait_event' => [
+            '7.4'       => true,
+        ],
+
+        'ldap_control_paged_result_response' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'ldap_search()',
+        ],
+        'ldap_control_paged_result' => [
+            '7.4'         => false,
+            '8.0'         => true,
+            'alternative' => 'ldap_search()',
+        ],
+        'recode_file' => [
+            '7.4'         => true,
+            'alternative' => 'the iconv or mbstring extension',
+        ],
+        'recode_string' => [
+            '7.4'         => true,
+            'alternative' => 'the iconv or mbstring extension',
+        ],
+        'recode' => [
+            '7.4'         => true,
+            'alternative' => 'the iconv or mbstring extension',
+        ],
+        'wddx_add_vars' => [
+            '7.4'       => true,
+        ],
+        'wddx_deserialize' => [
+            '7.4'       => true,
+        ],
+        'wddx_packet_end' => [
+            '7.4'       => true,
+        ],
+        'wddx_packet_start' => [
+            '7.4'       => true,
+        ],
+        'wddx_serialize_value' => [
+            '7.4'       => true,
+        ],
+        'wddx_serialize_vars' => [
+            '7.4'       => true,
+        ],
+        'mysqli_embedded_server_end' => [
+            '7.4' => true,
+        ],
+        'mysqli_embedded_server_start' => [
+            '7.4' => true,
+        ],
+
+        'enchant_broker_get_dict_path' => [
+            '8.0' => false,
+        ],
+        'enchant_broker_set_dict_path' => [
+            '8.0' => false,
+        ],
+        'enchant_broker_free' => [
+            '8.0'         => false,
+            'alternative' => 'unset the object',
+        ],
+        'enchant_broker_free_dict' => [
+            '8.0'         => false,
+            'alternative' => 'unset the object',
+        ],
+        'enchant_dict_add_to_personal' => [
+            '8.0'         => false,
+            'alternative' => 'enchant_dict_add()',
+        ],
+        'enchant_dict_is_in_session' => [
+            '8.0'         => false,
+            'alternative' => 'enchant_dict_is_added()',
+        ],
+        'imap_header' => [
+            '8.0'         => true,
+            'alternative' => 'imap_headerinfo()',
+        ],
+        'libxml_disable_entity_loader' => [
+            '8.0' => false,
+        ],
+        'oci_internal_debug' => [
+            '8.0' => true,
+        ],
+        'openssl_x509_free' => [
+            '8.0' => false,
+        ],
+        'openssl_pkey_free' => [
+            '8.0' => false,
+        ],
+        'openssl_free_key' => [
+            '8.0' => false,
+        ],
+        'pg_clientencoding' => [
+            '8.0'         => false,
+            'alternative' => 'pg_client_encoding()',
+        ],
+        'pg_cmdtuples' => [
+            '8.0'         => false,
+            'alternative' => 'pg_affected_rows()',
+        ],
+        'pg_errormessage' => [
+            '8.0'         => false,
+            'alternative' => 'pg_last_error()',
+        ],
+        'pg_fieldname' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_name()',
+        ],
+        'pg_fieldnum' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_num()',
+        ],
+        'pg_fieldisnull' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_is_null()',
+        ],
+        'pg_fieldprtlen' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_prtlen()',
+        ],
+        'pg_fieldsize' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_size()',
+        ],
+        'pg_fieldtype' => [
+            '8.0'         => false,
+            'alternative' => 'pg_field_type()',
+        ],
+        'pg_freeresult' => [
+            '8.0'         => false,
+            'alternative' => 'pg_free_result()',
+        ],
+        'pg_getlastoid' => [
+            '8.0'         => false,
+            'alternative' => 'pg_last_oid()',
+        ],
+        'pg_loclose' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_close()',
+        ],
+        'pg_locreate' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_create()',
+        ],
+        'pg_loexport' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_export()',
+        ],
+        'pg_loimport' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_import()',
+        ],
+        'pg_loopen' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_open()',
+        ],
+        'pg_loread' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_read()',
+        ],
+        'pg_loreadall' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_read_all()',
+        ],
+        'pg_lounlink' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_unlink()',
+        ],
+        'pg_lowrite' => [
+            '8.0'         => false,
+            'alternative' => 'pg_lo_write()',
+        ],
+        'pg_numfields' => [
+            '8.0'         => false,
+            'alternative' => 'pg_num_fields()',
+        ],
+        'pg_numrows' => [
+            '8.0'         => false,
+            'alternative' => 'pg_num_rows()',
+        ],
+        'pg_result' => [
+            '8.0'         => false,
+            'alternative' => 'pg_fetch_result()',
+        ],
+        'pg_setclientencoding' => [
+            '8.0'         => false,
+            'alternative' => 'pg_set_client_encoding()',
+        ],
+        'shmop_close' => [
+            '8.0' => false,
+        ],
+        'xmlrpc_decode_request' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_decode' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_encode_request' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_encode' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_get_type' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_is_fault' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_parse_method_descriptions' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_server_add_introspection_data' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_server_call_method' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_server_create' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_server_destroy' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_server_register_introspection_callback' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_server_register_method' => [
+            '8.0'       => true,
+        ],
+        'xmlrpc_set_type' => [
+            '8.0'       => true,
+        ],
+        'zip_close' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive::close()',
+        ],
+        'zip_entry_close' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_compressedsize' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_compressionmethod' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_filesize' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_name' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_open' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_entry_read' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+        'zip_open' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive::open()',
+        ],
+        'zip_read' => [
+            '8.0'         => false,
+            'alternative' => 'ZipArchive',
+        ],
+
+        'date_sunrise' => [
+            '8.1'         => false,
+            'alternative' => 'date_sun_info()',
+        ],
+        'date_sunset' => [
+            '8.1'         => false,
+            'alternative' => 'date_sun_info()',
+        ],
+        'strptime' => [
+            '8.1'         => false,
+            'alternative' => 'date_parse_from_format() or IntlDateFormatter::parse()',
+        ],
+        'strftime' => [
+            '8.1'         => false,
+            'alternative' => 'date() or IntlDateFormatter::format()',
+        ],
+        'gmstrftime' => [
+            '8.1'         => false,
+            'alternative' => 'date() or IntlDateFormatter::format()',
+        ],
+        'mhash_count' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash_get_block_size' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash_get_hash_name' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash_keygen_s2k' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'mhash' => [
+            '8.1'         => false,
+            'alternative' => 'the hash_*() functions',
+        ],
+        'odbc_result_all' => [
+            '8.1' => false,
+        ],
+        'utf8_encode' => [
+            '8.2' => false,
+            'alternative' => 'iconv()',
+        ],
+        'utf8_decode' => [
+            '8.2' => false,
+            'alternative' => 'iconv()',
+        ],
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr !== false && !Assert::isBuiltinFunctionCall($phpcsFile, $stackPtr)) {
+            return;
+        }
+        return parent::process($phpcsFile, $stackPtr);
+    }
+}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
new file mode 100644
index 00000000..e66223c2
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
@@ -0,0 +1,4 @@
+<?php
+$var = 'hello world';
+utf8_encode($var);
+utf8_decode($var);
\ No newline at end of file
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
new file mode 100644
index 00000000..144004bb
--- /dev/null
+++ b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\PHPCompatibility;
+
+/**
+ * Test the RemovedFunctions sniff.
+ *
+ * @covers \Magento2\Sniffs\PHPCompatibility\RemovedFunctionsSniff
+ */
+class RemovedFunctionsUnitTest extends \PHPCompatibility\Tests\FunctionUse\RemovedFunctionsUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getSniffCode()
+    {
+        return 'Magento2.PHPCompatibility.RemovedFunctions';
+    }
+
+    /**
+     * @param string $testFile
+     * @param array $errors
+     * @return void
+     * @dataProvider php8DeprecatedFunctionDataProvider
+     */
+    public function testPhp82DeprecatedFunction(string $testFile, array $errors): void
+    {
+        $file = $this->sniffFile($testFile, '8.2');
+        foreach ($errors as [$line, $functionName, $alternative]) {
+            $this->assertWarning(
+                $file,
+                $line,
+                "Function $functionName() is deprecated since PHP 8.2; Use $alternative instead"
+            );
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     * @see testPhp82DeprecatedFunction()
+     *
+     */
+    public function php8DeprecatedFunctionDataProvider()
+    {
+        return [
+            [
+                __DIR__ . '/RemovedFunctionsUnitTest.82.inc',
+                [
+                    [3, 'utf8_encode', 'iconv()'],
+                    [4, 'utf8_decode', 'iconv()'],
+                ]
+            ]
+        ];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index b26c8a73..6234fb1b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -168,7 +168,7 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions">
+    <rule ref="Magento2.PHPCompatibility.RemovedFunctions">
         <severity>10</severity>
         <type>error</type>
     </rule>
@@ -771,6 +771,8 @@
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
+        <!-- Following sniffs have an equivalent in Magento2 -->
+        <exclude name="PHPCompatibility.FunctionUse.RemovedFunctions" />
     </rule>
     <!--
      All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is
diff --git a/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc b/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc
new file mode 100644
index 00000000..ae484c99
--- /dev/null
+++ b/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc
@@ -0,0 +1,1232 @@
+<?php
+
+call_user_method();
+call_user_method_array();
+define_syslog_variables();
+dl();
+ereg();
+ereg_replace();
+eregi();
+eregi_replace();
+import_request_variables();
+mcrypt_generic_end();
+mysql_db_query();
+mysql_escape_string();
+mysql_list_dbs();
+mysqli_bind_param();
+mysqli_bind_result();
+mysqli_client_encoding();
+mysqli_fetch();
+mysqli_param_count();
+mysqli_get_metadata();
+mysqli_send_long_data();
+magic_quotes_runtime();
+session_register();
+session_unregister();
+session_is_registered();
+set_magic_quotes_runtime();
+set_socket_blocking();
+split();
+spliti();
+sql_regcase();
+php_logo_guid();
+php_egg_logo_guid();
+php_real_logo_guid();
+zend_logo_guid();
+datefmt_set_timezone_id();
+mcrypt_ecb();
+mcrypt_cbc();
+mcrypt_cfb();
+mcrypt_ofb();
+ocibindbyname();
+ocicancel();
+ocicloselob();
+ocicollappend();
+ocicollassign();
+ocicollassignelem();
+ocicollgetelem();
+ocicollmax();
+ocicollsize();
+ocicolltrim();
+ocicolumnisnull();
+ocicolumnname();
+ocicolumnprecision();
+ocicolumnscale();
+ocicolumnsize();
+ocicolumntype();
+ocicolumntyperaw();
+ocicommit();
+ocidefinebyname();
+ocierror();
+ociexecute();
+ocifetch();
+ocifetchinto();
+ocifetchstatement();
+ocifreecollection();
+ocifreecursor();
+ocifreedesc();
+ocifreestatement();
+ociinternaldebug();
+ociloadlob();
+ocilogoff();
+ocilogon();
+ocinewcollection();
+ocinewcursor();
+ocinewdescriptor();
+ocinlogon();
+ocinumcols();
+ociparse();
+ociplogon();
+ociresult();
+ocirollback();
+ocirowcount();
+ocisavelob();
+ocisavelobfile();
+ociserverversion();
+ocisetprefetch();
+ocistatementtype();
+ociwritelobtofile();
+ociwritetemporarylob();
+imagepsbbox();
+imagepsencodefont();
+imagepsextendfont();
+imagepsfreefont();
+imagepsloadfont();
+imagepsslantfont();
+imagepstext();
+ldap_sort();
+php_check_syntax();
+mysqli_get_cache_stats();
+mcrypt_create_iv();
+mcrypt_decrypt();
+mcrypt_enc_get_algorithms_name();
+mcrypt_enc_get_block_size();
+mcrypt_enc_get_iv_size();
+mcrypt_enc_get_key_size();
+mcrypt_enc_get_modes_name();
+mcrypt_enc_get_supported_key_sizes();
+mcrypt_enc_is_block_algorithm_mode();
+mcrypt_enc_is_block_algorithm();
+mcrypt_enc_is_block_mode();
+mcrypt_enc_self_test();
+mcrypt_encrypt();
+mcrypt_generic_deinit();
+mcrypt_generic_init();
+mcrypt_generic();
+mcrypt_get_block_size();
+mcrypt_get_cipher_name();
+mcrypt_get_iv_size();
+mcrypt_get_key_size();
+mcrypt_list_algorithms();
+mcrypt_list_modes();
+mcrypt_module_close();
+mcrypt_module_get_algo_block_size();
+mcrypt_module_get_algo_key_size();
+mcrypt_module_get_supported_key_sizes();
+mcrypt_module_is_block_algorithm_mode();
+mcrypt_module_is_block_algorithm();
+mcrypt_module_is_block_mode();
+mcrypt_module_open();
+mcrypt_module_self_test();
+mdecrypt_generic();
+
+// Test against false positives.
+$class->php_check_syntax();
+MyClass::php_check_syntax();
+MyNamespace\php_check_syntax();
+echo PHP_CHECK_SYNTAX; // Constant.
+const php_check_syntax = 'abc';
+use php_check_syntax;
+function php_check_syntax() {}
+abstract class Split {}
+
+// More deprecated functions, PHP 7.2
+jpeg2wbmp();
+png2wbmp();
+create_function();
+while (list($key, $val) = each($array)) {}
+gmp_random(2);
+read_exif_data();
+
+// PHP 7.3.
+image2wbmp();
+mbregex_encoding();
+mbereg();
+mberegi();
+mbereg_replace();
+mberegi_replace();
+mbsplit();
+mbereg_match();
+mbereg_search();
+mbereg_search_pos();
+mbereg_search_regs();
+mbereg_search_init();
+mbereg_search_getregs();
+mbereg_search_getpos();
+mbereg_search_setpos();
+fgetss();
+gzgetss();
+
+// PHP 7.4.
+ibase_add_user();
+ibase_affected_rows();
+ibase_backup();
+ibase_blob_add();
+ibase_blob_cancel();
+ibase_blob_close();
+ibase_blob_create();
+ibase_blob_echo();
+ibase_blob_get();
+ibase_blob_import();
+ibase_blob_info();
+ibase_blob_open();
+ibase_close();
+ibase_commit_ret();
+ibase_commit();
+ibase_connect();
+ibase_db_info();
+ibase_delete_user();
+ibase_drop_db();
+ibase_errcode();
+ibase_errmsg();
+ibase_execute();
+ibase_fetch_assoc();
+ibase_fetch_object();
+ibase_fetch_row();
+ibase_field_info();
+ibase_free_event_handler();
+ibase_free_query();
+ibase_free_result();
+ibase_gen_id();
+ibase_maintain_db();
+ibase_modify_user();
+ibase_name_result();
+ibase_num_fields();
+ibase_num_params();
+ibase_param_info();
+ibase_pconnect();
+ibase_prepare();
+ibase_query();
+ibase_restore();
+ibase_rollback_ret();
+ibase_rollback();
+ibase_server_info();
+ibase_service_attach();
+ibase_service_detach();
+ibase_set_event_handler();
+ibase_trans();
+ibase_wait_event();
+
+// Pfpro extension - PHP 5.1
+pfpro_cleanup();
+pfpro_init();
+pfpro_process_raw();
+pfpro_process();
+pfpro_version();
+
+// PHP 7.4.
+wddx_add_vars();
+wddx_deserialize();
+wddx_packet_end();
+wddx_packet_start();
+wddx_serialize_value();
+wddx_serialize_vars();
+ldap_control_paged_result_response();
+ldap_control_paged_result();
+recode_file();
+recode_string();
+recode();
+is_real();
+get_magic_quotes_gpc();
+get_magic_quotes_runtime();
+hebrevc($str));
+convert_cyr_string($str, 'k', 'i');
+money_format();
+ezmlm_hash();
+restore_include_path();
+
+// These calls should *not* trigger an error.
+$myobject -> php_check_syntax (); // Method, not the native PHP function.
+myNamespace \ /*comment*/ php_check_syntax(); // Namespaced function, not the native PHP function.
+namespace\php_check_syntax(); // Namespaced function, not the native PHP function.
+$obj = new php_check_syntax /*comment*/ (); // Class not method.
+
+// PHP 5.3 Ncurses extension.
+ncurses_addch();
+ncurses_addchnstr();
+ncurses_addchstr();
+ncurses_addnstr();
+ncurses_addstr();
+ncurses_assume_default_colors();
+ncurses_attroff();
+ncurses_attron();
+ncurses_attrset();
+ncurses_baudrate();
+ncurses_beep();
+ncurses_bkgd();
+ncurses_bkgdset();
+ncurses_border();
+ncurses_bottom_panel();
+ncurses_can_change_color();
+ncurses_cbreak();
+ncurses_clear();
+ncurses_clrtobot();
+ncurses_clrtoeol();
+ncurses_color_content();
+ncurses_color_set();
+ncurses_curs_set();
+ncurses_def_prog_mode();
+ncurses_def_shell_mode();
+ncurses_define_key();
+ncurses_del_panel();
+ncurses_delay_output();
+ncurses_delch();
+ncurses_deleteln();
+ncurses_delwin();
+ncurses_doupdate();
+ncurses_echo();
+ncurses_echochar();
+ncurses_end();
+ncurses_erase();
+ncurses_erasechar();
+ncurses_filter();
+ncurses_flash();
+ncurses_flushinp();
+ncurses_getch();
+ncurses_getmaxyx();
+ncurses_getmouse();
+ncurses_getyx();
+ncurses_halfdelay();
+ncurses_has_colors();
+ncurses_has_ic();
+ncurses_has_il();
+ncurses_has_key();
+ncurses_hide_panel();
+ncurses_hline();
+ncurses_inch();
+ncurses_init_color();
+ncurses_init_pair();
+ncurses_init();
+ncurses_insch();
+ncurses_insdelln();
+ncurses_insertln();
+ncurses_insstr();
+ncurses_instr();
+ncurses_isendwin();
+ncurses_keyok();
+ncurses_keypad();
+ncurses_killchar();
+ncurses_longname();
+ncurses_meta();
+ncurses_mouse_trafo();
+ncurses_mouseinterval();
+ncurses_mousemask();
+ncurses_move_panel();
+ncurses_move();
+ncurses_mvaddch();
+ncurses_mvaddchnstr();
+ncurses_mvaddchstr();
+ncurses_mvaddnstr();
+ncurses_mvaddstr();
+ncurses_mvcur();
+ncurses_mvdelch();
+ncurses_mvgetch();
+ncurses_mvhline();
+ncurses_mvinch();
+ncurses_mvvline();
+ncurses_mvwaddstr();
+ncurses_napms();
+ncurses_new_panel();
+ncurses_newpad();
+ncurses_newwin();
+ncurses_nl();
+ncurses_nocbreak();
+ncurses_noecho();
+ncurses_nonl();
+ncurses_noqiflush();
+ncurses_noraw();
+ncurses_pair_content();
+ncurses_panel_above();
+ncurses_panel_below();
+ncurses_panel_window();
+ncurses_pnoutrefresh();
+ncurses_prefresh();
+ncurses_putp();
+ncurses_qiflush();
+ncurses_raw();
+ncurses_refresh();
+ncurses_replace_panel();
+ncurses_reset_prog_mode();
+ncurses_reset_shell_mode();
+ncurses_resetty();
+ncurses_savetty();
+ncurses_scr_dump();
+ncurses_scr_init();
+ncurses_scr_restore();
+ncurses_scr_set();
+ncurses_scrl();
+ncurses_show_panel();
+ncurses_slk_attr();
+ncurses_slk_attroff();
+ncurses_slk_attron();
+ncurses_slk_attrset();
+ncurses_slk_clear();
+ncurses_slk_color();
+ncurses_slk_init();
+ncurses_slk_noutrefresh();
+ncurses_slk_refresh();
+ncurses_slk_restore();
+ncurses_slk_set();
+ncurses_slk_touch();
+ncurses_standend();
+ncurses_standout();
+ncurses_start_color();
+ncurses_termattrs();
+ncurses_termname();
+ncurses_timeout();
+ncurses_top_panel();
+ncurses_typeahead();
+ncurses_ungetch();
+ncurses_ungetmouse();
+ncurses_update_panels();
+ncurses_use_default_colors();
+ncurses_use_env();
+ncurses_use_extended_names();
+ncurses_vidattr();
+ncurses_vline();
+ncurses_waddch();
+ncurses_waddstr();
+ncurses_wattroff();
+ncurses_wattron();
+ncurses_wattrset();
+ncurses_wborder();
+ncurses_wclear();
+ncurses_wcolor_set();
+ncurses_werase();
+ncurses_wgetch();
+ncurses_whline();
+ncurses_wmouse_trafo();
+ncurses_wmove();
+ncurses_wnoutrefresh();
+ncurses_wrefresh();
+ncurses_wstandend();
+ncurses_wstandout();
+ncurses_wvline();
+
+// PHP 5.1 MCVE extension.
+m_checkstatus();
+m_completeauthorizations();
+m_connect();
+m_connectionerror();
+m_deletetrans();
+m_destroyconn();
+m_destroyengine();
+m_getcell();
+m_getcellbynum();
+m_getcommadelimited();
+m_getheader();
+m_initconn();
+m_initengine();
+m_iscommadelimited();
+m_maxconntimeout();
+m_monitor();
+m_numcolumns();
+m_numrows();
+m_parsecommadelimited();
+m_responsekeys();
+m_responseparam();
+m_returnstatus();
+m_setblocking();
+m_setdropfile();
+m_setip();
+m_setssl_cafile();
+m_setssl_files();
+m_setssl();
+m_settimeout();
+m_sslcert_gen_hash();
+m_transactionssent();
+m_transinqueue();
+m_transkeyval();
+m_transnew();
+m_transsend();
+m_uwait();
+m_validateidentifier();
+m_verifyconnection();
+m_verifysslcert();
+
+// PHP 5.1 DIO extension.
+dio_close();
+dio_fcntl();
+dio_open();
+dio_read();
+dio_seek();
+dio_stat();
+dio_tcsetattr();
+dio_truncate();
+dio_write();
+
+// PHP 5.3 FDF extension.
+fdf_add_doc_javascript();
+fdf_add_template();
+fdf_close();
+fdf_create();
+fdf_enum_values();
+fdf_errno();
+fdf_error();
+fdf_get_ap();
+fdf_get_attachment();
+fdf_get_encoding();
+fdf_get_file();
+fdf_get_flags();
+fdf_get_opt();
+fdf_get_status();
+fdf_get_value();
+fdf_get_version();
+fdf_header();
+fdf_next_field_name();
+fdf_open_string();
+fdf_open();
+fdf_remove_item();
+fdf_save_string();
+fdf_save();
+fdf_set_ap();
+fdf_set_encoding();
+fdf_set_file();
+fdf_set_flags();
+fdf_set_javascript_action();
+fdf_set_on_import_javascript();
+fdf_set_opt();
+fdf_set_status();
+fdf_set_submit_form_action();
+fdf_set_target_frame();
+fdf_set_value();
+fdf_set_version();
+
+// PHP 5.3 Ming extension.
+ming_keypress();
+ming_setcubicthreshold();
+ming_setscale();
+ming_setswfcompression();
+ming_useconstants();
+ming_useswfversion();
+
+// PHP 5.1 Fam extension.
+fam_cancel_monitor();
+fam_close();
+fam_monitor_collection();
+fam_monitor_directory();
+fam_monitor_file();
+fam_next_event();
+fam_open();
+fam_pending();
+fam_resume_monitor();
+fam_suspend_monitor();
+
+// PHP 5.2 HWAPI extension.
+hwapi_attribute_new();
+hwapi_content_new();
+hwapi_hgcsp();
+hwapi_object_new();
+
+// PHP 5.1 YP/NIS extension.
+yp_all();
+yp_cat();
+yp_err_string();
+yp_errno();
+yp_first();
+yp_get_default_domain();
+yp_master();
+yp_match();
+yp_next();
+yp_order();
+
+// PHP 5.1 Mnogosearch extension.
+udm_add_search_limit();
+udm_alloc_agent_array();
+udm_alloc_agent();
+udm_api_version();
+udm_cat_list();
+udm_cat_path();
+udm_check_charset();
+udm_clear_search_limits();
+udm_crc32();
+udm_errno();
+udm_error();
+udm_find();
+udm_free_agent();
+udm_free_ispell_data();
+udm_free_res();
+udm_get_doc_count();
+udm_get_res_field();
+udm_get_res_param();
+udm_hash32();
+udm_load_ispell_data();
+udm_set_agent_param();
+
+// PHP 5.1.3 Msession extension.
+msession_connect();
+msession_count();
+msession_create();
+msession_destroy();
+msession_disconnect();
+msession_find();
+msession_get_array();
+msession_get_data();
+msession_get();
+msession_inc();
+msession_list();
+msession_listvar();
+msession_lock();
+msession_plugin();
+msession_randstr();
+msession_set_array();
+msession_set_data();
+msession_set();
+msession_timeout();
+msession_uniq();
+msession_unlock();
+
+__autoload($class);
+
+// PHP 5.0 Crack extension.
+crack_check();
+crack_closedict();
+crack_getlastmessage();
+crack_opendict();
+
+// PHP 5.1 W32API extension.
+w32api_deftype();
+w32api_init_dtype();
+w32api_invoke_function();
+w32api_register_function();
+w32api_set_call_method();
+
+// PHP 5.1 CPDF extension.
+cpdf_add_annotation();
+cpdf_add_outline();
+cpdf_arc();
+cpdf_begin_text();
+cpdf_circle();
+cpdf_clip();
+cpdf_close();
+cpdf_closepath_fill_stroke();
+cpdf_closepath_stroke();
+cpdf_closepath();
+cpdf_continue_text();
+cpdf_curveto();
+cpdf_end_text();
+cpdf_fill_stroke();
+cpdf_fill();
+cpdf_finalize_page();
+cpdf_finalize();
+cpdf_global_set_document_limits();
+cpdf_import_jpeg();
+cpdf_lineto();
+cpdf_moveto();
+cpdf_newpath();
+cpdf_open();
+cpdf_output_buffer();
+cpdf_page_init();
+cpdf_place_inline_image();
+cpdf_rect();
+cpdf_restore();
+cpdf_rlineto();
+cpdf_rmoveto();
+cpdf_rotate_text();
+cpdf_rotate();
+cpdf_save_to_file();
+cpdf_save();
+cpdf_scale();
+cpdf_set_action_url();
+cpdf_set_char_spacing();
+cpdf_set_creator();
+cpdf_set_current_page();
+cpdf_set_font_directories();
+cpdf_set_font_map_file();
+cpdf_set_font();
+cpdf_set_horiz_scaling();
+cpdf_set_keywords();
+cpdf_set_leading();
+cpdf_set_page_animation();
+cpdf_set_subject();
+cpdf_set_text_matrix();
+cpdf_set_text_pos();
+cpdf_set_text_rendering();
+cpdf_set_text_rise();
+cpdf_set_title();
+cpdf_set_viewer_preferences();
+cpdf_set_word_spacing();
+cpdf_setdash();
+cpdf_setflat();
+cpdf_setgray_fill();
+cpdf_setgray_stroke();
+cpdf_setgray();
+cpdf_setlinecap();
+cpdf_setlinejoin();
+cpdf_setlinewidth();
+cpdf_setmiterlimit();
+cpdf_setrgbcolor_fill();
+cpdf_setrgbcolor_stroke();
+cpdf_setrgbcolor();
+cpdf_show_xy();
+cpdf_show();
+cpdf_stringwidth();
+cpdf_stroke();
+cpdf_text();
+cpdf_translate();
+ircg_channel_mode();
+ircg_disconnect();
+ircg_eval_ecmascript_params();
+ircg_fetch_error_msg();
+ircg_get_username();
+ircg_html_encode();
+ircg_ignore_add();
+ircg_ignore_del();
+ircg_invite();
+ircg_is_conn_alive();
+ircg_join();
+ircg_kick();
+ircg_list();
+ircg_lookup_format_messages();
+ircg_lusers();
+ircg_msg();
+ircg_names();
+ircg_nick();
+ircg_nickname_escape();
+ircg_nickname_unescape();
+ircg_notice();
+ircg_oper();
+ircg_part();
+ircg_pconnect();
+ircg_register_format_messages();
+ircg_set_current();
+ircg_set_file();
+ircg_set_on_die();
+ircg_topic();
+ircg_who();
+ircg_whois();
+dbase_add_record();
+dbase_close();
+dbase_create();
+dbase_delete_record();
+dbase_get_header_info();
+dbase_get_record_with_names();
+dbase_get_record();
+dbase_numfields();
+dbase_numrecords();
+dbase_open();
+dbase_pack();
+dbase_replace_record();
+dbx_close();
+dbx_compare();
+dbx_connect();
+dbx_error();
+dbx_escape_string();
+dbx_fetch_row();
+dbx_query();
+dbx_sort();
+fbsql_affected_rows();
+fbsql_autocommit();
+fbsql_blob_size();
+fbsql_change_user();
+fbsql_clob_size();
+fbsql_close();
+fbsql_commit();
+fbsql_connect();
+fbsql_create_blob();
+fbsql_create_clob();
+fbsql_create_db();
+fbsql_data_seek();
+fbsql_database_password();
+fbsql_database();
+fbsql_db_query();
+fbsql_db_status();
+fbsql_drop_db();
+fbsql_errno();
+fbsql_error();
+fbsql_fetch_array();
+fbsql_fetch_assoc();
+fbsql_fetch_field();
+fbsql_fetch_lengths();
+fbsql_fetch_object();
+fbsql_fetch_row();
+fbsql_field_flags();
+fbsql_field_len();
+fbsql_field_name();
+fbsql_field_seek();
+fbsql_field_table();
+fbsql_field_type();
+fbsql_free_result();
+fbsql_get_autostart_info();
+fbsql_hostname();
+fbsql_insert_id();
+fbsql_list_dbs();
+fbsql_list_fields();
+fbsql_list_tables();
+fbsql_next_result();
+fbsql_num_fields();
+fbsql_num_rows();
+fbsql_password();
+fbsql_pconnect();
+fbsql_query();
+fbsql_read_blob();
+fbsql_read_clob();
+fbsql_result();
+fbsql_rollback();
+fbsql_rows_fetched();
+fbsql_select_db();
+fbsql_set_characterset();
+fbsql_set_lob_mode();
+fbsql_set_password();
+fbsql_set_transaction();
+fbsql_start_db();
+fbsql_stop_db();
+fbsql_table_name();
+fbsql_tablename();
+fbsql_username();
+fbsql_warnings();
+filepro_fieldcount();
+filepro_fieldname();
+filepro_fieldtype();
+filepro_fieldwidth();
+filepro_retrieve();
+filepro_rowcount();
+filepro();
+ingres_autocommit();
+ingres_close();
+ingres_commit();
+ingres_connect();
+ingres_fetch_array();
+ingres_fetch_object();
+ingres_fetch_row();
+ingres_field_length();
+ingres_field_name();
+ingres_field_nullable();
+ingres_field_precision();
+ingres_field_scale();
+ingres_field_type();
+ingres_num_fields();
+ingres_num_rows();
+ingres_pconnect();
+ingres_query();
+ingres_rollback();
+msql_affected_rows();
+msql_close();
+msql_connect();
+msql_create_db();
+msql_createdb();
+msql_data_seek();
+msql_db_query();
+msql_dbname();
+msql_drop_db();
+msql_error();
+msql_fetch_array();
+msql_fetch_field();
+msql_fetch_object();
+msql_fetch_row();
+msql_field_flags();
+msql_field_len();
+msql_field_name();
+msql_field_seek();
+msql_field_table();
+msql_field_type();
+msql_fieldflags();
+msql_fieldlen();
+msql_fieldname();
+msql_fieldtable();
+msql_fieldtype();
+msql_free_result();
+msql_list_dbs();
+msql_list_fields();
+msql_list_tables();
+msql_num_fields();
+msql_num_rows();
+msql_numfields();
+msql_numrows();
+msql_pconnect();
+msql_query();
+msql_regcase();
+msql_result();
+msql_select_db();
+msql_tablename();
+msql();
+mssql_bind();
+mssql_close();
+mssql_connect();
+mssql_data_seek();
+mssql_execute();
+mssql_fetch_array();
+mssql_fetch_assoc();
+mssql_fetch_batch();
+mssql_fetch_field();
+mssql_fetch_object();
+mssql_fetch_row();
+mssql_field_length();
+mssql_field_name();
+mssql_field_seek();
+mssql_field_type();
+mssql_free_result();
+mssql_free_statement();
+mssql_get_last_message();
+mssql_guid_string();
+mssql_init();
+mssql_min_error_severity();
+mssql_min_message_severity();
+mssql_next_result();
+mssql_num_fields();
+mssql_num_rows();
+mssql_pconnect();
+mssql_query();
+mssql_result();
+mssql_rows_affected();
+mssql_select_db();
+sqlite_array_query();
+sqlite_busy_timeout();
+sqlite_changes();
+sqlite_close();
+sqlite_column();
+sqlite_create_aggregate();
+sqlite_create_function();
+sqlite_current();
+sqlite_error_string();
+sqlite_escape_string();
+sqlite_exec();
+sqlite_factory();
+sqlite_fetch_all();
+sqlite_fetch_array();
+sqlite_fetch_column_types();
+sqlite_fetch_object();
+sqlite_fetch_single();
+sqlite_fetch_string();
+sqlite_field_name();
+sqlite_has_more();
+sqlite_has_prev();
+sqlite_key();
+sqlite_last_error();
+sqlite_last_insert_rowid();
+sqlite_libencoding();
+sqlite_libversion();
+sqlite_next();
+sqlite_num_fields();
+sqlite_num_rows();
+sqlite_open();
+sqlite_popen();
+sqlite_prev();
+sqlite_query();
+sqlite_rewind();
+sqlite_seek();
+sqlite_single_query();
+sqlite_udf_decode_binary();
+sqlite_udf_encode_binary();
+sqlite_unbuffered_query();
+sqlite_valid();
+mysql_affected_rows();
+mysql_client_encoding();
+mysql_close();
+mysql_connect();
+mysql_create_db();
+mysql_data_seek();
+mysql_db_name();
+mysql_drop_db();
+mysql_errno();
+mysql_error();
+mysql_fetch_array();
+mysql_fetch_assoc();
+mysql_fetch_field();
+mysql_fetch_lengths();
+mysql_fetch_object();
+mysql_fetch_row();
+mysql_field_flags();
+mysql_field_len();
+mysql_field_name();
+mysql_field_seek();
+mysql_field_table();
+mysql_field_type();
+mysql_free_result();
+mysql_get_client_info();
+mysql_get_host_info();
+mysql_get_proto_info();
+mysql_get_server_info();
+mysql_info();
+mysql_insert_id();
+mysql_list_fields();
+mysql_list_processes();
+mysql_list_tables();
+mysql_num_fields();
+mysql_num_rows();
+mysql_pconnect();
+mysql_ping();
+mysql_query();
+mysql_real_escape_string();
+mysql_result();
+mysql_select_db();
+mysql_set_charset();
+mysql_stat();
+mysql_tablename();
+mysql_thread_id();
+mysql_unbuffered_query();
+mysql();
+mysql_fieldname();
+mysql_fieldtable();
+mysql_fieldlen();
+mysql_fieldtype();
+mysql_fieldflags();
+mysql_selectdb();
+mysql_createdb();
+mysql_dropdb();
+mysql_freeresult();
+mysql_numfields();
+mysql_numrows();
+mysql_listdbs();
+mysql_listtables();
+mysql_listfields();
+mysql_dbname();
+mysql_table_name();
+
+// PHP 7.4 ibase extension aliases.
+fbird_add_user();
+fbird_affected_rows();
+fbird_backup();
+fbird_blob_add();
+fbird_blob_cancel();
+fbird_blob_close();
+fbird_blob_create();
+fbird_blob_echo();
+fbird_blob_get();
+fbird_blob_import();
+fbird_blob_info();
+fbird_blob_open();
+fbird_close();
+fbird_commit_ret();
+fbird_commit();
+fbird_connect();
+fbird_db_info();
+fbird_delete_user();
+fbird_drop_db();
+fbird_errcode();
+fbird_errmsg();
+fbird_execute();
+fbird_fetch_assoc();
+fbird_fetch_object();
+fbird_fetch_row();
+fbird_field_info();
+fbird_free_event_handler();
+fbird_free_query();
+fbird_free_result();
+fbird_gen_id();
+fbird_maintain_db();
+fbird_modify_user();
+fbird_name_result();
+fbird_num_fields();
+fbird_num_params();
+fbird_param_info();
+fbird_pconnect();
+fbird_prepare();
+fbird_query();
+fbird_restore();
+fbird_rollback_ret();
+fbird_rollback();
+fbird_server_info();
+fbird_service_attach();
+fbird_service_detach();
+fbird_set_event_handler();
+fbird_trans();
+fbird_wait_event();
+
+ovrimos_close();
+ovrimos_commit();
+ovrimos_connect();
+ovrimos_cursor();
+ovrimos_exec();
+ovrimos_execute();
+ovrimos_fetch_into();
+ovrimos_fetch_row();
+ovrimos_field_len();
+ovrimos_field_name();
+ovrimos_field_num();
+ovrimos_field_type();
+ovrimos_free_result();
+ovrimos_longreadlen();
+ovrimos_num_fields();
+ovrimos_num_rows();
+ovrimos_prepare();
+ovrimos_result_all();
+ovrimos_result();
+ovrimos_rollback();
+ovrimos_close_all();
+
+ora_bind();
+ora_close();
+ora_columnname();
+ora_columnsize();
+ora_columntype();
+ora_commit();
+ora_commitoff();
+ora_commiton();
+ora_do();
+ora_error();
+ora_errorcode();
+ora_exec();
+ora_fetch_into();
+ora_fetch();
+ora_getcolumn();
+ora_logoff();
+ora_logon();
+ora_numcols();
+ora_numrows();
+ora_open();
+ora_parse();
+ora_plogon();
+ora_rollback();
+sybase_affected_rows();
+sybase_close();
+sybase_connect();
+sybase_data_seek();
+sybase_deadlock_retry_count();
+sybase_fetch_array();
+sybase_fetch_assoc();
+sybase_fetch_field();
+sybase_fetch_object();
+sybase_fetch_row();
+sybase_field_seek();
+sybase_free_result();
+sybase_get_last_message();
+sybase_min_client_severity();
+sybase_min_error_severity();
+sybase_min_message_severity();
+sybase_min_server_severity();
+sybase_num_fields();
+sybase_num_rows();
+sybase_pconnect();
+sybase_query();
+sybase_result();
+sybase_select_db();
+sybase_set_message_handler();
+sybase_unbuffered_query();
+ifx_affected_rows();
+ifx_blobinfile_mode();
+ifx_byteasvarchar();
+ifx_close();
+ifx_connect();
+ifx_copy_blob();
+ifx_create_blob();
+ifx_create_char();
+ifx_do();
+ifx_error();
+ifx_errormsg();
+ifx_fetch_row();
+ifx_fieldproperties();
+ifx_fieldtypes();
+ifx_free_blob();
+ifx_free_char();
+ifx_free_result();
+ifx_get_blob();
+ifx_get_char();
+ifx_getsqlca();
+ifx_htmltbl_result();
+ifx_nullformat();
+ifx_num_fields();
+ifx_num_rows();
+ifx_pconnect();
+ifx_prepare();
+ifx_query();
+ifx_textasvarchar();
+ifx_update_blob();
+ifx_update_char();
+ifxus_close_slob();
+ifxus_create_slob();
+ifxus_free_slob();
+ifxus_open_slob();
+ifxus_read_slob();
+ifxus_seek_slob();
+ifxus_tell_slob();
+ifxus_write_slob();
+mysqli_disable_reads_from_master();
+mysqli_disable_rpl_parse();
+mysqli_embedded_connect();
+mysqli_embedded_server_end();
+mysqli_embedded_server_start();
+mysqli_enable_reads_from_master();
+mysqli_enable_rpl_parse();
+mysqli_master_query();
+mysqli_resource();
+mysqli_rpl_parse_enabled();
+mysqli_rpl_probe();
+mysqli_server_end();
+mysqli_server_init();
+mysqli_slave_query();
+xmlrpc_decode_request();
+xmlrpc_decode();
+xmlrpc_encode_request();
+xmlrpc_encode();
+xmlrpc_get_type();
+xmlrpc_is_fault();
+xmlrpc_parse_method_descriptions();
+xmlrpc_server_add_introspection_data();
+xmlrpc_server_call_method();
+xmlrpc_server_create();
+xmlrpc_server_destroy();
+xmlrpc_server_register_introspection_callback();
+xmlrpc_server_register_method();
+xmlrpc_set_type();
+enchant_broker_get_dict_path();
+enchant_broker_set_dict_path();
+enchant_broker_free();
+enchant_broker_free_dict();
+enchant_dict_add_to_personal();
+enchant_dict_is_in_session();
+oci_internal_debug();
+zip_close();
+zip_entry_close();
+zip_entry_compressedsize();
+zip_entry_compressionmethod();
+zip_entry_filesize();
+zip_entry_name();
+zip_entry_open();
+zip_entry_read();
+zip_open();
+zip_read();
+openssl_x509_free();
+openssl_pkey_free();
+libxml_disable_entity_loader();
+pg_clientencoding();
+pg_cmdtuples();
+pg_errormessage();
+pg_fieldname();
+pg_fieldnum();
+pg_fieldisnull();
+pg_fieldprtlen();
+pg_fieldsize();
+pg_fieldtype();
+pg_freeresult();
+pg_getlastoid();
+pg_loclose();
+pg_locreate();
+pg_loexport();
+pg_loimport();
+pg_loopen();
+pg_loread();
+pg_loreadall();
+pg_lounlink();
+pg_lowrite();
+pg_numfields();
+pg_numrows();
+pg_result();
+pg_setclientencoding();
+imap_header();
+shmop_close();
+openssl_free_key();
+date_sunrise();
+date_sunset();
+strptime();
+strftime();
+gmstrftime();
+mhash_count();
+mhash_get_block_size();
+mhash_get_hash_name();
+mhash_keygen_s2k();
+mhash();
+odbc_result_all();
+
+// Prevent false positives on PHP 8.0+ nullsafe method calls.
+$obj?->php_check_syntax(); // OK.
diff --git a/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php b/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php
new file mode 100644
index 00000000..bcc09de2
--- /dev/null
+++ b/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php
@@ -0,0 +1,1553 @@
+<?php
+/**
+ * PHPCompatibility, an external standard for PHP_CodeSniffer.
+ *
+ * @package   PHPCompatibility
+ * @copyright 2012-2020 PHPCompatibility Contributors
+ * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
+ * @link      https://github.com/PHPCompatibility/PHPCompatibility
+ */
+
+namespace PHPCompatibility\Tests\FunctionUse;
+
+use PHPCompatibility\Tests\BaseSniffTest;
+
+/**
+ * Test the RemovedFunctions sniff.
+ *
+ * @group removedFunctions
+ * @group functionUse
+ *
+ * @covers \PHPCompatibility\Sniffs\FunctionUse\RemovedFunctionsSniff
+ *
+ * @since 5.5
+ */
+class RemovedFunctionsUnitTest extends BaseSniffTest
+{
+
+    /**
+     * testDeprecatedFunction
+     *
+     * @dataProvider dataDeprecatedFunction
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedFunction($functionName, $deprecatedIn, $lines, $okVersion, $deprecatedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedFunction()
+     *
+     * @return array
+     */
+    public function dataDeprecatedFunction()
+    {
+        return [
+            ['dl', '5.3', [6], '5.2'],
+            ['ocifetchinto', '5.4', [63], '5.3'],
+            ['enchant_broker_get_dict_path', '8.0', [1172], '7.4'],
+            ['enchant_broker_set_dict_path', '8.0', [1173], '7.4'],
+            ['libxml_disable_entity_loader', '8.0', [1191], '7.4'],
+            ['openssl_x509_free', '8.0', [1189], '7.4'],
+            ['openssl_pkey_free', '8.0', [1190], '7.4'],
+            ['shmop_close', '8.0', [1217], '7.4'],
+            ['openssl_free_key', '8.0', [1218], '7.4'],
+            ['odbc_result_all', '8.1', [1229], '8.0'],
+        ];
+    }
+
+
+    /**
+     * testDeprecatedFunctionWithAlternative
+     *
+     * @dataProvider dataDeprecatedFunctionWithAlternative
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param string $alternative       An alternative function.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedFunctionWithAlternative($functionName, $deprecatedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedFunctionWithAlternative()
+     *
+     * @return array
+     */
+    public function dataDeprecatedFunctionWithAlternative()
+    {
+        return [
+            ['ocibindbyname', '5.4', 'oci_bind_by_name()', [41], '5.3'],
+            ['ocicancel', '5.4', 'oci_cancel()', [42], '5.3'],
+            ['ocicloselob', '5.4', 'OCI-Lob::close() / OCILob::close() (PHP 8+)', [43], '5.3'],
+            ['ocicollappend', '5.4', 'OCI-Collection::append() / OCICollection::append() (PHP 8+)', [44], '5.3'],
+            ['ocicollassign', '5.4', 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)', [45], '5.3'],
+            ['ocicollassignelem', '5.4', 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)', [46], '5.3'],
+            ['ocicollgetelem', '5.4', 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)', [47], '5.3'],
+            ['ocicollmax', '5.4', 'OCI-Collection::max() / OCICollection::max() (PHP 8+)', [48], '5.3'],
+            ['ocicollsize', '5.4', 'OCI-Collection::size() / OCICollection::size() (PHP 8+)', [49], '5.3'],
+            ['ocicolltrim', '5.4', 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)', [50], '5.3'],
+            ['ocicolumnisnull', '5.4', 'oci_field_is_null()', [51], '5.3'],
+            ['ocicolumnname', '5.4', 'oci_field_name()', [52], '5.3'],
+            ['ocicolumnprecision', '5.4', 'oci_field_precision()', [53], '5.3'],
+            ['ocicolumnscale', '5.4', 'oci_field_scale()', [54], '5.3'],
+            ['ocicolumnsize', '5.4', 'oci_field_size()', [55], '5.3'],
+            ['ocicolumntype', '5.4', 'oci_field_type()', [56], '5.3'],
+            ['ocicolumntyperaw', '5.4', 'oci_field_type_raw()', [57], '5.3'],
+            ['ocicommit', '5.4', 'oci_commit()', [58], '5.3'],
+            ['ocidefinebyname', '5.4', 'oci_define_by_name()', [59], '5.3'],
+            ['ocierror', '5.4', 'oci_error()', [60], '5.3'],
+            ['ociexecute', '5.4', 'oci_execute()', [61], '5.3'],
+            ['ocifetch', '5.4', 'oci_fetch()', [62], '5.3'],
+            ['ocifetchstatement', '5.4', 'oci_fetch_all()', [64], '5.3'],
+            ['ocifreecollection', '5.4', 'OCI-Collection::free() / OCICollection::free() (PHP 8+)', [65], '5.3'],
+            ['ocifreecursor', '5.4', 'oci_free_statement()', [66], '5.3'],
+            ['ocifreedesc', '5.4', 'OCI-Lob::free() / OCILob::free() (PHP 8+)', [67], '5.3'],
+            ['ocifreestatement', '5.4', 'oci_free_statement()', [68], '5.3'],
+            ['ociloadlob', '5.4', 'OCI-Lob::load() / OCILob::load() (PHP 8+)', [70], '5.3'],
+            ['ocilogoff', '5.4', 'oci_close()', [71], '5.3'],
+            ['ocilogon', '5.4', 'oci_connect()', [72], '5.3'],
+            ['ocinewcollection', '5.4', 'oci_new_collection()', [73], '5.3'],
+            ['ocinewcursor', '5.4', 'oci_new_cursor()', [74], '5.3'],
+            ['ocinewdescriptor', '5.4', 'oci_new_descriptor()', [75], '5.3'],
+            ['ocinlogon', '5.4', 'oci_new_connect()', [76], '5.3'],
+            ['ocinumcols', '5.4', 'oci_num_fields()', [77], '5.3'],
+            ['ociparse', '5.4', 'oci_parse()', [78], '5.3'],
+            ['ociplogon', '5.4', 'oci_pconnect()', [79], '5.3'],
+            ['ociresult', '5.4', 'oci_result()', [80], '5.3'],
+            ['ocirollback', '5.4', 'oci_rollback()', [81], '5.3'],
+            ['ocirowcount', '5.4', 'oci_num_rows()', [82], '5.3'],
+            ['ocisavelob', '5.4', 'OCI-Lob::save() / OCILob::save() (PHP 8+)', [83], '5.3'],
+            ['ocisavelobfile', '5.4', 'OCI-Lob::import() / OCILob::import() (PHP 8+)', [84], '5.3'],
+            ['ociserverversion', '5.4', 'oci_server_version()', [85], '5.3'],
+            ['ocisetprefetch', '5.4', 'oci_set_prefetch()', [86], '5.3'],
+            ['ocistatementtype', '5.4', 'oci_statement_type()', [87], '5.3'],
+            ['ociwritelobtofile', '5.4', 'OCI-Lob::export() / OCILob::export() (PHP 8+)', [88], '5.3'],
+            ['ociwritetemporarylob', '5.4', 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)', [89], '5.3'],
+
+            ['__autoload', '7.2', 'SPL autoload', [589], '7.1'],
+            ['is_real', '7.4', 'is_float()', [239], '7.3'],
+
+            ['enchant_broker_free', '8.0', 'unset the object', [1174], '7.4'],
+            ['enchant_broker_free_dict', '8.0', 'unset the object', [1175], '7.4'],
+            ['enchant_dict_add_to_personal', '8.0', 'enchant_dict_add()', [1176], '7.4'],
+            ['enchant_dict_is_in_session', '8.0', 'enchant_dict_is_added()', [1177], '7.4'],
+            ['zip_close', '8.0', 'ZipArchive::close()', [1179], '7.4'],
+            ['zip_entry_close', '8.0', 'ZipArchive', [1180], '7.4'],
+            ['zip_entry_compressedsize', '8.0', 'ZipArchive', [1181], '7.4'],
+            ['zip_entry_compressionmethod', '8.0', 'ZipArchive', [1182], '7.4'],
+            ['zip_entry_filesize', '8.0', 'ZipArchive', [1183], '7.4'],
+            ['zip_entry_name', '8.0', 'ZipArchive', [1184], '7.4'],
+            ['zip_entry_open', '8.0', 'ZipArchive', [1185], '7.4'],
+            ['zip_entry_read', '8.0', 'ZipArchive', [1186], '7.4'],
+            ['zip_open', '8.0', 'ZipArchive::open()', [1187], '7.4'],
+            ['zip_read', '8.0', 'ZipArchive', [1188], '7.4'],
+            ['pg_clientencoding', '8.0', 'pg_client_encoding()', [1192], '7.4'],
+            ['pg_cmdtuples', '8.0', 'pg_affected_rows()', [1193], '7.4'],
+            ['pg_errormessage', '8.0', 'pg_last_error()', [1194], '7.4'],
+            ['pg_fieldname', '8.0', 'pg_field_name()', [1195], '7.4'],
+            ['pg_fieldnum', '8.0', 'pg_field_num()', [1196], '7.4'],
+            ['pg_fieldisnull', '8.0', 'pg_field_is_null()', [1197], '7.4'],
+            ['pg_fieldprtlen', '8.0', 'pg_field_prtlen()', [1198], '7.4'],
+            ['pg_fieldsize', '8.0', 'pg_field_size()', [1199], '7.4'],
+            ['pg_fieldtype', '8.0', 'pg_field_type()', [1200], '7.4'],
+            ['pg_freeresult', '8.0', 'pg_free_result()', [1201], '7.4'],
+            ['pg_getlastoid', '8.0', 'pg_last_oid()', [1202], '7.4'],
+            ['pg_loclose', '8.0', 'pg_lo_close()', [1203], '7.4'],
+            ['pg_locreate', '8.0', 'pg_lo_create()', [1204], '7.4'],
+            ['pg_loexport', '8.0', 'pg_lo_export()', [1205], '7.4'],
+            ['pg_loimport', '8.0', 'pg_lo_import()', [1206], '7.4'],
+            ['pg_loopen', '8.0', 'pg_lo_open()', [1207], '7.4'],
+            ['pg_loread', '8.0', 'pg_lo_read()', [1208], '7.4'],
+            ['pg_loreadall', '8.0', 'pg_lo_read_all()', [1209], '7.4'],
+            ['pg_lounlink', '8.0', 'pg_lo_unlink()', [1210], '7.4'],
+            ['pg_lowrite', '8.0', 'pg_lo_write()', [1211], '7.4'],
+            ['pg_numfields', '8.0', 'pg_num_fields()', [1212], '7.4'],
+            ['pg_numrows', '8.0', 'pg_num_rows()', [1213], '7.4'],
+            ['pg_result', '8.0', 'pg_fetch_result()', [1214], '7.4'],
+            ['pg_setclientencoding', '8.0', 'pg_set_client_encoding()', [1215], '7.4'],
+
+            ['date_sunrise', '8.1', 'date_sun_info()', [1219], '8.0'],
+            ['date_sunset', '8.1', 'date_sun_info()', [1220], '8.0'],
+            ['strptime', '8.1', 'date_parse_from_format() or IntlDateFormatter::parse()', [1221], '8.0'],
+            ['strftime', '8.1', 'date() or IntlDateFormatter::format()', [1222], '8.0'],
+            ['gmstrftime', '8.1', 'date() or IntlDateFormatter::format()', [1223], '8.0'],
+            ['mhash_count', '8.1', 'the hash_*() functions', [1224], '8.0'],
+            ['mhash_get_block_size', '8.1', 'the hash_*() functions', [1225], '8.0'],
+            ['mhash_get_hash_name', '8.1', 'the hash_*() functions', [1226], '8.0'],
+            ['mhash_keygen_s2k', '8.1', 'the hash_*() functions', [1227], '8.0'],
+            ['mhash', '8.1', 'the hash_*() functions', [1228], '8.0'],
+        ];
+    }
+
+
+    /**
+     * testRemovedFunction
+     *
+     * @dataProvider dataRemovedFunction
+     *
+     * @param string $functionName   Name of the function.
+     * @param string $removedIn      The PHP version in which the function was removed.
+     * @param array  $lines          The line numbers in the test file which apply to this function.
+     * @param string $okVersion      A PHP version in which the function was still valid.
+     * @param string $removedVersion Optional PHP version to test removed message with -
+     *                               if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testRemovedFunction($functionName, $removedIn, $lines, $okVersion, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is removed since PHP {$removedIn}";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedFunction()
+     *
+     * @return array
+     */
+    public function dataRemovedFunction()
+    {
+        return [
+            ['crack_check', '5.0', [592], '4.4'],
+            ['crack_closedict', '5.0', [593], '4.4'],
+            ['crack_getlastmessage', '5.0', [594], '4.4'],
+            ['crack_opendict', '5.0', [595], '4.4'],
+
+            ['pfpro_cleanup', '5.1', [221], '5.0'],
+            ['pfpro_init', '5.1', [222], '5.0'],
+            ['pfpro_process_raw', '5.1', [223], '5.0'],
+            ['pfpro_process', '5.1', [224], '5.0'],
+            ['pfpro_version', '5.1', [225], '5.0'],
+            ['m_checkstatus', '5.1', [417], '5.0'],
+            ['m_completeauthorizations', '5.1', [418], '5.0'],
+            ['m_connect', '5.1', [419], '5.0'],
+            ['m_connectionerror', '5.1', [420], '5.0'],
+            ['m_deletetrans', '5.1', [421], '5.0'],
+            ['m_destroyconn', '5.1', [422], '5.0'],
+            ['m_destroyengine', '5.1', [423], '5.0'],
+            ['m_getcell', '5.1', [424], '5.0'],
+            ['m_getcellbynum', '5.1', [425], '5.0'],
+            ['m_getcommadelimited', '5.1', [426], '5.0'],
+            ['m_getheader', '5.1', [427], '5.0'],
+            ['m_initconn', '5.1', [428], '5.0'],
+            ['m_initengine', '5.1', [429], '5.0'],
+            ['m_iscommadelimited', '5.1', [430], '5.0'],
+            ['m_maxconntimeout', '5.1', [431], '5.0'],
+            ['m_monitor', '5.1', [432], '5.0'],
+            ['m_numcolumns', '5.1', [433], '5.0'],
+            ['m_numrows', '5.1', [434], '5.0'],
+            ['m_parsecommadelimited', '5.1', [435], '5.0'],
+            ['m_responsekeys', '5.1', [436], '5.0'],
+            ['m_responseparam', '5.1', [437], '5.0'],
+            ['m_returnstatus', '5.1', [438], '5.0'],
+            ['m_setblocking', '5.1', [439], '5.0'],
+            ['m_setdropfile', '5.1', [440], '5.0'],
+            ['m_setip', '5.1', [441], '5.0'],
+            ['m_setssl_cafile', '5.1', [442], '5.0'],
+            ['m_setssl_files', '5.1', [443], '5.0'],
+            ['m_setssl', '5.1', [444], '5.0'],
+            ['m_settimeout', '5.1', [445], '5.0'],
+            ['m_sslcert_gen_hash', '5.1', [446], '5.0'],
+            ['m_transactionssent', '5.1', [447], '5.0'],
+            ['m_transinqueue', '5.1', [448], '5.0'],
+            ['m_transkeyval', '5.1', [449], '5.0'],
+            ['m_transnew', '5.1', [450], '5.0'],
+            ['m_transsend', '5.1', [451], '5.0'],
+            ['m_uwait', '5.1', [452], '5.0'],
+            ['m_validateidentifier', '5.1', [453], '5.0'],
+            ['m_verifyconnection', '5.1', [454], '5.0'],
+            ['m_verifysslcert', '5.1', [455], '5.0'],
+            ['dio_close', '5.1', [458], '5.0'],
+            ['dio_fcntl', '5.1', [459], '5.0'],
+            ['dio_open', '5.1', [460], '5.0'],
+            ['dio_read', '5.1', [461], '5.0'],
+            ['dio_seek', '5.1', [462], '5.0'],
+            ['dio_stat', '5.1', [463], '5.0'],
+            ['dio_tcsetattr', '5.1', [464], '5.0'],
+            ['dio_truncate', '5.1', [465], '5.0'],
+            ['dio_write', '5.1', [466], '5.0'],
+            ['fam_cancel_monitor', '5.1', [514], '5.0'],
+            ['fam_close', '5.1', [515], '5.0'],
+            ['fam_monitor_collection', '5.1', [516], '5.0'],
+            ['fam_monitor_directory', '5.1', [517], '5.0'],
+            ['fam_monitor_file', '5.1', [518], '5.0'],
+            ['fam_next_event', '5.1', [519], '5.0'],
+            ['fam_open', '5.1', [520], '5.0'],
+            ['fam_pending', '5.1', [521], '5.0'],
+            ['fam_resume_monitor', '5.1', [522], '5.0'],
+            ['fam_suspend_monitor', '5.1', [523], '5.0'],
+            ['yp_all', '5.1', [532], '5.0'],
+            ['yp_cat', '5.1', [533], '5.0'],
+            ['yp_err_string', '5.1', [534], '5.0'],
+            ['yp_errno', '5.1', [535], '5.0'],
+            ['yp_first', '5.1', [536], '5.0'],
+            ['yp_get_default_domain', '5.1', [537], '5.0'],
+            ['yp_master', '5.1', [538], '5.0'],
+            ['yp_match', '5.1', [539], '5.0'],
+            ['yp_next', '5.1', [540], '5.0'],
+            ['yp_order', '5.1', [541], '5.0'],
+            ['udm_add_search_limit', '5.1', [544], '5.0'],
+            ['udm_alloc_agent_array', '5.1', [545], '5.0'],
+            ['udm_alloc_agent', '5.1', [546], '5.0'],
+            ['udm_api_version', '5.1', [547], '5.0'],
+            ['udm_cat_list', '5.1', [548], '5.0'],
+            ['udm_cat_path', '5.1', [549], '5.0'],
+            ['udm_check_charset', '5.1', [550], '5.0'],
+            ['udm_clear_search_limits', '5.1', [551], '5.0'],
+            ['udm_crc32', '5.1', [552], '5.0'],
+            ['udm_errno', '5.1', [553], '5.0'],
+            ['udm_error', '5.1', [554], '5.0'],
+            ['udm_find', '5.1', [555], '5.0'],
+            ['udm_free_agent', '5.1', [556], '5.0'],
+            ['udm_free_ispell_data', '5.1', [557], '5.0'],
+            ['udm_free_res', '5.1', [558], '5.0'],
+            ['udm_get_doc_count', '5.1', [559], '5.0'],
+            ['udm_get_res_field', '5.1', [560], '5.0'],
+            ['udm_get_res_param', '5.1', [561], '5.0'],
+            ['udm_hash32', '5.1', [562], '5.0'],
+            ['udm_load_ispell_data', '5.1', [563], '5.0'],
+            ['udm_set_agent_param', '5.1', [564], '5.0'],
+            ['w32api_deftype', '5.1', [598], '5.0'],
+            ['w32api_init_dtype', '5.1', [599], '5.0'],
+            ['w32api_invoke_function', '5.1', [600], '5.0'],
+            ['w32api_register_function', '5.1', [601], '5.0'],
+            ['w32api_set_call_method', '5.1', [602], '5.0'],
+            ['cpdf_add_annotation', '5.1', [605], '5.0'],
+            ['cpdf_add_outline', '5.1', [606], '5.0'],
+            ['cpdf_arc', '5.1', [607], '5.0'],
+            ['cpdf_begin_text', '5.1', [608], '5.0'],
+            ['cpdf_circle', '5.1', [609], '5.0'],
+            ['cpdf_clip', '5.1', [610], '5.0'],
+            ['cpdf_close', '5.1', [611], '5.0'],
+            ['cpdf_closepath_fill_stroke', '5.1', [612], '5.0'],
+            ['cpdf_closepath_stroke', '5.1', [613], '5.0'],
+            ['cpdf_closepath', '5.1', [614], '5.0'],
+            ['cpdf_continue_text', '5.1', [615], '5.0'],
+            ['cpdf_curveto', '5.1', [616], '5.0'],
+            ['cpdf_end_text', '5.1', [617], '5.0'],
+            ['cpdf_fill_stroke', '5.1', [618], '5.0'],
+            ['cpdf_fill', '5.1', [619], '5.0'],
+            ['cpdf_finalize_page', '5.1', [620], '5.0'],
+            ['cpdf_finalize', '5.1', [621], '5.0'],
+            ['cpdf_global_set_document_limits', '5.1', [622], '5.0'],
+            ['cpdf_import_jpeg', '5.1', [623], '5.0'],
+            ['cpdf_lineto', '5.1', [624], '5.0'],
+            ['cpdf_moveto', '5.1', [625], '5.0'],
+            ['cpdf_newpath', '5.1', [626], '5.0'],
+            ['cpdf_open', '5.1', [627], '5.0'],
+            ['cpdf_output_buffer', '5.1', [628], '5.0'],
+            ['cpdf_page_init', '5.1', [629], '5.0'],
+            ['cpdf_place_inline_image', '5.1', [630], '5.0'],
+            ['cpdf_rect', '5.1', [631], '5.0'],
+            ['cpdf_restore', '5.1', [632], '5.0'],
+            ['cpdf_rlineto', '5.1', [633], '5.0'],
+            ['cpdf_rmoveto', '5.1', [634], '5.0'],
+            ['cpdf_rotate_text', '5.1', [635], '5.0'],
+            ['cpdf_rotate', '5.1', [636], '5.0'],
+            ['cpdf_save_to_file', '5.1', [637], '5.0'],
+            ['cpdf_save', '5.1', [638], '5.0'],
+            ['cpdf_scale', '5.1', [639], '5.0'],
+            ['cpdf_set_action_url', '5.1', [640], '5.0'],
+            ['cpdf_set_char_spacing', '5.1', [641], '5.0'],
+            ['cpdf_set_creator', '5.1', [642], '5.0'],
+            ['cpdf_set_current_page', '5.1', [643], '5.0'],
+            ['cpdf_set_font_directories', '5.1', [644], '5.0'],
+            ['cpdf_set_font_map_file', '5.1', [645], '5.0'],
+            ['cpdf_set_font', '5.1', [646], '5.0'],
+            ['cpdf_set_horiz_scaling', '5.1', [647], '5.0'],
+            ['cpdf_set_keywords', '5.1', [648], '5.0'],
+            ['cpdf_set_leading', '5.1', [649], '5.0'],
+            ['cpdf_set_page_animation', '5.1', [650], '5.0'],
+            ['cpdf_set_subject', '5.1', [651], '5.0'],
+            ['cpdf_set_text_matrix', '5.1', [652], '5.0'],
+            ['cpdf_set_text_pos', '5.1', [653], '5.0'],
+            ['cpdf_set_text_rendering', '5.1', [654], '5.0'],
+            ['cpdf_set_text_rise', '5.1', [655], '5.0'],
+            ['cpdf_set_title', '5.1', [656], '5.0'],
+            ['cpdf_set_viewer_preferences', '5.1', [657], '5.0'],
+            ['cpdf_set_word_spacing', '5.1', [658], '5.0'],
+            ['cpdf_setdash', '5.1', [659], '5.0'],
+            ['cpdf_setflat', '5.1', [660], '5.0'],
+            ['cpdf_setgray_fill', '5.1', [661], '5.0'],
+            ['cpdf_setgray_stroke', '5.1', [662], '5.0'],
+            ['cpdf_setgray', '5.1', [663], '5.0'],
+            ['cpdf_setlinecap', '5.1', [664], '5.0'],
+            ['cpdf_setlinejoin', '5.1', [665], '5.0'],
+            ['cpdf_setlinewidth', '5.1', [666], '5.0'],
+            ['cpdf_setmiterlimit', '5.1', [667], '5.0'],
+            ['cpdf_setrgbcolor_fill', '5.1', [668], '5.0'],
+            ['cpdf_setrgbcolor_stroke', '5.1', [669], '5.0'],
+            ['cpdf_setrgbcolor', '5.1', [670], '5.0'],
+            ['cpdf_show_xy', '5.1', [671], '5.0'],
+            ['cpdf_show', '5.1', [672], '5.0'],
+            ['cpdf_stringwidth', '5.1', [673], '5.0'],
+            ['cpdf_stroke', '5.1', [674], '5.0'],
+            ['cpdf_text', '5.1', [675], '5.0'],
+            ['cpdf_translate', '5.1', [676], '5.0'],
+            ['ircg_channel_mode', '5.1', [677], '5.0'],
+            ['ircg_disconnect', '5.1', [678], '5.0'],
+            ['ircg_eval_ecmascript_params', '5.1', [679], '5.0'],
+            ['ircg_fetch_error_msg', '5.1', [680], '5.0'],
+            ['ircg_get_username', '5.1', [681], '5.0'],
+            ['ircg_html_encode', '5.1', [682], '5.0'],
+            ['ircg_ignore_add', '5.1', [683], '5.0'],
+            ['ircg_ignore_del', '5.1', [684], '5.0'],
+            ['ircg_invite', '5.1', [685], '5.0'],
+            ['ircg_is_conn_alive', '5.1', [686], '5.0'],
+            ['ircg_join', '5.1', [687], '5.0'],
+            ['ircg_kick', '5.1', [688], '5.0'],
+            ['ircg_list', '5.1', [689], '5.0'],
+            ['ircg_lookup_format_messages', '5.1', [690], '5.0'],
+            ['ircg_lusers', '5.1', [691], '5.0'],
+            ['ircg_msg', '5.1', [692], '5.0'],
+            ['ircg_names', '5.1', [693], '5.0'],
+            ['ircg_nick', '5.1', [694], '5.0'],
+            ['ircg_nickname_escape', '5.1', [695], '5.0'],
+            ['ircg_nickname_unescape', '5.1', [696], '5.0'],
+            ['ircg_notice', '5.1', [697], '5.0'],
+            ['ircg_oper', '5.1', [698], '5.0'],
+            ['ircg_part', '5.1', [699], '5.0'],
+            ['ircg_pconnect', '5.1', [700], '5.0'],
+            ['ircg_register_format_messages', '5.1', [701], '5.0'],
+            ['ircg_set_current', '5.1', [702], '5.0'],
+            ['ircg_set_file', '5.1', [703], '5.0'],
+            ['ircg_set_on_die', '5.1', [704], '5.0'],
+            ['ircg_topic', '5.1', [705], '5.0'],
+            ['ircg_who', '5.1', [706], '5.0'],
+            ['ircg_whois', '5.1', [707], '5.0'],
+            ['dbx_close', '5.1', [720], '5.0'],
+            ['dbx_compare', '5.1', [721], '5.0'],
+            ['dbx_connect', '5.1', [722], '5.0'],
+            ['dbx_error', '5.1', [723], '5.0'],
+            ['dbx_escape_string', '5.1', [724], '5.0'],
+            ['dbx_fetch_row', '5.1', [725], '5.0'],
+            ['dbx_query', '5.1', [726], '5.0'],
+            ['dbx_sort', '5.1', [727], '5.0'],
+            ['ingres_autocommit', '5.1', [795], '5.0'],
+            ['ingres_close', '5.1', [796], '5.0'],
+            ['ingres_commit', '5.1', [797], '5.0'],
+            ['ingres_connect', '5.1', [798], '5.0'],
+            ['ingres_fetch_array', '5.1', [799], '5.0'],
+            ['ingres_fetch_object', '5.1', [800], '5.0'],
+            ['ingres_fetch_row', '5.1', [801], '5.0'],
+            ['ingres_field_length', '5.1', [802], '5.0'],
+            ['ingres_field_name', '5.1', [803], '5.0'],
+            ['ingres_field_nullable', '5.1', [804], '5.0'],
+            ['ingres_field_precision', '5.1', [805], '5.0'],
+            ['ingres_field_scale', '5.1', [806], '5.0'],
+            ['ingres_field_type', '5.1', [807], '5.0'],
+            ['ingres_num_fields', '5.1', [808], '5.0'],
+            ['ingres_num_rows', '5.1', [809], '5.0'],
+            ['ingres_pconnect', '5.1', [810], '5.0'],
+            ['ingres_query', '5.1', [811], '5.0'],
+            ['ingres_rollback', '5.1', [812], '5.0'],
+            ['ovrimos_close', '5.1', [1036], '5.0'],
+            ['ovrimos_commit', '5.1', [1037], '5.0'],
+            ['ovrimos_connect', '5.1', [1038], '5.0'],
+            ['ovrimos_cursor', '5.1', [1039], '5.0'],
+            ['ovrimos_exec', '5.1', [1040], '5.0'],
+            ['ovrimos_execute', '5.1', [1041], '5.0'],
+            ['ovrimos_fetch_into', '5.1', [1042], '5.0'],
+            ['ovrimos_fetch_row', '5.1', [1043], '5.0'],
+            ['ovrimos_field_len', '5.1', [1044], '5.0'],
+            ['ovrimos_field_name', '5.1', [1045], '5.0'],
+            ['ovrimos_field_num', '5.1', [1046], '5.0'],
+            ['ovrimos_field_type', '5.1', [1047], '5.0'],
+            ['ovrimos_free_result', '5.1', [1048], '5.0'],
+            ['ovrimos_longreadlen', '5.1', [1049], '5.0'],
+            ['ovrimos_num_fields', '5.1', [1050], '5.0'],
+            ['ovrimos_num_rows', '5.1', [1051], '5.0'],
+            ['ovrimos_prepare', '5.1', [1052], '5.0'],
+            ['ovrimos_result_all', '5.1', [1053], '5.0'],
+            ['ovrimos_result', '5.1', [1054], '5.0'],
+            ['ovrimos_rollback', '5.1', [1055], '5.0'],
+            ['ovrimos_close_all', '5.1', [1056], '5.0'],
+            ['ora_bind', '5.1', [1058], '5.0'],
+            ['ora_close', '5.1', [1059], '5.0'],
+            ['ora_columnname', '5.1', [1060], '5.0'],
+            ['ora_columnsize', '5.1', [1061], '5.0'],
+            ['ora_columntype', '5.1', [1062], '5.0'],
+            ['ora_commit', '5.1', [1063], '5.0'],
+            ['ora_commitoff', '5.1', [1064], '5.0'],
+            ['ora_commiton', '5.1', [1065], '5.0'],
+            ['ora_do', '5.1', [1066], '5.0'],
+            ['ora_error', '5.1', [1067], '5.0'],
+            ['ora_errorcode', '5.1', [1068], '5.0'],
+            ['ora_exec', '5.1', [1069], '5.0'],
+            ['ora_fetch_into', '5.1', [1070], '5.0'],
+            ['ora_fetch', '5.1', [1071], '5.0'],
+            ['ora_getcolumn', '5.1', [1072], '5.0'],
+            ['ora_logoff', '5.1', [1073], '5.0'],
+            ['ora_logon', '5.1', [1074], '5.0'],
+            ['ora_numcols', '5.1', [1075], '5.0'],
+            ['ora_numrows', '5.1', [1076], '5.0'],
+            ['ora_open', '5.1', [1077], '5.0'],
+            ['ora_parse', '5.1', [1078], '5.0'],
+            ['ora_plogon', '5.1', [1079], '5.0'],
+            ['ora_rollback', '5.1', [1080], '5.0'],
+            ['mysqli_embedded_connect', '5.1', [1146], '5.0'],
+            ['mysqli_server_end', '5.1', [1155], '5.0'],
+            ['mysqli_server_init', '5.1', [1156], '5.0'],
+
+            ['msession_connect', '5.1.3', [567], '5.1', '5.2'],
+            ['msession_count', '5.1.3', [568], '5.1', '5.2'],
+            ['msession_create', '5.1.3', [569], '5.1', '5.2'],
+            ['msession_destroy', '5.1.3', [570], '5.1', '5.2'],
+            ['msession_disconnect', '5.1.3', [571], '5.1', '5.2'],
+            ['msession_find', '5.1.3', [572], '5.1', '5.2'],
+            ['msession_get_array', '5.1.3', [573], '5.1', '5.2'],
+            ['msession_get_data', '5.1.3', [574], '5.1', '5.2'],
+            ['msession_get', '5.1.3', [575], '5.1', '5.2'],
+            ['msession_inc', '5.1.3', [576], '5.1', '5.2'],
+            ['msession_list', '5.1.3', [577], '5.1', '5.2'],
+            ['msession_listvar', '5.1.3', [578], '5.1', '5.2'],
+            ['msession_lock', '5.1.3', [579], '5.1', '5.2'],
+            ['msession_plugin', '5.1.3', [580], '5.1', '5.2'],
+            ['msession_randstr', '5.1.3', [581], '5.1', '5.2'],
+            ['msession_set_array', '5.1.3', [582], '5.1', '5.2'],
+            ['msession_set_data', '5.1.3', [583], '5.1', '5.2'],
+            ['msession_set', '5.1.3', [584], '5.1', '5.2'],
+            ['msession_timeout', '5.1.3', [585], '5.1', '5.2'],
+            ['msession_uniq', '5.1.3', [586], '5.1', '5.2'],
+            ['msession_unlock', '5.1.3', [587], '5.1', '5.2'],
+
+            ['mysqli_resource', '5.1.4', [1152], '5.1', '5.2'],
+
+            ['mysql_createdb', '5.1.7', [975], '5.1', '5.2'],
+            ['mysql_dropdb', '5.1.7', [976], '5.1', '5.2'],
+            ['mysql_listtables', '5.1.7', [981], '5.1', '5.2'],
+
+            ['hwapi_attribute_new', '5.2', [526], '5.1'],
+            ['hwapi_content_new', '5.2', [527], '5.1'],
+            ['hwapi_hgcsp', '5.2', [528], '5.1'],
+            ['hwapi_object_new', '5.2', [529], '5.1'],
+            ['filepro_fieldcount', '5.2', [788], '5.1'],
+            ['filepro_fieldname', '5.2', [789], '5.1'],
+            ['filepro_fieldtype', '5.2', [790], '5.1'],
+            ['filepro_fieldwidth', '5.2', [791], '5.1'],
+            ['filepro_retrieve', '5.2', [792], '5.1'],
+            ['filepro_rowcount', '5.2', [793], '5.1'],
+            ['filepro', '5.2', [794], '5.1'],
+
+            ['ifx_affected_rows', '5.2.1', [1106], '5.2', '5.3'],
+            ['ifx_blobinfile_mode', '5.2.1', [1107], '5.2', '5.3'],
+            ['ifx_byteasvarchar', '5.2.1', [1108], '5.2', '5.3'],
+            ['ifx_close', '5.2.1', [1109], '5.2', '5.3'],
+            ['ifx_connect', '5.2.1', [1110], '5.2', '5.3'],
+            ['ifx_copy_blob', '5.2.1', [1111], '5.2', '5.3'],
+            ['ifx_create_blob', '5.2.1', [1112], '5.2', '5.3'],
+            ['ifx_create_char', '5.2.1', [1113], '5.2', '5.3'],
+            ['ifx_do', '5.2.1', [1114], '5.2', '5.3'],
+            ['ifx_error', '5.2.1', [1115], '5.2', '5.3'],
+            ['ifx_errormsg', '5.2.1', [1116], '5.2', '5.3'],
+            ['ifx_fetch_row', '5.2.1', [1117], '5.2', '5.3'],
+            ['ifx_fieldproperties', '5.2.1', [1118], '5.2', '5.3'],
+            ['ifx_fieldtypes', '5.2.1', [1119], '5.2', '5.3'],
+            ['ifx_free_blob', '5.2.1', [1120], '5.2', '5.3'],
+            ['ifx_free_char', '5.2.1', [1121], '5.2', '5.3'],
+            ['ifx_free_result', '5.2.1', [1122], '5.2', '5.3'],
+            ['ifx_get_blob', '5.2.1', [1123], '5.2', '5.3'],
+            ['ifx_get_char', '5.2.1', [1124], '5.2', '5.3'],
+            ['ifx_getsqlca', '5.2.1', [1125], '5.2', '5.3'],
+            ['ifx_htmltbl_result', '5.2.1', [1126], '5.2', '5.3'],
+            ['ifx_nullformat', '5.2.1', [1127], '5.2', '5.3'],
+            ['ifx_num_fields', '5.2.1', [1128], '5.2', '5.3'],
+            ['ifx_num_rows', '5.2.1', [1129], '5.2', '5.3'],
+            ['ifx_pconnect', '5.2.1', [1130], '5.2', '5.3'],
+            ['ifx_prepare', '5.2.1', [1131], '5.2', '5.3'],
+            ['ifx_query', '5.2.1', [1132], '5.2', '5.3'],
+            ['ifx_textasvarchar', '5.2.1', [1133], '5.2', '5.3'],
+            ['ifx_update_blob', '5.2.1', [1134], '5.2', '5.3'],
+            ['ifx_update_char', '5.2.1', [1135], '5.2', '5.3'],
+            ['ifxus_close_slob', '5.2.1', [1136], '5.2', '5.3'],
+            ['ifxus_create_slob', '5.2.1', [1137], '5.2', '5.3'],
+            ['ifxus_free_slob', '5.2.1', [1138], '5.2', '5.3'],
+            ['ifxus_open_slob', '5.2.1', [1139], '5.2', '5.3'],
+            ['ifxus_read_slob', '5.2.1', [1140], '5.2', '5.3'],
+            ['ifxus_seek_slob', '5.2.1', [1141], '5.2', '5.3'],
+            ['ifxus_tell_slob', '5.2.1', [1142], '5.2', '5.3'],
+            ['ifxus_write_slob', '5.2.1', [1143], '5.2', '5.3'],
+
+            ['ncurses_addch', '5.3', [255], '5.2'],
+            ['ncurses_addchnstr', '5.3', [256], '5.2'],
+            ['ncurses_addchstr', '5.3', [257], '5.2'],
+            ['ncurses_addnstr', '5.3', [258], '5.2'],
+            ['ncurses_addstr', '5.3', [259], '5.2'],
+            ['ncurses_assume_default_colors', '5.3', [260], '5.2'],
+            ['ncurses_attroff', '5.3', [261], '5.2'],
+            ['ncurses_attron', '5.3', [262], '5.2'],
+            ['ncurses_attrset', '5.3', [263], '5.2'],
+            ['ncurses_baudrate', '5.3', [264], '5.2'],
+            ['ncurses_beep', '5.3', [265], '5.2'],
+            ['ncurses_bkgd', '5.3', [266], '5.2'],
+            ['ncurses_bkgdset', '5.3', [267], '5.2'],
+            ['ncurses_border', '5.3', [268], '5.2'],
+            ['ncurses_bottom_panel', '5.3', [269], '5.2'],
+            ['ncurses_can_change_color', '5.3', [270], '5.2'],
+            ['ncurses_cbreak', '5.3', [271], '5.2'],
+            ['ncurses_clear', '5.3', [272], '5.2'],
+            ['ncurses_clrtobot', '5.3', [273], '5.2'],
+            ['ncurses_clrtoeol', '5.3', [274], '5.2'],
+            ['ncurses_color_content', '5.3', [275], '5.2'],
+            ['ncurses_color_set', '5.3', [276], '5.2'],
+            ['ncurses_curs_set', '5.3', [277], '5.2'],
+            ['ncurses_def_prog_mode', '5.3', [278], '5.2'],
+            ['ncurses_def_shell_mode', '5.3', [279], '5.2'],
+            ['ncurses_define_key', '5.3', [280], '5.2'],
+            ['ncurses_del_panel', '5.3', [281], '5.2'],
+            ['ncurses_delay_output', '5.3', [282], '5.2'],
+            ['ncurses_delch', '5.3', [283], '5.2'],
+            ['ncurses_deleteln', '5.3', [284], '5.2'],
+            ['ncurses_delwin', '5.3', [285], '5.2'],
+            ['ncurses_doupdate', '5.3', [286], '5.2'],
+            ['ncurses_echo', '5.3', [287], '5.2'],
+            ['ncurses_echochar', '5.3', [288], '5.2'],
+            ['ncurses_end', '5.3', [289], '5.2'],
+            ['ncurses_erase', '5.3', [290], '5.2'],
+            ['ncurses_erasechar', '5.3', [291], '5.2'],
+            ['ncurses_filter', '5.3', [292], '5.2'],
+            ['ncurses_flash', '5.3', [293], '5.2'],
+            ['ncurses_flushinp', '5.3', [294], '5.2'],
+            ['ncurses_getch', '5.3', [295], '5.2'],
+            ['ncurses_getmaxyx', '5.3', [296], '5.2'],
+            ['ncurses_getmouse', '5.3', [297], '5.2'],
+            ['ncurses_getyx', '5.3', [298], '5.2'],
+            ['ncurses_halfdelay', '5.3', [299], '5.2'],
+            ['ncurses_has_colors', '5.3', [300], '5.2'],
+            ['ncurses_has_ic', '5.3', [301], '5.2'],
+            ['ncurses_has_il', '5.3', [302], '5.2'],
+            ['ncurses_has_key', '5.3', [303], '5.2'],
+            ['ncurses_hide_panel', '5.3', [304], '5.2'],
+            ['ncurses_hline', '5.3', [305], '5.2'],
+            ['ncurses_inch', '5.3', [306], '5.2'],
+            ['ncurses_init_color', '5.3', [307], '5.2'],
+            ['ncurses_init_pair', '5.3', [308], '5.2'],
+            ['ncurses_init', '5.3', [309], '5.2'],
+            ['ncurses_insch', '5.3', [310], '5.2'],
+            ['ncurses_insdelln', '5.3', [311], '5.2'],
+            ['ncurses_insertln', '5.3', [312], '5.2'],
+            ['ncurses_insstr', '5.3', [313], '5.2'],
+            ['ncurses_instr', '5.3', [314], '5.2'],
+            ['ncurses_isendwin', '5.3', [315], '5.2'],
+            ['ncurses_keyok', '5.3', [316], '5.2'],
+            ['ncurses_keypad', '5.3', [317], '5.2'],
+            ['ncurses_killchar', '5.3', [318], '5.2'],
+            ['ncurses_longname', '5.3', [319], '5.2'],
+            ['ncurses_meta', '5.3', [320], '5.2'],
+            ['ncurses_mouse_trafo', '5.3', [321], '5.2'],
+            ['ncurses_mouseinterval', '5.3', [322], '5.2'],
+            ['ncurses_mousemask', '5.3', [323], '5.2'],
+            ['ncurses_move_panel', '5.3', [324], '5.2'],
+            ['ncurses_move', '5.3', [325], '5.2'],
+            ['ncurses_mvaddch', '5.3', [326], '5.2'],
+            ['ncurses_mvaddchnstr', '5.3', [327], '5.2'],
+            ['ncurses_mvaddchstr', '5.3', [328], '5.2'],
+            ['ncurses_mvaddnstr', '5.3', [329], '5.2'],
+            ['ncurses_mvaddstr', '5.3', [330], '5.2'],
+            ['ncurses_mvcur', '5.3', [331], '5.2'],
+            ['ncurses_mvdelch', '5.3', [332], '5.2'],
+            ['ncurses_mvgetch', '5.3', [333], '5.2'],
+            ['ncurses_mvhline', '5.3', [334], '5.2'],
+            ['ncurses_mvinch', '5.3', [335], '5.2'],
+            ['ncurses_mvvline', '5.3', [336], '5.2'],
+            ['ncurses_mvwaddstr', '5.3', [337], '5.2'],
+            ['ncurses_napms', '5.3', [338], '5.2'],
+            ['ncurses_new_panel', '5.3', [339], '5.2'],
+            ['ncurses_newpad', '5.3', [340], '5.2'],
+            ['ncurses_newwin', '5.3', [341], '5.2'],
+            ['ncurses_nl', '5.3', [342], '5.2'],
+            ['ncurses_nocbreak', '5.3', [343], '5.2'],
+            ['ncurses_noecho', '5.3', [344], '5.2'],
+            ['ncurses_nonl', '5.3', [345], '5.2'],
+            ['ncurses_noqiflush', '5.3', [346], '5.2'],
+            ['ncurses_noraw', '5.3', [347], '5.2'],
+            ['ncurses_pair_content', '5.3', [348], '5.2'],
+            ['ncurses_panel_above', '5.3', [349], '5.2'],
+            ['ncurses_panel_below', '5.3', [350], '5.2'],
+            ['ncurses_panel_window', '5.3', [351], '5.2'],
+            ['ncurses_pnoutrefresh', '5.3', [352], '5.2'],
+            ['ncurses_prefresh', '5.3', [353], '5.2'],
+            ['ncurses_putp', '5.3', [354], '5.2'],
+            ['ncurses_qiflush', '5.3', [355], '5.2'],
+            ['ncurses_raw', '5.3', [356], '5.2'],
+            ['ncurses_refresh', '5.3', [357], '5.2'],
+            ['ncurses_replace_panel', '5.3', [358], '5.2'],
+            ['ncurses_reset_prog_mode', '5.3', [359], '5.2'],
+            ['ncurses_reset_shell_mode', '5.3', [360], '5.2'],
+            ['ncurses_resetty', '5.3', [361], '5.2'],
+            ['ncurses_savetty', '5.3', [362], '5.2'],
+            ['ncurses_scr_dump', '5.3', [363], '5.2'],
+            ['ncurses_scr_init', '5.3', [364], '5.2'],
+            ['ncurses_scr_restore', '5.3', [365], '5.2'],
+            ['ncurses_scr_set', '5.3', [366], '5.2'],
+            ['ncurses_scrl', '5.3', [367], '5.2'],
+            ['ncurses_show_panel', '5.3', [368], '5.2'],
+            ['ncurses_slk_attr', '5.3', [369], '5.2'],
+            ['ncurses_slk_attroff', '5.3', [370], '5.2'],
+            ['ncurses_slk_attron', '5.3', [371], '5.2'],
+            ['ncurses_slk_attrset', '5.3', [372], '5.2'],
+            ['ncurses_slk_clear', '5.3', [373], '5.2'],
+            ['ncurses_slk_color', '5.3', [374], '5.2'],
+            ['ncurses_slk_init', '5.3', [375], '5.2'],
+            ['ncurses_slk_noutrefresh', '5.3', [376], '5.2'],
+            ['ncurses_slk_refresh', '5.3', [377], '5.2'],
+            ['ncurses_slk_restore', '5.3', [378], '5.2'],
+            ['ncurses_slk_set', '5.3', [379], '5.2'],
+            ['ncurses_slk_touch', '5.3', [380], '5.2'],
+            ['ncurses_standend', '5.3', [381], '5.2'],
+            ['ncurses_standout', '5.3', [382], '5.2'],
+            ['ncurses_start_color', '5.3', [383], '5.2'],
+            ['ncurses_termattrs', '5.3', [384], '5.2'],
+            ['ncurses_termname', '5.3', [385], '5.2'],
+            ['ncurses_timeout', '5.3', [386], '5.2'],
+            ['ncurses_top_panel', '5.3', [387], '5.2'],
+            ['ncurses_typeahead', '5.3', [388], '5.2'],
+            ['ncurses_ungetch', '5.3', [389], '5.2'],
+            ['ncurses_ungetmouse', '5.3', [390], '5.2'],
+            ['ncurses_update_panels', '5.3', [391], '5.2'],
+            ['ncurses_use_default_colors', '5.3', [392], '5.2'],
+            ['ncurses_use_env', '5.3', [393], '5.2'],
+            ['ncurses_use_extended_names', '5.3', [394], '5.2'],
+            ['ncurses_vidattr', '5.3', [395], '5.2'],
+            ['ncurses_vline', '5.3', [396], '5.2'],
+            ['ncurses_waddch', '5.3', [397], '5.2'],
+            ['ncurses_waddstr', '5.3', [398], '5.2'],
+            ['ncurses_wattroff', '5.3', [399], '5.2'],
+            ['ncurses_wattron', '5.3', [400], '5.2'],
+            ['ncurses_wattrset', '5.3', [401], '5.2'],
+            ['ncurses_wborder', '5.3', [402], '5.2'],
+            ['ncurses_wclear', '5.3', [403], '5.2'],
+            ['ncurses_wcolor_set', '5.3', [404], '5.2'],
+            ['ncurses_werase', '5.3', [405], '5.2'],
+            ['ncurses_wgetch', '5.3', [406], '5.2'],
+            ['ncurses_whline', '5.3', [407], '5.2'],
+            ['ncurses_wmouse_trafo', '5.3', [408], '5.2'],
+            ['ncurses_wmove', '5.3', [409], '5.2'],
+            ['ncurses_wnoutrefresh', '5.3', [410], '5.2'],
+            ['ncurses_wrefresh', '5.3', [411], '5.2'],
+            ['ncurses_wstandend', '5.3', [412], '5.2'],
+            ['ncurses_wstandout', '5.3', [413], '5.2'],
+            ['ncurses_wvline', '5.3', [414], '5.2'],
+            ['fdf_add_doc_javascript', '5.3', [469], '5.2'],
+            ['fdf_add_template', '5.3', [470], '5.2'],
+            ['fdf_close', '5.3', [471], '5.2'],
+            ['fdf_create', '5.3', [472], '5.2'],
+            ['fdf_enum_values', '5.3', [473], '5.2'],
+            ['fdf_errno', '5.3', [474], '5.2'],
+            ['fdf_error', '5.3', [475], '5.2'],
+            ['fdf_get_ap', '5.3', [476], '5.2'],
+            ['fdf_get_attachment', '5.3', [477], '5.2'],
+            ['fdf_get_encoding', '5.3', [478], '5.2'],
+            ['fdf_get_file', '5.3', [479], '5.2'],
+            ['fdf_get_flags', '5.3', [480], '5.2'],
+            ['fdf_get_opt', '5.3', [481], '5.2'],
+            ['fdf_get_status', '5.3', [482], '5.2'],
+            ['fdf_get_value', '5.3', [483], '5.2'],
+            ['fdf_get_version', '5.3', [484], '5.2'],
+            ['fdf_header', '5.3', [485], '5.2'],
+            ['fdf_next_field_name', '5.3', [486], '5.2'],
+            ['fdf_open_string', '5.3', [487], '5.2'],
+            ['fdf_open', '5.3', [488], '5.2'],
+            ['fdf_remove_item', '5.3', [489], '5.2'],
+            ['fdf_save_string', '5.3', [490], '5.2'],
+            ['fdf_save', '5.3', [491], '5.2'],
+            ['fdf_set_ap', '5.3', [492], '5.2'],
+            ['fdf_set_encoding', '5.3', [493], '5.2'],
+            ['fdf_set_file', '5.3', [494], '5.2'],
+            ['fdf_set_flags', '5.3', [495], '5.2'],
+            ['fdf_set_javascript_action', '5.3', [496], '5.2'],
+            ['fdf_set_on_import_javascript', '5.3', [497], '5.2'],
+            ['fdf_set_opt', '5.3', [498], '5.2'],
+            ['fdf_set_status', '5.3', [499], '5.2'],
+            ['fdf_set_submit_form_action', '5.3', [500], '5.2'],
+            ['fdf_set_target_frame', '5.3', [501], '5.2'],
+            ['fdf_set_value', '5.3', [502], '5.2'],
+            ['fdf_set_version', '5.3', [503], '5.2'],
+            ['ming_keypress', '5.3', [506], '5.2'],
+            ['ming_setcubicthreshold', '5.3', [507], '5.2'],
+            ['ming_setscale', '5.3', [508], '5.2'],
+            ['ming_setswfcompression', '5.3', [509], '5.2'],
+            ['ming_useconstants', '5.3', [510], '5.2'],
+            ['ming_useswfversion', '5.3', [511], '5.2'],
+            ['dbase_add_record', '5.3', [708], '5.2'],
+            ['dbase_close', '5.3', [709], '5.2'],
+            ['dbase_create', '5.3', [710], '5.2'],
+            ['dbase_delete_record', '5.3', [711], '5.2'],
+            ['dbase_get_header_info', '5.3', [712], '5.2'],
+            ['dbase_get_record_with_names', '5.3', [713], '5.2'],
+            ['dbase_get_record', '5.3', [714], '5.2'],
+            ['dbase_numfields', '5.3', [715], '5.2'],
+            ['dbase_numrecords', '5.3', [716], '5.2'],
+            ['dbase_open', '5.3', [717], '5.2'],
+            ['dbase_pack', '5.3', [718], '5.2'],
+            ['dbase_replace_record', '5.3', [719], '5.2'],
+            ['fbsql_affected_rows', '5.3', [728], '5.2'],
+            ['fbsql_autocommit', '5.3', [729], '5.2'],
+            ['fbsql_blob_size', '5.3', [730], '5.2'],
+            ['fbsql_change_user', '5.3', [731], '5.2'],
+            ['fbsql_clob_size', '5.3', [732], '5.2'],
+            ['fbsql_close', '5.3', [733], '5.2'],
+            ['fbsql_commit', '5.3', [734], '5.2'],
+            ['fbsql_connect', '5.3', [735], '5.2'],
+            ['fbsql_create_blob', '5.3', [736], '5.2'],
+            ['fbsql_create_clob', '5.3', [737], '5.2'],
+            ['fbsql_create_db', '5.3', [738], '5.2'],
+            ['fbsql_data_seek', '5.3', [739], '5.2'],
+            ['fbsql_database_password', '5.3', [740], '5.2'],
+            ['fbsql_database', '5.3', [741], '5.2'],
+            ['fbsql_db_query', '5.3', [742], '5.2'],
+            ['fbsql_db_status', '5.3', [743], '5.2'],
+            ['fbsql_drop_db', '5.3', [744], '5.2'],
+            ['fbsql_errno', '5.3', [745], '5.2'],
+            ['fbsql_error', '5.3', [746], '5.2'],
+            ['fbsql_fetch_array', '5.3', [747], '5.2'],
+            ['fbsql_fetch_assoc', '5.3', [748], '5.2'],
+            ['fbsql_fetch_field', '5.3', [749], '5.2'],
+            ['fbsql_fetch_lengths', '5.3', [750], '5.2'],
+            ['fbsql_fetch_object', '5.3', [751], '5.2'],
+            ['fbsql_fetch_row', '5.3', [752], '5.2'],
+            ['fbsql_field_flags', '5.3', [753], '5.2'],
+            ['fbsql_field_len', '5.3', [754], '5.2'],
+            ['fbsql_field_name', '5.3', [755], '5.2'],
+            ['fbsql_field_seek', '5.3', [756], '5.2'],
+            ['fbsql_field_table', '5.3', [757], '5.2'],
+            ['fbsql_field_type', '5.3', [758], '5.2'],
+            ['fbsql_free_result', '5.3', [759], '5.2'],
+            ['fbsql_get_autostart_info', '5.3', [760], '5.2'],
+            ['fbsql_hostname', '5.3', [761], '5.2'],
+            ['fbsql_insert_id', '5.3', [762], '5.2'],
+            ['fbsql_list_dbs', '5.3', [763], '5.2'],
+            ['fbsql_list_fields', '5.3', [764], '5.2'],
+            ['fbsql_list_tables', '5.3', [765], '5.2'],
+            ['fbsql_next_result', '5.3', [766], '5.2'],
+            ['fbsql_num_fields', '5.3', [767], '5.2'],
+            ['fbsql_num_rows', '5.3', [768], '5.2'],
+            ['fbsql_password', '5.3', [769], '5.2'],
+            ['fbsql_pconnect', '5.3', [770], '5.2'],
+            ['fbsql_query', '5.3', [771], '5.2'],
+            ['fbsql_read_blob', '5.3', [772], '5.2'],
+            ['fbsql_read_clob', '5.3', [773], '5.2'],
+            ['fbsql_result', '5.3', [774], '5.2'],
+            ['fbsql_rollback', '5.3', [775], '5.2'],
+            ['fbsql_rows_fetched', '5.3', [776], '5.2'],
+            ['fbsql_select_db', '5.3', [777], '5.2'],
+            ['fbsql_set_characterset', '5.3', [778], '5.2'],
+            ['fbsql_set_lob_mode', '5.3', [779], '5.2'],
+            ['fbsql_set_password', '5.3', [780], '5.2'],
+            ['fbsql_set_transaction', '5.3', [781], '5.2'],
+            ['fbsql_start_db', '5.3', [782], '5.2'],
+            ['fbsql_stop_db', '5.3', [783], '5.2'],
+            ['fbsql_table_name', '5.3', [784], '5.2'],
+            ['fbsql_tablename', '5.3', [785], '5.2'],
+            ['fbsql_username', '5.3', [786], '5.2'],
+            ['fbsql_warnings', '5.3', [787], '5.2'],
+            ['msql_affected_rows', '5.3', [813], '5.2'],
+            ['msql_close', '5.3', [814], '5.2'],
+            ['msql_connect', '5.3', [815], '5.2'],
+            ['msql_create_db', '5.3', [816], '5.2'],
+            ['msql_createdb', '5.3', [817], '5.2'],
+            ['msql_data_seek', '5.3', [818], '5.2'],
+            ['msql_db_query', '5.3', [819], '5.2'],
+            ['msql_dbname', '5.3', [820], '5.2'],
+            ['msql_drop_db', '5.3', [821], '5.2'],
+            ['msql_error', '5.3', [822], '5.2'],
+            ['msql_fetch_array', '5.3', [823], '5.2'],
+            ['msql_fetch_field', '5.3', [824], '5.2'],
+            ['msql_fetch_object', '5.3', [825], '5.2'],
+            ['msql_fetch_row', '5.3', [826], '5.2'],
+            ['msql_field_flags', '5.3', [827], '5.2'],
+            ['msql_field_len', '5.3', [828], '5.2'],
+            ['msql_field_name', '5.3', [829], '5.2'],
+            ['msql_field_seek', '5.3', [830], '5.2'],
+            ['msql_field_table', '5.3', [831], '5.2'],
+            ['msql_field_type', '5.3', [832], '5.2'],
+            ['msql_fieldflags', '5.3', [833], '5.2'],
+            ['msql_fieldlen', '5.3', [834], '5.2'],
+            ['msql_fieldname', '5.3', [835], '5.2'],
+            ['msql_fieldtable', '5.3', [836], '5.2'],
+            ['msql_fieldtype', '5.3', [837], '5.2'],
+            ['msql_free_result', '5.3', [838], '5.2'],
+            ['msql_list_dbs', '5.3', [839], '5.2'],
+            ['msql_list_fields', '5.3', [840], '5.2'],
+            ['msql_list_tables', '5.3', [841], '5.2'],
+            ['msql_num_fields', '5.3', [842], '5.2'],
+            ['msql_num_rows', '5.3', [843], '5.2'],
+            ['msql_numfields', '5.3', [844], '5.2'],
+            ['msql_numrows', '5.3', [845], '5.2'],
+            ['msql_pconnect', '5.3', [846], '5.2'],
+            ['msql_query', '5.3', [847], '5.2'],
+            ['msql_regcase', '5.3', [848], '5.2'],
+            ['msql_result', '5.3', [849], '5.2'],
+            ['msql_select_db', '5.3', [850], '5.2'],
+            ['msql_tablename', '5.3', [851], '5.2'],
+            ['msql', '5.3', [852], '5.2'],
+            ['mysqli_disable_reads_from_master', '5.3', [1144], '5.2'],
+            ['mysqli_disable_rpl_parse', '5.3', [1145], '5.2'],
+            ['mysqli_enable_reads_from_master', '5.3', [1149], '5.2'],
+            ['mysqli_enable_rpl_parse', '5.3', [1150], '5.2'],
+            ['mysqli_master_query', '5.3', [1151], '5.2'],
+            ['mysqli_rpl_parse_enabled', '5.3', [1153], '5.2'],
+            ['mysqli_rpl_probe', '5.3', [1154], '5.2'],
+            ['mysqli_slave_query', '5.3', [1157], '5.2'],
+
+            ['sqlite_array_query', '5.4', [883], '5.3'],
+            ['sqlite_busy_timeout', '5.4', [884], '5.3'],
+            ['sqlite_changes', '5.4', [885], '5.3'],
+            ['sqlite_close', '5.4', [886], '5.3'],
+            ['sqlite_column', '5.4', [887], '5.3'],
+            ['sqlite_create_aggregate', '5.4', [888], '5.3'],
+            ['sqlite_create_function', '5.4', [889], '5.3'],
+            ['sqlite_current', '5.4', [890], '5.3'],
+            ['sqlite_error_string', '5.4', [891], '5.3'],
+            ['sqlite_escape_string', '5.4', [892], '5.3'],
+            ['sqlite_exec', '5.4', [893], '5.3'],
+            ['sqlite_factory', '5.4', [894], '5.3'],
+            ['sqlite_fetch_all', '5.4', [895], '5.3'],
+            ['sqlite_fetch_array', '5.4', [896], '5.3'],
+            ['sqlite_fetch_column_types', '5.4', [897], '5.3'],
+            ['sqlite_fetch_object', '5.4', [898], '5.3'],
+            ['sqlite_fetch_single', '5.4', [899], '5.3'],
+            ['sqlite_fetch_string', '5.4', [900], '5.3'],
+            ['sqlite_field_name', '5.4', [901], '5.3'],
+            ['sqlite_has_more', '5.4', [902], '5.3'],
+            ['sqlite_has_prev', '5.4', [903], '5.3'],
+            ['sqlite_key', '5.4', [904], '5.3'],
+            ['sqlite_last_error', '5.4', [905], '5.3'],
+            ['sqlite_last_insert_rowid', '5.4', [906], '5.3'],
+            ['sqlite_libencoding', '5.4', [907], '5.3'],
+            ['sqlite_libversion', '5.4', [908], '5.3'],
+            ['sqlite_next', '5.4', [909], '5.3'],
+            ['sqlite_num_fields', '5.4', [910], '5.3'],
+            ['sqlite_num_rows', '5.4', [911], '5.3'],
+            ['sqlite_open', '5.4', [912], '5.3'],
+            ['sqlite_popen', '5.4', [913], '5.3'],
+            ['sqlite_prev', '5.4', [914], '5.3'],
+            ['sqlite_query', '5.4', [915], '5.3'],
+            ['sqlite_rewind', '5.4', [916], '5.3'],
+            ['sqlite_seek', '5.4', [917], '5.3'],
+            ['sqlite_single_query', '5.4', [918], '5.3'],
+            ['sqlite_udf_decode_binary', '5.4', [919], '5.3'],
+            ['sqlite_udf_encode_binary', '5.4', [920], '5.3'],
+            ['sqlite_unbuffered_query', '5.4', [921], '5.3'],
+            ['sqlite_valid', '5.4', [922], '5.3'],
+
+            ['php_logo_guid', '5.5', [32], '5.4'],
+            ['php_egg_logo_guid', '5.5', [33], '5.4'],
+            ['php_real_logo_guid', '5.5', [34], '5.4'],
+            ['imagepsbbox', '7.0', [90], '5.6'],
+            ['imagepsencodefont', '7.0', [91], '5.6'],
+            ['imagepsextendfont', '7.0', [92], '5.6'],
+            ['imagepsfreefont', '7.0', [93], '5.6'],
+            ['imagepsloadfont', '7.0', [94], '5.6'],
+            ['imagepsslantfont', '7.0', [95], '5.6'],
+            ['imagepstext', '7.0', [96], '5.6'],
+            ['mssql_bind', '7.0', [853], '5.6'],
+            ['mssql_close', '7.0', [854], '5.6'],
+            ['mssql_connect', '7.0', [855], '5.6'],
+            ['mssql_data_seek', '7.0', [856], '5.6'],
+            ['mssql_execute', '7.0', [857], '5.6'],
+            ['mssql_fetch_array', '7.0', [858], '5.6'],
+            ['mssql_fetch_assoc', '7.0', [859], '5.6'],
+            ['mssql_fetch_batch', '7.0', [860], '5.6'],
+            ['mssql_fetch_field', '7.0', [861], '5.6'],
+            ['mssql_fetch_object', '7.0', [862], '5.6'],
+            ['mssql_fetch_row', '7.0', [863], '5.6'],
+            ['mssql_field_length', '7.0', [864], '5.6'],
+            ['mssql_field_name', '7.0', [865], '5.6'],
+            ['mssql_field_seek', '7.0', [866], '5.6'],
+            ['mssql_field_type', '7.0', [867], '5.6'],
+            ['mssql_free_result', '7.0', [868], '5.6'],
+            ['mssql_free_statement', '7.0', [869], '5.6'],
+            ['mssql_get_last_message', '7.0', [870], '5.6'],
+            ['mssql_guid_string', '7.0', [871], '5.6'],
+            ['mssql_init', '7.0', [872], '5.6'],
+            ['mssql_min_error_severity', '7.0', [873], '5.6'],
+            ['mssql_min_message_severity', '7.0', [874], '5.6'],
+            ['mssql_next_result', '7.0', [875], '5.6'],
+            ['mssql_num_fields', '7.0', [876], '5.6'],
+            ['mssql_num_rows', '7.0', [877], '5.6'],
+            ['mssql_pconnect', '7.0', [878], '5.6'],
+            ['mssql_query', '7.0', [879], '5.6'],
+            ['mssql_result', '7.0', [880], '5.6'],
+            ['mssql_rows_affected', '7.0', [881], '5.6'],
+            ['mssql_select_db', '7.0', [882], '5.6'],
+            ['sybase_affected_rows', '7.0', [1081], '5.6'],
+            ['sybase_close', '7.0', [1082], '5.6'],
+            ['sybase_connect', '7.0', [1083], '5.6'],
+            ['sybase_data_seek', '7.0', [1084], '5.6'],
+            ['sybase_deadlock_retry_count', '7.0', [1085], '5.6'],
+            ['sybase_fetch_array', '7.0', [1086], '5.6'],
+            ['sybase_fetch_assoc', '7.0', [1087], '5.6'],
+            ['sybase_fetch_field', '7.0', [1088], '5.6'],
+            ['sybase_fetch_object', '7.0', [1089], '5.6'],
+            ['sybase_fetch_row', '7.0', [1090], '5.6'],
+            ['sybase_field_seek', '7.0', [1091], '5.6'],
+            ['sybase_free_result', '7.0', [1092], '5.6'],
+            ['sybase_get_last_message', '7.0', [1093], '5.6'],
+            ['sybase_min_client_severity', '7.0', [1094], '5.6'],
+            ['sybase_min_error_severity', '7.0', [1095], '5.6'],
+            ['sybase_min_message_severity', '7.0', [1096], '5.6'],
+            ['sybase_min_server_severity', '7.0', [1097], '5.6'],
+            ['sybase_num_fields', '7.0', [1098], '5.6'],
+            ['sybase_num_rows', '7.0', [1099], '5.6'],
+            ['sybase_pconnect', '7.0', [1100], '5.6'],
+            ['sybase_query', '7.0', [1101], '5.6'],
+            ['sybase_result', '7.0', [1102], '5.6'],
+            ['sybase_select_db', '7.0', [1103], '5.6'],
+            ['sybase_set_message_handler', '7.0', [1104], '5.6'],
+            ['sybase_unbuffered_query', '7.0', [1105], '5.6'],
+
+            ['php_check_syntax', '5.0.5', [98], '5.0', '5.1'],
+            ['mysqli_get_cache_stats', '5.4', [99], '5.3'],
+            ['ibase_add_user', '7.4', [171], '7.3'],
+            ['ibase_affected_rows', '7.4', [172], '7.3'],
+            ['ibase_backup', '7.4', [173], '7.3'],
+            ['ibase_blob_add', '7.4', [174], '7.3'],
+            ['ibase_blob_cancel', '7.4', [175], '7.3'],
+            ['ibase_blob_close', '7.4', [176], '7.3'],
+            ['ibase_blob_create', '7.4', [177], '7.3'],
+            ['ibase_blob_echo', '7.4', [178], '7.3'],
+            ['ibase_blob_get', '7.4', [179], '7.3'],
+            ['ibase_blob_import', '7.4', [180], '7.3'],
+            ['ibase_blob_info', '7.4', [181], '7.3'],
+            ['ibase_blob_open', '7.4', [182], '7.3'],
+            ['ibase_close', '7.4', [183], '7.3'],
+            ['ibase_commit_ret', '7.4', [184], '7.3'],
+            ['ibase_commit', '7.4', [185], '7.3'],
+            ['ibase_connect', '7.4', [186], '7.3'],
+            ['ibase_db_info', '7.4', [187], '7.3'],
+            ['ibase_delete_user', '7.4', [188], '7.3'],
+            ['ibase_drop_db', '7.4', [189], '7.3'],
+            ['ibase_errcode', '7.4', [190], '7.3'],
+            ['ibase_errmsg', '7.4', [191], '7.3'],
+            ['ibase_execute', '7.4', [192], '7.3'],
+            ['ibase_fetch_assoc', '7.4', [193], '7.3'],
+            ['ibase_fetch_object', '7.4', [194], '7.3'],
+            ['ibase_fetch_row', '7.4', [195], '7.3'],
+            ['ibase_field_info', '7.4', [196], '7.3'],
+            ['ibase_free_event_handler', '7.4', [197], '7.3'],
+            ['ibase_free_query', '7.4', [198], '7.3'],
+            ['ibase_free_result', '7.4', [199], '7.3'],
+            ['ibase_gen_id', '7.4', [200], '7.3'],
+            ['ibase_maintain_db', '7.4', [201], '7.3'],
+            ['ibase_modify_user', '7.4', [202], '7.3'],
+            ['ibase_name_result', '7.4', [203], '7.3'],
+            ['ibase_num_fields', '7.4', [204], '7.3'],
+            ['ibase_num_params', '7.4', [205], '7.3'],
+            ['ibase_param_info', '7.4', [206], '7.3'],
+            ['ibase_pconnect', '7.4', [207], '7.3'],
+            ['ibase_prepare', '7.4', [208], '7.3'],
+            ['ibase_query', '7.4', [209], '7.3'],
+            ['ibase_restore', '7.4', [210], '7.3'],
+            ['ibase_rollback_ret', '7.4', [211], '7.3'],
+            ['ibase_rollback', '7.4', [212], '7.3'],
+            ['ibase_server_info', '7.4', [213], '7.3'],
+            ['ibase_service_attach', '7.4', [214], '7.3'],
+            ['ibase_service_detach', '7.4', [215], '7.3'],
+            ['ibase_set_event_handler', '7.4', [216], '7.3'],
+            ['ibase_trans', '7.4', [217], '7.3'],
+            ['ibase_wait_event', '7.4', [218], '7.3'],
+            ['fbird_add_user', '7.4', [987], '7.3'],
+            ['fbird_affected_rows', '7.4', [988], '7.3'],
+            ['fbird_backup', '7.4', [989], '7.3'],
+            ['fbird_blob_add', '7.4', [990], '7.3'],
+            ['fbird_blob_cancel', '7.4', [991], '7.3'],
+            ['fbird_blob_close', '7.4', [992], '7.3'],
+            ['fbird_blob_create', '7.4', [993], '7.3'],
+            ['fbird_blob_echo', '7.4', [994], '7.3'],
+            ['fbird_blob_get', '7.4', [995], '7.3'],
+            ['fbird_blob_import', '7.4', [996], '7.3'],
+            ['fbird_blob_info', '7.4', [997], '7.3'],
+            ['fbird_blob_open', '7.4', [998], '7.3'],
+            ['fbird_close', '7.4', [999], '7.3'],
+            ['fbird_commit_ret', '7.4', [1000], '7.3'],
+            ['fbird_commit', '7.4', [1001], '7.3'],
+            ['fbird_connect', '7.4', [1002], '7.3'],
+            ['fbird_db_info', '7.4', [1003], '7.3'],
+            ['fbird_delete_user', '7.4', [1004], '7.3'],
+            ['fbird_drop_db', '7.4', [1005], '7.3'],
+            ['fbird_errcode', '7.4', [1006], '7.3'],
+            ['fbird_errmsg', '7.4', [1007], '7.3'],
+            ['fbird_execute', '7.4', [1008], '7.3'],
+            ['fbird_fetch_assoc', '7.4', [1009], '7.3'],
+            ['fbird_fetch_object', '7.4', [1010], '7.3'],
+            ['fbird_fetch_row', '7.4', [1011], '7.3'],
+            ['fbird_field_info', '7.4', [1012], '7.3'],
+            ['fbird_free_event_handler', '7.4', [1013], '7.3'],
+            ['fbird_free_query', '7.4', [1014], '7.3'],
+            ['fbird_free_result', '7.4', [1015], '7.3'],
+            ['fbird_gen_id', '7.4', [1016], '7.3'],
+            ['fbird_maintain_db', '7.4', [1017], '7.3'],
+            ['fbird_modify_user', '7.4', [1018], '7.3'],
+            ['fbird_name_result', '7.4', [1019], '7.3'],
+            ['fbird_num_fields', '7.4', [1020], '7.3'],
+            ['fbird_num_params', '7.4', [1021], '7.3'],
+            ['fbird_param_info', '7.4', [1022], '7.3'],
+            ['fbird_pconnect', '7.4', [1023], '7.3'],
+            ['fbird_prepare', '7.4', [1024], '7.3'],
+            ['fbird_query', '7.4', [1025], '7.3'],
+            ['fbird_restore', '7.4', [1026], '7.3'],
+            ['fbird_rollback_ret', '7.4', [1027], '7.3'],
+            ['fbird_rollback', '7.4', [1028], '7.3'],
+            ['fbird_server_info', '7.4', [1029], '7.3'],
+            ['fbird_service_attach', '7.4', [1030], '7.3'],
+            ['fbird_service_detach', '7.4', [1031], '7.3'],
+            ['fbird_set_event_handler', '7.4', [1032], '7.3'],
+            ['fbird_trans', '7.4', [1033], '7.3'],
+            ['fbird_wait_event', '7.4', [1034], '7.3'],
+
+            ['wddx_add_vars', '7.4', [228], '7.3'],
+            ['wddx_deserialize', '7.4', [229], '7.3'],
+            ['wddx_packet_end', '7.4', [230], '7.3'],
+            ['wddx_packet_start', '7.4', [231], '7.3'],
+            ['wddx_serialize_value', '7.4', [232], '7.3'],
+            ['wddx_serialize_vars', '7.4', [233], '7.3'],
+            ['mysqli_embedded_server_end', '7.4', [1147], '7.3'],
+            ['mysqli_embedded_server_start', '7.4', [1148], '7.3'],
+
+            ['oci_internal_debug', '8.0', [1178], '7.4'],
+            ['xmlrpc_decode_request', '8.0', [1158], '7.4'],
+            ['xmlrpc_decode', '8.0', [1159], '7.4'],
+            ['xmlrpc_encode_request', '8.0', [1160], '7.4'],
+            ['xmlrpc_encode', '8.0', [1161], '7.4'],
+            ['xmlrpc_get_type', '8.0', [1162], '7.4'],
+            ['xmlrpc_is_fault', '8.0', [1163], '7.4'],
+            ['xmlrpc_parse_method_descriptions', '8.0', [1164], '7.4'],
+            ['xmlrpc_server_add_introspection_data', '8.0', [1165], '7.4'],
+            ['xmlrpc_server_call_method', '8.0', [1166], '7.4'],
+            ['xmlrpc_server_create', '8.0', [1167], '7.4'],
+            ['xmlrpc_server_destroy', '8.0', [1168], '7.4'],
+            ['xmlrpc_server_register_introspection_callback', '8.0', [1169], '7.4'],
+            ['xmlrpc_server_register_method', '8.0', [1170], '7.4'],
+            ['xmlrpc_set_type', '8.0', [1171], '7.4'],
+        ];
+    }
+
+
+    /**
+     * testRemovedFunctionWithAlternative
+     *
+     * @dataProvider dataRemovedFunctionWithAlternative
+     *
+     * @param string $functionName   Name of the function.
+     * @param string $removedIn      The PHP version in which the function was removed.
+     * @param string $alternative    An alternative function.
+     * @param array  $lines          The line numbers in the test file which apply to this function.
+     * @param string $okVersion      A PHP version in which the function was still valid.
+     * @param string $removedVersion Optional PHP version to test removed message with -
+     *                               if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testRemovedFunctionWithAlternative($functionName, $removedIn, $alternative, $lines, $okVersion, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is removed since PHP {$removedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testRemovedFunctionWithAlternative()
+     *
+     * @return array
+     */
+    public function dataRemovedFunctionWithAlternative()
+    {
+        return [
+            ['zend_logo_guid', '5.5', 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"', [35], '5.4'],
+
+            ['recode_file', '7.4', 'the iconv or mbstring extension', [236], '7.3'],
+            ['recode_string', '7.4', 'the iconv or mbstring extension', [237], '7.3'],
+            ['recode', '7.4', 'the iconv or mbstring extension', [238], '7.3'],
+
+            ['imap_header', '8.0', 'imap_headerinfo()', [1216], '7.4'],
+        ];
+    }
+
+
+    /**
+     * testDeprecatedRemovedFunction
+     *
+     * @dataProvider dataDeprecatedRemovedFunction
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param string $removedIn         The PHP version in which the function was removed.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     * @param string $removedVersion    Optional PHP version to test removed message with -
+     *                                  if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedRemovedFunction($functionName, $deprecatedIn, $removedIn, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedRemovedFunction()
+     *
+     * @return array
+     */
+    public function dataDeprecatedRemovedFunction()
+    {
+        return [
+            ['define_syslog_variables', '5.3', '5.4', [5], '5.2'],
+            ['import_request_variables', '5.3', '5.4', [11], '5.2'],
+            ['mysql_list_dbs', '5.4', '7.0', [15], '5.3'],
+            ['magic_quotes_runtime', '5.3', '7.0', [23], '5.2'],
+            ['set_magic_quotes_runtime', '5.3', '7.0', [27], '5.2'],
+            ['sql_regcase', '5.3', '7.0', [31], '5.2'],
+            ['mysql_affected_rows', '5.5', '7.0', [923], '5.4'],
+            ['mysql_client_encoding', '5.5', '7.0', [924], '5.4'],
+            ['mysql_close', '5.5', '7.0', [925], '5.4'],
+            ['mysql_connect', '5.5', '7.0', [926], '5.4'],
+            ['mysql_create_db', '4.3', '7.0', [927], '4.2'],
+            ['mysql_data_seek', '5.5', '7.0', [928], '5.4'],
+            ['mysql_db_name', '5.5', '7.0', [929], '5.4'],
+            ['mysql_drop_db', '4.3', '7.0', [930], '4.2'],
+            ['mysql_errno', '5.5', '7.0', [931], '5.4'],
+            ['mysql_error', '5.5', '7.0', [932], '5.4'],
+            ['mysql_fetch_array', '5.5', '7.0', [933], '5.4'],
+            ['mysql_fetch_assoc', '5.5', '7.0', [934], '5.4'],
+            ['mysql_fetch_field', '5.5', '7.0', [935], '5.4'],
+            ['mysql_fetch_lengths', '5.5', '7.0', [936], '5.4'],
+            ['mysql_fetch_object', '5.5', '7.0', [937], '5.4'],
+            ['mysql_fetch_row', '5.5', '7.0', [938], '5.4'],
+            ['mysql_field_flags', '5.5', '7.0', [939], '5.4'],
+            ['mysql_field_len', '5.5', '7.0', [940], '5.4'],
+            ['mysql_field_name', '5.5', '7.0', [941], '5.4'],
+            ['mysql_field_seek', '5.5', '7.0', [942], '5.4'],
+            ['mysql_field_table', '5.5', '7.0', [943], '5.4'],
+            ['mysql_field_type', '5.5', '7.0', [944], '5.4'],
+            ['mysql_free_result', '5.5', '7.0', [945], '5.4'],
+            ['mysql_get_client_info', '5.5', '7.0', [946], '5.4'],
+            ['mysql_get_host_info', '5.5', '7.0', [947], '5.4'],
+            ['mysql_get_proto_info', '5.5', '7.0', [948], '5.4'],
+            ['mysql_get_server_info', '5.5', '7.0', [949], '5.4'],
+            ['mysql_info', '5.5', '7.0', [950], '5.4'],
+            ['mysql_insert_id', '5.5', '7.0', [951], '5.4'],
+            ['mysql_list_fields', '5.4', '7.0', [952], '5.3'],
+            ['mysql_list_processes', '5.5', '7.0', [953], '5.4'],
+            ['mysql_list_tables', '4.3.7', '7.0', [954], '4.3', '4.4'],
+            ['mysql_num_fields', '5.5', '7.0', [955], '5.4'],
+            ['mysql_num_rows', '5.5', '7.0', [956], '5.4'],
+            ['mysql_pconnect', '5.5', '7.0', [957], '5.4'],
+            ['mysql_ping', '5.5', '7.0', [958], '5.4'],
+            ['mysql_query', '5.5', '7.0', [959], '5.4'],
+            ['mysql_real_escape_string', '5.5', '7.0', [960], '5.4'],
+            ['mysql_result', '5.5', '7.0', [961], '5.4'],
+            ['mysql_select_db', '5.5', '7.0', [962], '5.4'],
+            ['mysql_set_charset', '5.5', '7.0', [963], '5.4'],
+            ['mysql_stat', '5.5', '7.0', [964], '5.4'],
+            ['mysql_tablename', '5.5', '7.0', [965], '5.4'],
+            ['mysql_thread_id', '5.5', '7.0', [966], '5.4'],
+            ['mysql_unbuffered_query', '5.5', '7.0', [967], '5.4'],
+            ['mysql', '5.5', '7.0', [968], '5.4'],
+            ['mysql_fieldname', '5.5', '7.0', [969], '5.4'],
+            ['mysql_fieldtable', '5.5', '7.0', [970], '5.4'],
+            ['mysql_fieldlen', '5.5', '7.0', [971], '5.4'],
+            ['mysql_fieldtype', '5.5', '7.0', [972], '5.4'],
+            ['mysql_fieldflags', '5.5', '7.0', [973], '5.4'],
+            ['mysql_selectdb', '5.5', '7.0', [974], '5.4'],
+            ['mysql_freeresult', '5.5', '7.0', [977], '5.4'],
+            ['mysql_numfields', '5.5', '7.0', [978], '5.4'],
+            ['mysql_numrows', '5.5', '7.0', [979], '5.4'],
+            ['mysql_listdbs', '5.5', '7.0', [980], '5.4'],
+            ['mysql_listfields', '5.5', '7.0', [982], '5.4'],
+            ['mysql_dbname', '5.5', '7.0', [983], '5.4'],
+            ['mysql_table_name', '5.5', '7.0', [984], '5.4'],
+
+            ['ldap_sort', '7.0', '8.0', [97], '5.6'],
+            ['fgetss', '7.3', '8.0', [167], '7.2'],
+            ['gzgetss', '7.3', '8.0', [168], '7.2'],
+            ['ezmlm_hash', '7.4', '8.0', [245], '7.3'],
+            ['get_magic_quotes_gpc', '7.4', '8.0', [240], '7.3'],
+            ['get_magic_quotes_runtime', '7.4', '8.0', [241], '7.3'],
+            ['hebrevc', '7.4', '8.0', [242], '7.3'],
+        ];
+    }
+
+
+    /**
+     * testDeprecatedRemovedFunctionWithAlternative
+     *
+     * @dataProvider dataDeprecatedRemovedFunctionWithAlternative
+     *
+     * @param string $functionName      Name of the function.
+     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
+     * @param string $removedIn         The PHP version in which the function was removed.
+     * @param string $alternative       An alternative function.
+     * @param array  $lines             The line numbers in the test file which apply to this function.
+     * @param string $okVersion         A PHP version in which the function was still valid.
+     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
+     *                                  if different from the $deprecatedIn version.
+     * @param string $removedVersion    Optional PHP version to test removed message with -
+     *                                  if different from the $removedIn version.
+     *
+     * @return void
+     */
+    public function testDeprecatedRemovedFunctionWithAlternative($functionName, $deprecatedIn, $removedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
+    {
+        $file = $this->sniffFile(__FILE__, $okVersion);
+        foreach ($lines as $line) {
+            $this->assertNoViolation($file, $line);
+        }
+
+        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertWarning($file, $line, $error);
+        }
+
+        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
+        $file         = $this->sniffFile(__FILE__, $errorVersion);
+        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}; Use {$alternative} instead";
+        foreach ($lines as $line) {
+            $this->assertError($file, $line, $error);
+        }
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedRemovedFunctionWithAlternative()
+     *
+     * @return array
+     */
+    public function dataDeprecatedRemovedFunctionWithAlternative()
+    {
+        return [
+            ['call_user_method', '4.1', '7.0', 'call_user_func()', [3], '4.0'],
+            ['call_user_method_array', '4.1', '7.0', 'call_user_func_array()', [4], '4.0'],
+            ['ereg', '5.3', '7.0', 'preg_match()', [7], '5.2'],
+            ['ereg_replace', '5.3', '7.0', 'preg_replace()', [8], '5.2'],
+            ['eregi', '5.3', '7.0', 'preg_match() (with the i modifier)', [9], '5.2'],
+            ['eregi_replace', '5.3', '7.0', 'preg_replace() (with the i modifier)', [10], '5.2'],
+            ['mcrypt_generic_end', '5.3', '7.0', 'mcrypt_generic_deinit()', [12], '5.2'],
+            ['mcrypt_ecb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [37], '5.4'],
+            ['mcrypt_cbc', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [38], '5.4'],
+            ['mcrypt_cfb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [39], '5.4'],
+            ['mcrypt_ofb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [40], '5.4'],
+            ['mysql_db_query', '5.3', '7.0', 'mysqli::select_db() and mysqli::query()', [13], '5.2'],
+            ['mysql_escape_string', '4.3', '7.0', 'mysqli::real_escape_string()', [14], '4.2'],
+            ['mysqli_bind_param', '5.3', '5.4', 'mysqli_stmt::bind_param()', [16], '5.2'],
+            ['mysqli_bind_result', '5.3', '5.4', 'mysqli_stmt::bind_result()', [17], '5.2'],
+            ['mysqli_client_encoding', '5.3', '5.4', 'mysqli::character_set_name()', [18], '5.2'],
+            ['mysqli_fetch', '5.3', '5.4', 'mysqli_stmt::fetch()', [19], '5.2'],
+            ['mysqli_param_count', '5.3', '5.4', 'mysqli_stmt_param_count()', [20], '5.2'],
+            ['mysqli_get_metadata', '5.3', '5.4', 'mysqli_stmt::result_metadata()', [21], '5.2'],
+            ['mysqli_send_long_data', '5.3', '5.4', 'mysqli_stmt::send_long_data()', [22], '5.2'],
+            ['session_register', '5.3', '5.4', '$_SESSION', [24], '5.2'],
+            ['session_unregister', '5.3', '5.4', '$_SESSION', [25], '5.2'],
+            ['session_is_registered', '5.3', '5.4', '$_SESSION', [26], '5.2'],
+            ['set_socket_blocking', '5.3', '7.0', 'stream_set_blocking()', [28], '5.2'],
+            ['split', '5.3', '7.0', 'preg_split(), explode() or str_split()', [29], '5.2'],
+            ['spliti', '5.3', '7.0', 'preg_split() (with the i modifier)', [30], '5.2'],
+            ['datefmt_set_timezone_id', '5.5', '7.0', 'IntlDateFormatter::setTimeZone()', [36], '5.4'],
+
+            ['mcrypt_create_iv', '7.1', '7.2', 'random_bytes() or OpenSSL', [100], '7.0'],
+            ['mcrypt_decrypt', '7.1', '7.2', 'OpenSSL', [101], '7.0'],
+            ['mcrypt_enc_get_algorithms_name', '7.1', '7.2', 'OpenSSL', [102], '7.0'],
+            ['mcrypt_enc_get_block_size', '7.1', '7.2', 'OpenSSL', [103], '7.0'],
+            ['mcrypt_enc_get_iv_size', '7.1', '7.2', 'OpenSSL', [104], '7.0'],
+            ['mcrypt_enc_get_key_size', '7.1', '7.2', 'OpenSSL', [105], '7.0'],
+            ['mcrypt_enc_get_modes_name', '7.1', '7.2', 'OpenSSL', [106], '7.0'],
+            ['mcrypt_enc_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [107], '7.0'],
+            ['mcrypt_enc_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [108], '7.0'],
+            ['mcrypt_enc_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [109], '7.0'],
+            ['mcrypt_enc_is_block_mode', '7.1', '7.2', 'OpenSSL', [110], '7.0'],
+            ['mcrypt_enc_self_test', '7.1', '7.2', 'OpenSSL', [111], '7.0'],
+            ['mcrypt_encrypt', '7.1', '7.2', 'OpenSSL', [112], '7.0'],
+            ['mcrypt_generic_deinit', '7.1', '7.2', 'OpenSSL', [113], '7.0'],
+            ['mcrypt_generic_init', '7.1', '7.2', 'OpenSSL', [114], '7.0'],
+            ['mcrypt_generic', '7.1', '7.2', 'OpenSSL', [115], '7.0'],
+            ['mcrypt_get_block_size', '7.1', '7.2', 'OpenSSL', [116], '7.0'],
+            ['mcrypt_get_cipher_name', '7.1', '7.2', 'OpenSSL', [117], '7.0'],
+            ['mcrypt_get_iv_size', '7.1', '7.2', 'OpenSSL', [118], '7.0'],
+            ['mcrypt_get_key_size', '7.1', '7.2', 'OpenSSL', [119], '7.0'],
+            ['mcrypt_list_algorithms', '7.1', '7.2', 'OpenSSL', [120], '7.0'],
+            ['mcrypt_list_modes', '7.1', '7.2', 'OpenSSL', [121], '7.0'],
+            ['mcrypt_module_close', '7.1', '7.2', 'OpenSSL', [122], '7.0'],
+            ['mcrypt_module_get_algo_block_size', '7.1', '7.2', 'OpenSSL', [123], '7.0'],
+            ['mcrypt_module_get_algo_key_size', '7.1', '7.2', 'OpenSSL', [124], '7.0'],
+            ['mcrypt_module_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [125], '7.0'],
+            ['mcrypt_module_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [126], '7.0'],
+            ['mcrypt_module_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [127], '7.0'],
+            ['mcrypt_module_is_block_mode', '7.1', '7.2', 'OpenSSL', [128], '7.0'],
+            ['mcrypt_module_open', '7.1', '7.2', 'OpenSSL', [129], '7.0'],
+            ['mcrypt_module_self_test', '7.1', '7.2', 'OpenSSL', [130], '7.0'],
+            ['mdecrypt_generic', '7.1', '7.2', 'OpenSSL', [131], '7.0'],
+
+            ['create_function', '7.2', '8.0', 'an anonymous function', [146], '7.1'],
+            ['each', '7.2', '8.0', 'a foreach loop or ArrayIterator', [147], '7.1'],
+            ['read_exif_data', '7.2', '8.0', 'exif_read_data()', [149], '7.1'],
+            ['jpeg2wbmp', '7.2', '8.0', 'imagecreatefromjpeg() and imagewbmp()', [144], '7.1'],
+            ['png2wbmp', '7.2', '8.0', 'imagecreatefrompng() or imagewbmp()', [145], '7.1'],
+            ['gmp_random', '7.2', '8.0', 'gmp_random_bits() or gmp_random_range()', [148], '7.1'],
+
+            ['image2wbmp', '7.3', '8.0', 'imagewbmp()', [152], '7.2'],
+            ['mbregex_encoding', '7.3', '8.0', 'mb_regex_encoding()', [153], '7.2'],
+            ['mbereg', '7.3', '8.0', 'mb_ereg()', [154], '7.2'],
+            ['mberegi', '7.3', '8.0', 'mb_eregi()', [155], '7.2'],
+            ['mbereg_replace', '7.3', '8.0', 'mb_ereg_replace()', [156], '7.2'],
+            ['mberegi_replace', '7.3', '8.0', 'mb_eregi_replace()', [157], '7.2'],
+            ['mbsplit', '7.3', '8.0', 'mb_split()', [158], '7.2'],
+            ['mbereg_match', '7.3', '8.0', 'mb_ereg_match()', [159], '7.2'],
+            ['mbereg_search', '7.3', '8.0', 'mb_ereg_search()', [160], '7.2'],
+            ['mbereg_search_pos', '7.3', '8.0', 'mb_ereg_search_pos()', [161], '7.2'],
+            ['mbereg_search_regs', '7.3', '8.0', 'mb_ereg_search_regs()', [162], '7.2'],
+            ['mbereg_search_init', '7.3', '8.0', 'mb_ereg_search_init()', [163], '7.2'],
+            ['mbereg_search_getregs', '7.3', '8.0', 'mb_ereg_search_getregs()', [164], '7.2'],
+            ['mbereg_search_getpos', '7.3', '8.0', 'mb_ereg_search_getpos()', [165], '7.2'],
+            ['mbereg_search_setpos', '7.3', '8.0', 'mb_ereg_search_setpos()', [166], '7.2'],
+
+            ['convert_cyr_string', '7.4', '8.0', 'mb_convert_encoding(), iconv() or UConverter', [243], '7.3'],
+            ['money_format', '7.4', '8.0', 'NumberFormatter::formatCurrency()', [244], '7.3'],
+            ['restore_include_path', '7.4', '8.0', "ini_restore('include_path')", [246], '7.3'],
+            ['ociinternaldebug', '5.4', '8.0', 'oci_internal_debug() (PHP < 8.0)', [69], '5.3'],
+            ['ldap_control_paged_result_response', '7.4', '8.0', 'ldap_search()', [234], '7.3'],
+            ['ldap_control_paged_result', '7.4', '8.0', 'ldap_search()', [235], '7.3'],
+        ];
+    }
+
+
+    /**
+     * testNoFalsePositives
+     *
+     * @dataProvider dataNoFalsePositives
+     *
+     * @param int $line The line number.
+     *
+     * @return void
+     */
+    public function testNoFalsePositives($line)
+    {
+        $file = $this->sniffFile(__FILE__, '99.0'); // High version beyond latest deprecation.
+        $this->assertNoViolation($file, $line);
+    }
+
+    /**
+     * Data provider.
+     *
+     * @see testNoFalsePositives()
+     *
+     * @return array
+     */
+    public function dataNoFalsePositives()
+    {
+        return [
+            [134],
+            [135],
+            [136],
+            [137],
+            [138],
+            [139],
+            [140],
+            [141],
+            [249],
+            [250],
+            [251],
+            [252],
+            [1232],
+        ];
+    }
+
+
+    /**
+     * Verify no notices are thrown at all.
+     *
+     * @return void
+     */
+    public function testNoViolationsInFileOnValidVersion()
+    {
+        $file = $this->sniffFile(__FILE__, '4.0'); // Low version below the first deprecation.
+        $this->assertNoViolation($file);
+    }
+}
diff --git a/composer.json b/composer.json
index c5d67202..c3fed220 100644
--- a/composer.json
+++ b/composer.json
@@ -29,12 +29,12 @@
     },
     "autoload": {
         "classmap": [
-            "PHP_CodeSniffer/Tokenizers/",
-            "PHPCompatibility/"
+            "PHP_CodeSniffer/Tokenizers/"
         ],
         "psr-4": {
             "Magento2\\": "Magento2/",
-            "Magento2Framework\\": "Magento2Framework/"
+            "Magento2Framework\\": "Magento2Framework/",
+            "PHPCompatibility\\": "PHPCompatibility/"
         }
     },
     "scripts": {

From ea5897bb6c819b19406ec91845750cf9ad3686b9 Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Fri, 12 May 2023 17:03:08 -0500
Subject: [PATCH 559/630] ACP2E-1946: Move PHPCompatibility/PHPCompatibility
 sniffs into separate namespace

---
 Magento2/Helpers/Assert.php                   | 20 ++++++++++---------
 .../RemovedFunctionsUnitTest.82.inc           |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Magento2/Helpers/Assert.php b/Magento2/Helpers/Assert.php
index a29ebdb2..9b3eb0dc 100644
--- a/Magento2/Helpers/Assert.php
+++ b/Magento2/Helpers/Assert.php
@@ -17,7 +17,7 @@
 class Assert
 {
     /**
-     * Checks whether the function call is a built-in function call.
+     * Checks whether it is a built-in function call.
      *
      * @param File $phpcsFile
      * @param int $stackPtr
@@ -35,17 +35,19 @@ public static function isBuiltinFunctionCall(File $phpcsFile, int $stackPtr): bo
         }
 
         $prevPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        $ignorePrevToken = [\T_NEW => true] + Collections::objectOperators();
-        if (isset($ignorePrevToken[$tokens[$prevPtr]['code']])) {
-            return false;
-        }
-
-        if ($tokens[$prevPtr]['code'] === \T_NS_SEPARATOR) {
-            $prevPrevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevPtr - 1), null, true);
-            if ($tokens[$prevPrevToken]['code'] === \T_STRING || $tokens[$prevPrevToken]['code'] === \T_NAMESPACE
+        if ($prevPtr !== false) {
+            if (isset(Collections::objectOperators()[$tokens[$prevPtr]['code']])
+                || $tokens[$prevPtr]['code'] === \T_NEW
             ) {
                 return false;
             }
+
+            if ($tokens[$prevPtr]['code'] === \T_NS_SEPARATOR) {
+                $prevPrevPr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevPtr - 1), null, true);
+                if ($prevPrevPr !== false && \in_array($tokens[$prevPrevPr]['code'], [\T_STRING, \T_NAMESPACE], true)) {
+                    return false;
+                }
+            }
         }
 
         return true;
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
index e66223c2..bc80cf1b 100644
--- a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
+++ b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
@@ -1,4 +1,4 @@
 <?php
 $var = 'hello world';
 utf8_encode($var);
-utf8_decode($var);
\ No newline at end of file
+utf8_decode($var);

From 350cf9a1c81db7f4b6b1065e330273e014140577 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Tue, 16 May 2023 10:38:06 +0100
Subject: [PATCH 560/630] Add suggested replacement for \posix_isatty()

---
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index 51730217..45e00eb7 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -104,6 +104,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^parsekit_compile_string$' => null,
         '^pathinfo$' => 'Magento\Framework\Filesystem\Io\File::getPathInfo',
         '^pcntl_.*$' => null,
+        '^posix_isatty$' => 'stream_isatty',
         '^posix_.*$' => null,
         '^pfpro_.*$' => null,
         '^pfsockopen$' => null,

From cf43987202e6f3cf9ecd7dc933296eaa97a9ed41 Mon Sep 17 00:00:00 2001
From: Sandip Chandela <49310430+sandipklevu@users.noreply.github.com>
Date: Wed, 24 May 2023 11:57:37 +0530
Subject: [PATCH 561/630] allow readonly between phpdoc and property name

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 3732e2ac..0913be26 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -32,6 +32,7 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_NULLABLE,
         T_BITWISE_AND,
         T_TYPE_UNION,
+        T_READONLY,
     ];
 
     /**

From 9da2d9cadfaeb9f4390b1d57e15f6ec365eaf7a0 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Sun, 28 May 2023 18:23:25 +0100
Subject: [PATCH 562/630] Remove local copies of PHPCompatibility sniffs

---
 .../ChangedIntToBoolParamTypeSniff.php        |   14 -
 .../DeprecatedDynamicPropertySniff.php        |  275 --
 ...atedEncodingsForMBStringFunctionsSniff.php |  173 -
 .../ForbiddenFinalPrivateMethodsSniff.php     |   45 -
 .../RemovedAssertStringAssertionSniff.php     |   14 -
 ...llingDestructAfterConstructorExitSniff.php |   14 -
 .../RemovedDollarBraceStringEmbedsSniff.php   |   14 -
 .../RemovedFunctionsSniff.php                 | 3915 -----------------
 ...inedFunctionsExcludeDisabledFalseSniff.php |   14 -
 ...emovedOptionalBeforeRequiredParamSniff.php |   14 -
 ...ovedSplAutoloadRegisterThrowFalseSniff.php |   17 -
 .../ChangedIntToBoolParamTypeUnitTest.php     |   23 -
 ...ecatedDynamicPropertyUnitTest.autoload.inc |   21 -
 .../DeprecatedDynamicPropertyUnitTest.inc     |  177 -
 .../DeprecatedDynamicPropertyUnitTest.php     |  121 -
 ...dEncodingsForMBStringFunctionsUnitTest.inc |  188 -
 ...dEncodingsForMBStringFunctionsUnitTest.php |  106 -
 ...ForbiddenFinalPrivateMethodsUnitTest.1.inc |   20 -
 ...denFinalPrivateMethodsUnitTest.1.inc.fixed |   20 -
 .../ForbiddenFinalPrivateMethodsUnitTest.php  |   65 -
 .../RemovedAssertStringAssertionUnitTest.php  |   23 -
 ...ngDestructAfterConstructorExitUnitTest.php |   22 -
 ...RemovedDollarBraceStringEmbedsUnitTest.php |   22 -
 .../RemovedFunctionsUnitTest.82.inc           |    4 -
 .../RemovedFunctionsUnitTest.php              |   61 -
 ...dFunctionsExcludeDisabledFalseUnitTest.php |   23 -
 ...vedOptionalBeforeRequiredParamUnitTest.php |   23 -
 ...dSplAutoloadRegisterThrowFalseUnitTest.php |   23 -
 Magento2/ruleset.xml                          |   22 +-
 Magento2Framework/ruleset.xml                 |    2 -
 .../AbstractFunctionCallParameterSniff.php    |  204 -
 PHPCompatibility/LICENSE                      |  165 -
 .../ForbiddenFinalPrivateMethodsSniff.php     |   96 -
 ...llingDestructAfterConstructorExitSniff.php |  214 -
 ...emovedOptionalBeforeRequiredParamSniff.php |  146 -
 .../ChangedIntToBoolParamTypeSniff.php        |  124 -
 .../RemovedAssertStringAssertionSniff.php     |  134 -
 ...inedFunctionsExcludeDisabledFalseSniff.php |   85 -
 ...ovedSplAutoloadRegisterThrowFalseSniff.php |   86 -
 .../RemovedDollarBraceStringEmbedsSniff.php   |  134 -
 PHPCompatibility/Tests/BaseSniffTest.php      |  380 --
 .../ForbiddenFinalPrivateMethodsUnitTest.inc  |   61 -
 ...ngDestructAfterConstructorExitUnitTest.inc |  130 -
 ...ngDestructAfterConstructorExitUnitTest.php |  123 -
 ...vedOptionalBeforeRequiredParamUnitTest.inc |   51 -
 ...vedOptionalBeforeRequiredParamUnitTest.php |  119 -
 .../FunctionUse/RemovedFunctionsUnitTest.inc  | 1232 ------
 .../FunctionUse/RemovedFunctionsUnitTest.php  | 1553 -------
 .../ChangedIntToBoolParamTypeUnitTest.inc     |   28 -
 .../ChangedIntToBoolParamTypeUnitTest.php     |  115 -
 .../RemovedAssertStringAssertionUnitTest.inc  |   28 -
 .../RemovedAssertStringAssertionUnitTest.php  |   91 -
 ...dFunctionsExcludeDisabledFalseUnitTest.inc |   11 -
 ...dFunctionsExcludeDisabledFalseUnitTest.php |   84 -
 ...dSplAutoloadRegisterThrowFalseUnitTest.inc |   15 -
 ...dSplAutoloadRegisterThrowFalseUnitTest.php |   85 -
 ...movedDollarBraceStringEmbedsUnitTest.1.inc |   90 -
 ...movedDollarBraceStringEmbedsUnitTest.2.inc |   42 -
 ...RemovedDollarBraceStringEmbedsUnitTest.php |  256 --
 composer.json                                 |    5 +-
 composer.lock                                 |    2 +-
 phpunit-bootstrap.php                         |   76 +-
 62 files changed, 7 insertions(+), 11433 deletions(-)
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
 delete mode 100644 Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed
 delete mode 100644 Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
 delete mode 100644 Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
 delete mode 100644 PHPCompatibility/AbstractFunctionCallParameterSniff.php
 delete mode 100644 PHPCompatibility/LICENSE
 delete mode 100644 PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php
 delete mode 100644 PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php
 delete mode 100644 PHPCompatibility/Tests/BaseSniffTest.php
 delete mode 100644 PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
 delete mode 100644 PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
 delete mode 100644 PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc
 delete mode 100644 PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.2.inc
 delete mode 100644 PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php

diff --git a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php b/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
deleted file mode 100644
index e3aa6d87..00000000
--- a/Magento2/Sniffs/PHPCompatibility/ChangedIntToBoolParamTypeSniff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-/**
- * @inheritdoc
- */
-class ChangedIntToBoolParamTypeSniff extends \PHPCompatibility\Sniffs\ParameterValues\ChangedIntToBoolParamTypeSniff
-{
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php b/Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php
deleted file mode 100644
index 3e7d98ab..00000000
--- a/Magento2/Sniffs/PHPCompatibility/DeprecatedDynamicPropertySniff.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
-use Magento2\Internal\Cache;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Utils\Conditions;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\Namespaces;
-use PHPCSUtils\Utils\ObjectDeclarations;
-use PHPCSUtils\Utils\Scopes;
-use PHPCSUtils\Utils\UseStatements;
-
-/**
- * Detects usage of dynamic properties in classes
- */
-class DeprecatedDynamicPropertySniff extends \PHPCompatibility\Sniff
-{
-    /**
-     * @var PHPDocFormattingValidator
-     */
-    private PHPDocFormattingValidator $phpDocFormattingValidator;
-
-    /**
-     * List of tags that declare a magic property.
-     *
-     * @var string[]
-     */
-    private array $magicPropertyTags = [
-        '@property',
-        '@property-read',
-        '@property-write',
-    ];
-
-    /**
-     * Constructor for this sniff.
-     */
-    public function __construct()
-    {
-        $this->phpDocFormattingValidator = new PHPDocFormattingValidator();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [
-            \T_OBJECT_OPERATOR,
-            \T_NULLSAFE_OBJECT_OPERATOR
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if (!$this->supportsAbove('8.2')) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Check if pointer is inside a class.
-        $classPtr = Conditions::getLastCondition($phpcsFile, $stackPtr, [\T_CLASS]);
-        if ($classPtr === false) {
-            return;
-        }
-
-        // Check if it is string.
-        $propertyNamePtr = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
-        if ($propertyNamePtr === false || $tokens[$propertyNamePtr]['code'] !== \T_STRING) {
-            return;
-        }
-
-        $afterPropertyNamePtr = $phpcsFile->findNext(Tokens::$emptyTokens, ($propertyNamePtr + 1), null, true);
-        // Check if it is not a method call.
-        if ($tokens[$afterPropertyNamePtr]['code'] === \T_OPEN_PARENTHESIS) {
-            return;
-        }
-
-        // Check if it is a property access on $this.
-        $thisPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
-        if ($thisPtr === false
-            || $tokens[$thisPtr]['code'] !== \T_VARIABLE
-            || $tokens[$thisPtr]['content'] !== '$this'
-        ) {
-            return;
-        }
-
-        // Check if it is a direct property access.
-        $beforeThisPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $thisPtr - 1, null, true);
-        if ($beforeThisPtr &&
-            \in_array(
-                $tokens[$beforeThisPtr]['code'],
-                [\T_OBJECT_OPERATOR, \T_NULLSAFE_OBJECT_OPERATOR, \T_DOUBLE_COLON]
-            )
-        ) {
-            return;
-        }
-
-        $propertyName = $tokens[$propertyNamePtr]['content'];
-        if (\in_array($propertyName, $this->getClassDeclaredProperties($phpcsFile, $classPtr), true)
-            || \in_array($propertyName, $this->getClassPromotedProperties($phpcsFile, $classPtr), true)
-            || \in_array($propertyName, $this->getClassMagicProperties($phpcsFile, $classPtr), true)
-        ) {
-            return;
-        }
-
-        $className = ObjectDeclarations::getName($phpcsFile, $classPtr);
-        $namespace = Namespaces::determineNamespace($phpcsFile, $classPtr);
-        if ($namespace !== '') {
-            $className = $namespace . '\\' . $className;
-        }
-        $isPropertyInherited = true;
-        try {
-            // Try to autoload the class and check if the property is inherited.
-            if (\class_exists($className)) {
-                $isPropertyInherited = \property_exists($className, $propertyName);
-            }
-        } catch (\Throwable $e) {
-            unset($e);
-            // Ignore any errors that may occur during autoloading.
-        }
-        if ($isPropertyInherited === false ||
-            !$this->isClassUsingTraits($phpcsFile, $classPtr)
-            && ObjectDeclarations::findExtendedClassName($phpcsFile, $classPtr) === false
-        ) {
-            $error = 'Access to an undefined property %s::$%s;' .
-                ' Creation of dynamic property is deprecated since PHP 8.2';
-            $data = [$className, $propertyName];
-            $phpcsFile->addWarning($error, $propertyNamePtr, 'Deprecated', $data);
-        }
-    }
-
-    /**
-     * Get properties declared in the scope class
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return string[]
-     */
-    private function getClassDeclaredProperties(File $phpcsFile, int $stackPtr): array
-    {
-        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
-            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
-        }
-        $tokens = $phpcsFile->getTokens();
-        $properties = [];
-        $next = $stackPtr;
-        while ($next = $this->findInClass($phpcsFile, $stackPtr, $next + 1, \T_VARIABLE)) {
-            if (Scopes::isOOProperty($phpcsFile, $next) !== false) {
-                $properties[] = \ltrim($tokens[$next]['content'], '$');
-            }
-        }
-        Cache::set($phpcsFile, __METHOD__, $stackPtr, $properties);
-        return $properties;
-    }
-
-    /**
-     * Get properties declared in the constructor method
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return string[]
-     */
-    private function getClassPromotedProperties(File $phpcsFile, int $stackPtr): array
-    {
-        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
-            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
-        }
-        $properties = [];
-        $next = $stackPtr;
-        while ($next = $this->findInClass($phpcsFile, $stackPtr, $next + 1, \T_FUNCTION)) {
-            if (Scopes::isOOMethod($phpcsFile, $next)
-                && \strtolower(FunctionDeclarations::getName($phpcsFile, $next)) === '__construct'
-            ) {
-                $params = FunctionDeclarations::getParameters($phpcsFile, $next);
-                foreach ($params as $param) {
-                    if (isset($param['property_visibility']) === true) {
-                        $properties[] = \ltrim($param['name'], '$');
-                    }
-                }
-                break;
-            }
-        }
-        Cache::set($phpcsFile, __METHOD__, $stackPtr, $properties);
-        return $properties;
-    }
-
-    /**
-     * Find magic properties declared in the class PHPDoc
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return string[]
-     */
-    public function getClassMagicProperties(File $phpcsFile, int $stackPtr): array
-    {
-        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
-            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
-        }
-        $properties = [];
-        $tokens = $phpcsFile->getTokens();
-        $commentStartPtr = $this->phpDocFormattingValidator->findPHPDoc($stackPtr, $phpcsFile);
-        if ($commentStartPtr === -1) {
-            return [];
-        }
-        foreach ($tokens[$commentStartPtr]['comment_tags'] as $tag) {
-            $token = $tokens[$tag];
-            if (!\in_array($token['content'], $this->magicPropertyTags, true)
-                || $tokens[($tag + 2)]['code'] !== \T_DOC_COMMENT_STRING
-            ) {
-                continue;
-            }
-            $commentParts = \preg_split('/\s+/', (string)$tokens[($tag + 2)]['content'], 3);
-            if (\strpos($commentParts[0], '$') === 0) {
-                $properties[] = \ltrim($commentParts[0], '$');
-            } elseif (isset($commentParts[1])) {
-                $properties[] = \ltrim($commentParts[1], '$');
-            }
-        }
-        Cache::set($phpcsFile, __METHOD__, $stackPtr, $properties);
-        return $properties;
-    }
-
-    /**
-     * Check if class uses traits
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return bool
-     */
-    private function isClassUsingTraits(File $phpcsFile, int $stackPtr): bool
-    {
-        if (Cache::isCached($phpcsFile, __METHOD__, $stackPtr) === true) {
-            return Cache::get($phpcsFile, __METHOD__, $stackPtr);
-        }
-        $usesTraits = false;
-        $next = $stackPtr;
-        while ($next = $this->findInClass($phpcsFile, $stackPtr, $next + 1, \T_USE)) {
-            if (UseStatements::isTraitUse($phpcsFile, $next) === true) {
-                $usesTraits = true;
-                break;
-            }
-        }
-        Cache::set($phpcsFile, __METHOD__, $stackPtr, $usesTraits);
-        return $usesTraits;
-    }
-
-    /**
-     * Find token in class scope
-     *
-     * @param File $phpcsFile
-     * @param int $classPtr
-     * @param int $currentPtr
-     * @param array|int|string $needle
-     * @return int|false
-     */
-    private function findInClass(File $phpcsFile, int $classPtr, int $currentPtr, $needle)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $classScopeEnd = $tokens[$classPtr]['scope_closer'];
-        $classScopeStart = $tokens[$classPtr]['scope_opener'];
-        return $phpcsFile->findNext($needle, \max($currentPtr, $classScopeStart), $classScopeEnd);
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
deleted file mode 100644
index a2c1dc38..00000000
--- a/Magento2/Sniffs/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsSniff.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use Magento2\Helpers\Assert;
-use PHP_CodeSniffer\Files\File;
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer_Tokens as Tokens;
-
-/**
- * Detect: Usage of the QPrint, Base64, Uuencode, and HTML-ENTITIES encodings is deprecated for all MBString functions.
- *
- * PHP version 8.2
- *
- * @link https://www.php.net/manual/en/migration82.deprecated.php
- */
-class DeprecatedEncodingsForMBStringFunctionsSniff extends Sniff
-{
-    /**
-     * A list of MBString functions that emits deprecation notice
-     *
-     * @var \int[][]
-     */
-    private $targetFunctions = [
-        'mb_check_encoding' => [2],
-        'mb_chr' => [2],
-        'mb_convert_case' => [3],
-        'mb_convert_encoding' => [2],
-        'mb_convert_kana' => [3],
-        'mb_convert_variables' => [1],
-        'mb_decode_numericentity' => [3],
-        'mb_encode_numericentity' => [3],
-        'mb_encoding_aliases' => [1],
-        'mb_ord' => [2],
-        'mb_scrub' => [2],
-        'mb_str_split' => [3],
-        'mb_strcut' => [4],
-        'mb_strimwidth' => [5],
-        'mb_stripos' => [4],
-        'mb_stristr' => [4],
-        'mb_strlen' => [2],
-        'mb_strpos' => [4],
-        'mb_strrchr' => [4],
-        'mb_strrichr' => [4],
-        'mb_strripos' => [4],
-        'mb_strrpos' => [4],
-        'mb_strstr' => [4],
-        'mb_strtolower' => [2],
-        'mb_strtoupper' => [2],
-        'mb_strwidth' => [2],
-        'mb_substr_count' => [3],
-        'mb_substr' => [4],
-    ];
-
-    /**
-     * Message per encoding
-     *
-     * @var string[]
-     */
-    protected $messages = [
-        'qprint' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' Use quoted_printable_encode/quoted_printable_decode instead',
-        'quoted-printable' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' Use quoted_printable_encode/quoted_printable_decode instead',
-        'base64' => 'Handling Base64 via mbstring is deprecated since PHP 8.2;' .
-            ' Use base64_encode/base64_decode instead',
-        'uuencode' => 'Handling Uuencode via mbstring is deprecated since PHP 8.2;' .
-            ' Use convert_uuencode/convert_uudecode instead',
-        'html-entities' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
-        'html' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [\T_STRING];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if (!$this->supportsAbove('8.2')) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        $function = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
-
-        if (!isset($this->targetFunctions[$functionLc]) || !Assert::isBuiltinFunctionCall($phpcsFile, $stackPtr)) {
-            return;
-        }
-
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
-
-        foreach ($parameters as $index => $parameter) {
-            $this->processParameter($phpcsFile, $function, $index, $parameter);
-        }
-    }
-
-    /**
-     * Process function parameter
-     *
-     * @param File $phpcsFile
-     * @param string $function
-     * @param int $index
-     * @param array $parameter
-     * @return void
-     */
-    public function processParameter(File $phpcsFile, string $function, int $index, array $parameter)
-    {
-        $functionLc = strtolower($function);
-        if (!in_array($index, $this->targetFunctions[$functionLc])) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        $targetParam = $parameter;
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $targetParam['start'], $targetParam['end'], true);
-
-        if ($nextNonEmpty !== false && in_array($tokens[$nextNonEmpty]['code'], [\T_ARRAY, \T_OPEN_SHORT_ARRAY])) {
-            $items = $this->getFunctionCallParameters($phpcsFile, $nextNonEmpty);
-        } else {
-            $items = [$parameter];
-        }
-
-        $textStringTokens = [
-            \T_CONSTANT_ENCAPSED_STRING => true,
-            \T_DOUBLE_QUOTED_STRING => true,
-            \T_INLINE_HTML => true,
-            \T_HEREDOC => true,
-            \T_NOWDOC => true,
-        ];
-
-        foreach ($items as $item) {
-            for ($i = $item['start']; $i <= $item['end']; $i++) {
-                if ($tokens[$i]['code'] === \T_STRING
-                    || $tokens[$i]['code'] === \T_VARIABLE
-                ) {
-                    // Variable, constant, function call. Ignore complete item as undetermined.
-                    break;
-                }
-
-                if (isset($textStringTokens[$tokens[$i]['code']]) === true) {
-                    $encoding = $this->stripQuotes(strtolower(trim($tokens[$i]['content'])));
-                    $encodings = array_flip(explode(',', $encoding));
-                    if (count(array_intersect_key($encodings, $this->messages)) > 0) {
-                        $phpcsFile->addWarning(
-                            $this->messages[$encoding],
-                            $i,
-                            'Deprecated',
-                            [$item['raw']]
-                        );
-
-                    }
-
-                    // Only throw one error per array item.
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php b/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
deleted file mode 100644
index bf5e4c6f..00000000
--- a/Magento2/Sniffs/PHPCompatibility/ForbiddenFinalPrivateMethodsSniff.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use Magento2\Internal\FileProxy;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * @inheritdoc
- */
-class ForbiddenFinalPrivateMethodsSniff extends \PHPCompatibility\Sniffs\FunctionDeclarations\ForbiddenFinalPrivateMethodsSniff
-{
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $phpcsFile->fixer->enabled = true;
-        $warningCount = $phpcsFile->getWarningCount();
-        $phpcsFileProxy = new FileProxy(
-            $phpcsFile,
-            [
-                'addWarning' => function ($warning, $stackPtr, $code, $data = [], $severity = 0) use ($phpcsFile) {
-                    $phpcsFile->addFixableWarning($warning, $stackPtr, $code, $data, $severity);
-                },
-            ]
-        );
-        $result =  parent::process($phpcsFileProxy, $stackPtr);
-        if ($warningCount < $phpcsFile->getWarningCount() && $phpcsFile->fixer->enabled === true) {
-            $phpcsFile->fixer->beginChangeset();
-            $prev = $phpcsFile->findPrevious(\T_FINAL, ($stackPtr - 1));
-            $phpcsFile->fixer->replaceToken($prev, null);
-            // Remove extra space left out by previous replacement
-            $next = $phpcsFile->findNext(\T_WHITESPACE, $prev);
-            $phpcsFile->fixer->replaceToken($next, null);
-            $phpcsFile->fixer->endChangeset();
-        }
-
-        return $result;
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
deleted file mode 100644
index c1f1984e..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedAssertStringAssertionSniff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-/**
- * @inheritdoc
- */
-class RemovedAssertStringAssertionSniff extends \PHPCompatibility\Sniffs\ParameterValues\RemovedAssertStringAssertionSniff
-{
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
deleted file mode 100644
index b3d1c981..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedCallingDestructAfterConstructorExitSniff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-/**
- * @inheritdoc
- */
-class RemovedCallingDestructAfterConstructorExitSniff extends \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedCallingDestructAfterConstructorExitSniff
-{
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
deleted file mode 100644
index 5e9daa81..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedDollarBraceStringEmbedsSniff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-/**
- * @inheritdoc
- */
-class RemovedDollarBraceStringEmbedsSniff extends \PHPCompatibility\Sniffs\TextStrings\RemovedDollarBraceStringEmbedsSniff
-{
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
deleted file mode 100644
index 6a7a6f78..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedFunctionsSniff.php
+++ /dev/null
@@ -1,3915 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use Magento2\Helpers\Assert;
-use PHP_CodeSniffer_File as File;
-
-/**
- * @inheritdoc
- */
-class RemovedFunctionsSniff extends \PHPCompatibility\Sniffs\FunctionUse\RemovedFunctionsSniff
-{
-    /**
-     * {@inheritdoc}
-     * @var array
-     */
-    protected $removedFunctions = [
-        'crack_check' => [
-            '5.0'       => true,
-        ],
-        'crack_closedict' => [
-            '5.0'       => true,
-        ],
-        'crack_getlastmessage' => [
-            '5.0'       => true,
-        ],
-        'crack_opendict' => [
-            '5.0'       => true,
-        ],
-
-        'php_check_syntax' => [
-            '5.0.5' => true,
-        ],
-
-        'pfpro_cleanup' => [
-            '5.1'       => true,
-        ],
-        'pfpro_init' => [
-            '5.1'       => true,
-        ],
-        'pfpro_process_raw' => [
-            '5.1'       => true,
-        ],
-        'pfpro_process' => [
-            '5.1'       => true,
-        ],
-        'pfpro_version' => [
-            '5.1'       => true,
-        ],
-        'm_checkstatus' => [
-            '5.1'       => true,
-        ],
-        'm_completeauthorizations' => [
-            '5.1'       => true,
-        ],
-        'm_connect' => [
-            '5.1'       => true,
-        ],
-        'm_connectionerror' => [
-            '5.1'       => true,
-        ],
-        'm_deletetrans' => [
-            '5.1'       => true,
-        ],
-        'm_destroyconn' => [
-            '5.1'       => true,
-        ],
-        'm_destroyengine' => [
-            '5.1'       => true,
-        ],
-        'm_getcell' => [
-            '5.1'       => true,
-        ],
-        'm_getcellbynum' => [
-            '5.1'       => true,
-        ],
-        'm_getcommadelimited' => [
-            '5.1'       => true,
-        ],
-        'm_getheader' => [
-            '5.1'       => true,
-        ],
-        'm_initconn' => [
-            '5.1'       => true,
-        ],
-        'm_initengine' => [
-            '5.1'       => true,
-        ],
-        'm_iscommadelimited' => [
-            '5.1'       => true,
-        ],
-        'm_maxconntimeout' => [
-            '5.1'       => true,
-        ],
-        'm_monitor' => [
-            '5.1'       => true,
-        ],
-        'm_numcolumns' => [
-            '5.1'       => true,
-        ],
-        'm_numrows' => [
-            '5.1'       => true,
-        ],
-        'm_parsecommadelimited' => [
-            '5.1'       => true,
-        ],
-        'm_responsekeys' => [
-            '5.1'       => true,
-        ],
-        'm_responseparam' => [
-            '5.1'       => true,
-        ],
-        'm_returnstatus' => [
-            '5.1'       => true,
-        ],
-        'm_setblocking' => [
-            '5.1'       => true,
-        ],
-        'm_setdropfile' => [
-            '5.1'       => true,
-        ],
-        'm_setip' => [
-            '5.1'       => true,
-        ],
-        'm_setssl_cafile' => [
-            '5.1'       => true,
-        ],
-        'm_setssl_files' => [
-            '5.1'       => true,
-        ],
-        'm_setssl' => [
-            '5.1'       => true,
-        ],
-        'm_settimeout' => [
-            '5.1'       => true,
-        ],
-        'm_sslcert_gen_hash' => [
-            '5.1'       => true,
-        ],
-        'm_transactionssent' => [
-            '5.1'       => true,
-        ],
-        'm_transinqueue' => [
-            '5.1'       => true,
-        ],
-        'm_transkeyval' => [
-            '5.1'       => true,
-        ],
-        'm_transnew' => [
-            '5.1'       => true,
-        ],
-        'm_transsend' => [
-            '5.1'       => true,
-        ],
-        'm_uwait' => [
-            '5.1'       => true,
-        ],
-        'm_validateidentifier' => [
-            '5.1'       => true,
-        ],
-        'm_verifyconnection' => [
-            '5.1'       => true,
-        ],
-        'm_verifysslcert' => [
-            '5.1'       => true,
-        ],
-        'dio_close' => [
-            '5.1'       => true,
-        ],
-        'dio_fcntl' => [
-            '5.1'       => true,
-        ],
-        'dio_open' => [
-            '5.1'       => true,
-        ],
-        'dio_read' => [
-            '5.1'       => true,
-        ],
-        'dio_seek' => [
-            '5.1'       => true,
-        ],
-        'dio_stat' => [
-            '5.1'       => true,
-        ],
-        'dio_tcsetattr' => [
-            '5.1'       => true,
-        ],
-        'dio_truncate' => [
-            '5.1'       => true,
-        ],
-        'dio_write' => [
-            '5.1'       => true,
-        ],
-        'fam_cancel_monitor' => [
-            '5.1'       => true,
-        ],
-        'fam_close' => [
-            '5.1'       => true,
-        ],
-        'fam_monitor_collection' => [
-            '5.1'       => true,
-        ],
-        'fam_monitor_directory' => [
-            '5.1'       => true,
-        ],
-        'fam_monitor_file' => [
-            '5.1'       => true,
-        ],
-        'fam_next_event' => [
-            '5.1'       => true,
-        ],
-        'fam_open' => [
-            '5.1'       => true,
-        ],
-        'fam_pending' => [
-            '5.1'       => true,
-        ],
-        'fam_resume_monitor' => [
-            '5.1'       => true,
-        ],
-        'fam_suspend_monitor' => [
-            '5.1'       => true,
-        ],
-        'yp_all' => [
-            '5.1'       => true,
-        ],
-        'yp_cat' => [
-            '5.1'       => true,
-        ],
-        'yp_err_string' => [
-            '5.1'       => true,
-        ],
-        'yp_errno' => [
-            '5.1'       => true,
-        ],
-        'yp_first' => [
-            '5.1'       => true,
-        ],
-        'yp_get_default_domain' => [
-            '5.1'       => true,
-        ],
-        'yp_master' => [
-            '5.1'       => true,
-        ],
-        'yp_match' => [
-            '5.1'       => true,
-        ],
-        'yp_next' => [
-            '5.1'       => true,
-        ],
-        'yp_order' => [
-            '5.1'       => true,
-        ],
-        'udm_add_search_limit' => [
-            '5.1'       => true,
-        ],
-        'udm_alloc_agent_array' => [
-            '5.1'       => true,
-        ],
-        'udm_alloc_agent' => [
-            '5.1'       => true,
-        ],
-        'udm_api_version' => [
-            '5.1'       => true,
-        ],
-        'udm_cat_list' => [
-            '5.1'       => true,
-        ],
-        'udm_cat_path' => [
-            '5.1'       => true,
-        ],
-        'udm_check_charset' => [
-            '5.1'       => true,
-        ],
-        'udm_clear_search_limits' => [
-            '5.1'       => true,
-        ],
-        'udm_crc32' => [
-            '5.1'       => true,
-        ],
-        'udm_errno' => [
-            '5.1'       => true,
-        ],
-        'udm_error' => [
-            '5.1'       => true,
-        ],
-        'udm_find' => [
-            '5.1'       => true,
-        ],
-        'udm_free_agent' => [
-            '5.1'       => true,
-        ],
-        'udm_free_ispell_data' => [
-            '5.1'       => true,
-        ],
-        'udm_free_res' => [
-            '5.1'       => true,
-        ],
-        'udm_get_doc_count' => [
-            '5.1'       => true,
-        ],
-        'udm_get_res_field' => [
-            '5.1'       => true,
-        ],
-        'udm_get_res_param' => [
-            '5.1'       => true,
-        ],
-        'udm_hash32' => [
-            '5.1'       => true,
-        ],
-        'udm_load_ispell_data' => [
-            '5.1'       => true,
-        ],
-        'udm_set_agent_param' => [
-            '5.1'       => true,
-        ],
-        'w32api_deftype' => [
-            '5.1'       => true,
-        ],
-        'w32api_init_dtype' => [
-            '5.1'       => true,
-        ],
-        'w32api_invoke_function' => [
-            '5.1'       => true,
-        ],
-        'w32api_register_function' => [
-            '5.1'       => true,
-        ],
-        'w32api_set_call_method' => [
-            '5.1'       => true,
-        ],
-        'cpdf_add_annotation' => [
-            '5.1'       => true,
-        ],
-        'cpdf_add_outline' => [
-            '5.1'       => true,
-        ],
-        'cpdf_arc' => [
-            '5.1'       => true,
-        ],
-        'cpdf_begin_text' => [
-            '5.1'       => true,
-        ],
-        'cpdf_circle' => [
-            '5.1'       => true,
-        ],
-        'cpdf_clip' => [
-            '5.1'       => true,
-        ],
-        'cpdf_close' => [
-            '5.1'       => true,
-        ],
-        'cpdf_closepath_fill_stroke' => [
-            '5.1'       => true,
-        ],
-        'cpdf_closepath_stroke' => [
-            '5.1'       => true,
-        ],
-        'cpdf_closepath' => [
-            '5.1'       => true,
-        ],
-        'cpdf_continue_text' => [
-            '5.1'       => true,
-        ],
-        'cpdf_curveto' => [
-            '5.1'       => true,
-        ],
-        'cpdf_end_text' => [
-            '5.1'       => true,
-        ],
-        'cpdf_fill_stroke' => [
-            '5.1'       => true,
-        ],
-        'cpdf_fill' => [
-            '5.1'       => true,
-        ],
-        'cpdf_finalize_page' => [
-            '5.1'       => true,
-        ],
-        'cpdf_finalize' => [
-            '5.1'       => true,
-        ],
-        'cpdf_global_set_document_limits' => [
-            '5.1'       => true,
-        ],
-        'cpdf_import_jpeg' => [
-            '5.1'       => true,
-        ],
-        'cpdf_lineto' => [
-            '5.1'       => true,
-        ],
-        'cpdf_moveto' => [
-            '5.1'       => true,
-        ],
-        'cpdf_newpath' => [
-            '5.1'       => true,
-        ],
-        'cpdf_open' => [
-            '5.1'       => true,
-        ],
-        'cpdf_output_buffer' => [
-            '5.1'       => true,
-        ],
-        'cpdf_page_init' => [
-            '5.1'       => true,
-        ],
-        'cpdf_place_inline_image' => [
-            '5.1'       => true,
-        ],
-        'cpdf_rect' => [
-            '5.1'       => true,
-        ],
-        'cpdf_restore' => [
-            '5.1'       => true,
-        ],
-        'cpdf_rlineto' => [
-            '5.1'       => true,
-        ],
-        'cpdf_rmoveto' => [
-            '5.1'       => true,
-        ],
-        'cpdf_rotate_text' => [
-            '5.1'       => true,
-        ],
-        'cpdf_rotate' => [
-            '5.1'       => true,
-        ],
-        'cpdf_save_to_file' => [
-            '5.1'       => true,
-        ],
-        'cpdf_save' => [
-            '5.1'       => true,
-        ],
-        'cpdf_scale' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_action_url' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_char_spacing' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_creator' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_current_page' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_font_directories' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_font_map_file' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_font' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_horiz_scaling' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_keywords' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_leading' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_page_animation' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_subject' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_text_matrix' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_text_pos' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_text_rendering' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_text_rise' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_title' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_viewer_preferences' => [
-            '5.1'       => true,
-        ],
-        'cpdf_set_word_spacing' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setdash' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setflat' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setgray_fill' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setgray_stroke' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setgray' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setlinecap' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setlinejoin' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setlinewidth' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setmiterlimit' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setrgbcolor_fill' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setrgbcolor_stroke' => [
-            '5.1'       => true,
-        ],
-        'cpdf_setrgbcolor' => [
-            '5.1'       => true,
-        ],
-        'cpdf_show_xy' => [
-            '5.1'       => true,
-        ],
-        'cpdf_show' => [
-            '5.1'       => true,
-        ],
-        'cpdf_stringwidth' => [
-            '5.1'       => true,
-        ],
-        'cpdf_stroke' => [
-            '5.1'       => true,
-        ],
-        'cpdf_text' => [
-            '5.1'       => true,
-        ],
-        'cpdf_translate' => [
-            '5.1'       => true,
-        ],
-        'ircg_channel_mode' => [
-            '5.1'       => true,
-        ],
-        'ircg_disconnect' => [
-            '5.1'       => true,
-        ],
-        'ircg_eval_ecmascript_params' => [
-            '5.1'       => true,
-        ],
-        'ircg_fetch_error_msg' => [
-            '5.1'       => true,
-        ],
-        'ircg_get_username' => [
-            '5.1'       => true,
-        ],
-        'ircg_html_encode' => [
-            '5.1'       => true,
-        ],
-        'ircg_ignore_add' => [
-            '5.1'       => true,
-        ],
-        'ircg_ignore_del' => [
-            '5.1'       => true,
-        ],
-        'ircg_invite' => [
-            '5.1'       => true,
-        ],
-        'ircg_is_conn_alive' => [
-            '5.1'       => true,
-        ],
-        'ircg_join' => [
-            '5.1'       => true,
-        ],
-        'ircg_kick' => [
-            '5.1'       => true,
-        ],
-        'ircg_list' => [
-            '5.1'       => true,
-        ],
-        'ircg_lookup_format_messages' => [
-            '5.1'       => true,
-        ],
-        'ircg_lusers' => [
-            '5.1'       => true,
-        ],
-        'ircg_msg' => [
-            '5.1'       => true,
-        ],
-        'ircg_names' => [
-            '5.1'       => true,
-        ],
-        'ircg_nick' => [
-            '5.1'       => true,
-        ],
-        'ircg_nickname_escape' => [
-            '5.1'       => true,
-        ],
-        'ircg_nickname_unescape' => [
-            '5.1'       => true,
-        ],
-        'ircg_notice' => [
-            '5.1'       => true,
-        ],
-        'ircg_oper' => [
-            '5.1'       => true,
-        ],
-        'ircg_part' => [
-            '5.1'       => true,
-        ],
-        'ircg_pconnect' => [
-            '5.1'       => true,
-        ],
-        'ircg_register_format_messages' => [
-            '5.1'       => true,
-        ],
-        'ircg_set_current' => [
-            '5.1'       => true,
-        ],
-        'ircg_set_file' => [
-            '5.1'       => true,
-        ],
-        'ircg_set_on_die' => [
-            '5.1'       => true,
-        ],
-        'ircg_topic' => [
-            '5.1'       => true,
-        ],
-        'ircg_who' => [
-            '5.1'       => true,
-        ],
-        'ircg_whois' => [
-            '5.1'       => true,
-        ],
-        'dbx_close' => [
-            '5.1'       => true,
-        ],
-        'dbx_compare' => [
-            '5.1'       => true,
-        ],
-        'dbx_connect' => [
-            '5.1'       => true,
-        ],
-        'dbx_error' => [
-            '5.1'       => true,
-        ],
-        'dbx_escape_string' => [
-            '5.1'       => true,
-        ],
-        'dbx_fetch_row' => [
-            '5.1'       => true,
-        ],
-        'dbx_query' => [
-            '5.1'       => true,
-        ],
-        'dbx_sort' => [
-            '5.1'       => true,
-        ],
-        'ingres_autocommit' => [
-            '5.1'       => true,
-        ],
-        'ingres_close' => [
-            '5.1'       => true,
-        ],
-        'ingres_commit' => [
-            '5.1'       => true,
-        ],
-        'ingres_connect' => [
-            '5.1'       => true,
-        ],
-        'ingres_fetch_array' => [
-            '5.1'       => true,
-        ],
-        'ingres_fetch_object' => [
-            '5.1'       => true,
-        ],
-        'ingres_fetch_row' => [
-            '5.1'       => true,
-        ],
-        'ingres_field_length' => [
-            '5.1'       => true,
-        ],
-        'ingres_field_name' => [
-            '5.1'       => true,
-        ],
-        'ingres_field_nullable' => [
-            '5.1'       => true,
-        ],
-        'ingres_field_precision' => [
-            '5.1'       => true,
-        ],
-        'ingres_field_scale' => [
-            '5.1'       => true,
-        ],
-        'ingres_field_type' => [
-            '5.1'       => true,
-        ],
-        'ingres_num_fields' => [
-            '5.1'       => true,
-        ],
-        'ingres_num_rows' => [
-            '5.1'       => true,
-        ],
-        'ingres_pconnect' => [
-            '5.1'       => true,
-        ],
-        'ingres_query' => [
-            '5.1'       => true,
-        ],
-        'ingres_rollback' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_close' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_commit' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_connect' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_cursor' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_exec' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_execute' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_fetch_into' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_fetch_row' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_field_len' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_field_name' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_field_num' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_field_type' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_free_result' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_longreadlen' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_num_fields' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_num_rows' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_prepare' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_result_all' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_result' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_rollback' => [
-            '5.1'       => true,
-        ],
-        'ovrimos_close_all' => [
-            '5.1'       => true,
-        ],
-        'ora_bind' => [
-            '5.1'       => true,
-        ],
-        'ora_close' => [
-            '5.1'       => true,
-        ],
-        'ora_columnname' => [
-            '5.1'       => true,
-        ],
-        'ora_columnsize' => [
-            '5.1'       => true,
-        ],
-        'ora_columntype' => [
-            '5.1'       => true,
-        ],
-        'ora_commit' => [
-            '5.1'       => true,
-        ],
-        'ora_commitoff' => [
-            '5.1'       => true,
-        ],
-        'ora_commiton' => [
-            '5.1'       => true,
-        ],
-        'ora_do' => [
-            '5.1'       => true,
-        ],
-        'ora_error' => [
-            '5.1'       => true,
-        ],
-        'ora_errorcode' => [
-            '5.1'       => true,
-        ],
-        'ora_exec' => [
-            '5.1'       => true,
-        ],
-        'ora_fetch_into' => [
-            '5.1'       => true,
-        ],
-        'ora_fetch' => [
-            '5.1'       => true,
-        ],
-        'ora_getcolumn' => [
-            '5.1'       => true,
-        ],
-        'ora_logoff' => [
-            '5.1'       => true,
-        ],
-        'ora_logon' => [
-            '5.1'       => true,
-        ],
-        'ora_numcols' => [
-            '5.1'       => true,
-        ],
-        'ora_numrows' => [
-            '5.1'       => true,
-        ],
-        'ora_open' => [
-            '5.1'       => true,
-        ],
-        'ora_parse' => [
-            '5.1'       => true,
-        ],
-        'ora_plogon' => [
-            '5.1'       => true,
-        ],
-        'ora_rollback' => [
-            '5.1'       => true,
-        ],
-        'mysqli_embedded_connect' => [
-            '5.1' => true,
-        ],
-        'mysqli_server_end' => [
-            '5.1' => true,
-        ],
-        'mysqli_server_init' => [
-            '5.1' => true,
-        ],
-
-        'msession_connect' => [
-            '5.1.3'     => true,
-        ],
-        'msession_count' => [
-            '5.1.3'     => true,
-        ],
-        'msession_create' => [
-            '5.1.3'     => true,
-        ],
-        'msession_destroy' => [
-            '5.1.3'     => true,
-        ],
-        'msession_disconnect' => [
-            '5.1.3'     => true,
-        ],
-        'msession_find' => [
-            '5.1.3'     => true,
-        ],
-        'msession_get_array' => [
-            '5.1.3'     => true,
-        ],
-        'msession_get_data' => [
-            '5.1.3'     => true,
-        ],
-        'msession_get' => [
-            '5.1.3'     => true,
-        ],
-        'msession_inc' => [
-            '5.1.3'     => true,
-        ],
-        'msession_list' => [
-            '5.1.3'     => true,
-        ],
-        'msession_listvar' => [
-            '5.1.3'     => true,
-        ],
-        'msession_lock' => [
-            '5.1.3'     => true,
-        ],
-        'msession_plugin' => [
-            '5.1.3'     => true,
-        ],
-        'msession_randstr' => [
-            '5.1.3'     => true,
-        ],
-        'msession_set_array' => [
-            '5.1.3'     => true,
-        ],
-        'msession_set_data' => [
-            '5.1.3'     => true,
-        ],
-        'msession_set' => [
-            '5.1.3'     => true,
-        ],
-        'msession_timeout' => [
-            '5.1.3'     => true,
-        ],
-        'msession_uniq' => [
-            '5.1.3'     => true,
-        ],
-        'msession_unlock' => [
-            '5.1.3'     => true,
-        ],
-
-        'mysqli_resource' => [
-            '5.1.4' => true,
-        ],
-
-        'mysql_createdb' => [
-            '5.1.7'     => true,
-        ],
-        'mysql_dropdb' => [
-            '5.1.7'     => true,
-        ],
-        'mysql_listtables' => [
-            '5.1.7'     => true,
-        ],
-
-        'hwapi_attribute_new' => [
-            '5.2'       => true,
-        ],
-        'hwapi_content_new' => [
-            '5.2'       => true,
-        ],
-        'hwapi_hgcsp' => [
-            '5.2'       => true,
-        ],
-        'hwapi_object_new' => [
-            '5.2'       => true,
-        ],
-        'filepro_fieldcount' => [
-            '5.2'       => true,
-        ],
-        'filepro_fieldname' => [
-            '5.2'       => true,
-        ],
-        'filepro_fieldtype' => [
-            '5.2'       => true,
-        ],
-        'filepro_fieldwidth' => [
-            '5.2'       => true,
-        ],
-        'filepro_retrieve' => [
-            '5.2'       => true,
-        ],
-        'filepro_rowcount' => [
-            '5.2'       => true,
-        ],
-        'filepro' => [
-            '5.2'       => true,
-        ],
-
-        'ifx_affected_rows' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_blobinfile_mode' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_byteasvarchar' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_close' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_connect' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_copy_blob' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_create_blob' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_create_char' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_do' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_error' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_errormsg' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_fetch_row' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_fieldproperties' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_fieldtypes' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_free_blob' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_free_char' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_free_result' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_get_blob' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_get_char' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_getsqlca' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_htmltbl_result' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_nullformat' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_num_fields' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_num_rows' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_pconnect' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_prepare' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_query' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_textasvarchar' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_update_blob' => [
-            '5.2.1'     => true,
-        ],
-        'ifx_update_char' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_close_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_create_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_free_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_open_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_read_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_seek_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_tell_slob' => [
-            '5.2.1'     => true,
-        ],
-        'ifxus_write_slob' => [
-            '5.2.1'     => true,
-        ],
-
-        'ncurses_addch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_addchnstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_addchstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_addnstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_addstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_assume_default_colors' => [
-            '5.3'       => true,
-        ],
-        'ncurses_attroff' => [
-            '5.3'       => true,
-        ],
-        'ncurses_attron' => [
-            '5.3'       => true,
-        ],
-        'ncurses_attrset' => [
-            '5.3'       => true,
-        ],
-        'ncurses_baudrate' => [
-            '5.3'       => true,
-        ],
-        'ncurses_beep' => [
-            '5.3'       => true,
-        ],
-        'ncurses_bkgd' => [
-            '5.3'       => true,
-        ],
-        'ncurses_bkgdset' => [
-            '5.3'       => true,
-        ],
-        'ncurses_border' => [
-            '5.3'       => true,
-        ],
-        'ncurses_bottom_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_can_change_color' => [
-            '5.3'       => true,
-        ],
-        'ncurses_cbreak' => [
-            '5.3'       => true,
-        ],
-        'ncurses_clear' => [
-            '5.3'       => true,
-        ],
-        'ncurses_clrtobot' => [
-            '5.3'       => true,
-        ],
-        'ncurses_clrtoeol' => [
-            '5.3'       => true,
-        ],
-        'ncurses_color_content' => [
-            '5.3'       => true,
-        ],
-        'ncurses_color_set' => [
-            '5.3'       => true,
-        ],
-        'ncurses_curs_set' => [
-            '5.3'       => true,
-        ],
-        'ncurses_def_prog_mode' => [
-            '5.3'       => true,
-        ],
-        'ncurses_def_shell_mode' => [
-            '5.3'       => true,
-        ],
-        'ncurses_define_key' => [
-            '5.3'       => true,
-        ],
-        'ncurses_del_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_delay_output' => [
-            '5.3'       => true,
-        ],
-        'ncurses_delch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_deleteln' => [
-            '5.3'       => true,
-        ],
-        'ncurses_delwin' => [
-            '5.3'       => true,
-        ],
-        'ncurses_doupdate' => [
-            '5.3'       => true,
-        ],
-        'ncurses_echo' => [
-            '5.3'       => true,
-        ],
-        'ncurses_echochar' => [
-            '5.3'       => true,
-        ],
-        'ncurses_end' => [
-            '5.3'       => true,
-        ],
-        'ncurses_erase' => [
-            '5.3'       => true,
-        ],
-        'ncurses_erasechar' => [
-            '5.3'       => true,
-        ],
-        'ncurses_filter' => [
-            '5.3'       => true,
-        ],
-        'ncurses_flash' => [
-            '5.3'       => true,
-        ],
-        'ncurses_flushinp' => [
-            '5.3'       => true,
-        ],
-        'ncurses_getch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_getmaxyx' => [
-            '5.3'       => true,
-        ],
-        'ncurses_getmouse' => [
-            '5.3'       => true,
-        ],
-        'ncurses_getyx' => [
-            '5.3'       => true,
-        ],
-        'ncurses_halfdelay' => [
-            '5.3'       => true,
-        ],
-        'ncurses_has_colors' => [
-            '5.3'       => true,
-        ],
-        'ncurses_has_ic' => [
-            '5.3'       => true,
-        ],
-        'ncurses_has_il' => [
-            '5.3'       => true,
-        ],
-        'ncurses_has_key' => [
-            '5.3'       => true,
-        ],
-        'ncurses_hide_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_hline' => [
-            '5.3'       => true,
-        ],
-        'ncurses_inch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_init_color' => [
-            '5.3'       => true,
-        ],
-        'ncurses_init_pair' => [
-            '5.3'       => true,
-        ],
-        'ncurses_init' => [
-            '5.3'       => true,
-        ],
-        'ncurses_insch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_insdelln' => [
-            '5.3'       => true,
-        ],
-        'ncurses_insertln' => [
-            '5.3'       => true,
-        ],
-        'ncurses_insstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_instr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_isendwin' => [
-            '5.3'       => true,
-        ],
-        'ncurses_keyok' => [
-            '5.3'       => true,
-        ],
-        'ncurses_keypad' => [
-            '5.3'       => true,
-        ],
-        'ncurses_killchar' => [
-            '5.3'       => true,
-        ],
-        'ncurses_longname' => [
-            '5.3'       => true,
-        ],
-        'ncurses_meta' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mouse_trafo' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mouseinterval' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mousemask' => [
-            '5.3'       => true,
-        ],
-        'ncurses_move_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_move' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvaddch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvaddchnstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvaddchstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvaddnstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvaddstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvcur' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvdelch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvgetch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvhline' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvinch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvvline' => [
-            '5.3'       => true,
-        ],
-        'ncurses_mvwaddstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_napms' => [
-            '5.3'       => true,
-        ],
-        'ncurses_new_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_newpad' => [
-            '5.3'       => true,
-        ],
-        'ncurses_newwin' => [
-            '5.3'       => true,
-        ],
-        'ncurses_nl' => [
-            '5.3'       => true,
-        ],
-        'ncurses_nocbreak' => [
-            '5.3'       => true,
-        ],
-        'ncurses_noecho' => [
-            '5.3'       => true,
-        ],
-        'ncurses_nonl' => [
-            '5.3'       => true,
-        ],
-        'ncurses_noqiflush' => [
-            '5.3'       => true,
-        ],
-        'ncurses_noraw' => [
-            '5.3'       => true,
-        ],
-        'ncurses_pair_content' => [
-            '5.3'       => true,
-        ],
-        'ncurses_panel_above' => [
-            '5.3'       => true,
-        ],
-        'ncurses_panel_below' => [
-            '5.3'       => true,
-        ],
-        'ncurses_panel_window' => [
-            '5.3'       => true,
-        ],
-        'ncurses_pnoutrefresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_prefresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_putp' => [
-            '5.3'       => true,
-        ],
-        'ncurses_qiflush' => [
-            '5.3'       => true,
-        ],
-        'ncurses_raw' => [
-            '5.3'       => true,
-        ],
-        'ncurses_refresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_replace_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_reset_prog_mode' => [
-            '5.3'       => true,
-        ],
-        'ncurses_reset_shell_mode' => [
-            '5.3'       => true,
-        ],
-        'ncurses_resetty' => [
-            '5.3'       => true,
-        ],
-        'ncurses_savetty' => [
-            '5.3'       => true,
-        ],
-        'ncurses_scr_dump' => [
-            '5.3'       => true,
-        ],
-        'ncurses_scr_init' => [
-            '5.3'       => true,
-        ],
-        'ncurses_scr_restore' => [
-            '5.3'       => true,
-        ],
-        'ncurses_scr_set' => [
-            '5.3'       => true,
-        ],
-        'ncurses_scrl' => [
-            '5.3'       => true,
-        ],
-        'ncurses_show_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_attr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_attroff' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_attron' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_attrset' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_clear' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_color' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_init' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_noutrefresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_refresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_restore' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_set' => [
-            '5.3'       => true,
-        ],
-        'ncurses_slk_touch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_standend' => [
-            '5.3'       => true,
-        ],
-        'ncurses_standout' => [
-            '5.3'       => true,
-        ],
-        'ncurses_start_color' => [
-            '5.3'       => true,
-        ],
-        'ncurses_termattrs' => [
-            '5.3'       => true,
-        ],
-        'ncurses_termname' => [
-            '5.3'       => true,
-        ],
-        'ncurses_timeout' => [
-            '5.3'       => true,
-        ],
-        'ncurses_top_panel' => [
-            '5.3'       => true,
-        ],
-        'ncurses_typeahead' => [
-            '5.3'       => true,
-        ],
-        'ncurses_ungetch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_ungetmouse' => [
-            '5.3'       => true,
-        ],
-        'ncurses_update_panels' => [
-            '5.3'       => true,
-        ],
-        'ncurses_use_default_colors' => [
-            '5.3'       => true,
-        ],
-        'ncurses_use_env' => [
-            '5.3'       => true,
-        ],
-        'ncurses_use_extended_names' => [
-            '5.3'       => true,
-        ],
-        'ncurses_vidattr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_vline' => [
-            '5.3'       => true,
-        ],
-        'ncurses_waddch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_waddstr' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wattroff' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wattron' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wattrset' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wborder' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wclear' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wcolor_set' => [
-            '5.3'       => true,
-        ],
-        'ncurses_werase' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wgetch' => [
-            '5.3'       => true,
-        ],
-        'ncurses_whline' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wmouse_trafo' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wmove' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wnoutrefresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wrefresh' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wstandend' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wstandout' => [
-            '5.3'       => true,
-        ],
-        'ncurses_wvline' => [
-            '5.3'       => true,
-        ],
-        'fdf_add_doc_javascript' => [
-            '5.3'       => true,
-        ],
-        'fdf_add_template' => [
-            '5.3'       => true,
-        ],
-        'fdf_close' => [
-            '5.3'       => true,
-        ],
-        'fdf_create' => [
-            '5.3'       => true,
-        ],
-        'fdf_enum_values' => [
-            '5.3'       => true,
-        ],
-        'fdf_errno' => [
-            '5.3'       => true,
-        ],
-        'fdf_error' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_ap' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_attachment' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_encoding' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_file' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_flags' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_opt' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_status' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_value' => [
-            '5.3'       => true,
-        ],
-        'fdf_get_version' => [
-            '5.3'       => true,
-        ],
-        'fdf_header' => [
-            '5.3'       => true,
-        ],
-        'fdf_next_field_name' => [
-            '5.3'       => true,
-        ],
-        'fdf_open_string' => [
-            '5.3'       => true,
-        ],
-        'fdf_open' => [
-            '5.3'       => true,
-        ],
-        'fdf_remove_item' => [
-            '5.3'       => true,
-        ],
-        'fdf_save_string' => [
-            '5.3'       => true,
-        ],
-        'fdf_save' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_ap' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_encoding' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_file' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_flags' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_javascript_action' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_on_import_javascript' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_opt' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_status' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_submit_form_action' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_target_frame' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_value' => [
-            '5.3'       => true,
-        ],
-        'fdf_set_version' => [
-            '5.3'       => true,
-        ],
-        'ming_keypress' => [
-            '5.3'       => true,
-        ],
-        'ming_setcubicthreshold' => [
-            '5.3'       => true,
-        ],
-        'ming_setscale' => [
-            '5.3'       => true,
-        ],
-        'ming_setswfcompression' => [
-            '5.3'       => true,
-        ],
-        'ming_useconstants' => [
-            '5.3'       => true,
-        ],
-        'ming_useswfversion' => [
-            '5.3'       => true,
-        ],
-        'dbase_add_record' => [
-            '5.3'       => true,
-        ],
-        'dbase_close' => [
-            '5.3'       => true,
-        ],
-        'dbase_create' => [
-            '5.3'       => true,
-        ],
-        'dbase_delete_record' => [
-            '5.3'       => true,
-        ],
-        'dbase_get_header_info' => [
-            '5.3'       => true,
-        ],
-        'dbase_get_record_with_names' => [
-            '5.3'       => true,
-        ],
-        'dbase_get_record' => [
-            '5.3'       => true,
-        ],
-        'dbase_numfields' => [
-            '5.3'       => true,
-        ],
-        'dbase_numrecords' => [
-            '5.3'       => true,
-        ],
-        'dbase_open' => [
-            '5.3'       => true,
-        ],
-        'dbase_pack' => [
-            '5.3'       => true,
-        ],
-        'dbase_replace_record' => [
-            '5.3'       => true,
-        ],
-        'fbsql_affected_rows' => [
-            '5.3'       => true,
-        ],
-        'fbsql_autocommit' => [
-            '5.3'       => true,
-        ],
-        'fbsql_blob_size' => [
-            '5.3'       => true,
-        ],
-        'fbsql_change_user' => [
-            '5.3'       => true,
-        ],
-        'fbsql_clob_size' => [
-            '5.3'       => true,
-        ],
-        'fbsql_close' => [
-            '5.3'       => true,
-        ],
-        'fbsql_commit' => [
-            '5.3'       => true,
-        ],
-        'fbsql_connect' => [
-            '5.3'       => true,
-        ],
-        'fbsql_create_blob' => [
-            '5.3'       => true,
-        ],
-        'fbsql_create_clob' => [
-            '5.3'       => true,
-        ],
-        'fbsql_create_db' => [
-            '5.3'       => true,
-        ],
-        'fbsql_data_seek' => [
-            '5.3'       => true,
-        ],
-        'fbsql_database_password' => [
-            '5.3'       => true,
-        ],
-        'fbsql_database' => [
-            '5.3'       => true,
-        ],
-        'fbsql_db_query' => [
-            '5.3'       => true,
-        ],
-        'fbsql_db_status' => [
-            '5.3'       => true,
-        ],
-        'fbsql_drop_db' => [
-            '5.3'       => true,
-        ],
-        'fbsql_errno' => [
-            '5.3'       => true,
-        ],
-        'fbsql_error' => [
-            '5.3'       => true,
-        ],
-        'fbsql_fetch_array' => [
-            '5.3'       => true,
-        ],
-        'fbsql_fetch_assoc' => [
-            '5.3'       => true,
-        ],
-        'fbsql_fetch_field' => [
-            '5.3'       => true,
-        ],
-        'fbsql_fetch_lengths' => [
-            '5.3'       => true,
-        ],
-        'fbsql_fetch_object' => [
-            '5.3'       => true,
-        ],
-        'fbsql_fetch_row' => [
-            '5.3'       => true,
-        ],
-        'fbsql_field_flags' => [
-            '5.3'       => true,
-        ],
-        'fbsql_field_len' => [
-            '5.3'       => true,
-        ],
-        'fbsql_field_name' => [
-            '5.3'       => true,
-        ],
-        'fbsql_field_seek' => [
-            '5.3'       => true,
-        ],
-        'fbsql_field_table' => [
-            '5.3'       => true,
-        ],
-        'fbsql_field_type' => [
-            '5.3'       => true,
-        ],
-        'fbsql_free_result' => [
-            '5.3'       => true,
-        ],
-        'fbsql_get_autostart_info' => [
-            '5.3'       => true,
-        ],
-        'fbsql_hostname' => [
-            '5.3'       => true,
-        ],
-        'fbsql_insert_id' => [
-            '5.3'       => true,
-        ],
-        'fbsql_list_dbs' => [
-            '5.3'       => true,
-        ],
-        'fbsql_list_fields' => [
-            '5.3'       => true,
-        ],
-        'fbsql_list_tables' => [
-            '5.3'       => true,
-        ],
-        'fbsql_next_result' => [
-            '5.3'       => true,
-        ],
-        'fbsql_num_fields' => [
-            '5.3'       => true,
-        ],
-        'fbsql_num_rows' => [
-            '5.3'       => true,
-        ],
-        'fbsql_password' => [
-            '5.3'       => true,
-        ],
-        'fbsql_pconnect' => [
-            '5.3'       => true,
-        ],
-        'fbsql_query' => [
-            '5.3'       => true,
-        ],
-        'fbsql_read_blob' => [
-            '5.3'       => true,
-        ],
-        'fbsql_read_clob' => [
-            '5.3'       => true,
-        ],
-        'fbsql_result' => [
-            '5.3'       => true,
-        ],
-        'fbsql_rollback' => [
-            '5.3'       => true,
-        ],
-        'fbsql_rows_fetched' => [
-            '5.3'       => true,
-        ],
-        'fbsql_select_db' => [
-            '5.3'       => true,
-        ],
-        'fbsql_set_characterset' => [
-            '5.3'       => true,
-        ],
-        'fbsql_set_lob_mode' => [
-            '5.3'       => true,
-        ],
-        'fbsql_set_password' => [
-            '5.3'       => true,
-        ],
-        'fbsql_set_transaction' => [
-            '5.3'       => true,
-        ],
-        'fbsql_start_db' => [
-            '5.3'       => true,
-        ],
-        'fbsql_stop_db' => [
-            '5.3'       => true,
-        ],
-        'fbsql_table_name' => [
-            '5.3'       => true,
-        ],
-        'fbsql_tablename' => [
-            '5.3'       => true,
-        ],
-        'fbsql_username' => [
-            '5.3'       => true,
-        ],
-        'fbsql_warnings' => [
-            '5.3'       => true,
-        ],
-        'msql_affected_rows' => [
-            '5.3'       => true,
-        ],
-        'msql_close' => [
-            '5.3'       => true,
-        ],
-        'msql_connect' => [
-            '5.3'       => true,
-        ],
-        'msql_create_db' => [
-            '5.3'       => true,
-        ],
-        'msql_createdb' => [
-            '5.3'       => true,
-        ],
-        'msql_data_seek' => [
-            '5.3'       => true,
-        ],
-        'msql_db_query' => [
-            '5.3'       => true,
-        ],
-        'msql_dbname' => [
-            '5.3'       => true,
-        ],
-        'msql_drop_db' => [
-            '5.3'       => true,
-        ],
-        'msql_error' => [
-            '5.3'       => true,
-        ],
-        'msql_fetch_array' => [
-            '5.3'       => true,
-        ],
-        'msql_fetch_field' => [
-            '5.3'       => true,
-        ],
-        'msql_fetch_object' => [
-            '5.3'       => true,
-        ],
-        'msql_fetch_row' => [
-            '5.3'       => true,
-        ],
-        'msql_field_flags' => [
-            '5.3'       => true,
-        ],
-        'msql_field_len' => [
-            '5.3'       => true,
-        ],
-        'msql_field_name' => [
-            '5.3'       => true,
-        ],
-        'msql_field_seek' => [
-            '5.3'       => true,
-        ],
-        'msql_field_table' => [
-            '5.3'       => true,
-        ],
-        'msql_field_type' => [
-            '5.3'       => true,
-        ],
-        'msql_fieldflags' => [
-            '5.3'       => true,
-        ],
-        'msql_fieldlen' => [
-            '5.3'       => true,
-        ],
-        'msql_fieldname' => [
-            '5.3'       => true,
-        ],
-        'msql_fieldtable' => [
-            '5.3'       => true,
-        ],
-        'msql_fieldtype' => [
-            '5.3'       => true,
-        ],
-        'msql_free_result' => [
-            '5.3'       => true,
-        ],
-        'msql_list_dbs' => [
-            '5.3'       => true,
-        ],
-        'msql_list_fields' => [
-            '5.3'       => true,
-        ],
-        'msql_list_tables' => [
-            '5.3'       => true,
-        ],
-        'msql_num_fields' => [
-            '5.3'       => true,
-        ],
-        'msql_num_rows' => [
-            '5.3'       => true,
-        ],
-        'msql_numfields' => [
-            '5.3'       => true,
-        ],
-        'msql_numrows' => [
-            '5.3'       => true,
-        ],
-        'msql_pconnect' => [
-            '5.3'       => true,
-        ],
-        'msql_query' => [
-            '5.3'       => true,
-        ],
-        'msql_regcase' => [
-            '5.3'       => true,
-        ],
-        'msql_result' => [
-            '5.3'       => true,
-        ],
-        'msql_select_db' => [
-            '5.3'       => true,
-        ],
-        'msql_tablename' => [
-            '5.3'       => true,
-        ],
-        'msql' => [
-            '5.3'       => true,
-        ],
-        'mysqli_disable_reads_from_master' => [
-            '5.3' => true,
-        ],
-        'mysqli_disable_rpl_parse' => [
-            '5.3' => true,
-        ],
-        'mysqli_enable_reads_from_master' => [
-            '5.3' => true,
-        ],
-        'mysqli_enable_rpl_parse' => [
-            '5.3' => true,
-        ],
-        'mysqli_master_query' => [
-            '5.3' => true,
-        ],
-        'mysqli_rpl_parse_enabled' => [
-            '5.3' => true,
-        ],
-        'mysqli_rpl_probe' => [
-            '5.3' => true,
-        ],
-        'mysqli_slave_query' => [
-            '5.3' => true,
-        ],
-
-        'call_user_method' => [
-            '4.1'         => false,
-            '7.0'         => true,
-            'alternative' => 'call_user_func()',
-        ],
-        'call_user_method_array' => [
-            '4.1'         => false,
-            '7.0'         => true,
-            'alternative' => 'call_user_func_array()',
-        ],
-        'define_syslog_variables' => [
-            '5.3' => false,
-            '5.4' => true,
-        ],
-        'dl' => [
-            '5.3' => false,
-        ],
-        'ereg' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_match()',
-        ],
-        'ereg_replace' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_replace()',
-        ],
-        'eregi' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_match() (with the i modifier)',
-        ],
-        'eregi_replace' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_replace() (with the i modifier)',
-        ],
-        'imagepsbbox' => [
-            '7.0' => true,
-        ],
-        'imagepsencodefont' => [
-            '7.0' => true,
-        ],
-        'imagepsextendfont' => [
-            '7.0' => true,
-        ],
-        'imagepsfreefont' => [
-            '7.0' => true,
-        ],
-        'imagepsloadfont' => [
-            '7.0' => true,
-        ],
-        'imagepsslantfont' => [
-            '7.0' => true,
-        ],
-        'imagepstext' => [
-            '7.0' => true,
-        ],
-        'import_request_variables' => [
-            '5.3' => false,
-            '5.4' => true,
-        ],
-        'ldap_sort' => [
-            '7.0' => false,
-            '8.0' => true,
-        ],
-        'mcrypt_generic_end' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_generic_deinit()',
-        ],
-        'mysql_db_query' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'mysqli::select_db() and mysqli::query()',
-        ],
-        'mysql_escape_string' => [
-            '4.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'mysqli::real_escape_string()',
-        ],
-        'mysql_list_dbs' => [
-            '5.4'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_list_fields' => [
-            '5.4'       => false,
-            '7.0'       => true,
-        ],
-        'mysqli_bind_param' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::bind_param()',
-        ],
-        'mysqli_bind_result' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::bind_result()',
-        ],
-        'mysqli_client_encoding' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli::character_set_name()',
-        ],
-        'mysqli_fetch' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::fetch()',
-        ],
-        'mysqli_param_count' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt_param_count()',
-        ],
-        'mysqli_get_metadata' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::result_metadata()',
-        ],
-        'mysqli_send_long_data' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => 'mysqli_stmt::send_long_data()',
-        ],
-        'magic_quotes_runtime' => [
-            '5.3' => false,
-            '7.0' => true,
-        ],
-        'session_register' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => '$_SESSION',
-        ],
-        'session_unregister' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => '$_SESSION',
-        ],
-        'session_is_registered' => [
-            '5.3'         => false,
-            '5.4'         => true,
-            'alternative' => '$_SESSION',
-        ],
-        'set_magic_quotes_runtime' => [
-            '5.3' => false,
-            '7.0' => true,
-        ],
-        'set_socket_blocking' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'stream_set_blocking()',
-        ],
-        'split' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_split(), explode() or str_split()',
-        ],
-        'spliti' => [
-            '5.3'         => false,
-            '7.0'         => true,
-            'alternative' => 'preg_split() (with the i modifier)',
-        ],
-        'sql_regcase' => [
-            '5.3'       => false,
-            '7.0'       => true,
-        ],
-        'php_logo_guid' => [
-            '5.5' => true,
-        ],
-        'php_egg_logo_guid' => [
-            '5.5' => true,
-        ],
-        'php_real_logo_guid' => [
-            '5.5' => true,
-        ],
-        'zend_logo_guid' => [
-            '5.5'         => true,
-            'alternative' => 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"',
-        ],
-        'datefmt_set_timezone_id' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'IntlDateFormatter::setTimeZone()',
-        ],
-        'mcrypt_ecb' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-        ],
-        'mcrypt_cbc' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-        ],
-        'mcrypt_cfb' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-        ],
-        'mcrypt_ofb' => [
-            '5.5'         => false,
-            '7.0'         => true,
-            'alternative' => 'mcrypt_decrypt()/mcrypt_encrypt()',
-        ],
-        'ocibindbyname' => [
-            '5.4'         => false,
-            'alternative' => 'oci_bind_by_name()',
-        ],
-        'ocicancel' => [
-            '5.4'         => false,
-            'alternative' => 'oci_cancel()',
-        ],
-        'ocicloselob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::close() / OCILob::close() (PHP 8+)',
-        ],
-        'ocicollappend' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::append() / OCICollection::append() (PHP 8+)',
-        ],
-        'ocicollassign' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)',
-        ],
-        'ocicollassignelem' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)',
-        ],
-        'ocicollgetelem' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)',
-        ],
-        'ocicollmax' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::max() / OCICollection::max() (PHP 8+)',
-        ],
-        'ocicollsize' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::size() / OCICollection::size() (PHP 8+)',
-        ],
-        'ocicolltrim' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)',
-        ],
-        'ocicolumnisnull' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_is_null()',
-        ],
-        'ocicolumnname' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_name()',
-        ],
-        'ocicolumnprecision' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_precision()',
-        ],
-        'ocicolumnscale' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_scale()',
-        ],
-        'ocicolumnsize' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_size()',
-        ],
-        'ocicolumntype' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_type()',
-        ],
-        'ocicolumntyperaw' => [
-            '5.4'         => false,
-            'alternative' => 'oci_field_type_raw()',
-        ],
-        'ocicommit' => [
-            '5.4'         => false,
-            'alternative' => 'oci_commit()',
-        ],
-        'ocidefinebyname' => [
-            '5.4'         => false,
-            'alternative' => 'oci_define_by_name()',
-        ],
-        'ocierror' => [
-            '5.4'         => false,
-            'alternative' => 'oci_error()',
-        ],
-        'ociexecute' => [
-            '5.4'         => false,
-            'alternative' => 'oci_execute()',
-        ],
-        'ocifetch' => [
-            '5.4'         => false,
-            'alternative' => 'oci_fetch()',
-        ],
-        'ocifetchinto' => [
-            '5.4' => false,
-        ],
-        'ocifetchstatement' => [
-            '5.4'         => false,
-            'alternative' => 'oci_fetch_all()',
-        ],
-        'ocifreecollection' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Collection::free() / OCICollection::free() (PHP 8+)',
-        ],
-        'ocifreecursor' => [
-            '5.4'         => false,
-            'alternative' => 'oci_free_statement()',
-        ],
-        'ocifreedesc' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::free() / OCILob::free() (PHP 8+)',
-        ],
-        'ocifreestatement' => [
-            '5.4'         => false,
-            'alternative' => 'oci_free_statement()',
-        ],
-        'ociinternaldebug' => [
-            '5.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'oci_internal_debug() (PHP < 8.0)',
-        ],
-        'ociloadlob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::load() / OCILob::load() (PHP 8+)',
-        ],
-        'ocilogoff' => [
-            '5.4'         => false,
-            'alternative' => 'oci_close()',
-        ],
-        'ocilogon' => [
-            '5.4'         => false,
-            'alternative' => 'oci_connect()',
-        ],
-        'ocinewcollection' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_collection()',
-        ],
-        'ocinewcursor' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_cursor()',
-        ],
-        'ocinewdescriptor' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_descriptor()',
-        ],
-        'ocinlogon' => [
-            '5.4'         => false,
-            'alternative' => 'oci_new_connect()',
-        ],
-        'ocinumcols' => [
-            '5.4'         => false,
-            'alternative' => 'oci_num_fields()',
-        ],
-        'ociparse' => [
-            '5.4'         => false,
-            'alternative' => 'oci_parse()',
-        ],
-        'ociplogon' => [
-            '5.4'         => false,
-            'alternative' => 'oci_pconnect()',
-        ],
-        'ociresult' => [
-            '5.4'         => false,
-            'alternative' => 'oci_result()',
-        ],
-        'ocirollback' => [
-            '5.4'         => false,
-            'alternative' => 'oci_rollback()',
-        ],
-        'ocirowcount' => [
-            '5.4'         => false,
-            'alternative' => 'oci_num_rows()',
-        ],
-        'ocisavelob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::save() / OCILob::save() (PHP 8+)',
-        ],
-        'ocisavelobfile' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::import() / OCILob::import() (PHP 8+)',
-        ],
-        'ociserverversion' => [
-            '5.4'         => false,
-            'alternative' => 'oci_server_version()',
-        ],
-        'ocisetprefetch' => [
-            '5.4'         => false,
-            'alternative' => 'oci_set_prefetch()',
-        ],
-        'ocistatementtype' => [
-            '5.4'         => false,
-            'alternative' => 'oci_statement_type()',
-        ],
-        'ociwritelobtofile' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::export() / OCILob::export() (PHP 8+)',
-        ],
-        'ociwritetemporarylob' => [
-            '5.4'         => false,
-            'alternative' => 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)',
-        ],
-        'mysqli_get_cache_stats' => [
-            '5.4' => true,
-        ],
-        'sqlite_array_query' => [
-            '5.4'       => true,
-        ],
-        'sqlite_busy_timeout' => [
-            '5.4'       => true,
-        ],
-        'sqlite_changes' => [
-            '5.4'       => true,
-        ],
-        'sqlite_close' => [
-            '5.4'       => true,
-        ],
-        'sqlite_column' => [
-            '5.4'       => true,
-        ],
-        'sqlite_create_aggregate' => [
-            '5.4'       => true,
-        ],
-        'sqlite_create_function' => [
-            '5.4'       => true,
-        ],
-        'sqlite_current' => [
-            '5.4'       => true,
-        ],
-        'sqlite_error_string' => [
-            '5.4'       => true,
-        ],
-        'sqlite_escape_string' => [
-            '5.4'       => true,
-        ],
-        'sqlite_exec' => [
-            '5.4'       => true,
-        ],
-        'sqlite_factory' => [
-            '5.4'       => true,
-        ],
-        'sqlite_fetch_all' => [
-            '5.4'       => true,
-        ],
-        'sqlite_fetch_array' => [
-            '5.4'       => true,
-        ],
-        'sqlite_fetch_column_types' => [
-            '5.4'       => true,
-        ],
-        'sqlite_fetch_object' => [
-            '5.4'       => true,
-        ],
-        'sqlite_fetch_single' => [
-            '5.4'       => true,
-        ],
-        'sqlite_fetch_string' => [
-            '5.4'       => true,
-        ],
-        'sqlite_field_name' => [
-            '5.4'       => true,
-        ],
-        'sqlite_has_more' => [
-            '5.4'       => true,
-        ],
-        'sqlite_has_prev' => [
-            '5.4'       => true,
-        ],
-        'sqlite_key' => [
-            '5.4'       => true,
-        ],
-        'sqlite_last_error' => [
-            '5.4'       => true,
-        ],
-        'sqlite_last_insert_rowid' => [
-            '5.4'       => true,
-        ],
-        'sqlite_libencoding' => [
-            '5.4'       => true,
-        ],
-        'sqlite_libversion' => [
-            '5.4'       => true,
-        ],
-        'sqlite_next' => [
-            '5.4'       => true,
-        ],
-        'sqlite_num_fields' => [
-            '5.4'       => true,
-        ],
-        'sqlite_num_rows' => [
-            '5.4'       => true,
-        ],
-        'sqlite_open' => [
-            '5.4'       => true,
-        ],
-        'sqlite_popen' => [
-            '5.4'       => true,
-        ],
-        'sqlite_prev' => [
-            '5.4'       => true,
-        ],
-        'sqlite_query' => [
-            '5.4'       => true,
-        ],
-        'sqlite_rewind' => [
-            '5.4'       => true,
-        ],
-        'sqlite_seek' => [
-            '5.4'       => true,
-        ],
-        'sqlite_single_query' => [
-            '5.4'       => true,
-        ],
-        'sqlite_udf_decode_binary' => [
-            '5.4'       => true,
-        ],
-        'sqlite_udf_encode_binary' => [
-            '5.4'       => true,
-        ],
-        'sqlite_unbuffered_query' => [
-            '5.4'       => true,
-        ],
-        'sqlite_valid' => [
-            '5.4'       => true,
-        ],
-
-        'mssql_bind' => [
-            '7.0'       => true,
-        ],
-        'mssql_close' => [
-            '7.0'       => true,
-        ],
-        'mssql_connect' => [
-            '7.0'       => true,
-        ],
-        'mssql_data_seek' => [
-            '7.0'       => true,
-        ],
-        'mssql_execute' => [
-            '7.0'       => true,
-        ],
-        'mssql_fetch_array' => [
-            '7.0'       => true,
-        ],
-        'mssql_fetch_assoc' => [
-            '7.0'       => true,
-        ],
-        'mssql_fetch_batch' => [
-            '7.0'       => true,
-        ],
-        'mssql_fetch_field' => [
-            '7.0'       => true,
-        ],
-        'mssql_fetch_object' => [
-            '7.0'       => true,
-        ],
-        'mssql_fetch_row' => [
-            '7.0'       => true,
-        ],
-        'mssql_field_length' => [
-            '7.0'       => true,
-        ],
-        'mssql_field_name' => [
-            '7.0'       => true,
-        ],
-        'mssql_field_seek' => [
-            '7.0'       => true,
-        ],
-        'mssql_field_type' => [
-            '7.0'       => true,
-        ],
-        'mssql_free_result' => [
-            '7.0'       => true,
-        ],
-        'mssql_free_statement' => [
-            '7.0'       => true,
-        ],
-        'mssql_get_last_message' => [
-            '7.0'       => true,
-        ],
-        'mssql_guid_string' => [
-            '7.0'       => true,
-        ],
-        'mssql_init' => [
-            '7.0'       => true,
-        ],
-        'mssql_min_error_severity' => [
-            '7.0'       => true,
-        ],
-        'mssql_min_message_severity' => [
-            '7.0'       => true,
-        ],
-        'mssql_next_result' => [
-            '7.0'       => true,
-        ],
-        'mssql_num_fields' => [
-            '7.0'       => true,
-        ],
-        'mssql_num_rows' => [
-            '7.0'       => true,
-        ],
-        'mssql_pconnect' => [
-            '7.0'       => true,
-        ],
-        'mssql_query' => [
-            '7.0'       => true,
-        ],
-        'mssql_result' => [
-            '7.0'       => true,
-        ],
-        'mssql_rows_affected' => [
-            '7.0'       => true,
-        ],
-        'mssql_select_db' => [
-            '7.0'       => true,
-        ],
-        'mysql_affected_rows' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_client_encoding' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_close' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_connect' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_create_db' => [
-            '4.3'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_data_seek' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_db_name' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_drop_db' => [
-            '4.3'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_errno' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_error' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fetch_array' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fetch_assoc' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fetch_field' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fetch_lengths' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fetch_object' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fetch_row' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_field_flags' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_field_len' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_field_name' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_field_seek' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_field_table' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_field_type' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_free_result' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_get_client_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_get_host_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_get_proto_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_get_server_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_info' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_insert_id' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_list_processes' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_list_tables' => [
-            '4.3.7'     => false,
-            '7.0'       => true,
-        ],
-        'mysql_num_fields' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_num_rows' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_pconnect' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_ping' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_query' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_real_escape_string' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_result' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_select_db' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_set_charset' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_stat' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_tablename' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_thread_id' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_unbuffered_query' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fieldname' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fieldtable' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fieldlen' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fieldtype' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_fieldflags' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_selectdb' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_freeresult' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_numfields' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_numrows' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_listdbs' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_listfields' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_dbname' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'mysql_table_name' => [
-            '5.5'       => false,
-            '7.0'       => true,
-        ],
-        'sybase_affected_rows' => [
-            '7.0'       => true,
-        ],
-        'sybase_close' => [
-            '7.0'       => true,
-        ],
-        'sybase_connect' => [
-            '7.0'       => true,
-        ],
-        'sybase_data_seek' => [
-            '7.0'       => true,
-        ],
-        'sybase_deadlock_retry_count' => [
-            '7.0'       => true,
-        ],
-        'sybase_fetch_array' => [
-            '7.0'       => true,
-        ],
-        'sybase_fetch_assoc' => [
-            '7.0'       => true,
-        ],
-        'sybase_fetch_field' => [
-            '7.0'       => true,
-        ],
-        'sybase_fetch_object' => [
-            '7.0'       => true,
-        ],
-        'sybase_fetch_row' => [
-            '7.0'       => true,
-        ],
-        'sybase_field_seek' => [
-            '7.0'       => true,
-        ],
-        'sybase_free_result' => [
-            '7.0'       => true,
-        ],
-        'sybase_get_last_message' => [
-            '7.0'       => true,
-        ],
-        'sybase_min_client_severity' => [
-            '7.0'       => true,
-        ],
-        'sybase_min_error_severity' => [
-            '7.0'       => true,
-        ],
-        'sybase_min_message_severity' => [
-            '7.0'       => true,
-        ],
-        'sybase_min_server_severity' => [
-            '7.0'       => true,
-        ],
-        'sybase_num_fields' => [
-            '7.0'       => true,
-        ],
-        'sybase_num_rows' => [
-            '7.0'       => true,
-        ],
-        'sybase_pconnect' => [
-            '7.0'       => true,
-        ],
-        'sybase_query' => [
-            '7.0'       => true,
-        ],
-        'sybase_result' => [
-            '7.0'       => true,
-        ],
-        'sybase_select_db' => [
-            '7.0'       => true,
-        ],
-        'sybase_set_message_handler' => [
-            '7.0'       => true,
-        ],
-        'sybase_unbuffered_query' => [
-            '7.0'       => true,
-        ],
-
-        'mcrypt_create_iv' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'random_bytes() or OpenSSL',
-        ],
-        'mcrypt_decrypt' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_get_algorithms_name' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_get_block_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_get_iv_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_get_key_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_get_modes_name' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_get_supported_key_sizes' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_is_block_algorithm_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_is_block_algorithm' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_is_block_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_enc_self_test' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_encrypt' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_generic_deinit' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_generic_init' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_generic' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_get_block_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_get_cipher_name' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_get_iv_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_get_key_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_list_algorithms' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_list_modes' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_close' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_get_algo_block_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_get_algo_key_size' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_get_supported_key_sizes' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_is_block_algorithm_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_is_block_algorithm' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_is_block_mode' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_open' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mcrypt_module_self_test' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'mdecrypt_generic' => [
-            '7.1'         => false,
-            '7.2'         => true,
-            'alternative' => 'OpenSSL',
-        ],
-        'jpeg2wbmp' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'imagecreatefromjpeg() and imagewbmp()',
-        ],
-        'png2wbmp' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'imagecreatefrompng() or imagewbmp()',
-        ],
-        '__autoload' => [
-            '7.2'         => false,
-            'alternative' => 'SPL autoload',
-        ],
-        'create_function' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'an anonymous function',
-        ],
-        'each' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'a foreach loop or ArrayIterator',
-        ],
-        'gmp_random' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'gmp_random_bits() or gmp_random_range()',
-        ],
-        'read_exif_data' => [
-            '7.2'         => false,
-            '8.0'         => true,
-            'alternative' => 'exif_read_data()',
-        ],
-
-        'image2wbmp' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'imagewbmp()',
-        ],
-        'mbregex_encoding' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_regex_encoding()',
-        ],
-        'mbereg' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg()',
-        ],
-        'mberegi' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_eregi()',
-        ],
-        'mbereg_replace' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_replace()',
-        ],
-        'mberegi_replace' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_eregi_replace()',
-        ],
-        'mbsplit' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_split()',
-        ],
-        'mbereg_match' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_match()',
-        ],
-        'mbereg_search' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search()',
-        ],
-        'mbereg_search_pos' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_pos()',
-        ],
-        'mbereg_search_regs' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_regs()',
-        ],
-        'mbereg_search_init' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_init()',
-        ],
-        'mbereg_search_getregs' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_getregs()',
-        ],
-        'mbereg_search_getpos' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_getpos()',
-        ],
-        'mbereg_search_setpos' => [
-            '7.3'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_ereg_search_setpos()',
-        ],
-        'fgetss' => [
-            '7.3' => false,
-            '8.0' => true,
-        ],
-        'gzgetss' => [
-            '7.3' => false,
-            '8.0' => true,
-        ],
-
-        'convert_cyr_string' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'mb_convert_encoding(), iconv() or UConverter',
-        ],
-        'ezmlm_hash' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'get_magic_quotes_gpc' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'get_magic_quotes_runtime' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'hebrevc' => [
-            '7.4' => false,
-            '8.0' => true,
-        ],
-        'is_real' => [
-            '7.4'         => false,
-            'alternative' => 'is_float()',
-        ],
-        'money_format' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'NumberFormatter::formatCurrency()',
-        ],
-        'restore_include_path' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => "ini_restore('include_path')",
-        ],
-        'ibase_add_user' => [
-            '7.4'       => true,
-        ],
-        'ibase_affected_rows' => [
-            '7.4'       => true,
-        ],
-        'ibase_backup' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_add' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_cancel' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_close' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_create' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_echo' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_get' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_import' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_info' => [
-            '7.4'       => true,
-        ],
-        'ibase_blob_open' => [
-            '7.4'       => true,
-        ],
-        'ibase_close' => [
-            '7.4'       => true,
-        ],
-        'ibase_commit_ret' => [
-            '7.4'       => true,
-        ],
-        'ibase_commit' => [
-            '7.4'       => true,
-        ],
-        'ibase_connect' => [
-            '7.4'       => true,
-        ],
-        'ibase_db_info' => [
-            '7.4'       => true,
-        ],
-        'ibase_delete_user' => [
-            '7.4'       => true,
-        ],
-        'ibase_drop_db' => [
-            '7.4'       => true,
-        ],
-        'ibase_errcode' => [
-            '7.4'       => true,
-        ],
-        'ibase_errmsg' => [
-            '7.4'       => true,
-        ],
-        'ibase_execute' => [
-            '7.4'       => true,
-        ],
-        'ibase_fetch_assoc' => [
-            '7.4'       => true,
-        ],
-        'ibase_fetch_object' => [
-            '7.4'       => true,
-        ],
-        'ibase_fetch_row' => [
-            '7.4'       => true,
-        ],
-        'ibase_field_info' => [
-            '7.4'       => true,
-        ],
-        'ibase_free_event_handler' => [
-            '7.4'       => true,
-        ],
-        'ibase_free_query' => [
-            '7.4'       => true,
-        ],
-        'ibase_free_result' => [
-            '7.4'       => true,
-        ],
-        'ibase_gen_id' => [
-            '7.4'       => true,
-        ],
-        'ibase_maintain_db' => [
-            '7.4'       => true,
-        ],
-        'ibase_modify_user' => [
-            '7.4'       => true,
-        ],
-        'ibase_name_result' => [
-            '7.4'       => true,
-        ],
-        'ibase_num_fields' => [
-            '7.4'       => true,
-        ],
-        'ibase_num_params' => [
-            '7.4'       => true,
-        ],
-        'ibase_param_info' => [
-            '7.4'       => true,
-        ],
-        'ibase_pconnect' => [
-            '7.4'       => true,
-        ],
-        'ibase_prepare' => [
-            '7.4'       => true,
-        ],
-        'ibase_query' => [
-            '7.4'       => true,
-        ],
-        'ibase_restore' => [
-            '7.4'       => true,
-        ],
-        'ibase_rollback_ret' => [
-            '7.4'       => true,
-        ],
-        'ibase_rollback' => [
-            '7.4'       => true,
-        ],
-        'ibase_server_info' => [
-            '7.4'       => true,
-        ],
-        'ibase_service_attach' => [
-            '7.4'       => true,
-        ],
-        'ibase_service_detach' => [
-            '7.4'       => true,
-        ],
-        'ibase_set_event_handler' => [
-            '7.4'       => true,
-        ],
-        'ibase_trans' => [
-            '7.4'       => true,
-        ],
-        'ibase_wait_event' => [
-            '7.4'       => true,
-        ],
-        'fbird_add_user' => [
-            '7.4'       => true,
-        ],
-        'fbird_affected_rows' => [
-            '7.4'       => true,
-        ],
-        'fbird_backup' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_add' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_cancel' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_close' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_create' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_echo' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_get' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_import' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_info' => [
-            '7.4'       => true,
-        ],
-        'fbird_blob_open' => [
-            '7.4'       => true,
-        ],
-        'fbird_close' => [
-            '7.4'       => true,
-        ],
-        'fbird_commit_ret' => [
-            '7.4'       => true,
-        ],
-        'fbird_commit' => [
-            '7.4'       => true,
-        ],
-        'fbird_connect' => [
-            '7.4'       => true,
-        ],
-        'fbird_db_info' => [
-            '7.4'       => true,
-        ],
-        'fbird_delete_user' => [
-            '7.4'       => true,
-        ],
-        'fbird_drop_db' => [
-            '7.4'       => true,
-        ],
-        'fbird_errcode' => [
-            '7.4'       => true,
-        ],
-        'fbird_errmsg' => [
-            '7.4'       => true,
-        ],
-        'fbird_execute' => [
-            '7.4'       => true,
-        ],
-        'fbird_fetch_assoc' => [
-            '7.4'       => true,
-        ],
-        'fbird_fetch_object' => [
-            '7.4'       => true,
-        ],
-        'fbird_fetch_row' => [
-            '7.4'       => true,
-        ],
-        'fbird_field_info' => [
-            '7.4'       => true,
-        ],
-        'fbird_free_event_handler' => [
-            '7.4'       => true,
-        ],
-        'fbird_free_query' => [
-            '7.4'       => true,
-        ],
-        'fbird_free_result' => [
-            '7.4'       => true,
-        ],
-        'fbird_gen_id' => [
-            '7.4'       => true,
-        ],
-        'fbird_maintain_db' => [
-            '7.4'       => true,
-        ],
-        'fbird_modify_user' => [
-            '7.4'       => true,
-        ],
-        'fbird_name_result' => [
-            '7.4'       => true,
-        ],
-        'fbird_num_fields' => [
-            '7.4'       => true,
-        ],
-        'fbird_num_params' => [
-            '7.4'       => true,
-        ],
-        'fbird_param_info' => [
-            '7.4'       => true,
-        ],
-        'fbird_pconnect' => [
-            '7.4'       => true,
-        ],
-        'fbird_prepare' => [
-            '7.4'       => true,
-        ],
-        'fbird_query' => [
-            '7.4'       => true,
-        ],
-        'fbird_restore' => [
-            '7.4'       => true,
-        ],
-        'fbird_rollback_ret' => [
-            '7.4'       => true,
-        ],
-        'fbird_rollback' => [
-            '7.4'       => true,
-        ],
-        'fbird_server_info' => [
-            '7.4'       => true,
-        ],
-        'fbird_service_attach' => [
-            '7.4'       => true,
-        ],
-        'fbird_service_detach' => [
-            '7.4'       => true,
-        ],
-        'fbird_set_event_handler' => [
-            '7.4'       => true,
-        ],
-        'fbird_trans' => [
-            '7.4'       => true,
-        ],
-        'fbird_wait_event' => [
-            '7.4'       => true,
-        ],
-
-        'ldap_control_paged_result_response' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'ldap_search()',
-        ],
-        'ldap_control_paged_result' => [
-            '7.4'         => false,
-            '8.0'         => true,
-            'alternative' => 'ldap_search()',
-        ],
-        'recode_file' => [
-            '7.4'         => true,
-            'alternative' => 'the iconv or mbstring extension',
-        ],
-        'recode_string' => [
-            '7.4'         => true,
-            'alternative' => 'the iconv or mbstring extension',
-        ],
-        'recode' => [
-            '7.4'         => true,
-            'alternative' => 'the iconv or mbstring extension',
-        ],
-        'wddx_add_vars' => [
-            '7.4'       => true,
-        ],
-        'wddx_deserialize' => [
-            '7.4'       => true,
-        ],
-        'wddx_packet_end' => [
-            '7.4'       => true,
-        ],
-        'wddx_packet_start' => [
-            '7.4'       => true,
-        ],
-        'wddx_serialize_value' => [
-            '7.4'       => true,
-        ],
-        'wddx_serialize_vars' => [
-            '7.4'       => true,
-        ],
-        'mysqli_embedded_server_end' => [
-            '7.4' => true,
-        ],
-        'mysqli_embedded_server_start' => [
-            '7.4' => true,
-        ],
-
-        'enchant_broker_get_dict_path' => [
-            '8.0' => false,
-        ],
-        'enchant_broker_set_dict_path' => [
-            '8.0' => false,
-        ],
-        'enchant_broker_free' => [
-            '8.0'         => false,
-            'alternative' => 'unset the object',
-        ],
-        'enchant_broker_free_dict' => [
-            '8.0'         => false,
-            'alternative' => 'unset the object',
-        ],
-        'enchant_dict_add_to_personal' => [
-            '8.0'         => false,
-            'alternative' => 'enchant_dict_add()',
-        ],
-        'enchant_dict_is_in_session' => [
-            '8.0'         => false,
-            'alternative' => 'enchant_dict_is_added()',
-        ],
-        'imap_header' => [
-            '8.0'         => true,
-            'alternative' => 'imap_headerinfo()',
-        ],
-        'libxml_disable_entity_loader' => [
-            '8.0' => false,
-        ],
-        'oci_internal_debug' => [
-            '8.0' => true,
-        ],
-        'openssl_x509_free' => [
-            '8.0' => false,
-        ],
-        'openssl_pkey_free' => [
-            '8.0' => false,
-        ],
-        'openssl_free_key' => [
-            '8.0' => false,
-        ],
-        'pg_clientencoding' => [
-            '8.0'         => false,
-            'alternative' => 'pg_client_encoding()',
-        ],
-        'pg_cmdtuples' => [
-            '8.0'         => false,
-            'alternative' => 'pg_affected_rows()',
-        ],
-        'pg_errormessage' => [
-            '8.0'         => false,
-            'alternative' => 'pg_last_error()',
-        ],
-        'pg_fieldname' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_name()',
-        ],
-        'pg_fieldnum' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_num()',
-        ],
-        'pg_fieldisnull' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_is_null()',
-        ],
-        'pg_fieldprtlen' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_prtlen()',
-        ],
-        'pg_fieldsize' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_size()',
-        ],
-        'pg_fieldtype' => [
-            '8.0'         => false,
-            'alternative' => 'pg_field_type()',
-        ],
-        'pg_freeresult' => [
-            '8.0'         => false,
-            'alternative' => 'pg_free_result()',
-        ],
-        'pg_getlastoid' => [
-            '8.0'         => false,
-            'alternative' => 'pg_last_oid()',
-        ],
-        'pg_loclose' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_close()',
-        ],
-        'pg_locreate' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_create()',
-        ],
-        'pg_loexport' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_export()',
-        ],
-        'pg_loimport' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_import()',
-        ],
-        'pg_loopen' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_open()',
-        ],
-        'pg_loread' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_read()',
-        ],
-        'pg_loreadall' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_read_all()',
-        ],
-        'pg_lounlink' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_unlink()',
-        ],
-        'pg_lowrite' => [
-            '8.0'         => false,
-            'alternative' => 'pg_lo_write()',
-        ],
-        'pg_numfields' => [
-            '8.0'         => false,
-            'alternative' => 'pg_num_fields()',
-        ],
-        'pg_numrows' => [
-            '8.0'         => false,
-            'alternative' => 'pg_num_rows()',
-        ],
-        'pg_result' => [
-            '8.0'         => false,
-            'alternative' => 'pg_fetch_result()',
-        ],
-        'pg_setclientencoding' => [
-            '8.0'         => false,
-            'alternative' => 'pg_set_client_encoding()',
-        ],
-        'shmop_close' => [
-            '8.0' => false,
-        ],
-        'xmlrpc_decode_request' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_decode' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_encode_request' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_encode' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_get_type' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_is_fault' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_parse_method_descriptions' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_server_add_introspection_data' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_server_call_method' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_server_create' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_server_destroy' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_server_register_introspection_callback' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_server_register_method' => [
-            '8.0'       => true,
-        ],
-        'xmlrpc_set_type' => [
-            '8.0'       => true,
-        ],
-        'zip_close' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive::close()',
-        ],
-        'zip_entry_close' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_compressedsize' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_compressionmethod' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_filesize' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_name' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_open' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_entry_read' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-        'zip_open' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive::open()',
-        ],
-        'zip_read' => [
-            '8.0'         => false,
-            'alternative' => 'ZipArchive',
-        ],
-
-        'date_sunrise' => [
-            '8.1'         => false,
-            'alternative' => 'date_sun_info()',
-        ],
-        'date_sunset' => [
-            '8.1'         => false,
-            'alternative' => 'date_sun_info()',
-        ],
-        'strptime' => [
-            '8.1'         => false,
-            'alternative' => 'date_parse_from_format() or IntlDateFormatter::parse()',
-        ],
-        'strftime' => [
-            '8.1'         => false,
-            'alternative' => 'date() or IntlDateFormatter::format()',
-        ],
-        'gmstrftime' => [
-            '8.1'         => false,
-            'alternative' => 'date() or IntlDateFormatter::format()',
-        ],
-        'mhash_count' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash_get_block_size' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash_get_hash_name' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash_keygen_s2k' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'mhash' => [
-            '8.1'         => false,
-            'alternative' => 'the hash_*() functions',
-        ],
-        'odbc_result_all' => [
-            '8.1' => false,
-        ],
-        'utf8_encode' => [
-            '8.2' => false,
-            'alternative' => 'iconv()',
-        ],
-        'utf8_decode' => [
-            '8.2' => false,
-            'alternative' => 'iconv()',
-        ],
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($stackPtr !== false && !Assert::isBuiltinFunctionCall($phpcsFile, $stackPtr)) {
-            return;
-        }
-        return parent::process($phpcsFile, $stackPtr);
-    }
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
deleted file mode 100644
index 9a722cd3..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-/**
- * @inheritdoc
- */
-class RemovedGetDefinedFunctionsExcludeDisabledFalseSniff extends \PHPCompatibility\Sniffs\ParameterValues\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
-{
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
deleted file mode 100644
index 021da412..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedOptionalBeforeRequiredParamSniff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-/**
- * @inheritdoc
- */
-class RemovedOptionalBeforeRequiredParamSniff extends \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedOptionalBeforeRequiredParamSniff
-{
-}
diff --git a/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php b/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
deleted file mode 100644
index e5233d13..00000000
--- a/Magento2/Sniffs/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseSniff.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * @inheritdoc
- */
-class RemovedSplAutoloadRegisterThrowFalseSniff extends \PHPCompatibility\Sniffs\ParameterValues\RemovedSplAutoloadRegisterThrowFalseSniff
-{
-}
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
deleted file mode 100644
index 79a63b41..00000000
--- a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the ChangedIntToBoolParamType sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\ChangedIntToBoolParamTypeSniff
- */
-class ChangedIntToBoolParamTypeUnitTest extends \PHPCompatibility\Tests\ParameterValues\ChangedIntToBoolParamTypeUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.ChangedIntToBoolParamType';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc
deleted file mode 100644
index da973bc1..00000000
--- a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.autoload.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*
- * Test: Creation of dynamic property when class cannot be autoloaded
- */
-namespace Magento2\Sniffs\PHPCompatibility;
-
-use PHP_CodeSniffer\Files\File;
-
-class DeprecatedDynamicPropertySniff extends \PHPCompatibility\Sniff
-{
-    public function register()
-    {
-        // TODO: Implement register() method.
-    }
-
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $this->xyz = 1; // this property is not defined anywhere.
-        $this->superglobals['TEST_VAR'] = 'TEST_VAR'; // this property is defined in the parent class.
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc
deleted file mode 100644
index da5b8593..00000000
--- a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.inc
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/*
- * Test: Creation of dynamic property when class cannot be autoloaded
- */
-
-trait TraitA
-{
-    private bool $prop2;
-}
-
-trait TraitB
-{
-    private bool $prop3;
-}
-
-class Bar
-{
-    public bool $prop1;
-
-    public function resetProp1()
-    {
-        $this->prop1 = false;
-    }
-}
-
-/**
- * @property bool $prop6 full format
- * @property $prop7 prop without type
- * @property bool prop8 prop with comment
- */
-class Foo1 extends Bar
-{
-    use TraitA, TraitB;
-    private bool $prop4;
-    public function __construct(
-        private bool $prop5
-    ) {
-    }
-
-    private function reset(): void
-    {
-        $this->resetProp1();
-        $this->prop1 = false;
-        $this->prop2 = false;
-        $this->prop3 = false;
-        $this->prop4 = false;
-        $this->prop5 = false;
-        $this->prop6 = false;
-        $this->prop7 = false;
-        $this->prop8 = false;
-        $this->prop9 = false;
-    }
-}
-
-/**
- * @property bool $prop6 full format
- * @property $prop7 prop without type
- * @property bool prop8 prop with comment
- */
-class Foo2
-{
-    use TraitA, TraitB;
-    private bool $prop4;
-    public function __construct(
-        private bool $prop5
-    ) {
-    }
-
-    private function reset(): void
-    {
-        $this->resetProp1();
-        $this->prop1 = false;
-        $this->prop2 = false;
-        $this->prop3 = false;
-        $this->prop4 = false;
-        $this->prop5 = false;
-        $this->prop6 = false;
-        $this->prop7 = false;
-        $this->prop8 = false;
-        $this->prop9 = false;
-    }
-}
-
-/**
- * @property bool $prop6 full format
- * @property $prop7 prop without type
- * @property bool prop8 prop with comment
- */
-class Foo3 extends Bar
-{
-    private bool $prop4;
-    public function __construct(
-        private bool $prop5
-    ) {
-    }
-
-    private function reset(): void
-    {
-        $this->resetProp1();
-        $this->prop1 = false;
-        $this->prop2 = false;
-        $this->prop3 = false;
-        $this->prop4 = false;
-        $this->prop5 = false;
-        $this->prop6 = false;
-        $this->prop7 = false;
-        $this->prop8 = false;
-        $this->prop9 = false;
-    }
-}
-
-/**
- * @property bool $prop6 full format
- * @property $prop7 prop without type
- * @property bool prop8 prop with comment
- */
-class Foo4
-{
-    private bool $prop4;
-    public function __construct(
-        private bool $prop5
-    ) {
-    }
-
-    private function reset(): void
-    {
-        $this->resetProp1();
-        $this->prop1 = false;
-        $this->prop2 = false;
-        $this->prop3 = false;
-        $this->prop4 = false;
-        $this->prop5 = false;
-        $this->prop6 = false;
-        $this->prop7 = false;
-        $this->prop8 = false;
-        $this->prop9 = false;
-    }
-}
-
-class Foo5
-{
-    private bool $prop4;
-    public function __construct(
-        private bool $prop5
-    ) {
-    }
-
-    private function reset(): void
-    {
-        $this->resetProp1();
-        $this->prop1 = false;
-        $this->prop2 = false;
-        $this->prop3 = false;
-        $this->prop4 = false;
-        $this->prop5 = false;
-        $this->prop6 = false;
-        $this->prop7 = false;
-        $this->prop8 = false;
-        $this->prop9 = false;
-        $this/** a comment */ ->/** another comment*/ prop9 = false;
-        $this->setSomething($this->prop9);
-        $prop9 = $this->prop9;
-        $this::$prop9 = false;
-        $this->prop4->prop9 = false;
-        $thisVar = $this;
-        $thisVar->prop9 = false; // undetermined context
-        $thisVar->$this->prop9 = false; // false positive
-    }
-
-    public function setSomething()
-    {
-
-    }
-}
-
-$object->prop9 = false;
-$object->reset();
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
deleted file mode 100644
index 49983b7f..00000000
--- a/Magento2/Tests/PHPCompatibility/DeprecatedDynamicPropertyUnitTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the DeprecatedDynamicProperty sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\DeprecatedEncodingsForMBStringFunctionsSniff
- */
-class DeprecatedDynamicPropertyUnitTest extends \PHPCompatibility\Tests\BaseSniffTest
-{
-    const TEST_FILE_WITH_AUTOLOADABLE_CLASS = 'DeprecatedDynamicPropertyUnitTest.autoload.inc';
-
-    /**
-     * Verify a deprecation warning is thrown if a dynamic property is found in a class.
-     *
-     * @dataProvider dataProvider
-     * @param string $testFile
-     * @param array $errors
-     * @return void
-     */
-    public function testCreationOfDynamicProperty(string $testFile, array $errors): void
-    {
-        $file = $this->sniffFile($testFile, '8.2');
-        foreach ($errors as [$line, $property]) {
-            $this->assertWarning(
-                $file,
-                $line,
-                'Access to an undefined property '. $property .'; Creation of dynamic property is deprecated since PHP 8.2'
-            );
-        }
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataProvider
-     * @param string $testFile
-     * @param array $errors
-     * @return void
-     */
-    public function testNoFalsePositives(string $testFile, array $errors): void
-    {
-        $file = $this->sniffFile($testFile, '8.2');
-        $errorLines = array_column($errors, 0, 0);
-        $totalLines = substr_count(file_get_contents(\str_replace('UnitTest.php', 'UnitTest.inc', $testFile)), PHP_EOL);
-
-        for ($line = 1; $line <= $totalLines; $line++) {
-            if (isset($errorLines[$line])) {
-                continue;
-            }
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @dataProvider dataProvider
-     * @param string $file
-     * @param array $errors
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion(string $testFile, array $errors): void
-    {
-        $file = $this->sniffFile($testFile, '8.1');
-        $this->assertNoViolation($file);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @return array
-     * @see testCreationOfDynamicProperty()
-     * @see testNoFalsePositives()
-     * @see testNoViolationsInFileOnValidVersion()
-     *
-     */
-    public function dataProvider()
-    {
-        return [
-            [
-                __FILE__,
-                [
-                    [128, 'Foo4::$prop1'],
-                    [129, 'Foo4::$prop2'],
-                    [130, 'Foo4::$prop3'],
-                    [136, 'Foo4::$prop9'],
-                    [151, 'Foo5::$prop1'],
-                    [152, 'Foo5::$prop2'],
-                    [153, 'Foo5::$prop3'],
-                    [156, 'Foo5::$prop6'],
-                    [157, 'Foo5::$prop7'],
-                    [158, 'Foo5::$prop8'],
-                    [159, 'Foo5::$prop9'],
-                    [160, 'Foo5::$prop9'],
-                    [161, 'Foo5::$prop9'],
-                    [162, 'Foo5::$prop9'],
-                ]
-            ],
-            [
-                __DIR__ . '/' . self::TEST_FILE_WITH_AUTOLOADABLE_CLASS,
-                [
-                    [18, 'Magento2\Sniffs\PHPCompatibility\DeprecatedDynamicPropertySniff::$xyz'],
-                ]
-            ]
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.DeprecatedDynamicProperty';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc
deleted file mode 100644
index cf7fb97f..00000000
--- a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.inc
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/*
- * Test: Usage of the QPrint, BASE64, UUENCODE, and HTML-ENTITIES "text encodings" is deprecated for all MBString functions
- */
-
-### BASE64 ###
-mb_check_encoding($str, "BASE64");
-mb_chr(65, "BASE64");
-mb_convert_case($str, MB_CASE_UPPER, "BASE64");
-mb_convert_encoding($str, "BASE64");
-mb_convert_kana($str, "KVa", "BASE64");
-mb_convert_variables("BASE64", "ASCII,UTF-8,SJIS-win", $str1, $str2);
-mb_decode_numericentity($str, $convmap, "BASE64");
-mb_encode_numericentity($str, $convmap, "BASE64");
-mb_ord($str, "BASE64");
-mb_scrub($str, "BASE64");
-mb_str_split($str, 1, "BASE64");
-mb_strcut($str, 0, 1, "BASE64");
-mb_strimwidth($str, 0, 5, "...", "BASE64");
-mb_stripos($str, "s", 0, "BASE64");
-mb_stristr($str, "s", true, "BASE64");
-mb_strlen($str, "BASE64");
-mb_strpos($str, "s", 0, "BASE64");
-mb_strrchr($str, "s", true, "BASE64");
-mb_strrichr($str, "s", true, "BASE64");
-mb_strripos($str, "s", 0, "BASE64");
-mb_strrpos($str, "s", 0, "BASE64");
-mb_strstr($str, "s", true, "BASE64");
-mb_strtolower($str, "BASE64");
-mb_strtoupper($str, "BASE64");
-mb_strwidth($str, "BASE64");
-mb_substr_count($str, "s", "BASE64");
-mb_substr($str, 0, 1, "BASE64");
-### BASE64 ###
-#### QPrint ###
-mb_check_encoding($str, "QPrint");
-mb_chr(65, "QPrint");
-mb_convert_case($str, MB_CASE_UPPER, "QPrint");
-mb_convert_encoding($str, "QPrint");
-mb_convert_kana($str, "KVa", "QPrint");
-mb_convert_variables("QPrint", "ASCII,UTF-8,SJIS-win", $str1, $str2);
-mb_decode_numericentity($str, $convmap, "QPrint");
-mb_encode_numericentity($str, $convmap, "QPrint");
-mb_ord($str, "QPrint");
-mb_scrub($str, "QPrint");
-mb_str_split($str, 1, "QPrint");
-mb_strcut($str, 0, 1, "QPrint");
-mb_strimwidth($str, 0, 5, "...", "QPrint");
-mb_stripos($str, "s", 0, "QPrint");
-mb_stristr($str, "s", true, "QPrint");
-mb_strlen($str, "QPrint");
-mb_strpos($str, "s", 0, "QPrint");
-mb_strrchr($str, "s", true, "QPrint");
-mb_strrichr($str, "s", true, "QPrint");
-mb_strripos($str, "s", 0, "QPrint");
-mb_strrpos($str, "s", 0, "QPrint");
-mb_strstr($str, "s", true, "QPrint");
-mb_strtolower($str, "QPrint");
-mb_strtoupper($str, "QPrint");
-mb_strwidth($str, "QPrint");
-mb_substr_count($str, "s", "QPrint");
-mb_substr($str, 0, 1, "QPrint");
-### QPrint ###
-##### Quoted-Printable ###
-mb_check_encoding($str, "Quoted-Printable");
-mb_chr(65, "Quoted-Printable");
-mb_convert_case($str, MB_CASE_UPPER, "Quoted-Printable");
-mb_convert_encoding($str, "Quoted-Printable");
-mb_convert_kana($str, "KVa", "Quoted-Printable");
-mb_convert_variables("Quoted-Printable", "ASCII,UTF-8,SJIS-win", $str1, $str2);
-mb_decode_numericentity($str, $convmap, "Quoted-Printable");
-mb_encode_numericentity($str, $convmap, "Quoted-Printable");
-mb_ord($str, "Quoted-Printable");
-mb_scrub($str, "Quoted-Printable");
-mb_str_split($str, 1, "Quoted-Printable");
-mb_strcut($str, 0, 1, "Quoted-Printable");
-mb_strimwidth($str, 0, 5, "...", "Quoted-Printable");
-mb_stripos($str, "s", 0, "Quoted-Printable");
-mb_stristr($str, "s", true, "Quoted-Printable");
-mb_strlen($str, "Quoted-Printable");
-mb_strpos($str, "s", 0, "Quoted-Printable");
-mb_strrchr($str, "s", true, "Quoted-Printable");
-mb_strrichr($str, "s", true, "Quoted-Printable");
-mb_strripos($str, "s", 0, "Quoted-Printable");
-mb_strrpos($str, "s", 0, "Quoted-Printable");
-mb_strstr($str, "s", true, "Quoted-Printable");
-mb_strtolower($str, "Quoted-Printable");
-mb_strtoupper($str, "Quoted-Printable");
-mb_strwidth($str, "Quoted-Printable");
-mb_substr_count($str, "s", "Quoted-Printable");
-mb_substr($str, 0, 1, "Quoted-Printable");
-### Quoted-Printable ###
-### UUENCODE ###
-mb_check_encoding($str, "UUENCODE");
-mb_chr(65, "UUENCODE");
-mb_convert_case($str, MB_CASE_UPPER, "UUENCODE");
-mb_convert_encoding($str, "UUENCODE");
-mb_convert_kana($str, "KVa", "UUENCODE");
-mb_convert_variables("UUENCODE", "ASCII,UTF-8,SJIS-win", $str1, $str2);
-mb_decode_numericentity($str, $convmap, "UUENCODE");
-mb_encode_numericentity($str, $convmap, "UUENCODE");
-mb_ord($str, "UUENCODE");
-mb_scrub($str, "UUENCODE");
-mb_str_split($str, 1, "UUENCODE");
-mb_strcut($str, 0, 1, "UUENCODE");
-mb_strimwidth($str, 0, 5, "...", "UUENCODE");
-mb_stripos($str, "s", 0, "UUENCODE");
-mb_stristr($str, "s", true, "UUENCODE");
-mb_strlen($str, "UUENCODE");
-mb_strpos($str, "s", 0, "UUENCODE");
-mb_strrchr($str, "s", true, "UUENCODE");
-mb_strrichr($str, "s", true, "UUENCODE");
-mb_strripos($str, "s", 0, "UUENCODE");
-mb_strrpos($str, "s", 0, "UUENCODE");
-mb_strstr($str, "s", true, "UUENCODE");
-mb_strtolower($str, "UUENCODE");
-mb_strtoupper($str, "UUENCODE");
-mb_strwidth($str, "UUENCODE");
-mb_substr_count($str, "s", "UUENCODE");
-mb_substr($str, 0, 1, "UUENCODE");
-### UUENCODE ###
-#### HTML-ENTITIES ###
-mb_check_encoding($str, "HTML-ENTITIES");
-mb_chr(65, "HTML-ENTITIES");
-mb_convert_case($str, MB_CASE_UPPER, "HTML-ENTITIES");
-mb_convert_encoding($str, "HTML-ENTITIES");
-mb_convert_kana($str, "KVa", "HTML-ENTITIES");
-mb_convert_variables("HTML-ENTITIES", "ASCII,UTF-8,SJIS-win", $str1, $str2);
-mb_decode_numericentity($str, $convmap, "HTML-ENTITIES");
-mb_encode_numericentity($str, $convmap, "HTML-ENTITIES");
-mb_ord($str, "HTML-ENTITIES");
-mb_scrub($str, "HTML-ENTITIES");
-mb_str_split($str, 1, "HTML-ENTITIES");
-mb_strcut($str, 0, 1, "HTML-ENTITIES");
-mb_strimwidth($str, 0, 5, "...", "HTML-ENTITIES");
-mb_stripos($str, "s", 0, "HTML-ENTITIES");
-mb_stristr($str, "s", true, "HTML-ENTITIES");
-mb_strlen($str, "HTML-ENTITIES");
-mb_strpos($str, "s", 0, "HTML-ENTITIES");
-mb_strrchr($str, "s", true, "HTML-ENTITIES");
-mb_strrichr($str, "s", true, "HTML-ENTITIES");
-mb_strripos($str, "s", 0, "HTML-ENTITIES");
-mb_strrpos($str, "s", 0, "HTML-ENTITIES");
-mb_strstr($str, "s", true, "HTML-ENTITIES");
-mb_strtolower($str, "HTML-ENTITIES");
-mb_strtoupper($str, "HTML-ENTITIES");
-mb_strwidth($str, "HTML-ENTITIES");
-mb_substr_count($str, "s", "HTML-ENTITIES");
-mb_substr($str, 0, 1, "HTML-ENTITIES");
-### HTML-ENTITIES ###
-##### HTML ###
-mb_check_encoding($str, "HTML");
-mb_chr(65, "HTML");
-mb_convert_case($str, MB_CASE_UPPER, "HTML");
-mb_convert_encoding($str, "HTML");
-mb_convert_kana($str, "KVa", "HTML");
-mb_convert_variables("HTML", "ASCII,UTF-8,SJIS-win", $str1, $str2);
-mb_decode_numericentity($str, $convmap, "HTML");
-mb_encode_numericentity($str, $convmap, "HTML");
-mb_ord($str, "HTML");
-mb_scrub($str, "HTML");
-mb_str_split($str, 1, "HTML");
-mb_strcut($str, 0, 1, "HTML");
-mb_strimwidth($str, 0, 5, "...", "HTML");
-mb_stripos($str, "s", 0, "HTML");
-mb_stristr($str, "s", true, "HTML");
-mb_strlen($str, "HTML");
-mb_strpos($str, "s", 0, "HTML");
-mb_strrchr($str, "s", true, "HTML");
-mb_strrichr($str, "s", true, "HTML");
-mb_strripos($str, "s", 0, "HTML");
-mb_strrpos($str, "s", 0, "HTML");
-mb_strstr($str, "s", true, "HTML");
-mb_strtolower($str, "HTML");
-mb_strtoupper($str, "HTML");
-mb_strwidth($str, "HTML");
-mb_substr_count($str, "s", "HTML");
-mb_substr($str, 0, 1, "HTML");
-### HTML ###
-
-// Ok
-mb_convert_encoding($str, "SJIS");
-mb_convert_encoding($str, "UTF-7", "EUC-JP");
-mb_convert_encoding($str, "UCS-2LE", "JIS, eucjp-win, sjis-win");
-mb_convert_encoding($str, "EUC-JP", "auto");
-mb_convert_encoding($str, "UTF-8", "BASE64");
-mb_convert_encoding($str, strtolower('BASE64'));
-mb_detect_encoding($str, ['BASE64']);
diff --git a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
deleted file mode 100644
index 1f477928..00000000
--- a/Magento2/Tests/PHPCompatibility/DeprecatedEncodingsForMBStringFunctionsUnitTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the DeprecatedEncodingsForMBStringFunctions sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\DeprecatedEncodingsForMBStringFunctionsSniff
- */
-class DeprecatedEncodingsForMBStringFunctionsUnitTest extends \PHPCompatibility\Tests\BaseSniffTest
-{
-    /**
-     * Message per encoding
-     *
-     * @var string[]
-     */
-    private $messages = [
-        'qprint' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' Use quoted_printable_encode/quoted_printable_decode instead',
-        'quoted-printable' => 'Handling QPrint via mbstring is deprecated since PHP 8.2;' .
-            ' Use quoted_printable_encode/quoted_printable_decode instead',
-        'base64' => 'Handling Base64 via mbstring is deprecated since PHP 8.2;' .
-            ' Use base64_encode/base64_decode instead',
-        'uuencode' => 'Handling Uuencode via mbstring is deprecated since PHP 8.2;' .
-            ' Use convert_uuencode/convert_uudecode instead',
-        'html-entities' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead',
-        'html' => 'Handling HTML entities via mbstring is deprecated since PHP 8.2;' .
-            ' Use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead'
-    ];
-
-    /**
-     * Verify a deprecation warning is thrown if MBString function is used with encodings: QPrint,BASE64,UUENCODE,HTML
-     *
-     * @dataProvider usageOfDeprecatedEncodingsInMbStringFunctionsDataProvider
-     * @param string $encoding
-     * @param int $start
-     * @param int $end
-     * @return void
-     */
-    public function testUsageOfDeprecatedEncodingsInMbStringFunctions($encoding, $start, $end)
-    {
-        $file = $this->sniffFile(__FILE__, '8.2');
-        // No errors expected on the first 11 lines.
-        for ($line = $start; $line <= $end; $line++) {
-            $this->assertWarning($file, $line, $this->messages[$encoding]);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testUsageOfDeprecatedEncodingsInMbStringFunctions()
-     *
-     * @return array
-     */
-    public function usageOfDeprecatedEncodingsInMbStringFunctionsDataProvider()
-    {
-        return [
-            ['base64', 7, 33],
-            ['qprint', 36, 62],
-            ['quoted-printable', 65, 91],
-            ['uuencode', 94, 120],
-            ['html-entities', 123, 149],
-            ['html', 157, 178],
-        ];
-    }
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '8.2');
-
-        // No errors expected on the first 11 lines.
-        for ($line = 183; $line <= 188; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '8.1');
-        $this->assertNoViolation($file);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.DeprecatedEncodingsForMBStringFunctions';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc
deleted file mode 100644
index 9757ecfc..00000000
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-class ForbiddenFinalPrivateMethodsUnitTest1
-{
-    private final function __construct() {}
-    private final function privateFinalMethod() {}
-    final private function finalPrivateMethod() {}
-    protected final function protectedFinalMethod() {}
-    final protected function finalProtectedMethod() {}
-    public final function publicFinalMethod() {}
-    final public function finaPublicMethod() {}
-    final private static function finalPrivateStaticMethod() {}
-    private final static function privateFinalStaticMethod() {}
-    private static final function privateStaticFinalMethod() {}
-    final protected static function finalProtectedStaticMethod() {}
-    protected final static function protectedFinalStaticMethod() {}
-    protected static final function protectedStaticFinalMethod() {}
-    final public static function finalPublicStaticMethod() {}
-    public final static function publicFinalStaticMethod() {}
-    public static final function publicStaticFinalMethod() {}
-}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed
deleted file mode 100644
index 6822b808..00000000
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.1.inc.fixed
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-class ForbiddenFinalPrivateMethodsUnitTest1
-{
-    private final function __construct() {}
-    private function privateFinalMethod() {}
-    private function finalPrivateMethod() {}
-    protected final function protectedFinalMethod() {}
-    final protected function finalProtectedMethod() {}
-    public final function publicFinalMethod() {}
-    final public function finaPublicMethod() {}
-    private static function finalPrivateStaticMethod() {}
-    private static function privateFinalStaticMethod() {}
-    private static function privateStaticFinalMethod() {}
-    final protected static function finalProtectedStaticMethod() {}
-    protected final static function protectedFinalStaticMethod() {}
-    protected static final function protectedStaticFinalMethod() {}
-    final public static function finalPublicStaticMethod() {}
-    public final static function publicFinalStaticMethod() {}
-    public static final function publicStaticFinalMethod() {}
-}
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
deleted file mode 100644
index 2c572c26..00000000
--- a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Test the ForbiddenFinalPrivateMethods sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\ForbiddenFinalPrivateMethodsSniff
- */
-class ForbiddenFinalPrivateMethodsUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    public function getErrorList()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList($testFile = '')
-    {
-        if ($testFile === 'ForbiddenFinalPrivateMethodsUnitTest.inc') {
-            return [
-                34 => 1,
-                35 => 1,
-                39 => 1,
-                40 => 1,
-                45 => 1,
-                46 => 1,
-                54 => 1,
-                60 => 1,
-            ];
-        }
-        return [
-            5 => 1,
-            6 => 1,
-            11 => 1,
-            12 => 1,
-            13 => 1,
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function getTestFiles($testFileBase)
-    {
-        $files = parent::getTestFiles($testFileBase);
-        return array_merge(
-            $files,
-            [
-                dirname(__FILE__, 4) . '/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc',
-            ]
-        );
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
deleted file mode 100644
index 7d03b4c3..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedAssertStringAssertion sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedAssertStringAssertionSniff
- */
-class RemovedAssertStringAssertionUnitTest extends \PHPCompatibility\Tests\ParameterValues\RemovedAssertStringAssertionUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedAssertStringAssertion';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
deleted file mode 100644
index 6a6687f1..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedCallingDestructAfterConstructorExit sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedCallingDestructAfterConstructorExitSniff
- */
-class RemovedCallingDestructAfterConstructorExitUnitTest extends \PHPCompatibility\Tests\FunctionDeclarations\RemovedCallingDestructAfterConstructorExitUnitTest
-{    /**
- * @inheritdoc
- */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedCallingDestructAfterConstructorExit';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
deleted file mode 100644
index edb1d4a8..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedDollarBraceStringEmbedsUnitTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedDollarBraceStringEmbeds sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedDollarBraceStringEmbedsSniff
- */
-class RemovedDollarBraceStringEmbedsUnitTest extends \PHPCompatibility\Tests\TextStrings\RemovedDollarBraceStringEmbedsUnitTest
-{    /**
- * @inheritdoc
- */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedDollarBraceStringEmbeds';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
deleted file mode 100644
index bc80cf1b..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.82.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$var = 'hello world';
-utf8_encode($var);
-utf8_decode($var);
diff --git a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
deleted file mode 100644
index 144004bb..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedFunctionsUnitTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedFunctions sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedFunctionsSniff
- */
-class RemovedFunctionsUnitTest extends \PHPCompatibility\Tests\FunctionUse\RemovedFunctionsUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedFunctions';
-    }
-
-    /**
-     * @param string $testFile
-     * @param array $errors
-     * @return void
-     * @dataProvider php8DeprecatedFunctionDataProvider
-     */
-    public function testPhp82DeprecatedFunction(string $testFile, array $errors): void
-    {
-        $file = $this->sniffFile($testFile, '8.2');
-        foreach ($errors as [$line, $functionName, $alternative]) {
-            $this->assertWarning(
-                $file,
-                $line,
-                "Function $functionName() is deprecated since PHP 8.2; Use $alternative instead"
-            );
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @return array
-     * @see testPhp82DeprecatedFunction()
-     *
-     */
-    public function php8DeprecatedFunctionDataProvider()
-    {
-        return [
-            [
-                __DIR__ . '/RemovedFunctionsUnitTest.82.inc',
-                [
-                    [3, 'utf8_encode', 'iconv()'],
-                    [4, 'utf8_decode', 'iconv()'],
-                ]
-            ]
-        ];
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
deleted file mode 100644
index 260afb14..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedGetDefinedFunctionsExcludeDisabledFalse sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
- */
-class RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest extends \PHPCompatibility\Tests\ParameterValues\RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
deleted file mode 100644
index 0d0979ec..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedOptionalBeforeRequiredParam sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedOptionalBeforeRequiredParamSniff
- */
-class RemovedOptionalBeforeRequiredParamUnitTest extends \PHPCompatibility\Tests\FunctionDeclarations\RemovedOptionalBeforeRequiredParamUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedOptionalBeforeRequiredParam';
-    }
-}
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
deleted file mode 100644
index 2cccd297..00000000
--- a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento2\Tests\PHPCompatibility;
-
-/**
- * Test the RemovedSplAutoloadRegisterThrowFalse sniff.
- *
- * @covers \Magento2\Sniffs\PHPCompatibility\RemovedSplAutoloadRegisterThrowFalseSniff
- */
-class RemovedSplAutoloadRegisterThrowFalseUnitTest extends \PHPCompatibility\Tests\ParameterValues\RemovedSplAutoloadRegisterThrowFalseUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    protected function getSniffCode()
-    {
-        return 'Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse';
-    }
-}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 6234fb1b..770b3643 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -168,10 +168,6 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
-    <rule ref="Magento2.PHPCompatibility.RemovedFunctions">
-        <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>
@@ -350,7 +346,7 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-   
+
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <severity>7</severity>
@@ -484,7 +480,6 @@
         </properties>
         <severity>6</severity>
         <type>warning</type>
-        <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
     </rule>
     <rule ref="Generic.Formatting.DisallowMultipleStatements">
         <severity>6</severity>
@@ -765,25 +760,10 @@
     <config name="testVersion" value="7.4-"/>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
-        <!-- Following sniffs have been updated or renamed in PHPCompatibility 10 -->
-        <exclude name="PHPCompatibility.Constants.NewMagicClassConstant.Found" />
-        <exclude name="PHPCompatibility.Classes.ForbiddenAbstractPrivateMethods.Found" />
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
         <!-- Following sniffs have an equivalent in Magento2 -->
         <exclude name="PHPCompatibility.FunctionUse.RemovedFunctions" />
     </rule>
-    <!--
-     All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is
-     updated to version 10
-     -->
-    <rule ref="Magento2.PHPCompatibility.ForbiddenFinalPrivateMethods" />
-    <rule ref="Magento2.PHPCompatibility.RemovedCallingDestructAfterConstructorExit" />
-    <rule ref="Magento2.PHPCompatibility.RemovedOptionalBeforeRequiredParam" />
-    <rule ref="Magento2.PHPCompatibility.ChangedIntToBoolParamType" />
-    <rule ref="Magento2.PHPCompatibility.RemovedAssertStringAssertion" />
-    <rule ref="Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse" />
-    <rule ref="Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse" />
-    <rule ref="Magento2.PHPCompatibility.RemovedDollarBraceStringEmbeds" />
 </ruleset>
diff --git a/Magento2Framework/ruleset.xml b/Magento2Framework/ruleset.xml
index 5e16e7a1..ecdb92da 100644
--- a/Magento2Framework/ruleset.xml
+++ b/Magento2Framework/ruleset.xml
@@ -7,7 +7,6 @@
     <rule ref="Magento2Framework.Header.License">
         <severity>5</severity>
         <type>warning</type>
-        <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
     </rule>
     <rule ref="Magento2Framework.Header.CopyrightAnotherExtensionsFiles">
         <severity>5</severity>
@@ -18,7 +17,6 @@
     <rule ref="Magento2Framework.Header.Copyright">
         <severity>5</severity>
         <type>warning</type>
-        <exclude-pattern>*/PHPCompatibility/*</exclude-pattern>
         <include-pattern>*\.php$</include-pattern>
         <include-pattern>*\.phtml$</include-pattern>
         <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
diff --git a/PHPCompatibility/AbstractFunctionCallParameterSniff.php b/PHPCompatibility/AbstractFunctionCallParameterSniff.php
deleted file mode 100644
index b2660e8b..00000000
--- a/PHPCompatibility/AbstractFunctionCallParameterSniff.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\PassedParameters;
-
-/**
- * Abstract class to use as a base for examining the parameter values passed to function calls.
- *
- * @since 8.2.0
- */
-abstract class AbstractFunctionCallParameterSniff extends Sniff
-{
-
-    /**
-     * Is the sniff looking for a function call or a method call ?
-     *
-     * Note: the child class may need to do additional checks to make sure that
-     * the method called is of the right class/object.
-     * Checking that is outside of the scope of this abstract sniff.
-     *
-     * @since 8.2.0
-     *
-     * @var bool False (default) if the sniff is looking for function calls.
-     *           True if the sniff is looking for method calls.
-     */
-    protected $isMethod = false;
-
-    /**
-     * Functions the sniff is looking for. Should be defined in the child class.
-     *
-     * @since 8.2.0
-     *
-     * @var array The only requirement for this array is that the top level
-     *            array keys are the names of the functions you're looking for.
-     *            Other than that, the array can have arbitrary content
-     *            depending on your needs.
-     */
-    protected $targetFunctions = [];
-
-    /**
-     * List of tokens which when they preceed the $stackPtr indicate that this
-     * is not a function call.
-     *
-     * {@internal The object operators are added to the array in the register() method.}
-     *
-     * @since 8.2.0
-     *
-     * @var array
-     */
-    private $ignoreTokens = [
-        \T_NEW => true,
-    ];
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 8.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->ignoreTokens += Collections::objectOperators();
-
-        // Handle case-insensitivity of function names.
-        $this->targetFunctions = \array_change_key_case($this->targetFunctions, \CASE_LOWER);
-
-        return [\T_STRING];
-    }
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 8.2.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->bowOutEarly() === true) {
-            return;
-        }
-
-        $tokens     = $phpcsFile->getTokens();
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = \strtolower($function);
-
-        if (isset($this->targetFunctions[$functionLc]) === false) {
-            return;
-        }
-
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($nextToken === false
-            || $tokens[$nextToken]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$nextToken]['parenthesis_owner']) === true
-        ) {
-            return;
-        }
-
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-
-        if ($this->isMethod === true) {
-            if (isset(Collections::objectOperators()[$tokens[$prevNonEmpty]['code']]) === false) {
-                // Not a call to a PHP method.
-                return;
-            }
-        } else {
-            if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
-                // Not a call to a PHP function.
-                return;
-            }
-
-            if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR) {
-                $prevPrevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevNonEmpty - 1), null, true);
-                if ($tokens[$prevPrevToken]['code'] === \T_STRING
-                    || $tokens[$prevPrevToken]['code'] === \T_NAMESPACE
-                ) {
-                    // Namespaced function.
-                    return;
-                }
-            }
-        }
-
-        $parameters = PassedParameters::getParameters($phpcsFile, $stackPtr);
-
-        if (empty($parameters)) {
-            return $this->processNoParameters($phpcsFile, $stackPtr, $function);
-        } else {
-            return $this->processParameters($phpcsFile, $stackPtr, $function, $parameters);
-        }
-    }
-
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 8.2.0
-     *
-     * If the check done in a child class is not specific to one PHP version,
-     * this function should return `false`.
-     *
-     * @return bool
-     */
-    abstract protected function bowOutEarly();
-
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * This method has to be made concrete in child classes.
-     *
-     * @since 8.2.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    abstract public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters);
-
-
-    /**
-     * Process the function if no parameters were found.
-     *
-     * Defaults to doing nothing. Can be overloaded in child classes to handle functions
-     * were parameters are expected, but none found.
-     *
-     * @since 8.2.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
-    {
-        return;
-    }
-}
diff --git a/PHPCompatibility/LICENSE b/PHPCompatibility/LICENSE
deleted file mode 100644
index 65c5ca88..00000000
--- a/PHPCompatibility/LICENSE
+++ /dev/null
@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php b/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php
deleted file mode 100644
index 40954070..00000000
--- a/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenFinalPrivateMethodsSniff.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\FunctionDeclarations;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\Scopes;
-
-/**
- * Applying the final modifier on a private method will produce a warning since PHP 8.0
- * unless that method is the constructor.
- *
- * Previously final private methods were allowed and overriding the method in a child class
- * would result in a fatal "Cannot override final method". This was inappropriate as
- * private methods are not inherited.
- *
- * > Due to how common the usage of `final private function __construct` is and given that
- * > the same results cannot be achieved with a protected visibility, an exception to this rule
- * > is made for constructors.
- *
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/inheritance_private_methods
- *
- * @since 10.0.0
- */
-class ForbiddenFinalPrivateMethodsSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_FUNCTION];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.0') === false) {
-            return;
-        }
-
-        if (Scopes::isOOMethod($phpcsFile, $stackPtr) === false) {
-            // Function, not method.
-            return;
-        }
-
-        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
-        if (empty($name) === true) {
-            // Parse error or live coding.
-            return;
-        }
-
-        if (\strtolower($name) === '__construct') {
-            // The rule does not apply to constructors. Bow out.
-            return;
-        }
-
-        $properties = FunctionDeclarations::getProperties($phpcsFile, $stackPtr);
-        if ($properties['scope'] !== 'private' || $properties['is_final'] === false) {
-            // Not an private final method.
-            return;
-        }
-
-        $phpcsFile->addWarning(
-            'Private methods should not be declared as final since PHP 8.0',
-            $stackPtr,
-            'Found'
-        );
-    }
-}
diff --git a/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php b/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php
deleted file mode 100644
index c59343d0..00000000
--- a/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitSniff.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\FunctionDeclarations;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
-use PHPCSUtils\Utils\MessageHelper;
-use PHPCSUtils\Utils\ObjectDeclarations;
-use PHPCSUtils\Utils\Scopes;
-use PHPCSUtils\Utils\UseStatements;
-
-/**
- * As of PHP 8.0, when an object constructor exit()s, the destructor will no longer be called.
- *
- * Note: shutdown functions registered with `register_shutdown_function()` will still be called.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/71bfa5344ab207072f4cd25745d7023096338385/UPGRADING#L200-L201
- *
- * @since 10.0.0
- */
-class RemovedCallingDestructAfterConstructorExitSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [\T_FUNCTION];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.0') === false) {
-            return;
-        }
-
-        // Note: interface constructors cannot contain code, enums cannot contain constructors or destructors.
-        $classPtr = Scopes::validDirectScope($phpcsFile, $stackPtr, [\T_CLASS, \T_ANON_CLASS, \T_TRAIT]);
-        if ($classPtr === false) {
-            // Function, not method.
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false
-            || isset($tokens[$classPtr]['scope_opener'], $tokens[$classPtr]['scope_closer']) === false
-        ) {
-            // Parse error, tokenizer error or live coding.
-            return;
-        }
-
-        $name = FunctionDeclarations::getName($phpcsFile, $stackPtr);
-        if (empty($name) === true) {
-            // Parse error or live coding.
-            return;
-        }
-
-        if (\strtolower($name) !== '__construct') {
-            // The rule only applies to constructors. Bow out.
-            return;
-        }
-
-        $functionOpen  = $tokens[$stackPtr]['scope_opener'];
-        $functionClose = $tokens[$stackPtr]['scope_closer'];
-        $exits         = [];
-        for ($current = ($functionOpen + 1); $current < $functionClose; $current++) {
-            if (isset(Tokens::$emptyTokens[$tokens[$current]['code']]) === true) {
-                continue;
-            }
-
-            if ($tokens[$current]['code'] === \T_EXIT) {
-                $exits[] = $current;
-                continue;
-            }
-
-            // Skip over nested closed scopes as much as possible for efficiency.
-            // Ignore arrow functions as they aren't closed scopes.
-            if (isset(Collections::closedScopes()[$tokens[$current]['code']]) === true
-                && isset($tokens[$current]['scope_closer']) === true
-            ) {
-                $current = $tokens[$current]['scope_closer'];
-                continue;
-            }
-
-            // Skip over array access and short arrays/lists, but not control structures.
-            if (isset($tokens[$current]['bracket_closer']) === true
-                && isset($tokens[$current]['scope_closer']) === false
-            ) {
-                $current = $tokens[$current]['bracket_closer'];
-                continue;
-            }
-
-            // Skip over long array/lists as they can't contain an exit statement, except within a closed scope.
-            if (($tokens[$current]['code'] === \T_ARRAY || $tokens[$current]['code'] === \T_LIST)
-                && isset($tokens[$current]['parenthesis_closer']) === true
-            ) {
-                $current = $tokens[$current]['parenthesis_closer'];
-                continue;
-            }
-        }
-
-        if (empty($exits) === true) {
-            // No calls to exit or die found.
-            return;
-        }
-
-        $hasDestruct = false;
-        $usesTraits  = false;
-        $isError     = false;
-        $classOpen   = $tokens[$classPtr]['scope_opener'];
-        $classClose  = $tokens[$classPtr]['scope_closer'];
-        $nextFunc    = $classOpen;
-
-        while (($nextFunc = $phpcsFile->findNext([\T_FUNCTION, \T_DOC_COMMENT_OPEN_TAG, \T_ATTRIBUTE, \T_USE], ($nextFunc + 1), $classClose)) !== false) {
-            // Skip over docblocks.
-            if ($tokens[$nextFunc]['code'] === \T_DOC_COMMENT_OPEN_TAG) {
-                $nextFunc = $tokens[$nextFunc]['comment_closer'];
-                continue;
-            }
-
-            // Skip over attributes.
-            if ($tokens[$nextFunc]['code'] === \T_ATTRIBUTE
-                && isset($tokens[$nextFunc]['attribute_closer'])
-            ) {
-                $nextFunc = $tokens[$nextFunc]['attribute_closer'];
-                continue;
-            }
-
-            if ($tokens[$nextFunc]['code'] === \T_USE
-                && UseStatements::isTraitUse($phpcsFile, $nextFunc) === true
-            ) {
-                $usesTraits = true;
-                continue;
-            }
-
-            $functionScopeCloser = $nextFunc;
-            if (isset($tokens[$nextFunc]['scope_closer'])) {
-                // Normal (non-abstract) method.
-                $functionScopeCloser = $tokens[$nextFunc]['scope_closer'];
-            }
-
-            $funcName = FunctionDeclarations::getName($phpcsFile, $nextFunc);
-            $nextFunc = $functionScopeCloser; // Set up to skip over the method content.
-
-            if (empty($funcName) === true) {
-                continue;
-            }
-
-            if (\strtolower($funcName) !== '__destruct') {
-                continue;
-            }
-
-            $hasDestruct = true;
-            $isError     = true;
-            break;
-        }
-
-        if ($hasDestruct === false && $usesTraits === false) {
-            /*
-             * No destruct method or trait use found, check if this class extends another one
-             * which may contain a destruct method.
-             */
-            $extends = ObjectDeclarations::findExtendedClassName($phpcsFile, $classPtr);
-            if (empty($extends) === true) {
-                // No destruct method and class doesn't extend nor uses traits, so the calls to exit can be ignored.
-                return;
-            }
-        }
-
-        /*
-         * Ok, either a destruct method has been found and we can throw an error, or either a class extends
-         * or trait use has been found and no destruct method, in which case, we throw a warning.
-         */
-        $error     = 'When %s() is called within an object constructor, the object destructor will no longer be called since PHP 8.0';
-        $errorCode = 'Found';
-        if ($isError === false) {
-            $error    .= ' While no __destruct() method was found in this class, one may be declared in the parent class or in a trait being used.';
-            $errorCode = 'NeedsInspection';
-        }
-
-        foreach ($exits as $ptr) {
-            MessageHelper::addMessage($phpcsFile, $error, $ptr, $isError, $errorCode, [$tokens[$ptr]['content']]);
-        }
-    }
-}
diff --git a/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php b/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php
deleted file mode 100644
index 07b93d12..00000000
--- a/PHPCompatibility/Sniffs/FunctionDeclarations/RemovedOptionalBeforeRequiredParamSniff.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\FunctionDeclarations;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\Sniff;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\FunctionDeclarations;
-
-/**
- * Declaring a required function parameter after an optional parameter is deprecated since PHP 8.0.
- *
- * > Declaring a required parameter after an optional one is deprecated. As an
- * > exception, declaring a parameter of the form "Type $param = null" before
- * > a required one continues to be allowed, because this pattern was sometimes
- * > used to achieve nullable types in older PHP versions.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L145-L151
- *
- * @since 10.0.0
- */
-class RemovedOptionalBeforeRequiredParamSniff extends Sniff
-{
-
-    /**
-     * Tokens allowed in the default value.
-     *
-     * This property will be enriched in the register() method.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    private $allowedInDefault = [
-        \T_NULL => \T_NULL,
-    ];
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->allowedInDefault += Tokens::$emptyTokens;
-
-        return Collections::functionDeclarationTokens();
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.0') === false) {
-            return;
-        }
-
-        // Get all parameters from the function signature.
-        $parameters = FunctionDeclarations::getParameters($phpcsFile, $stackPtr);
-        if (empty($parameters)) {
-            return;
-        }
-
-        $error = 'Declaring a required parameter after an optional one is deprecated since PHP 8.0. Parameter %s is optional, while parameter %s is required.';
-
-        $paramCount    = \count($parameters);
-        $lastKey       = ($paramCount - 1);
-        $firstOptional = null;
-
-        foreach ($parameters as $key => $param) {
-            /*
-             * Ignore variadic parameters, which are optional by nature.
-             * These always have to be declared last and this has been this way since their introduction.
-             */
-            if ($param['variable_length'] === true) {
-                continue;
-            }
-
-            // Handle optional parameters.
-            if (isset($param['default']) === true) {
-                if ($key === $lastKey) {
-                    // This is the last parameter and it's optional, no further checking needed.
-                    break;
-                }
-
-                if (isset($firstOptional) === false) {
-                    // Check if it's typed and has a null default value, in which case we can ignore it.
-                    if ($param['type_hint'] !== '') {
-                        $hasNull    = $phpcsFile->findNext(\T_NULL, $param['default_token'], $param['comma_token']);
-                        $hasNonNull = $phpcsFile->findNext(
-                            $this->allowedInDefault,
-                            $param['default_token'],
-                            $param['comma_token'],
-                            true
-                        );
-
-                        if ($hasNull !== false && $hasNonNull === false) {
-                            continue;
-                        }
-                    }
-
-                    // Non-null default value. This is an optional param we need to take into account.
-                    $firstOptional = $param['name'];
-                }
-
-                continue;
-            }
-
-            // Found a required parameter.
-            if (isset($firstOptional) === false) {
-                // No optional params found yet.
-                continue;
-            }
-
-            // Found a required parameter with an optional param before it.
-            $data = [
-                $firstOptional,
-                $param['name'],
-            ];
-
-            $phpcsFile->addWarning($error, $param['token'], 'Deprecated', $data);
-        }
-    }
-}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php b/PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php
deleted file mode 100644
index 7428b97b..00000000
--- a/PHPCompatibility/Sniffs/ParameterValues/ChangedIntToBoolParamTypeSniff.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\ParameterValues;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHPCSUtils\BackCompat\BCTokens;
-use PHPCSUtils\Utils\MessageHelper;
-use PHPCSUtils\Utils\PassedParameters;
-
-/**
- * Detect calls to functions where the expected type of a parameter has been changed from integer to boolean.
- *
- * Throws an error when a hard-coded numeric value is passed.
- *
- * PHP version 8.0+
- *
- * @since 10.0.0
- */
-class ChangedIntToBoolParamTypeSniff extends AbstractFunctionCallParameterSniff
-{
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'ob_implicit_flush' => [
-            1 => [
-                'name'  => 'enable',
-                'since' => '8.0',
-            ],
-        ],
-        'sem_get' => [
-            4 => [
-                'name'  => 'auto_release',
-                'since' => '8.0',
-            ],
-        ],
-    ];
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * Checks against the first PHP version listed in the above array.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('8.0') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        static $search;
-
-        if (isset($search) === false) {
-            $search  = [
-                \T_LNUMBER => \T_LNUMBER,
-                \T_DNUMBER => \T_DNUMBER,
-            ];
-            $search += BCTokens::arithmeticTokens();
-            $search += Tokens::$emptyTokens;
-        }
-
-        $functionLC   = \strtolower($functionName);
-        $functionInfo = $this->targetFunctions[$functionLC];
-        foreach ($functionInfo as $offset => $paramInfo) {
-            if ($this->supportsAbove($paramInfo['since']) === false) {
-                continue;
-            }
-
-            $target = PassedParameters::getParameterFromStack($parameters, $offset, $paramInfo['name']);
-            if ($target === false) {
-                continue;
-            }
-
-            $hasNonNumeric = $phpcsFile->findNext($search, $target['start'], ($target['end'] + 1), true);
-            if ($hasNonNumeric !== false) {
-                // Not a purely numerical value. Ignore.
-                continue;
-            }
-
-            $error = 'The $%s parameter of %s() expects a boolean value instead of an integer since PHP %s. Found: %s';
-            $code  = MessageHelper::stringToErrorCode($functionLC . '_' . $paramInfo['name'], true) . 'NumericFound';
-            $data  = [
-                $paramInfo['name'],
-                $functionLC,
-                $paramInfo['since'],
-                $target['clean'],
-            ];
-
-            $phpcsFile->addError($error, $target['start'], $code, $data);
-        }
-    }
-}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php b/PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php
deleted file mode 100644
index c71dd722..00000000
--- a/PHPCompatibility/Sniffs/ParameterValues/RemovedAssertStringAssertionSniff.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\ParameterValues;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHPCSUtils\Utils\MessageHelper;
-
-/**
- * Detect the use of assertions passed as a string.
- *
- * PHP 7.2:
- * > Usage of a string as the assertion became deprecated. It now emits an E_DEPRECATED
- * > notice when both assert.active and zend.assertions are set to 1.
- *
- * PHP 8.0:
- * > assert() will no longer evaluate string arguments, instead they will be treated
- * > like any other argument. `assert($a == $b)` should be used instead of `assert('$a == $b')`.
- *
- * PHP version 7.2
- * PHP version 8.0
- *
- * @link https://wiki.php.net/rfc/deprecations_php_7_2#assert_with_string_argument
- * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L350-L354
- * @link https://www.php.net/manual/en/function.assert.php#refsect1-function.assert-changelog
- *
- * @since 10.0.0
- */
-class RemovedAssertStringAssertionSniff extends AbstractFunctionCallParameterSniff
-{
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'assert' => true,
-    ];
-
-    /**
-     * Target tokens.
-     *
-     * If there is anything but any of these tokens in the parameter, we bow out as undetermined.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    private $targetTokens = [];
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        // Set $targetTokens only once.
-        $this->targetTokens                   = Tokens::$emptyTokens;
-        $this->targetTokens                  += Tokens::$stringTokens + Tokens::$heredocTokens;
-        $this->targetTokens[\T_STRING_CONCAT] = \T_STRING_CONCAT;
-
-        return parent::register();
-    }
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('7.2') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        if (isset($parameters[1]) === false) {
-            return;
-        }
-
-        $targetParam = $parameters[1];
-        $hasOther    = $phpcsFile->findNext($this->targetTokens, $targetParam['start'], ($targetParam['end'] + 1), true);
-        if ($hasOther !== false) {
-            // Some other token was found, unclear whether this is really a text string. Bow out.
-            return;
-        }
-
-        $error   = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2%s. Found: %s';
-        $code    = 'Deprecated';
-        $isError = false;
-        $data    = [
-            '',
-            $targetParam['clean'],
-        ];
-
-        if ($this->supportsAbove('8.0') === true) {
-            $data[0] = ' and removed since PHP 8.0';
-            $isError = true;
-            $code    = 'Removed';
-        }
-
-        MessageHelper::addMessage($phpcsFile, $error, $targetParam['start'], $isError, $code, $data);
-    }
-}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php b/PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
deleted file mode 100644
index 32971c1c..00000000
--- a/PHPCompatibility/Sniffs/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseSniff.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\ParameterValues;
-
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\PassedParameters;
-
-/**
- * Detect: Passing `false` to `get_defined_functions()` is deprecated as of PHP 8.0.
- *
- * > Calling `get_defined_functions()` with `$exclude_disabled` explicitly set to `false`
- * > is deprecated. `get_defined_functions()` will never include disabled functions.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/69888c3ff1f2301ead8e37b23ff8481d475e29d2/UPGRADING#L514-L516
- *
- * @since 10.0.0
- */
-class RemovedGetDefinedFunctionsExcludeDisabledFalseSniff extends AbstractFunctionCallParameterSniff
-{
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'get_defined_functions' => true,
-    ];
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('8.0') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        $targetParam = PassedParameters::getParameterFromStack($parameters, 1, 'exclude_disabled');
-        if ($targetParam === false) {
-            return;
-        }
-
-        if ($targetParam['clean'] !== 'false') {
-            return;
-        }
-
-        $phpcsFile->addWarning(
-            'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.',
-            $targetParam['start'],
-            'Deprecated'
-        );
-    }
-}
diff --git a/PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php b/PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php
deleted file mode 100644
index fc98b1fa..00000000
--- a/PHPCompatibility/Sniffs/ParameterValues/RemovedSplAutoloadRegisterThrowFalseSniff.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\ParameterValues;
-
-use PHPCompatibility\AbstractFunctionCallParameterSniff;
-use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\PassedParameters;
-
-/**
- * Detect: Passing `false` to `spl_autoload_register()` is deprecated as of PHP 8.0.
- *
- * > spl_autoload_register() will now always throw a TypeError on invalid
- * > arguments, therefore the second argument $throw is ignored and a
- * > notice will be emitted if it is set to false.
- *
- * PHP version 8.0
- *
- * @link https://github.com/php/php-src/blob/c0172aa2bdb9ea223c8491bdb300995b93a857a0/UPGRADING#L393-L395
- *
- * @since 10.0.0
- */
-class RemovedSplAutoloadRegisterThrowFalseSniff extends AbstractFunctionCallParameterSniff
-{
-
-    /**
-     * Functions to check for.
-     *
-     * @since 10.0.0
-     *
-     * @var array
-     */
-    protected $targetFunctions = [
-        'spl_autoload_register' => true,
-    ];
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @since 10.0.0
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsAbove('8.0') === false);
-    }
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile    The file being scanned.
-     * @param int                         $stackPtr     The position of the current token in the stack.
-     * @param string                      $functionName The token content (function name) which was matched.
-     * @param array                       $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters)
-    {
-        $targetParam = PassedParameters::getParameterFromStack($parameters, 2, 'throw');
-        if ($targetParam === false) {
-            return;
-        }
-
-        if ($targetParam['clean'] !== 'false') {
-            return;
-        }
-
-        $phpcsFile->addWarning(
-            'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.',
-            $targetParam['start'],
-            'Deprecated'
-        );
-    }
-}
diff --git a/PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php b/PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php
deleted file mode 100644
index 468ebed1..00000000
--- a/PHPCompatibility/Sniffs/TextStrings/RemovedDollarBraceStringEmbedsSniff.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2022 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Sniffs\TextStrings;
-
-use PHPCompatibility\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\Utils\GetTokensAsString;
-use PHPCSUtils\Utils\TextStrings;
-
-/**
- * Detect use of select forms of variable embedding in heredocs and double strings as deprecated per PHP 8.2.
- *
- * > PHP allows embedding variables in strings with double-quotes (") and heredoc in various ways.
- * > 1. Directly embedding variables (`$foo`)
- * > 2. Braces outside the variable (`{$foo}`)
- * > 3. Braces after the dollar sign (`${foo}`)
- * > 4. Variable variables (`${expr}`, equivalent to `(string) ${expr}`)
- * >
- * > [...] to deprecate options 3 and 4 in PHP 8.2 and remove them in PHP 9.0.
- *
- * PHP version 8.2
- * PHP version 9.0
- *
- * @link https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
- *
- * @since 10.0.0
- */
-class RemovedDollarBraceStringEmbedsSniff extends Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 10.0.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            \T_DOUBLE_QUOTED_STRING,
-            \T_START_HEREDOC,
-            \T_DOLLAR_OPEN_CURLY_BRACES,
-        ];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 10.0.0
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void|int Void or a stack pointer to skip forward.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('8.2') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        /*
-         * Defensive coding, this code is not expected to ever actually be hit since PHPCS#3604
-         * (included in 3.7.0), but _will_ be hit if a file containing a PHP 7.3 indented heredoc/nowdocs
-         * is scanned with PHPCS on PHP < 7.3. People shouldn't do that, but hey, we can't stop them.
-         */
-        if ($tokens[$stackPtr]['code'] === \T_DOLLAR_OPEN_CURLY_BRACES) {
-            // @codeCoverageIgnoreStart
-            if ($tokens[($stackPtr - 1)]['code'] === \T_DOUBLE_QUOTED_STRING) {
-                --$stackPtr;
-            } else {
-                // Throw an error anyway, though it won't be very informative.
-                $message = 'Using ${} in strings is deprecated since PHP 8.2, use {$var} or {${expr}} instead.';
-                $code    = 'DeprecatedDollarBraceEmbed';
-                $phpcsFile->addWarning($message, $stackPtr, $code);
-                return;
-            }
-            // @codeCoverageIgnoreEnd
-        }
-
-        $endOfString   = TextStrings::getEndOfCompleteTextString($phpcsFile, $stackPtr);
-        $startOfString = $stackPtr;
-        if ($tokens[$stackPtr]['code'] === \T_START_HEREDOC) {
-            $startOfString = ($stackPtr + 1);
-        }
-
-        $contents = GetTokensAsString::normal($phpcsFile, $startOfString, $endOfString);
-        if (\strpos($contents, '${') === false) {
-            // No interpolation found or only interpolations which are still supported.
-            return ($endOfString + 1);
-        }
-
-        $embeds = TextStrings::getEmbeds($contents);
-        foreach ($embeds as $offset => $embed) {
-            if (\strpos($embed, '${') !== 0) {
-                continue;
-            }
-
-            // Figure out the stack pointer to throw the warning on.
-            $errorPtr = $startOfString;
-            $length   = 0;
-            while (($length + $tokens[$errorPtr]['length']) < $offset) {
-                $length += $tokens[$errorPtr]['length'];
-                ++$errorPtr;
-            }
-
-            // Type 4.
-            $message = 'Using %s (variable variables) in strings is deprecated since PHP 8.2, use {${expr}} instead.';
-            $code    = 'DeprecatedExpressionSyntax';
-            if (\preg_match('`^\$\{(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)(?:\[([\'"])?[^\$\{\}\]]+(?:\2)?\])?\}$`', $embed) === 1) {
-                // Type 3.
-                $message = 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: %s';
-                $code    = 'DeprecatedVariableSyntax';
-            }
-
-            $phpcsFile->addWarning($message, $errorPtr, $code, [$embed]);
-
-        }
-
-        return ($endOfString + 1);
-    }
-}
diff --git a/PHPCompatibility/Tests/BaseSniffTest.php b/PHPCompatibility/Tests/BaseSniffTest.php
deleted file mode 100644
index 68c9d605..00000000
--- a/PHPCompatibility/Tests/BaseSniffTest.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests;
-
-use PHPUnit\Framework\TestCase;
-use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\BackCompat\Helper;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains;
-
-/**
- * Base sniff test class file.
- *
- * Adds PHPCS sniffing logic and custom assertions for PHPCS errors and
- * warnings.
- *
- * @since 5.5
- * @since 7.0.4  Caches sniff results per file and testVersion.
- * @since 7.1.3  Compatible with PHPUnit 6.
- * @since 7.1.3  Limits the sniff run to the actual sniff being tested.
- * @since 8.0.0  Compatible with PHP_CodeSniffer 3+.
- * @since 8.2.0  Allows for sniffs in multiple categories.
- * @since 9.0.0  Dropped support for PHP_CodeSniffer 1.x.
- * @since 10.0.0 Updated for preliminary support of PHP_CodeSniffer 4 and dropped support for PHPCS 2.x.
- */
-class BaseSniffTest extends TestCase
-{
-    use AssertStringContains;
-
-    /**
-     * The name of the standard as registered with PHPCS.
-     *
-     * @since 7.1.3
-     *
-     * @var string
-     */
-    const STANDARD_NAME = 'PHPCompatibility';
-
-    /**
-     * An array of PHPCS results by filename and PHP version.
-     *
-     * @since 7.0.4
-     *
-     * @var array
-     */
-    public static $sniffFiles = [];
-
-    /**
-     * Last PHPCS config instance used, if any. (PHPCS > 3)
-     *
-     * @since 10.0.0
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    public static $lastConfig = null;
-
-    /**
-     * Reset the sniff file cache before/after each test class.
-     *
-     * @beforeClass
-     * @afterClass
-     *
-     * @since 7.0.4
-     * @since 10.0.0 Renamed the method from `setUpBeforeClass()` to `resetSniffFiles()` and
-     *               now using the `@beforeClass`/`@afterClass` annotations to allow for
-     *               PHPUnit cross-version compatibility.
-     *
-     * @return void
-     */
-    public static function resetSniffFiles()
-    {
-        self::$sniffFiles = [];
-    }
-
-    /**
-     * Reset the testVersion after each test.
-     *
-     * @after
-     *
-     * @since 5.5
-     * @since 10.0.0 Renamed the method from `tearDown()` to `resetTestVersion()` and now using
-     *               the `@after` annotation to allow for PHPUnit cross-version compatibility.
-     *
-     * @return void
-     */
-    public function resetTestVersion()
-    {
-        // Reset the targetPhpVersion.
-        Helper::setConfigData('testVersion', null, true, self::$lastConfig);
-    }
-
-    /**
-     * Get the sniff code for the current sniff being tested.
-     *
-     * @since 7.1.3
-     *
-     * @return string
-     */
-    protected function getSniffCode()
-    {
-        $class    = \get_class($this);
-        $parts    = \explode('\\', $class);
-        $sniff    = \array_pop($parts);
-        $sniff    = \str_replace('UnitTest', '', $sniff);
-        $category = \array_pop($parts);
-        return self::STANDARD_NAME . '.' . $category . '.' . $sniff;
-    }
-
-    /**
-     * Sniff a file and return resulting file object.
-     *
-     * @since 5.5
-     * @since 9.0.0 Signature change. The `$filename` parameter was renamed to
-     *              `$pathToFile` and now expects an absolute path instead of
-     *              a relative one.
-     *
-     * @param string $pathToFile       Absolute path to the file to sniff.
-     *                                 Allows for passing __FILE__ from the unit test
-     *                                 file. In that case, the test case file is presumed
-     *                                 to have the same name, but with an `inc` extension.
-     * @param string $targetPhpVersion Value of 'testVersion' to set on PHPCS object.
-     *
-     * @return \PHP_CodeSniffer\Files\File|false File object.
-     */
-    public function sniffFile($pathToFile, $targetPhpVersion = 'none')
-    {
-        if (\strpos($pathToFile, 'UnitTest.php') !== false) {
-            // Ok, so __FILE__ was passed, change the file extension.
-            $pathToFile = \str_replace('UnitTest.php', 'UnitTest.inc', $pathToFile);
-        }
-        $pathToFile = \realpath($pathToFile);
-
-        if (isset(self::$sniffFiles[$pathToFile][$targetPhpVersion])) {
-            return self::$sniffFiles[$pathToFile][$targetPhpVersion];
-        }
-
-        // Set up the Config and tokenize the test case file only once.
-        if (isset(self::$sniffFiles[$pathToFile]['only_parsed']) === false) {
-            try {
-                // PHPCS 3.x, 4.x.
-                $config            = new \PHP_CodeSniffer\Config();
-                $config->cache     = false;
-                $config->standards = [self::STANDARD_NAME];
-                $config->sniffs    = [$this->getSniffCode()];
-                $config->ignored   = [];
-
-                self::$lastConfig = $config;
-
-                $ruleset = new \PHP_CodeSniffer\Ruleset($config);
-
-                self::$sniffFiles[$pathToFile]['only_parsed'] = new \PHP_CodeSniffer\Files\LocalFile($pathToFile, $ruleset, $config);
-                self::$sniffFiles[$pathToFile]['only_parsed']->parse();
-            } catch (\Exception $e) {
-                $this->fail('An unexpected exception has been caught when parsing file "' . $pathToFile . '" : ' . $e->getMessage());
-                return false;
-            }
-        }
-
-        // Now process the file against the target testVersion setting and cache the results.
-        self::$sniffFiles[$pathToFile][$targetPhpVersion] = clone self::$sniffFiles[$pathToFile]['only_parsed'];
-
-        if ($targetPhpVersion !== 'none') {
-            Helper::setConfigData('testVersion', $targetPhpVersion, true, self::$sniffFiles[$pathToFile][$targetPhpVersion]->config);
-        }
-
-        try {
-            self::$sniffFiles[$pathToFile][$targetPhpVersion]->process();
-        } catch (\Exception $e) {
-            $this->fail('An unexpected exception has been caught when processing file "' . $pathToFile . '" : ' . $e->getMessage());
-            return false;
-        }
-
-        return self::$sniffFiles[$pathToFile][$targetPhpVersion];
-    }
-
-    /**
-     * Assert a PHPCS error on a particular line number.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $file            Codesniffer file object.
-     * @param int                         $lineNumber      Line number.
-     * @param string                      $expectedMessage Expected error message (assertContains).
-     *
-     * @return bool
-     */
-    public function assertError(File $file, $lineNumber, $expectedMessage)
-    {
-        $errors = $this->gatherErrors($file);
-
-        return $this->assertForType($errors, 'error', $lineNumber, $expectedMessage);
-    }
-
-    /**
-     * Assert a PHPCS warning on a particular line number.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $file            Codesniffer file object.
-     * @param int                         $lineNumber      Line number.
-     * @param string                      $expectedMessage Expected message (assertContains).
-     *
-     * @return bool
-     */
-    public function assertWarning(File $file, $lineNumber, $expectedMessage)
-    {
-        $warnings = $this->gatherWarnings($file);
-
-        return $this->assertForType($warnings, 'warning', $lineNumber, $expectedMessage);
-    }
-
-    /**
-     * Assert a PHPCS error or warning on a particular line number.
-     *
-     * @since 7.0.3
-     *
-     * @param array  $issues          Array of issues of a particular type.
-     * @param string $type            The type of issues, either 'error' or 'warning'.
-     * @param int    $lineNumber      Line number.
-     * @param string $expectedMessage Expected message (assertContains).
-     *
-     * @return bool
-     *
-     * @throws \Exception When no issues of a certain type where found on a line
-     *                    for which issues of that type where expected.
-     */
-    private function assertForType($issues, $type, $lineNumber, $expectedMessage)
-    {
-        if (isset($issues[$lineNumber]) === false) {
-            $this->fail("Expected $type '$expectedMessage' on line number $lineNumber, but none found.");
-        }
-
-        $insteadFoundMessages = [];
-
-        // Concat any error messages so we can do an assertContains.
-        foreach ($issues[$lineNumber] as $issue) {
-            $insteadFoundMessages[] = $issue['message'];
-        }
-
-        $insteadMessagesString = \implode(', ', $insteadFoundMessages);
-
-        $msg = "Expected $type message '$expectedMessage' on line $lineNumber not found. Instead found: $insteadMessagesString.";
-
-        return $this->assertStringContainsString($expectedMessage, $insteadMessagesString, $msg);
-    }
-
-    /**
-     * Assert no violation (warning or error) on a given line number.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $file       Codesniffer File object.
-     * @param mixed                       $lineNumber Line number.
-     *
-     * @return bool
-     */
-    public function assertNoViolation(File $file, $lineNumber = 0)
-    {
-        $errors   = $this->gatherErrors($file);
-        $warnings = $this->gatherWarnings($file);
-
-        if (empty($errors) && empty($warnings)) {
-            return $this->assertTrue(true);
-        }
-
-        if ($lineNumber === 0) {
-            $failMessage = 'Failed asserting no violations in file. Found ' . \count($errors) . ' errors and ' . \count($warnings) . ' warnings.';
-            $allMessages = $errors + $warnings;
-            // TODO: Update the fail message to give the tester some
-            // indication of what the errors or warnings were.
-            return $this->assertEmpty($allMessages, $failMessage);
-        }
-
-        $encounteredMessages = [];
-        if (isset($errors[$lineNumber])) {
-            foreach ($errors[$lineNumber] as $error) {
-                $encounteredMessages[] = 'ERROR: ' . $error['message'];
-            }
-        }
-
-        if (isset($warnings[$lineNumber])) {
-            foreach ($warnings[$lineNumber] as $warning) {
-                $encounteredMessages[] = 'WARNING: ' . $warning['message'];
-            }
-        }
-
-        $failMessage = "Failed asserting no standards violation on line $lineNumber. Found: \n"
-            . \implode("\n", $encounteredMessages);
-        $this->assertCount(0, $encounteredMessages, $failMessage);
-    }
-
-    /**
-     * Show violations in file by line number.
-     *
-     * This is useful for debugging sniffs on a file.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $file Codesniffer file object.
-     *
-     * @return array
-     */
-    public function showViolations(File $file)
-    {
-        $violations = [
-            'errors'   => $this->gatherErrors($file),
-            'warnings' => $this->gatherWarnings($file),
-        ];
-
-        return $violations;
-    }
-
-    /**
-     * Gather all error messages by line number from phpcs file result.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $file Codesniffer File object.
-     *
-     * @return array
-     */
-    public function gatherErrors(File $file)
-    {
-        $foundErrors = $file->getErrors();
-
-        return $this->gatherIssues($foundErrors);
-    }
-
-    /**
-     * Gather all warning messages by line number from phpcs file result.
-     *
-     * @since 5.5
-     *
-     * @param \PHP_CodeSniffer\Files\File $file Codesniffer File object.
-     *
-     * @return array
-     */
-    public function gatherWarnings(File $file)
-    {
-        $foundWarnings = $file->getWarnings();
-
-        return $this->gatherIssues($foundWarnings);
-    }
-
-    /**
-     * Gather all messages or a particular type by line number.
-     *
-     * @since 7.0.3
-     *
-     * @param array $issuesArray Array of a particular type of issues,
-     *                           i.e. errors or warnings.
-     *
-     * @return array
-     */
-    private function gatherIssues($issuesArray)
-    {
-        $allIssues = [];
-        foreach ($issuesArray as $line => $lineIssues) {
-            foreach ($lineIssues as $column => $issues) {
-                foreach ($issues as $issue) {
-
-                    if (isset($allIssues[$line]) === false) {
-                        $allIssues[$line] = [];
-                    }
-
-                    $allIssues[$line][] = $issue;
-                }
-            }
-        }
-
-        return $allIssues;
-    }
-}
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc b/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc
deleted file mode 100644
index b8acbecd..00000000
--- a/PHPCompatibility/Tests/FunctionDeclarations/ForbiddenFinalPrivateMethodsUnitTest.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * OK cross version.
- */
-class CrossVersionValid
-{
-    private final function __construct() {}
-    final public function publicFinal() {}
-    final protected static function protectedFinal() {}
-    private function privateNonOverloadable() {}
-}
-
-trait CrossVersionValidTrait
-{
-    final private function __CONSTRUCT() {}
-    final public static function publicFinal() {}
-    final protected function protectedFinal() {}
-    private function privateStillOverloadable() {} // Open question in RFC PR https://github.com/php/php-src/pull/5401
-}
-
-$anon = new class() {
-    final private function __Construct() {}
-    final public static function publicFinal();
-    final protected function protectedFinal();
-    private function privateNonOverloadable() {}
-};
-
-/*
- * PHP 8.0: private methods cannot be final as they are never overridden by other classes.
- */
-class CrossVersionInValid
-{
-    final private function privateFinal();
-    static private final function privateStaticFinal();
-}
-
-$anon = new class() {
-    final private function privateFinal();
-    static final private function privateStaticFinal();
-};
-
-trait CrossVersionInValidTrait
-{
-    final private function privateFinal();
-    static private final function privateStaticFinal();
-}
-
-// Global function cannot have final nor private keyword.
-static function globalFunction() {}
-
-// Interface cannot have private methods, nor final methods, but that's not the concern of this sniff.
-interface IllegalPrivate {
-    final private function privateToImplement();
-}
-
-// Safeguard handling of PHP 8.1+ enums.
-enum MyEnum {
-    final public static function publicFinal();
-    final private function privateFinal() {}
-}
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc b/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc
deleted file mode 100644
index f0d583a8..00000000
--- a/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.inc
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- * OK no change in behaviour cross-version.
- */
-class CrossVersionValid
-{
-    function __construct() {
-        throw new Exception();
-    }
-
-    function __destruct() {
-        // Destructor will not be called on thrown exception in constructor.
-    }
-}
-
-$anon = new class() {
-    function __Construct() {
-        throw new Exception();
-    }
-
-    function __Destruct() {
-        // Destructor will not be called on thrown exception in constructor.
-    }
-};
-
-/*
- * PHP 8.0: If an object constructor exit()s, the object destructor will no longer be called.
- */
-class CrossVersionInValid
-{
-    public function __construct() {
-        exit(1); // Error.
-    }
-
-    public function __destruct() {
-        // Destructor will not be called on exit() in constructor.
-    }
-}
-
-$anon = new class() extends ClassWhichMayOrMayNotContainADestructMethod {
-    function __CONSTRUCT() {
-        if ($something) {
-            die(); // Warning.
-        } else {
-            exit(2); // Warning.
-        }
-    }
-};
-
-abstract class HasDestructAndExtends extends ClassWhichMayOrMayNotContainADestructMethod
-{
-    public function __construct() {
-        // Test skipping over irrelevant code.
-        $array = [
-            'closure' => function() { exit; }, // Ignore, nested closed scope.
-        ];
-
-        $anon = new class {
-            function something() {
-                exit; // Ignore, nested closed scope.
-            }
-        };
-
-        $array = array(
-            'closure' => function() { exit; }, // Ignore, nested closed scope.
-        );
-
-        die; // Error.
-    }
-
-    /**
-     * This should be easily skipped over.
-     */
-    abstract function something();
-    #[AttributeWhichCouldBeLong, ShouldBeSkippedOver( 10, self::CONST_VALUE)]
-    public function __DeStruct() {
-        // Destructor will not be called on exit() in constructor.
-    }
-}
-
-trait CrossVersionInValid
-{
-    public function __construct() {
-        exit(1); // Error.
-    }
-
-    public function __destruct() {
-        // Destructor will not be called on exit() in constructor.
-    }
-}
-
-class DoesntExtendAndDoesntHaveDestructMethodButUsesTrait {
-    use TraitWhichMayOrMayNotContainADestructMethod;
-
-    public function __construct() {
-        die(1); // Warning.
-    }
-}
-
-/*
- * Prevent false positives.
- */
-class DoesntExtendAndDoesntHaveDestructMethod {
-    public function __construct() {
-        exit(1);
-    }
-}
-
-trait CantExtendAndDoesntHaveDestructMethod {
-    public function __construct() {
-        exit(1);
-    }
-}
-
-class ExitNotInFunctionScope {
-    public function __construct() {
-        $this->property = function($param) {
-            exit(1);
-        };
-    }
-
-    public function __destruct() {}
-}
-
-function __construct() {}
-
-interface DoesntHaveCodeInFunctions {
-    public function __construct();
-}
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php b/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php
deleted file mode 100644
index 43d1bd0b..00000000
--- a/PHPCompatibility/Tests/FunctionDeclarations/RemovedCallingDestructAfterConstructorExitUnitTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\FunctionDeclarations;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedCallingDestructAfterConstructorExit sniff.
- *
- * @group removedCallingDestructAfterConstructorExit
- * @group functiondeclarations
- *
- * @covers \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedCallingDestructAfterConstructorExitSniff
- *
- * @since 10.0.0
- */
-class RemovedCallingDestructAfterConstructorExitUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Verify that the sniff throws an error when an exit/die is encountered in a class constructor for PHP 8.0+.
-     *
-     * @dataProvider dataRemovedCallingDestructAfterConstructorExit
-     *
-     * @param int    $line    The line number where an error is expected.
-     * @param string $name    The name of the exit type used.
-     * @param bool   $isError Whether to expect an error or a warning. Defaults to true (= error).
-     *
-     * @return void
-     */
-    public function testRemovedCallingDestructAfterConstructorExit($line, $name, $isError = true)
-    {
-        $file  = $this->sniffFile(__FILE__, '8.0');
-        $error = "When $name() is called within an object constructor, the object destructor will no longer be called since PHP 8.0";
-
-        if ($isError === true) {
-            $this->assertError($file, $line, $error);
-        } else {
-            $this->assertWarning($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedCallingDestructAfterConstructorExit()
-     *
-     * @return array
-     */
-    public function dataRemovedCallingDestructAfterConstructorExit()
-    {
-        return [
-            [33, 'exit'],
-            [44, 'die', false],
-            [46, 'exit', false],
-            [69, 'die'],
-            [85, 'exit'],
-            [97, 'die', false],
-        ];
-    }
-
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $cases = [];
-        // No errors expected on the first 26 lines.
-        for ($line = 1; $line <= 26; $line++) {
-            $cases[] = [$line];
-        }
-
-        $cases[] = [56];
-        $cases[] = [61];
-        $cases[] = [66];
-
-        for ($line = 101; $line <= 130; $line++) {
-            $cases[] = [$line];
-        }
-
-        return $cases;
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.inc b/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.inc
deleted file mode 100644
index 4cd62436..00000000
--- a/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * OK on all versions.
- */
-function requiredBeforeOptional($a, $b, $c = null, $d = true) {}
-function requiredBeforeOptionalWithTypes(?int $a, string $b, callable $c = null, bool $d = /*comment*/ true) {}
-function nullableTypedOptionalBeforeRequired(Foo $a = /* comment */ null, ?int $b = null, $c, $d) {}
-
-/*
- * Deprecated in PHP 8.
- */
-function optionalBeforeRequired($a = [], $b, $c) {}
-function nonNullTypedOptionalBeforeRequired(int $a = 1, bool $b) {}
-
-$closure = function ($a = 10 * DAY_IN_SECONDS, $b) {};
-$arrow = fn(?bool $a = true, ?bool $b): string => $a ? (string) $b : '';
-
-// Parse error, nothing in default, not our concern. Throw error anyway.
-$closure = function ($a = /*comment*/, $b) {};
-
-// Prevent false positives on variadic parameters.
-function variadicIsOptionalByNature($a, int ...$b) {}
-function variadicIsOptionalByNatureWithExtraOptional($a, $b = null, ...$c) {}
-// Intentional parse error. This has always been an error though, so ignore for this sniff.
-function variadicBeforeRequiredWasAlwaysAnError(...$a, $b) {}
-
-// Rule also applies to constructor property promotion.
-class ConstructorPropertyPromotion {
-    public function __construct(
-        public $propA = 10,
-        protected $propB,
-    ) {}
-}
-
-class MixedWithOptionalProperty {
-    public function __construct(
-        public $propA = false,
-        $normalParam
-    ) {}
-}
-
-class MixedWithOptionalParam {
-    public function __construct(
-        public $propA,
-        $normalParam = 10, // OK.
-    ) {}
-}
-
-// Intentional parse error. This has to be the last test in the file.
-$closure = function( $a = [], $b
diff --git a/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php b/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php
deleted file mode 100644
index af0e9063..00000000
--- a/PHPCompatibility/Tests/FunctionDeclarations/RemovedOptionalBeforeRequiredParamUnitTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\FunctionDeclarations;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedOptionalBeforeRequiredParam sniff.
- *
- * @group removedOptionalBeforeRequiredParam
- * @group functiondeclarations
- *
- * @covers \PHPCompatibility\Sniffs\FunctionDeclarations\RemovedOptionalBeforeRequiredParamSniff
- *
- * @since 10.0.0
- */
-class RemovedOptionalBeforeRequiredParamUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Verify that the sniff throws a warning for optional parameters before required.
-     *
-     * @dataProvider dataRemovedOptionalBeforeRequiredParam
-     *
-     * @param int $line The line number where a warning is expected.
-     *
-     * @return void
-     */
-    public function testRemovedOptionalBeforeRequiredParam($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Declaring a required parameter after an optional one is deprecated since PHP 8.0');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedOptionalBeforeRequiredParam()
-     *
-     * @return array
-     */
-    public function dataRemovedOptionalBeforeRequiredParam()
-    {
-        return [
-            [13], // Warning x 2.
-            [14],
-            [16],
-            [17],
-            [20],
-            [32],
-            [39],
-        ];
-    }
-
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $cases = [];
-        // No errors expected on the first 9 lines.
-        for ($line = 1; $line <= 9; $line++) {
-            $cases[] = [$line];
-        }
-
-        // Don't error on variadic parameters.
-        $cases[] = [23];
-        $cases[] = [24];
-        $cases[] = [26];
-
-        // Constructor property promotion - valid example.
-        $cases[] = [46];
-
-        // Add parse error test case.
-        $cases[] = [51];
-
-        return $cases;
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc b/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc
deleted file mode 100644
index ae484c99..00000000
--- a/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.inc
+++ /dev/null
@@ -1,1232 +0,0 @@
-<?php
-
-call_user_method();
-call_user_method_array();
-define_syslog_variables();
-dl();
-ereg();
-ereg_replace();
-eregi();
-eregi_replace();
-import_request_variables();
-mcrypt_generic_end();
-mysql_db_query();
-mysql_escape_string();
-mysql_list_dbs();
-mysqli_bind_param();
-mysqli_bind_result();
-mysqli_client_encoding();
-mysqli_fetch();
-mysqli_param_count();
-mysqli_get_metadata();
-mysqli_send_long_data();
-magic_quotes_runtime();
-session_register();
-session_unregister();
-session_is_registered();
-set_magic_quotes_runtime();
-set_socket_blocking();
-split();
-spliti();
-sql_regcase();
-php_logo_guid();
-php_egg_logo_guid();
-php_real_logo_guid();
-zend_logo_guid();
-datefmt_set_timezone_id();
-mcrypt_ecb();
-mcrypt_cbc();
-mcrypt_cfb();
-mcrypt_ofb();
-ocibindbyname();
-ocicancel();
-ocicloselob();
-ocicollappend();
-ocicollassign();
-ocicollassignelem();
-ocicollgetelem();
-ocicollmax();
-ocicollsize();
-ocicolltrim();
-ocicolumnisnull();
-ocicolumnname();
-ocicolumnprecision();
-ocicolumnscale();
-ocicolumnsize();
-ocicolumntype();
-ocicolumntyperaw();
-ocicommit();
-ocidefinebyname();
-ocierror();
-ociexecute();
-ocifetch();
-ocifetchinto();
-ocifetchstatement();
-ocifreecollection();
-ocifreecursor();
-ocifreedesc();
-ocifreestatement();
-ociinternaldebug();
-ociloadlob();
-ocilogoff();
-ocilogon();
-ocinewcollection();
-ocinewcursor();
-ocinewdescriptor();
-ocinlogon();
-ocinumcols();
-ociparse();
-ociplogon();
-ociresult();
-ocirollback();
-ocirowcount();
-ocisavelob();
-ocisavelobfile();
-ociserverversion();
-ocisetprefetch();
-ocistatementtype();
-ociwritelobtofile();
-ociwritetemporarylob();
-imagepsbbox();
-imagepsencodefont();
-imagepsextendfont();
-imagepsfreefont();
-imagepsloadfont();
-imagepsslantfont();
-imagepstext();
-ldap_sort();
-php_check_syntax();
-mysqli_get_cache_stats();
-mcrypt_create_iv();
-mcrypt_decrypt();
-mcrypt_enc_get_algorithms_name();
-mcrypt_enc_get_block_size();
-mcrypt_enc_get_iv_size();
-mcrypt_enc_get_key_size();
-mcrypt_enc_get_modes_name();
-mcrypt_enc_get_supported_key_sizes();
-mcrypt_enc_is_block_algorithm_mode();
-mcrypt_enc_is_block_algorithm();
-mcrypt_enc_is_block_mode();
-mcrypt_enc_self_test();
-mcrypt_encrypt();
-mcrypt_generic_deinit();
-mcrypt_generic_init();
-mcrypt_generic();
-mcrypt_get_block_size();
-mcrypt_get_cipher_name();
-mcrypt_get_iv_size();
-mcrypt_get_key_size();
-mcrypt_list_algorithms();
-mcrypt_list_modes();
-mcrypt_module_close();
-mcrypt_module_get_algo_block_size();
-mcrypt_module_get_algo_key_size();
-mcrypt_module_get_supported_key_sizes();
-mcrypt_module_is_block_algorithm_mode();
-mcrypt_module_is_block_algorithm();
-mcrypt_module_is_block_mode();
-mcrypt_module_open();
-mcrypt_module_self_test();
-mdecrypt_generic();
-
-// Test against false positives.
-$class->php_check_syntax();
-MyClass::php_check_syntax();
-MyNamespace\php_check_syntax();
-echo PHP_CHECK_SYNTAX; // Constant.
-const php_check_syntax = 'abc';
-use php_check_syntax;
-function php_check_syntax() {}
-abstract class Split {}
-
-// More deprecated functions, PHP 7.2
-jpeg2wbmp();
-png2wbmp();
-create_function();
-while (list($key, $val) = each($array)) {}
-gmp_random(2);
-read_exif_data();
-
-// PHP 7.3.
-image2wbmp();
-mbregex_encoding();
-mbereg();
-mberegi();
-mbereg_replace();
-mberegi_replace();
-mbsplit();
-mbereg_match();
-mbereg_search();
-mbereg_search_pos();
-mbereg_search_regs();
-mbereg_search_init();
-mbereg_search_getregs();
-mbereg_search_getpos();
-mbereg_search_setpos();
-fgetss();
-gzgetss();
-
-// PHP 7.4.
-ibase_add_user();
-ibase_affected_rows();
-ibase_backup();
-ibase_blob_add();
-ibase_blob_cancel();
-ibase_blob_close();
-ibase_blob_create();
-ibase_blob_echo();
-ibase_blob_get();
-ibase_blob_import();
-ibase_blob_info();
-ibase_blob_open();
-ibase_close();
-ibase_commit_ret();
-ibase_commit();
-ibase_connect();
-ibase_db_info();
-ibase_delete_user();
-ibase_drop_db();
-ibase_errcode();
-ibase_errmsg();
-ibase_execute();
-ibase_fetch_assoc();
-ibase_fetch_object();
-ibase_fetch_row();
-ibase_field_info();
-ibase_free_event_handler();
-ibase_free_query();
-ibase_free_result();
-ibase_gen_id();
-ibase_maintain_db();
-ibase_modify_user();
-ibase_name_result();
-ibase_num_fields();
-ibase_num_params();
-ibase_param_info();
-ibase_pconnect();
-ibase_prepare();
-ibase_query();
-ibase_restore();
-ibase_rollback_ret();
-ibase_rollback();
-ibase_server_info();
-ibase_service_attach();
-ibase_service_detach();
-ibase_set_event_handler();
-ibase_trans();
-ibase_wait_event();
-
-// Pfpro extension - PHP 5.1
-pfpro_cleanup();
-pfpro_init();
-pfpro_process_raw();
-pfpro_process();
-pfpro_version();
-
-// PHP 7.4.
-wddx_add_vars();
-wddx_deserialize();
-wddx_packet_end();
-wddx_packet_start();
-wddx_serialize_value();
-wddx_serialize_vars();
-ldap_control_paged_result_response();
-ldap_control_paged_result();
-recode_file();
-recode_string();
-recode();
-is_real();
-get_magic_quotes_gpc();
-get_magic_quotes_runtime();
-hebrevc($str));
-convert_cyr_string($str, 'k', 'i');
-money_format();
-ezmlm_hash();
-restore_include_path();
-
-// These calls should *not* trigger an error.
-$myobject -> php_check_syntax (); // Method, not the native PHP function.
-myNamespace \ /*comment*/ php_check_syntax(); // Namespaced function, not the native PHP function.
-namespace\php_check_syntax(); // Namespaced function, not the native PHP function.
-$obj = new php_check_syntax /*comment*/ (); // Class not method.
-
-// PHP 5.3 Ncurses extension.
-ncurses_addch();
-ncurses_addchnstr();
-ncurses_addchstr();
-ncurses_addnstr();
-ncurses_addstr();
-ncurses_assume_default_colors();
-ncurses_attroff();
-ncurses_attron();
-ncurses_attrset();
-ncurses_baudrate();
-ncurses_beep();
-ncurses_bkgd();
-ncurses_bkgdset();
-ncurses_border();
-ncurses_bottom_panel();
-ncurses_can_change_color();
-ncurses_cbreak();
-ncurses_clear();
-ncurses_clrtobot();
-ncurses_clrtoeol();
-ncurses_color_content();
-ncurses_color_set();
-ncurses_curs_set();
-ncurses_def_prog_mode();
-ncurses_def_shell_mode();
-ncurses_define_key();
-ncurses_del_panel();
-ncurses_delay_output();
-ncurses_delch();
-ncurses_deleteln();
-ncurses_delwin();
-ncurses_doupdate();
-ncurses_echo();
-ncurses_echochar();
-ncurses_end();
-ncurses_erase();
-ncurses_erasechar();
-ncurses_filter();
-ncurses_flash();
-ncurses_flushinp();
-ncurses_getch();
-ncurses_getmaxyx();
-ncurses_getmouse();
-ncurses_getyx();
-ncurses_halfdelay();
-ncurses_has_colors();
-ncurses_has_ic();
-ncurses_has_il();
-ncurses_has_key();
-ncurses_hide_panel();
-ncurses_hline();
-ncurses_inch();
-ncurses_init_color();
-ncurses_init_pair();
-ncurses_init();
-ncurses_insch();
-ncurses_insdelln();
-ncurses_insertln();
-ncurses_insstr();
-ncurses_instr();
-ncurses_isendwin();
-ncurses_keyok();
-ncurses_keypad();
-ncurses_killchar();
-ncurses_longname();
-ncurses_meta();
-ncurses_mouse_trafo();
-ncurses_mouseinterval();
-ncurses_mousemask();
-ncurses_move_panel();
-ncurses_move();
-ncurses_mvaddch();
-ncurses_mvaddchnstr();
-ncurses_mvaddchstr();
-ncurses_mvaddnstr();
-ncurses_mvaddstr();
-ncurses_mvcur();
-ncurses_mvdelch();
-ncurses_mvgetch();
-ncurses_mvhline();
-ncurses_mvinch();
-ncurses_mvvline();
-ncurses_mvwaddstr();
-ncurses_napms();
-ncurses_new_panel();
-ncurses_newpad();
-ncurses_newwin();
-ncurses_nl();
-ncurses_nocbreak();
-ncurses_noecho();
-ncurses_nonl();
-ncurses_noqiflush();
-ncurses_noraw();
-ncurses_pair_content();
-ncurses_panel_above();
-ncurses_panel_below();
-ncurses_panel_window();
-ncurses_pnoutrefresh();
-ncurses_prefresh();
-ncurses_putp();
-ncurses_qiflush();
-ncurses_raw();
-ncurses_refresh();
-ncurses_replace_panel();
-ncurses_reset_prog_mode();
-ncurses_reset_shell_mode();
-ncurses_resetty();
-ncurses_savetty();
-ncurses_scr_dump();
-ncurses_scr_init();
-ncurses_scr_restore();
-ncurses_scr_set();
-ncurses_scrl();
-ncurses_show_panel();
-ncurses_slk_attr();
-ncurses_slk_attroff();
-ncurses_slk_attron();
-ncurses_slk_attrset();
-ncurses_slk_clear();
-ncurses_slk_color();
-ncurses_slk_init();
-ncurses_slk_noutrefresh();
-ncurses_slk_refresh();
-ncurses_slk_restore();
-ncurses_slk_set();
-ncurses_slk_touch();
-ncurses_standend();
-ncurses_standout();
-ncurses_start_color();
-ncurses_termattrs();
-ncurses_termname();
-ncurses_timeout();
-ncurses_top_panel();
-ncurses_typeahead();
-ncurses_ungetch();
-ncurses_ungetmouse();
-ncurses_update_panels();
-ncurses_use_default_colors();
-ncurses_use_env();
-ncurses_use_extended_names();
-ncurses_vidattr();
-ncurses_vline();
-ncurses_waddch();
-ncurses_waddstr();
-ncurses_wattroff();
-ncurses_wattron();
-ncurses_wattrset();
-ncurses_wborder();
-ncurses_wclear();
-ncurses_wcolor_set();
-ncurses_werase();
-ncurses_wgetch();
-ncurses_whline();
-ncurses_wmouse_trafo();
-ncurses_wmove();
-ncurses_wnoutrefresh();
-ncurses_wrefresh();
-ncurses_wstandend();
-ncurses_wstandout();
-ncurses_wvline();
-
-// PHP 5.1 MCVE extension.
-m_checkstatus();
-m_completeauthorizations();
-m_connect();
-m_connectionerror();
-m_deletetrans();
-m_destroyconn();
-m_destroyengine();
-m_getcell();
-m_getcellbynum();
-m_getcommadelimited();
-m_getheader();
-m_initconn();
-m_initengine();
-m_iscommadelimited();
-m_maxconntimeout();
-m_monitor();
-m_numcolumns();
-m_numrows();
-m_parsecommadelimited();
-m_responsekeys();
-m_responseparam();
-m_returnstatus();
-m_setblocking();
-m_setdropfile();
-m_setip();
-m_setssl_cafile();
-m_setssl_files();
-m_setssl();
-m_settimeout();
-m_sslcert_gen_hash();
-m_transactionssent();
-m_transinqueue();
-m_transkeyval();
-m_transnew();
-m_transsend();
-m_uwait();
-m_validateidentifier();
-m_verifyconnection();
-m_verifysslcert();
-
-// PHP 5.1 DIO extension.
-dio_close();
-dio_fcntl();
-dio_open();
-dio_read();
-dio_seek();
-dio_stat();
-dio_tcsetattr();
-dio_truncate();
-dio_write();
-
-// PHP 5.3 FDF extension.
-fdf_add_doc_javascript();
-fdf_add_template();
-fdf_close();
-fdf_create();
-fdf_enum_values();
-fdf_errno();
-fdf_error();
-fdf_get_ap();
-fdf_get_attachment();
-fdf_get_encoding();
-fdf_get_file();
-fdf_get_flags();
-fdf_get_opt();
-fdf_get_status();
-fdf_get_value();
-fdf_get_version();
-fdf_header();
-fdf_next_field_name();
-fdf_open_string();
-fdf_open();
-fdf_remove_item();
-fdf_save_string();
-fdf_save();
-fdf_set_ap();
-fdf_set_encoding();
-fdf_set_file();
-fdf_set_flags();
-fdf_set_javascript_action();
-fdf_set_on_import_javascript();
-fdf_set_opt();
-fdf_set_status();
-fdf_set_submit_form_action();
-fdf_set_target_frame();
-fdf_set_value();
-fdf_set_version();
-
-// PHP 5.3 Ming extension.
-ming_keypress();
-ming_setcubicthreshold();
-ming_setscale();
-ming_setswfcompression();
-ming_useconstants();
-ming_useswfversion();
-
-// PHP 5.1 Fam extension.
-fam_cancel_monitor();
-fam_close();
-fam_monitor_collection();
-fam_monitor_directory();
-fam_monitor_file();
-fam_next_event();
-fam_open();
-fam_pending();
-fam_resume_monitor();
-fam_suspend_monitor();
-
-// PHP 5.2 HWAPI extension.
-hwapi_attribute_new();
-hwapi_content_new();
-hwapi_hgcsp();
-hwapi_object_new();
-
-// PHP 5.1 YP/NIS extension.
-yp_all();
-yp_cat();
-yp_err_string();
-yp_errno();
-yp_first();
-yp_get_default_domain();
-yp_master();
-yp_match();
-yp_next();
-yp_order();
-
-// PHP 5.1 Mnogosearch extension.
-udm_add_search_limit();
-udm_alloc_agent_array();
-udm_alloc_agent();
-udm_api_version();
-udm_cat_list();
-udm_cat_path();
-udm_check_charset();
-udm_clear_search_limits();
-udm_crc32();
-udm_errno();
-udm_error();
-udm_find();
-udm_free_agent();
-udm_free_ispell_data();
-udm_free_res();
-udm_get_doc_count();
-udm_get_res_field();
-udm_get_res_param();
-udm_hash32();
-udm_load_ispell_data();
-udm_set_agent_param();
-
-// PHP 5.1.3 Msession extension.
-msession_connect();
-msession_count();
-msession_create();
-msession_destroy();
-msession_disconnect();
-msession_find();
-msession_get_array();
-msession_get_data();
-msession_get();
-msession_inc();
-msession_list();
-msession_listvar();
-msession_lock();
-msession_plugin();
-msession_randstr();
-msession_set_array();
-msession_set_data();
-msession_set();
-msession_timeout();
-msession_uniq();
-msession_unlock();
-
-__autoload($class);
-
-// PHP 5.0 Crack extension.
-crack_check();
-crack_closedict();
-crack_getlastmessage();
-crack_opendict();
-
-// PHP 5.1 W32API extension.
-w32api_deftype();
-w32api_init_dtype();
-w32api_invoke_function();
-w32api_register_function();
-w32api_set_call_method();
-
-// PHP 5.1 CPDF extension.
-cpdf_add_annotation();
-cpdf_add_outline();
-cpdf_arc();
-cpdf_begin_text();
-cpdf_circle();
-cpdf_clip();
-cpdf_close();
-cpdf_closepath_fill_stroke();
-cpdf_closepath_stroke();
-cpdf_closepath();
-cpdf_continue_text();
-cpdf_curveto();
-cpdf_end_text();
-cpdf_fill_stroke();
-cpdf_fill();
-cpdf_finalize_page();
-cpdf_finalize();
-cpdf_global_set_document_limits();
-cpdf_import_jpeg();
-cpdf_lineto();
-cpdf_moveto();
-cpdf_newpath();
-cpdf_open();
-cpdf_output_buffer();
-cpdf_page_init();
-cpdf_place_inline_image();
-cpdf_rect();
-cpdf_restore();
-cpdf_rlineto();
-cpdf_rmoveto();
-cpdf_rotate_text();
-cpdf_rotate();
-cpdf_save_to_file();
-cpdf_save();
-cpdf_scale();
-cpdf_set_action_url();
-cpdf_set_char_spacing();
-cpdf_set_creator();
-cpdf_set_current_page();
-cpdf_set_font_directories();
-cpdf_set_font_map_file();
-cpdf_set_font();
-cpdf_set_horiz_scaling();
-cpdf_set_keywords();
-cpdf_set_leading();
-cpdf_set_page_animation();
-cpdf_set_subject();
-cpdf_set_text_matrix();
-cpdf_set_text_pos();
-cpdf_set_text_rendering();
-cpdf_set_text_rise();
-cpdf_set_title();
-cpdf_set_viewer_preferences();
-cpdf_set_word_spacing();
-cpdf_setdash();
-cpdf_setflat();
-cpdf_setgray_fill();
-cpdf_setgray_stroke();
-cpdf_setgray();
-cpdf_setlinecap();
-cpdf_setlinejoin();
-cpdf_setlinewidth();
-cpdf_setmiterlimit();
-cpdf_setrgbcolor_fill();
-cpdf_setrgbcolor_stroke();
-cpdf_setrgbcolor();
-cpdf_show_xy();
-cpdf_show();
-cpdf_stringwidth();
-cpdf_stroke();
-cpdf_text();
-cpdf_translate();
-ircg_channel_mode();
-ircg_disconnect();
-ircg_eval_ecmascript_params();
-ircg_fetch_error_msg();
-ircg_get_username();
-ircg_html_encode();
-ircg_ignore_add();
-ircg_ignore_del();
-ircg_invite();
-ircg_is_conn_alive();
-ircg_join();
-ircg_kick();
-ircg_list();
-ircg_lookup_format_messages();
-ircg_lusers();
-ircg_msg();
-ircg_names();
-ircg_nick();
-ircg_nickname_escape();
-ircg_nickname_unescape();
-ircg_notice();
-ircg_oper();
-ircg_part();
-ircg_pconnect();
-ircg_register_format_messages();
-ircg_set_current();
-ircg_set_file();
-ircg_set_on_die();
-ircg_topic();
-ircg_who();
-ircg_whois();
-dbase_add_record();
-dbase_close();
-dbase_create();
-dbase_delete_record();
-dbase_get_header_info();
-dbase_get_record_with_names();
-dbase_get_record();
-dbase_numfields();
-dbase_numrecords();
-dbase_open();
-dbase_pack();
-dbase_replace_record();
-dbx_close();
-dbx_compare();
-dbx_connect();
-dbx_error();
-dbx_escape_string();
-dbx_fetch_row();
-dbx_query();
-dbx_sort();
-fbsql_affected_rows();
-fbsql_autocommit();
-fbsql_blob_size();
-fbsql_change_user();
-fbsql_clob_size();
-fbsql_close();
-fbsql_commit();
-fbsql_connect();
-fbsql_create_blob();
-fbsql_create_clob();
-fbsql_create_db();
-fbsql_data_seek();
-fbsql_database_password();
-fbsql_database();
-fbsql_db_query();
-fbsql_db_status();
-fbsql_drop_db();
-fbsql_errno();
-fbsql_error();
-fbsql_fetch_array();
-fbsql_fetch_assoc();
-fbsql_fetch_field();
-fbsql_fetch_lengths();
-fbsql_fetch_object();
-fbsql_fetch_row();
-fbsql_field_flags();
-fbsql_field_len();
-fbsql_field_name();
-fbsql_field_seek();
-fbsql_field_table();
-fbsql_field_type();
-fbsql_free_result();
-fbsql_get_autostart_info();
-fbsql_hostname();
-fbsql_insert_id();
-fbsql_list_dbs();
-fbsql_list_fields();
-fbsql_list_tables();
-fbsql_next_result();
-fbsql_num_fields();
-fbsql_num_rows();
-fbsql_password();
-fbsql_pconnect();
-fbsql_query();
-fbsql_read_blob();
-fbsql_read_clob();
-fbsql_result();
-fbsql_rollback();
-fbsql_rows_fetched();
-fbsql_select_db();
-fbsql_set_characterset();
-fbsql_set_lob_mode();
-fbsql_set_password();
-fbsql_set_transaction();
-fbsql_start_db();
-fbsql_stop_db();
-fbsql_table_name();
-fbsql_tablename();
-fbsql_username();
-fbsql_warnings();
-filepro_fieldcount();
-filepro_fieldname();
-filepro_fieldtype();
-filepro_fieldwidth();
-filepro_retrieve();
-filepro_rowcount();
-filepro();
-ingres_autocommit();
-ingres_close();
-ingres_commit();
-ingres_connect();
-ingres_fetch_array();
-ingres_fetch_object();
-ingres_fetch_row();
-ingres_field_length();
-ingres_field_name();
-ingres_field_nullable();
-ingres_field_precision();
-ingres_field_scale();
-ingres_field_type();
-ingres_num_fields();
-ingres_num_rows();
-ingres_pconnect();
-ingres_query();
-ingres_rollback();
-msql_affected_rows();
-msql_close();
-msql_connect();
-msql_create_db();
-msql_createdb();
-msql_data_seek();
-msql_db_query();
-msql_dbname();
-msql_drop_db();
-msql_error();
-msql_fetch_array();
-msql_fetch_field();
-msql_fetch_object();
-msql_fetch_row();
-msql_field_flags();
-msql_field_len();
-msql_field_name();
-msql_field_seek();
-msql_field_table();
-msql_field_type();
-msql_fieldflags();
-msql_fieldlen();
-msql_fieldname();
-msql_fieldtable();
-msql_fieldtype();
-msql_free_result();
-msql_list_dbs();
-msql_list_fields();
-msql_list_tables();
-msql_num_fields();
-msql_num_rows();
-msql_numfields();
-msql_numrows();
-msql_pconnect();
-msql_query();
-msql_regcase();
-msql_result();
-msql_select_db();
-msql_tablename();
-msql();
-mssql_bind();
-mssql_close();
-mssql_connect();
-mssql_data_seek();
-mssql_execute();
-mssql_fetch_array();
-mssql_fetch_assoc();
-mssql_fetch_batch();
-mssql_fetch_field();
-mssql_fetch_object();
-mssql_fetch_row();
-mssql_field_length();
-mssql_field_name();
-mssql_field_seek();
-mssql_field_type();
-mssql_free_result();
-mssql_free_statement();
-mssql_get_last_message();
-mssql_guid_string();
-mssql_init();
-mssql_min_error_severity();
-mssql_min_message_severity();
-mssql_next_result();
-mssql_num_fields();
-mssql_num_rows();
-mssql_pconnect();
-mssql_query();
-mssql_result();
-mssql_rows_affected();
-mssql_select_db();
-sqlite_array_query();
-sqlite_busy_timeout();
-sqlite_changes();
-sqlite_close();
-sqlite_column();
-sqlite_create_aggregate();
-sqlite_create_function();
-sqlite_current();
-sqlite_error_string();
-sqlite_escape_string();
-sqlite_exec();
-sqlite_factory();
-sqlite_fetch_all();
-sqlite_fetch_array();
-sqlite_fetch_column_types();
-sqlite_fetch_object();
-sqlite_fetch_single();
-sqlite_fetch_string();
-sqlite_field_name();
-sqlite_has_more();
-sqlite_has_prev();
-sqlite_key();
-sqlite_last_error();
-sqlite_last_insert_rowid();
-sqlite_libencoding();
-sqlite_libversion();
-sqlite_next();
-sqlite_num_fields();
-sqlite_num_rows();
-sqlite_open();
-sqlite_popen();
-sqlite_prev();
-sqlite_query();
-sqlite_rewind();
-sqlite_seek();
-sqlite_single_query();
-sqlite_udf_decode_binary();
-sqlite_udf_encode_binary();
-sqlite_unbuffered_query();
-sqlite_valid();
-mysql_affected_rows();
-mysql_client_encoding();
-mysql_close();
-mysql_connect();
-mysql_create_db();
-mysql_data_seek();
-mysql_db_name();
-mysql_drop_db();
-mysql_errno();
-mysql_error();
-mysql_fetch_array();
-mysql_fetch_assoc();
-mysql_fetch_field();
-mysql_fetch_lengths();
-mysql_fetch_object();
-mysql_fetch_row();
-mysql_field_flags();
-mysql_field_len();
-mysql_field_name();
-mysql_field_seek();
-mysql_field_table();
-mysql_field_type();
-mysql_free_result();
-mysql_get_client_info();
-mysql_get_host_info();
-mysql_get_proto_info();
-mysql_get_server_info();
-mysql_info();
-mysql_insert_id();
-mysql_list_fields();
-mysql_list_processes();
-mysql_list_tables();
-mysql_num_fields();
-mysql_num_rows();
-mysql_pconnect();
-mysql_ping();
-mysql_query();
-mysql_real_escape_string();
-mysql_result();
-mysql_select_db();
-mysql_set_charset();
-mysql_stat();
-mysql_tablename();
-mysql_thread_id();
-mysql_unbuffered_query();
-mysql();
-mysql_fieldname();
-mysql_fieldtable();
-mysql_fieldlen();
-mysql_fieldtype();
-mysql_fieldflags();
-mysql_selectdb();
-mysql_createdb();
-mysql_dropdb();
-mysql_freeresult();
-mysql_numfields();
-mysql_numrows();
-mysql_listdbs();
-mysql_listtables();
-mysql_listfields();
-mysql_dbname();
-mysql_table_name();
-
-// PHP 7.4 ibase extension aliases.
-fbird_add_user();
-fbird_affected_rows();
-fbird_backup();
-fbird_blob_add();
-fbird_blob_cancel();
-fbird_blob_close();
-fbird_blob_create();
-fbird_blob_echo();
-fbird_blob_get();
-fbird_blob_import();
-fbird_blob_info();
-fbird_blob_open();
-fbird_close();
-fbird_commit_ret();
-fbird_commit();
-fbird_connect();
-fbird_db_info();
-fbird_delete_user();
-fbird_drop_db();
-fbird_errcode();
-fbird_errmsg();
-fbird_execute();
-fbird_fetch_assoc();
-fbird_fetch_object();
-fbird_fetch_row();
-fbird_field_info();
-fbird_free_event_handler();
-fbird_free_query();
-fbird_free_result();
-fbird_gen_id();
-fbird_maintain_db();
-fbird_modify_user();
-fbird_name_result();
-fbird_num_fields();
-fbird_num_params();
-fbird_param_info();
-fbird_pconnect();
-fbird_prepare();
-fbird_query();
-fbird_restore();
-fbird_rollback_ret();
-fbird_rollback();
-fbird_server_info();
-fbird_service_attach();
-fbird_service_detach();
-fbird_set_event_handler();
-fbird_trans();
-fbird_wait_event();
-
-ovrimos_close();
-ovrimos_commit();
-ovrimos_connect();
-ovrimos_cursor();
-ovrimos_exec();
-ovrimos_execute();
-ovrimos_fetch_into();
-ovrimos_fetch_row();
-ovrimos_field_len();
-ovrimos_field_name();
-ovrimos_field_num();
-ovrimos_field_type();
-ovrimos_free_result();
-ovrimos_longreadlen();
-ovrimos_num_fields();
-ovrimos_num_rows();
-ovrimos_prepare();
-ovrimos_result_all();
-ovrimos_result();
-ovrimos_rollback();
-ovrimos_close_all();
-
-ora_bind();
-ora_close();
-ora_columnname();
-ora_columnsize();
-ora_columntype();
-ora_commit();
-ora_commitoff();
-ora_commiton();
-ora_do();
-ora_error();
-ora_errorcode();
-ora_exec();
-ora_fetch_into();
-ora_fetch();
-ora_getcolumn();
-ora_logoff();
-ora_logon();
-ora_numcols();
-ora_numrows();
-ora_open();
-ora_parse();
-ora_plogon();
-ora_rollback();
-sybase_affected_rows();
-sybase_close();
-sybase_connect();
-sybase_data_seek();
-sybase_deadlock_retry_count();
-sybase_fetch_array();
-sybase_fetch_assoc();
-sybase_fetch_field();
-sybase_fetch_object();
-sybase_fetch_row();
-sybase_field_seek();
-sybase_free_result();
-sybase_get_last_message();
-sybase_min_client_severity();
-sybase_min_error_severity();
-sybase_min_message_severity();
-sybase_min_server_severity();
-sybase_num_fields();
-sybase_num_rows();
-sybase_pconnect();
-sybase_query();
-sybase_result();
-sybase_select_db();
-sybase_set_message_handler();
-sybase_unbuffered_query();
-ifx_affected_rows();
-ifx_blobinfile_mode();
-ifx_byteasvarchar();
-ifx_close();
-ifx_connect();
-ifx_copy_blob();
-ifx_create_blob();
-ifx_create_char();
-ifx_do();
-ifx_error();
-ifx_errormsg();
-ifx_fetch_row();
-ifx_fieldproperties();
-ifx_fieldtypes();
-ifx_free_blob();
-ifx_free_char();
-ifx_free_result();
-ifx_get_blob();
-ifx_get_char();
-ifx_getsqlca();
-ifx_htmltbl_result();
-ifx_nullformat();
-ifx_num_fields();
-ifx_num_rows();
-ifx_pconnect();
-ifx_prepare();
-ifx_query();
-ifx_textasvarchar();
-ifx_update_blob();
-ifx_update_char();
-ifxus_close_slob();
-ifxus_create_slob();
-ifxus_free_slob();
-ifxus_open_slob();
-ifxus_read_slob();
-ifxus_seek_slob();
-ifxus_tell_slob();
-ifxus_write_slob();
-mysqli_disable_reads_from_master();
-mysqli_disable_rpl_parse();
-mysqli_embedded_connect();
-mysqli_embedded_server_end();
-mysqli_embedded_server_start();
-mysqli_enable_reads_from_master();
-mysqli_enable_rpl_parse();
-mysqli_master_query();
-mysqli_resource();
-mysqli_rpl_parse_enabled();
-mysqli_rpl_probe();
-mysqli_server_end();
-mysqli_server_init();
-mysqli_slave_query();
-xmlrpc_decode_request();
-xmlrpc_decode();
-xmlrpc_encode_request();
-xmlrpc_encode();
-xmlrpc_get_type();
-xmlrpc_is_fault();
-xmlrpc_parse_method_descriptions();
-xmlrpc_server_add_introspection_data();
-xmlrpc_server_call_method();
-xmlrpc_server_create();
-xmlrpc_server_destroy();
-xmlrpc_server_register_introspection_callback();
-xmlrpc_server_register_method();
-xmlrpc_set_type();
-enchant_broker_get_dict_path();
-enchant_broker_set_dict_path();
-enchant_broker_free();
-enchant_broker_free_dict();
-enchant_dict_add_to_personal();
-enchant_dict_is_in_session();
-oci_internal_debug();
-zip_close();
-zip_entry_close();
-zip_entry_compressedsize();
-zip_entry_compressionmethod();
-zip_entry_filesize();
-zip_entry_name();
-zip_entry_open();
-zip_entry_read();
-zip_open();
-zip_read();
-openssl_x509_free();
-openssl_pkey_free();
-libxml_disable_entity_loader();
-pg_clientencoding();
-pg_cmdtuples();
-pg_errormessage();
-pg_fieldname();
-pg_fieldnum();
-pg_fieldisnull();
-pg_fieldprtlen();
-pg_fieldsize();
-pg_fieldtype();
-pg_freeresult();
-pg_getlastoid();
-pg_loclose();
-pg_locreate();
-pg_loexport();
-pg_loimport();
-pg_loopen();
-pg_loread();
-pg_loreadall();
-pg_lounlink();
-pg_lowrite();
-pg_numfields();
-pg_numrows();
-pg_result();
-pg_setclientencoding();
-imap_header();
-shmop_close();
-openssl_free_key();
-date_sunrise();
-date_sunset();
-strptime();
-strftime();
-gmstrftime();
-mhash_count();
-mhash_get_block_size();
-mhash_get_hash_name();
-mhash_keygen_s2k();
-mhash();
-odbc_result_all();
-
-// Prevent false positives on PHP 8.0+ nullsafe method calls.
-$obj?->php_check_syntax(); // OK.
diff --git a/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php b/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php
deleted file mode 100644
index bcc09de2..00000000
--- a/PHPCompatibility/Tests/FunctionUse/RemovedFunctionsUnitTest.php
+++ /dev/null
@@ -1,1553 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\FunctionUse;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedFunctions sniff.
- *
- * @group removedFunctions
- * @group functionUse
- *
- * @covers \PHPCompatibility\Sniffs\FunctionUse\RemovedFunctionsSniff
- *
- * @since 5.5
- */
-class RemovedFunctionsUnitTest extends BaseSniffTest
-{
-
-    /**
-     * testDeprecatedFunction
-     *
-     * @dataProvider dataDeprecatedFunction
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedFunction($functionName, $deprecatedIn, $lines, $okVersion, $deprecatedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedFunction()
-     *
-     * @return array
-     */
-    public function dataDeprecatedFunction()
-    {
-        return [
-            ['dl', '5.3', [6], '5.2'],
-            ['ocifetchinto', '5.4', [63], '5.3'],
-            ['enchant_broker_get_dict_path', '8.0', [1172], '7.4'],
-            ['enchant_broker_set_dict_path', '8.0', [1173], '7.4'],
-            ['libxml_disable_entity_loader', '8.0', [1191], '7.4'],
-            ['openssl_x509_free', '8.0', [1189], '7.4'],
-            ['openssl_pkey_free', '8.0', [1190], '7.4'],
-            ['shmop_close', '8.0', [1217], '7.4'],
-            ['openssl_free_key', '8.0', [1218], '7.4'],
-            ['odbc_result_all', '8.1', [1229], '8.0'],
-        ];
-    }
-
-
-    /**
-     * testDeprecatedFunctionWithAlternative
-     *
-     * @dataProvider dataDeprecatedFunctionWithAlternative
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param string $alternative       An alternative function.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedFunctionWithAlternative($functionName, $deprecatedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedFunctionWithAlternative()
-     *
-     * @return array
-     */
-    public function dataDeprecatedFunctionWithAlternative()
-    {
-        return [
-            ['ocibindbyname', '5.4', 'oci_bind_by_name()', [41], '5.3'],
-            ['ocicancel', '5.4', 'oci_cancel()', [42], '5.3'],
-            ['ocicloselob', '5.4', 'OCI-Lob::close() / OCILob::close() (PHP 8+)', [43], '5.3'],
-            ['ocicollappend', '5.4', 'OCI-Collection::append() / OCICollection::append() (PHP 8+)', [44], '5.3'],
-            ['ocicollassign', '5.4', 'OCI-Collection::assign() / OCICollection::assign() (PHP 8+)', [45], '5.3'],
-            ['ocicollassignelem', '5.4', 'OCI-Collection::assignElem() / OCICollection::assignElem() (PHP 8+)', [46], '5.3'],
-            ['ocicollgetelem', '5.4', 'OCI-Collection::getElem() / OCICollection::getElem() (PHP 8+)', [47], '5.3'],
-            ['ocicollmax', '5.4', 'OCI-Collection::max() / OCICollection::max() (PHP 8+)', [48], '5.3'],
-            ['ocicollsize', '5.4', 'OCI-Collection::size() / OCICollection::size() (PHP 8+)', [49], '5.3'],
-            ['ocicolltrim', '5.4', 'OCI-Collection::trim() / OCICollection::trim() (PHP 8+)', [50], '5.3'],
-            ['ocicolumnisnull', '5.4', 'oci_field_is_null()', [51], '5.3'],
-            ['ocicolumnname', '5.4', 'oci_field_name()', [52], '5.3'],
-            ['ocicolumnprecision', '5.4', 'oci_field_precision()', [53], '5.3'],
-            ['ocicolumnscale', '5.4', 'oci_field_scale()', [54], '5.3'],
-            ['ocicolumnsize', '5.4', 'oci_field_size()', [55], '5.3'],
-            ['ocicolumntype', '5.4', 'oci_field_type()', [56], '5.3'],
-            ['ocicolumntyperaw', '5.4', 'oci_field_type_raw()', [57], '5.3'],
-            ['ocicommit', '5.4', 'oci_commit()', [58], '5.3'],
-            ['ocidefinebyname', '5.4', 'oci_define_by_name()', [59], '5.3'],
-            ['ocierror', '5.4', 'oci_error()', [60], '5.3'],
-            ['ociexecute', '5.4', 'oci_execute()', [61], '5.3'],
-            ['ocifetch', '5.4', 'oci_fetch()', [62], '5.3'],
-            ['ocifetchstatement', '5.4', 'oci_fetch_all()', [64], '5.3'],
-            ['ocifreecollection', '5.4', 'OCI-Collection::free() / OCICollection::free() (PHP 8+)', [65], '5.3'],
-            ['ocifreecursor', '5.4', 'oci_free_statement()', [66], '5.3'],
-            ['ocifreedesc', '5.4', 'OCI-Lob::free() / OCILob::free() (PHP 8+)', [67], '5.3'],
-            ['ocifreestatement', '5.4', 'oci_free_statement()', [68], '5.3'],
-            ['ociloadlob', '5.4', 'OCI-Lob::load() / OCILob::load() (PHP 8+)', [70], '5.3'],
-            ['ocilogoff', '5.4', 'oci_close()', [71], '5.3'],
-            ['ocilogon', '5.4', 'oci_connect()', [72], '5.3'],
-            ['ocinewcollection', '5.4', 'oci_new_collection()', [73], '5.3'],
-            ['ocinewcursor', '5.4', 'oci_new_cursor()', [74], '5.3'],
-            ['ocinewdescriptor', '5.4', 'oci_new_descriptor()', [75], '5.3'],
-            ['ocinlogon', '5.4', 'oci_new_connect()', [76], '5.3'],
-            ['ocinumcols', '5.4', 'oci_num_fields()', [77], '5.3'],
-            ['ociparse', '5.4', 'oci_parse()', [78], '5.3'],
-            ['ociplogon', '5.4', 'oci_pconnect()', [79], '5.3'],
-            ['ociresult', '5.4', 'oci_result()', [80], '5.3'],
-            ['ocirollback', '5.4', 'oci_rollback()', [81], '5.3'],
-            ['ocirowcount', '5.4', 'oci_num_rows()', [82], '5.3'],
-            ['ocisavelob', '5.4', 'OCI-Lob::save() / OCILob::save() (PHP 8+)', [83], '5.3'],
-            ['ocisavelobfile', '5.4', 'OCI-Lob::import() / OCILob::import() (PHP 8+)', [84], '5.3'],
-            ['ociserverversion', '5.4', 'oci_server_version()', [85], '5.3'],
-            ['ocisetprefetch', '5.4', 'oci_set_prefetch()', [86], '5.3'],
-            ['ocistatementtype', '5.4', 'oci_statement_type()', [87], '5.3'],
-            ['ociwritelobtofile', '5.4', 'OCI-Lob::export() / OCILob::export() (PHP 8+)', [88], '5.3'],
-            ['ociwritetemporarylob', '5.4', 'OCI-Lob::writeTemporary() / OCILob::writeTemporary() (PHP 8+)', [89], '5.3'],
-
-            ['__autoload', '7.2', 'SPL autoload', [589], '7.1'],
-            ['is_real', '7.4', 'is_float()', [239], '7.3'],
-
-            ['enchant_broker_free', '8.0', 'unset the object', [1174], '7.4'],
-            ['enchant_broker_free_dict', '8.0', 'unset the object', [1175], '7.4'],
-            ['enchant_dict_add_to_personal', '8.0', 'enchant_dict_add()', [1176], '7.4'],
-            ['enchant_dict_is_in_session', '8.0', 'enchant_dict_is_added()', [1177], '7.4'],
-            ['zip_close', '8.0', 'ZipArchive::close()', [1179], '7.4'],
-            ['zip_entry_close', '8.0', 'ZipArchive', [1180], '7.4'],
-            ['zip_entry_compressedsize', '8.0', 'ZipArchive', [1181], '7.4'],
-            ['zip_entry_compressionmethod', '8.0', 'ZipArchive', [1182], '7.4'],
-            ['zip_entry_filesize', '8.0', 'ZipArchive', [1183], '7.4'],
-            ['zip_entry_name', '8.0', 'ZipArchive', [1184], '7.4'],
-            ['zip_entry_open', '8.0', 'ZipArchive', [1185], '7.4'],
-            ['zip_entry_read', '8.0', 'ZipArchive', [1186], '7.4'],
-            ['zip_open', '8.0', 'ZipArchive::open()', [1187], '7.4'],
-            ['zip_read', '8.0', 'ZipArchive', [1188], '7.4'],
-            ['pg_clientencoding', '8.0', 'pg_client_encoding()', [1192], '7.4'],
-            ['pg_cmdtuples', '8.0', 'pg_affected_rows()', [1193], '7.4'],
-            ['pg_errormessage', '8.0', 'pg_last_error()', [1194], '7.4'],
-            ['pg_fieldname', '8.0', 'pg_field_name()', [1195], '7.4'],
-            ['pg_fieldnum', '8.0', 'pg_field_num()', [1196], '7.4'],
-            ['pg_fieldisnull', '8.0', 'pg_field_is_null()', [1197], '7.4'],
-            ['pg_fieldprtlen', '8.0', 'pg_field_prtlen()', [1198], '7.4'],
-            ['pg_fieldsize', '8.0', 'pg_field_size()', [1199], '7.4'],
-            ['pg_fieldtype', '8.0', 'pg_field_type()', [1200], '7.4'],
-            ['pg_freeresult', '8.0', 'pg_free_result()', [1201], '7.4'],
-            ['pg_getlastoid', '8.0', 'pg_last_oid()', [1202], '7.4'],
-            ['pg_loclose', '8.0', 'pg_lo_close()', [1203], '7.4'],
-            ['pg_locreate', '8.0', 'pg_lo_create()', [1204], '7.4'],
-            ['pg_loexport', '8.0', 'pg_lo_export()', [1205], '7.4'],
-            ['pg_loimport', '8.0', 'pg_lo_import()', [1206], '7.4'],
-            ['pg_loopen', '8.0', 'pg_lo_open()', [1207], '7.4'],
-            ['pg_loread', '8.0', 'pg_lo_read()', [1208], '7.4'],
-            ['pg_loreadall', '8.0', 'pg_lo_read_all()', [1209], '7.4'],
-            ['pg_lounlink', '8.0', 'pg_lo_unlink()', [1210], '7.4'],
-            ['pg_lowrite', '8.0', 'pg_lo_write()', [1211], '7.4'],
-            ['pg_numfields', '8.0', 'pg_num_fields()', [1212], '7.4'],
-            ['pg_numrows', '8.0', 'pg_num_rows()', [1213], '7.4'],
-            ['pg_result', '8.0', 'pg_fetch_result()', [1214], '7.4'],
-            ['pg_setclientencoding', '8.0', 'pg_set_client_encoding()', [1215], '7.4'],
-
-            ['date_sunrise', '8.1', 'date_sun_info()', [1219], '8.0'],
-            ['date_sunset', '8.1', 'date_sun_info()', [1220], '8.0'],
-            ['strptime', '8.1', 'date_parse_from_format() or IntlDateFormatter::parse()', [1221], '8.0'],
-            ['strftime', '8.1', 'date() or IntlDateFormatter::format()', [1222], '8.0'],
-            ['gmstrftime', '8.1', 'date() or IntlDateFormatter::format()', [1223], '8.0'],
-            ['mhash_count', '8.1', 'the hash_*() functions', [1224], '8.0'],
-            ['mhash_get_block_size', '8.1', 'the hash_*() functions', [1225], '8.0'],
-            ['mhash_get_hash_name', '8.1', 'the hash_*() functions', [1226], '8.0'],
-            ['mhash_keygen_s2k', '8.1', 'the hash_*() functions', [1227], '8.0'],
-            ['mhash', '8.1', 'the hash_*() functions', [1228], '8.0'],
-        ];
-    }
-
-
-    /**
-     * testRemovedFunction
-     *
-     * @dataProvider dataRemovedFunction
-     *
-     * @param string $functionName   Name of the function.
-     * @param string $removedIn      The PHP version in which the function was removed.
-     * @param array  $lines          The line numbers in the test file which apply to this function.
-     * @param string $okVersion      A PHP version in which the function was still valid.
-     * @param string $removedVersion Optional PHP version to test removed message with -
-     *                               if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testRemovedFunction($functionName, $removedIn, $lines, $okVersion, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is removed since PHP {$removedIn}";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedFunction()
-     *
-     * @return array
-     */
-    public function dataRemovedFunction()
-    {
-        return [
-            ['crack_check', '5.0', [592], '4.4'],
-            ['crack_closedict', '5.0', [593], '4.4'],
-            ['crack_getlastmessage', '5.0', [594], '4.4'],
-            ['crack_opendict', '5.0', [595], '4.4'],
-
-            ['pfpro_cleanup', '5.1', [221], '5.0'],
-            ['pfpro_init', '5.1', [222], '5.0'],
-            ['pfpro_process_raw', '5.1', [223], '5.0'],
-            ['pfpro_process', '5.1', [224], '5.0'],
-            ['pfpro_version', '5.1', [225], '5.0'],
-            ['m_checkstatus', '5.1', [417], '5.0'],
-            ['m_completeauthorizations', '5.1', [418], '5.0'],
-            ['m_connect', '5.1', [419], '5.0'],
-            ['m_connectionerror', '5.1', [420], '5.0'],
-            ['m_deletetrans', '5.1', [421], '5.0'],
-            ['m_destroyconn', '5.1', [422], '5.0'],
-            ['m_destroyengine', '5.1', [423], '5.0'],
-            ['m_getcell', '5.1', [424], '5.0'],
-            ['m_getcellbynum', '5.1', [425], '5.0'],
-            ['m_getcommadelimited', '5.1', [426], '5.0'],
-            ['m_getheader', '5.1', [427], '5.0'],
-            ['m_initconn', '5.1', [428], '5.0'],
-            ['m_initengine', '5.1', [429], '5.0'],
-            ['m_iscommadelimited', '5.1', [430], '5.0'],
-            ['m_maxconntimeout', '5.1', [431], '5.0'],
-            ['m_monitor', '5.1', [432], '5.0'],
-            ['m_numcolumns', '5.1', [433], '5.0'],
-            ['m_numrows', '5.1', [434], '5.0'],
-            ['m_parsecommadelimited', '5.1', [435], '5.0'],
-            ['m_responsekeys', '5.1', [436], '5.0'],
-            ['m_responseparam', '5.1', [437], '5.0'],
-            ['m_returnstatus', '5.1', [438], '5.0'],
-            ['m_setblocking', '5.1', [439], '5.0'],
-            ['m_setdropfile', '5.1', [440], '5.0'],
-            ['m_setip', '5.1', [441], '5.0'],
-            ['m_setssl_cafile', '5.1', [442], '5.0'],
-            ['m_setssl_files', '5.1', [443], '5.0'],
-            ['m_setssl', '5.1', [444], '5.0'],
-            ['m_settimeout', '5.1', [445], '5.0'],
-            ['m_sslcert_gen_hash', '5.1', [446], '5.0'],
-            ['m_transactionssent', '5.1', [447], '5.0'],
-            ['m_transinqueue', '5.1', [448], '5.0'],
-            ['m_transkeyval', '5.1', [449], '5.0'],
-            ['m_transnew', '5.1', [450], '5.0'],
-            ['m_transsend', '5.1', [451], '5.0'],
-            ['m_uwait', '5.1', [452], '5.0'],
-            ['m_validateidentifier', '5.1', [453], '5.0'],
-            ['m_verifyconnection', '5.1', [454], '5.0'],
-            ['m_verifysslcert', '5.1', [455], '5.0'],
-            ['dio_close', '5.1', [458], '5.0'],
-            ['dio_fcntl', '5.1', [459], '5.0'],
-            ['dio_open', '5.1', [460], '5.0'],
-            ['dio_read', '5.1', [461], '5.0'],
-            ['dio_seek', '5.1', [462], '5.0'],
-            ['dio_stat', '5.1', [463], '5.0'],
-            ['dio_tcsetattr', '5.1', [464], '5.0'],
-            ['dio_truncate', '5.1', [465], '5.0'],
-            ['dio_write', '5.1', [466], '5.0'],
-            ['fam_cancel_monitor', '5.1', [514], '5.0'],
-            ['fam_close', '5.1', [515], '5.0'],
-            ['fam_monitor_collection', '5.1', [516], '5.0'],
-            ['fam_monitor_directory', '5.1', [517], '5.0'],
-            ['fam_monitor_file', '5.1', [518], '5.0'],
-            ['fam_next_event', '5.1', [519], '5.0'],
-            ['fam_open', '5.1', [520], '5.0'],
-            ['fam_pending', '5.1', [521], '5.0'],
-            ['fam_resume_monitor', '5.1', [522], '5.0'],
-            ['fam_suspend_monitor', '5.1', [523], '5.0'],
-            ['yp_all', '5.1', [532], '5.0'],
-            ['yp_cat', '5.1', [533], '5.0'],
-            ['yp_err_string', '5.1', [534], '5.0'],
-            ['yp_errno', '5.1', [535], '5.0'],
-            ['yp_first', '5.1', [536], '5.0'],
-            ['yp_get_default_domain', '5.1', [537], '5.0'],
-            ['yp_master', '5.1', [538], '5.0'],
-            ['yp_match', '5.1', [539], '5.0'],
-            ['yp_next', '5.1', [540], '5.0'],
-            ['yp_order', '5.1', [541], '5.0'],
-            ['udm_add_search_limit', '5.1', [544], '5.0'],
-            ['udm_alloc_agent_array', '5.1', [545], '5.0'],
-            ['udm_alloc_agent', '5.1', [546], '5.0'],
-            ['udm_api_version', '5.1', [547], '5.0'],
-            ['udm_cat_list', '5.1', [548], '5.0'],
-            ['udm_cat_path', '5.1', [549], '5.0'],
-            ['udm_check_charset', '5.1', [550], '5.0'],
-            ['udm_clear_search_limits', '5.1', [551], '5.0'],
-            ['udm_crc32', '5.1', [552], '5.0'],
-            ['udm_errno', '5.1', [553], '5.0'],
-            ['udm_error', '5.1', [554], '5.0'],
-            ['udm_find', '5.1', [555], '5.0'],
-            ['udm_free_agent', '5.1', [556], '5.0'],
-            ['udm_free_ispell_data', '5.1', [557], '5.0'],
-            ['udm_free_res', '5.1', [558], '5.0'],
-            ['udm_get_doc_count', '5.1', [559], '5.0'],
-            ['udm_get_res_field', '5.1', [560], '5.0'],
-            ['udm_get_res_param', '5.1', [561], '5.0'],
-            ['udm_hash32', '5.1', [562], '5.0'],
-            ['udm_load_ispell_data', '5.1', [563], '5.0'],
-            ['udm_set_agent_param', '5.1', [564], '5.0'],
-            ['w32api_deftype', '5.1', [598], '5.0'],
-            ['w32api_init_dtype', '5.1', [599], '5.0'],
-            ['w32api_invoke_function', '5.1', [600], '5.0'],
-            ['w32api_register_function', '5.1', [601], '5.0'],
-            ['w32api_set_call_method', '5.1', [602], '5.0'],
-            ['cpdf_add_annotation', '5.1', [605], '5.0'],
-            ['cpdf_add_outline', '5.1', [606], '5.0'],
-            ['cpdf_arc', '5.1', [607], '5.0'],
-            ['cpdf_begin_text', '5.1', [608], '5.0'],
-            ['cpdf_circle', '5.1', [609], '5.0'],
-            ['cpdf_clip', '5.1', [610], '5.0'],
-            ['cpdf_close', '5.1', [611], '5.0'],
-            ['cpdf_closepath_fill_stroke', '5.1', [612], '5.0'],
-            ['cpdf_closepath_stroke', '5.1', [613], '5.0'],
-            ['cpdf_closepath', '5.1', [614], '5.0'],
-            ['cpdf_continue_text', '5.1', [615], '5.0'],
-            ['cpdf_curveto', '5.1', [616], '5.0'],
-            ['cpdf_end_text', '5.1', [617], '5.0'],
-            ['cpdf_fill_stroke', '5.1', [618], '5.0'],
-            ['cpdf_fill', '5.1', [619], '5.0'],
-            ['cpdf_finalize_page', '5.1', [620], '5.0'],
-            ['cpdf_finalize', '5.1', [621], '5.0'],
-            ['cpdf_global_set_document_limits', '5.1', [622], '5.0'],
-            ['cpdf_import_jpeg', '5.1', [623], '5.0'],
-            ['cpdf_lineto', '5.1', [624], '5.0'],
-            ['cpdf_moveto', '5.1', [625], '5.0'],
-            ['cpdf_newpath', '5.1', [626], '5.0'],
-            ['cpdf_open', '5.1', [627], '5.0'],
-            ['cpdf_output_buffer', '5.1', [628], '5.0'],
-            ['cpdf_page_init', '5.1', [629], '5.0'],
-            ['cpdf_place_inline_image', '5.1', [630], '5.0'],
-            ['cpdf_rect', '5.1', [631], '5.0'],
-            ['cpdf_restore', '5.1', [632], '5.0'],
-            ['cpdf_rlineto', '5.1', [633], '5.0'],
-            ['cpdf_rmoveto', '5.1', [634], '5.0'],
-            ['cpdf_rotate_text', '5.1', [635], '5.0'],
-            ['cpdf_rotate', '5.1', [636], '5.0'],
-            ['cpdf_save_to_file', '5.1', [637], '5.0'],
-            ['cpdf_save', '5.1', [638], '5.0'],
-            ['cpdf_scale', '5.1', [639], '5.0'],
-            ['cpdf_set_action_url', '5.1', [640], '5.0'],
-            ['cpdf_set_char_spacing', '5.1', [641], '5.0'],
-            ['cpdf_set_creator', '5.1', [642], '5.0'],
-            ['cpdf_set_current_page', '5.1', [643], '5.0'],
-            ['cpdf_set_font_directories', '5.1', [644], '5.0'],
-            ['cpdf_set_font_map_file', '5.1', [645], '5.0'],
-            ['cpdf_set_font', '5.1', [646], '5.0'],
-            ['cpdf_set_horiz_scaling', '5.1', [647], '5.0'],
-            ['cpdf_set_keywords', '5.1', [648], '5.0'],
-            ['cpdf_set_leading', '5.1', [649], '5.0'],
-            ['cpdf_set_page_animation', '5.1', [650], '5.0'],
-            ['cpdf_set_subject', '5.1', [651], '5.0'],
-            ['cpdf_set_text_matrix', '5.1', [652], '5.0'],
-            ['cpdf_set_text_pos', '5.1', [653], '5.0'],
-            ['cpdf_set_text_rendering', '5.1', [654], '5.0'],
-            ['cpdf_set_text_rise', '5.1', [655], '5.0'],
-            ['cpdf_set_title', '5.1', [656], '5.0'],
-            ['cpdf_set_viewer_preferences', '5.1', [657], '5.0'],
-            ['cpdf_set_word_spacing', '5.1', [658], '5.0'],
-            ['cpdf_setdash', '5.1', [659], '5.0'],
-            ['cpdf_setflat', '5.1', [660], '5.0'],
-            ['cpdf_setgray_fill', '5.1', [661], '5.0'],
-            ['cpdf_setgray_stroke', '5.1', [662], '5.0'],
-            ['cpdf_setgray', '5.1', [663], '5.0'],
-            ['cpdf_setlinecap', '5.1', [664], '5.0'],
-            ['cpdf_setlinejoin', '5.1', [665], '5.0'],
-            ['cpdf_setlinewidth', '5.1', [666], '5.0'],
-            ['cpdf_setmiterlimit', '5.1', [667], '5.0'],
-            ['cpdf_setrgbcolor_fill', '5.1', [668], '5.0'],
-            ['cpdf_setrgbcolor_stroke', '5.1', [669], '5.0'],
-            ['cpdf_setrgbcolor', '5.1', [670], '5.0'],
-            ['cpdf_show_xy', '5.1', [671], '5.0'],
-            ['cpdf_show', '5.1', [672], '5.0'],
-            ['cpdf_stringwidth', '5.1', [673], '5.0'],
-            ['cpdf_stroke', '5.1', [674], '5.0'],
-            ['cpdf_text', '5.1', [675], '5.0'],
-            ['cpdf_translate', '5.1', [676], '5.0'],
-            ['ircg_channel_mode', '5.1', [677], '5.0'],
-            ['ircg_disconnect', '5.1', [678], '5.0'],
-            ['ircg_eval_ecmascript_params', '5.1', [679], '5.0'],
-            ['ircg_fetch_error_msg', '5.1', [680], '5.0'],
-            ['ircg_get_username', '5.1', [681], '5.0'],
-            ['ircg_html_encode', '5.1', [682], '5.0'],
-            ['ircg_ignore_add', '5.1', [683], '5.0'],
-            ['ircg_ignore_del', '5.1', [684], '5.0'],
-            ['ircg_invite', '5.1', [685], '5.0'],
-            ['ircg_is_conn_alive', '5.1', [686], '5.0'],
-            ['ircg_join', '5.1', [687], '5.0'],
-            ['ircg_kick', '5.1', [688], '5.0'],
-            ['ircg_list', '5.1', [689], '5.0'],
-            ['ircg_lookup_format_messages', '5.1', [690], '5.0'],
-            ['ircg_lusers', '5.1', [691], '5.0'],
-            ['ircg_msg', '5.1', [692], '5.0'],
-            ['ircg_names', '5.1', [693], '5.0'],
-            ['ircg_nick', '5.1', [694], '5.0'],
-            ['ircg_nickname_escape', '5.1', [695], '5.0'],
-            ['ircg_nickname_unescape', '5.1', [696], '5.0'],
-            ['ircg_notice', '5.1', [697], '5.0'],
-            ['ircg_oper', '5.1', [698], '5.0'],
-            ['ircg_part', '5.1', [699], '5.0'],
-            ['ircg_pconnect', '5.1', [700], '5.0'],
-            ['ircg_register_format_messages', '5.1', [701], '5.0'],
-            ['ircg_set_current', '5.1', [702], '5.0'],
-            ['ircg_set_file', '5.1', [703], '5.0'],
-            ['ircg_set_on_die', '5.1', [704], '5.0'],
-            ['ircg_topic', '5.1', [705], '5.0'],
-            ['ircg_who', '5.1', [706], '5.0'],
-            ['ircg_whois', '5.1', [707], '5.0'],
-            ['dbx_close', '5.1', [720], '5.0'],
-            ['dbx_compare', '5.1', [721], '5.0'],
-            ['dbx_connect', '5.1', [722], '5.0'],
-            ['dbx_error', '5.1', [723], '5.0'],
-            ['dbx_escape_string', '5.1', [724], '5.0'],
-            ['dbx_fetch_row', '5.1', [725], '5.0'],
-            ['dbx_query', '5.1', [726], '5.0'],
-            ['dbx_sort', '5.1', [727], '5.0'],
-            ['ingres_autocommit', '5.1', [795], '5.0'],
-            ['ingres_close', '5.1', [796], '5.0'],
-            ['ingres_commit', '5.1', [797], '5.0'],
-            ['ingres_connect', '5.1', [798], '5.0'],
-            ['ingres_fetch_array', '5.1', [799], '5.0'],
-            ['ingres_fetch_object', '5.1', [800], '5.0'],
-            ['ingres_fetch_row', '5.1', [801], '5.0'],
-            ['ingres_field_length', '5.1', [802], '5.0'],
-            ['ingres_field_name', '5.1', [803], '5.0'],
-            ['ingres_field_nullable', '5.1', [804], '5.0'],
-            ['ingres_field_precision', '5.1', [805], '5.0'],
-            ['ingres_field_scale', '5.1', [806], '5.0'],
-            ['ingres_field_type', '5.1', [807], '5.0'],
-            ['ingres_num_fields', '5.1', [808], '5.0'],
-            ['ingres_num_rows', '5.1', [809], '5.0'],
-            ['ingres_pconnect', '5.1', [810], '5.0'],
-            ['ingres_query', '5.1', [811], '5.0'],
-            ['ingres_rollback', '5.1', [812], '5.0'],
-            ['ovrimos_close', '5.1', [1036], '5.0'],
-            ['ovrimos_commit', '5.1', [1037], '5.0'],
-            ['ovrimos_connect', '5.1', [1038], '5.0'],
-            ['ovrimos_cursor', '5.1', [1039], '5.0'],
-            ['ovrimos_exec', '5.1', [1040], '5.0'],
-            ['ovrimos_execute', '5.1', [1041], '5.0'],
-            ['ovrimos_fetch_into', '5.1', [1042], '5.0'],
-            ['ovrimos_fetch_row', '5.1', [1043], '5.0'],
-            ['ovrimos_field_len', '5.1', [1044], '5.0'],
-            ['ovrimos_field_name', '5.1', [1045], '5.0'],
-            ['ovrimos_field_num', '5.1', [1046], '5.0'],
-            ['ovrimos_field_type', '5.1', [1047], '5.0'],
-            ['ovrimos_free_result', '5.1', [1048], '5.0'],
-            ['ovrimos_longreadlen', '5.1', [1049], '5.0'],
-            ['ovrimos_num_fields', '5.1', [1050], '5.0'],
-            ['ovrimos_num_rows', '5.1', [1051], '5.0'],
-            ['ovrimos_prepare', '5.1', [1052], '5.0'],
-            ['ovrimos_result_all', '5.1', [1053], '5.0'],
-            ['ovrimos_result', '5.1', [1054], '5.0'],
-            ['ovrimos_rollback', '5.1', [1055], '5.0'],
-            ['ovrimos_close_all', '5.1', [1056], '5.0'],
-            ['ora_bind', '5.1', [1058], '5.0'],
-            ['ora_close', '5.1', [1059], '5.0'],
-            ['ora_columnname', '5.1', [1060], '5.0'],
-            ['ora_columnsize', '5.1', [1061], '5.0'],
-            ['ora_columntype', '5.1', [1062], '5.0'],
-            ['ora_commit', '5.1', [1063], '5.0'],
-            ['ora_commitoff', '5.1', [1064], '5.0'],
-            ['ora_commiton', '5.1', [1065], '5.0'],
-            ['ora_do', '5.1', [1066], '5.0'],
-            ['ora_error', '5.1', [1067], '5.0'],
-            ['ora_errorcode', '5.1', [1068], '5.0'],
-            ['ora_exec', '5.1', [1069], '5.0'],
-            ['ora_fetch_into', '5.1', [1070], '5.0'],
-            ['ora_fetch', '5.1', [1071], '5.0'],
-            ['ora_getcolumn', '5.1', [1072], '5.0'],
-            ['ora_logoff', '5.1', [1073], '5.0'],
-            ['ora_logon', '5.1', [1074], '5.0'],
-            ['ora_numcols', '5.1', [1075], '5.0'],
-            ['ora_numrows', '5.1', [1076], '5.0'],
-            ['ora_open', '5.1', [1077], '5.0'],
-            ['ora_parse', '5.1', [1078], '5.0'],
-            ['ora_plogon', '5.1', [1079], '5.0'],
-            ['ora_rollback', '5.1', [1080], '5.0'],
-            ['mysqli_embedded_connect', '5.1', [1146], '5.0'],
-            ['mysqli_server_end', '5.1', [1155], '5.0'],
-            ['mysqli_server_init', '5.1', [1156], '5.0'],
-
-            ['msession_connect', '5.1.3', [567], '5.1', '5.2'],
-            ['msession_count', '5.1.3', [568], '5.1', '5.2'],
-            ['msession_create', '5.1.3', [569], '5.1', '5.2'],
-            ['msession_destroy', '5.1.3', [570], '5.1', '5.2'],
-            ['msession_disconnect', '5.1.3', [571], '5.1', '5.2'],
-            ['msession_find', '5.1.3', [572], '5.1', '5.2'],
-            ['msession_get_array', '5.1.3', [573], '5.1', '5.2'],
-            ['msession_get_data', '5.1.3', [574], '5.1', '5.2'],
-            ['msession_get', '5.1.3', [575], '5.1', '5.2'],
-            ['msession_inc', '5.1.3', [576], '5.1', '5.2'],
-            ['msession_list', '5.1.3', [577], '5.1', '5.2'],
-            ['msession_listvar', '5.1.3', [578], '5.1', '5.2'],
-            ['msession_lock', '5.1.3', [579], '5.1', '5.2'],
-            ['msession_plugin', '5.1.3', [580], '5.1', '5.2'],
-            ['msession_randstr', '5.1.3', [581], '5.1', '5.2'],
-            ['msession_set_array', '5.1.3', [582], '5.1', '5.2'],
-            ['msession_set_data', '5.1.3', [583], '5.1', '5.2'],
-            ['msession_set', '5.1.3', [584], '5.1', '5.2'],
-            ['msession_timeout', '5.1.3', [585], '5.1', '5.2'],
-            ['msession_uniq', '5.1.3', [586], '5.1', '5.2'],
-            ['msession_unlock', '5.1.3', [587], '5.1', '5.2'],
-
-            ['mysqli_resource', '5.1.4', [1152], '5.1', '5.2'],
-
-            ['mysql_createdb', '5.1.7', [975], '5.1', '5.2'],
-            ['mysql_dropdb', '5.1.7', [976], '5.1', '5.2'],
-            ['mysql_listtables', '5.1.7', [981], '5.1', '5.2'],
-
-            ['hwapi_attribute_new', '5.2', [526], '5.1'],
-            ['hwapi_content_new', '5.2', [527], '5.1'],
-            ['hwapi_hgcsp', '5.2', [528], '5.1'],
-            ['hwapi_object_new', '5.2', [529], '5.1'],
-            ['filepro_fieldcount', '5.2', [788], '5.1'],
-            ['filepro_fieldname', '5.2', [789], '5.1'],
-            ['filepro_fieldtype', '5.2', [790], '5.1'],
-            ['filepro_fieldwidth', '5.2', [791], '5.1'],
-            ['filepro_retrieve', '5.2', [792], '5.1'],
-            ['filepro_rowcount', '5.2', [793], '5.1'],
-            ['filepro', '5.2', [794], '5.1'],
-
-            ['ifx_affected_rows', '5.2.1', [1106], '5.2', '5.3'],
-            ['ifx_blobinfile_mode', '5.2.1', [1107], '5.2', '5.3'],
-            ['ifx_byteasvarchar', '5.2.1', [1108], '5.2', '5.3'],
-            ['ifx_close', '5.2.1', [1109], '5.2', '5.3'],
-            ['ifx_connect', '5.2.1', [1110], '5.2', '5.3'],
-            ['ifx_copy_blob', '5.2.1', [1111], '5.2', '5.3'],
-            ['ifx_create_blob', '5.2.1', [1112], '5.2', '5.3'],
-            ['ifx_create_char', '5.2.1', [1113], '5.2', '5.3'],
-            ['ifx_do', '5.2.1', [1114], '5.2', '5.3'],
-            ['ifx_error', '5.2.1', [1115], '5.2', '5.3'],
-            ['ifx_errormsg', '5.2.1', [1116], '5.2', '5.3'],
-            ['ifx_fetch_row', '5.2.1', [1117], '5.2', '5.3'],
-            ['ifx_fieldproperties', '5.2.1', [1118], '5.2', '5.3'],
-            ['ifx_fieldtypes', '5.2.1', [1119], '5.2', '5.3'],
-            ['ifx_free_blob', '5.2.1', [1120], '5.2', '5.3'],
-            ['ifx_free_char', '5.2.1', [1121], '5.2', '5.3'],
-            ['ifx_free_result', '5.2.1', [1122], '5.2', '5.3'],
-            ['ifx_get_blob', '5.2.1', [1123], '5.2', '5.3'],
-            ['ifx_get_char', '5.2.1', [1124], '5.2', '5.3'],
-            ['ifx_getsqlca', '5.2.1', [1125], '5.2', '5.3'],
-            ['ifx_htmltbl_result', '5.2.1', [1126], '5.2', '5.3'],
-            ['ifx_nullformat', '5.2.1', [1127], '5.2', '5.3'],
-            ['ifx_num_fields', '5.2.1', [1128], '5.2', '5.3'],
-            ['ifx_num_rows', '5.2.1', [1129], '5.2', '5.3'],
-            ['ifx_pconnect', '5.2.1', [1130], '5.2', '5.3'],
-            ['ifx_prepare', '5.2.1', [1131], '5.2', '5.3'],
-            ['ifx_query', '5.2.1', [1132], '5.2', '5.3'],
-            ['ifx_textasvarchar', '5.2.1', [1133], '5.2', '5.3'],
-            ['ifx_update_blob', '5.2.1', [1134], '5.2', '5.3'],
-            ['ifx_update_char', '5.2.1', [1135], '5.2', '5.3'],
-            ['ifxus_close_slob', '5.2.1', [1136], '5.2', '5.3'],
-            ['ifxus_create_slob', '5.2.1', [1137], '5.2', '5.3'],
-            ['ifxus_free_slob', '5.2.1', [1138], '5.2', '5.3'],
-            ['ifxus_open_slob', '5.2.1', [1139], '5.2', '5.3'],
-            ['ifxus_read_slob', '5.2.1', [1140], '5.2', '5.3'],
-            ['ifxus_seek_slob', '5.2.1', [1141], '5.2', '5.3'],
-            ['ifxus_tell_slob', '5.2.1', [1142], '5.2', '5.3'],
-            ['ifxus_write_slob', '5.2.1', [1143], '5.2', '5.3'],
-
-            ['ncurses_addch', '5.3', [255], '5.2'],
-            ['ncurses_addchnstr', '5.3', [256], '5.2'],
-            ['ncurses_addchstr', '5.3', [257], '5.2'],
-            ['ncurses_addnstr', '5.3', [258], '5.2'],
-            ['ncurses_addstr', '5.3', [259], '5.2'],
-            ['ncurses_assume_default_colors', '5.3', [260], '5.2'],
-            ['ncurses_attroff', '5.3', [261], '5.2'],
-            ['ncurses_attron', '5.3', [262], '5.2'],
-            ['ncurses_attrset', '5.3', [263], '5.2'],
-            ['ncurses_baudrate', '5.3', [264], '5.2'],
-            ['ncurses_beep', '5.3', [265], '5.2'],
-            ['ncurses_bkgd', '5.3', [266], '5.2'],
-            ['ncurses_bkgdset', '5.3', [267], '5.2'],
-            ['ncurses_border', '5.3', [268], '5.2'],
-            ['ncurses_bottom_panel', '5.3', [269], '5.2'],
-            ['ncurses_can_change_color', '5.3', [270], '5.2'],
-            ['ncurses_cbreak', '5.3', [271], '5.2'],
-            ['ncurses_clear', '5.3', [272], '5.2'],
-            ['ncurses_clrtobot', '5.3', [273], '5.2'],
-            ['ncurses_clrtoeol', '5.3', [274], '5.2'],
-            ['ncurses_color_content', '5.3', [275], '5.2'],
-            ['ncurses_color_set', '5.3', [276], '5.2'],
-            ['ncurses_curs_set', '5.3', [277], '5.2'],
-            ['ncurses_def_prog_mode', '5.3', [278], '5.2'],
-            ['ncurses_def_shell_mode', '5.3', [279], '5.2'],
-            ['ncurses_define_key', '5.3', [280], '5.2'],
-            ['ncurses_del_panel', '5.3', [281], '5.2'],
-            ['ncurses_delay_output', '5.3', [282], '5.2'],
-            ['ncurses_delch', '5.3', [283], '5.2'],
-            ['ncurses_deleteln', '5.3', [284], '5.2'],
-            ['ncurses_delwin', '5.3', [285], '5.2'],
-            ['ncurses_doupdate', '5.3', [286], '5.2'],
-            ['ncurses_echo', '5.3', [287], '5.2'],
-            ['ncurses_echochar', '5.3', [288], '5.2'],
-            ['ncurses_end', '5.3', [289], '5.2'],
-            ['ncurses_erase', '5.3', [290], '5.2'],
-            ['ncurses_erasechar', '5.3', [291], '5.2'],
-            ['ncurses_filter', '5.3', [292], '5.2'],
-            ['ncurses_flash', '5.3', [293], '5.2'],
-            ['ncurses_flushinp', '5.3', [294], '5.2'],
-            ['ncurses_getch', '5.3', [295], '5.2'],
-            ['ncurses_getmaxyx', '5.3', [296], '5.2'],
-            ['ncurses_getmouse', '5.3', [297], '5.2'],
-            ['ncurses_getyx', '5.3', [298], '5.2'],
-            ['ncurses_halfdelay', '5.3', [299], '5.2'],
-            ['ncurses_has_colors', '5.3', [300], '5.2'],
-            ['ncurses_has_ic', '5.3', [301], '5.2'],
-            ['ncurses_has_il', '5.3', [302], '5.2'],
-            ['ncurses_has_key', '5.3', [303], '5.2'],
-            ['ncurses_hide_panel', '5.3', [304], '5.2'],
-            ['ncurses_hline', '5.3', [305], '5.2'],
-            ['ncurses_inch', '5.3', [306], '5.2'],
-            ['ncurses_init_color', '5.3', [307], '5.2'],
-            ['ncurses_init_pair', '5.3', [308], '5.2'],
-            ['ncurses_init', '5.3', [309], '5.2'],
-            ['ncurses_insch', '5.3', [310], '5.2'],
-            ['ncurses_insdelln', '5.3', [311], '5.2'],
-            ['ncurses_insertln', '5.3', [312], '5.2'],
-            ['ncurses_insstr', '5.3', [313], '5.2'],
-            ['ncurses_instr', '5.3', [314], '5.2'],
-            ['ncurses_isendwin', '5.3', [315], '5.2'],
-            ['ncurses_keyok', '5.3', [316], '5.2'],
-            ['ncurses_keypad', '5.3', [317], '5.2'],
-            ['ncurses_killchar', '5.3', [318], '5.2'],
-            ['ncurses_longname', '5.3', [319], '5.2'],
-            ['ncurses_meta', '5.3', [320], '5.2'],
-            ['ncurses_mouse_trafo', '5.3', [321], '5.2'],
-            ['ncurses_mouseinterval', '5.3', [322], '5.2'],
-            ['ncurses_mousemask', '5.3', [323], '5.2'],
-            ['ncurses_move_panel', '5.3', [324], '5.2'],
-            ['ncurses_move', '5.3', [325], '5.2'],
-            ['ncurses_mvaddch', '5.3', [326], '5.2'],
-            ['ncurses_mvaddchnstr', '5.3', [327], '5.2'],
-            ['ncurses_mvaddchstr', '5.3', [328], '5.2'],
-            ['ncurses_mvaddnstr', '5.3', [329], '5.2'],
-            ['ncurses_mvaddstr', '5.3', [330], '5.2'],
-            ['ncurses_mvcur', '5.3', [331], '5.2'],
-            ['ncurses_mvdelch', '5.3', [332], '5.2'],
-            ['ncurses_mvgetch', '5.3', [333], '5.2'],
-            ['ncurses_mvhline', '5.3', [334], '5.2'],
-            ['ncurses_mvinch', '5.3', [335], '5.2'],
-            ['ncurses_mvvline', '5.3', [336], '5.2'],
-            ['ncurses_mvwaddstr', '5.3', [337], '5.2'],
-            ['ncurses_napms', '5.3', [338], '5.2'],
-            ['ncurses_new_panel', '5.3', [339], '5.2'],
-            ['ncurses_newpad', '5.3', [340], '5.2'],
-            ['ncurses_newwin', '5.3', [341], '5.2'],
-            ['ncurses_nl', '5.3', [342], '5.2'],
-            ['ncurses_nocbreak', '5.3', [343], '5.2'],
-            ['ncurses_noecho', '5.3', [344], '5.2'],
-            ['ncurses_nonl', '5.3', [345], '5.2'],
-            ['ncurses_noqiflush', '5.3', [346], '5.2'],
-            ['ncurses_noraw', '5.3', [347], '5.2'],
-            ['ncurses_pair_content', '5.3', [348], '5.2'],
-            ['ncurses_panel_above', '5.3', [349], '5.2'],
-            ['ncurses_panel_below', '5.3', [350], '5.2'],
-            ['ncurses_panel_window', '5.3', [351], '5.2'],
-            ['ncurses_pnoutrefresh', '5.3', [352], '5.2'],
-            ['ncurses_prefresh', '5.3', [353], '5.2'],
-            ['ncurses_putp', '5.3', [354], '5.2'],
-            ['ncurses_qiflush', '5.3', [355], '5.2'],
-            ['ncurses_raw', '5.3', [356], '5.2'],
-            ['ncurses_refresh', '5.3', [357], '5.2'],
-            ['ncurses_replace_panel', '5.3', [358], '5.2'],
-            ['ncurses_reset_prog_mode', '5.3', [359], '5.2'],
-            ['ncurses_reset_shell_mode', '5.3', [360], '5.2'],
-            ['ncurses_resetty', '5.3', [361], '5.2'],
-            ['ncurses_savetty', '5.3', [362], '5.2'],
-            ['ncurses_scr_dump', '5.3', [363], '5.2'],
-            ['ncurses_scr_init', '5.3', [364], '5.2'],
-            ['ncurses_scr_restore', '5.3', [365], '5.2'],
-            ['ncurses_scr_set', '5.3', [366], '5.2'],
-            ['ncurses_scrl', '5.3', [367], '5.2'],
-            ['ncurses_show_panel', '5.3', [368], '5.2'],
-            ['ncurses_slk_attr', '5.3', [369], '5.2'],
-            ['ncurses_slk_attroff', '5.3', [370], '5.2'],
-            ['ncurses_slk_attron', '5.3', [371], '5.2'],
-            ['ncurses_slk_attrset', '5.3', [372], '5.2'],
-            ['ncurses_slk_clear', '5.3', [373], '5.2'],
-            ['ncurses_slk_color', '5.3', [374], '5.2'],
-            ['ncurses_slk_init', '5.3', [375], '5.2'],
-            ['ncurses_slk_noutrefresh', '5.3', [376], '5.2'],
-            ['ncurses_slk_refresh', '5.3', [377], '5.2'],
-            ['ncurses_slk_restore', '5.3', [378], '5.2'],
-            ['ncurses_slk_set', '5.3', [379], '5.2'],
-            ['ncurses_slk_touch', '5.3', [380], '5.2'],
-            ['ncurses_standend', '5.3', [381], '5.2'],
-            ['ncurses_standout', '5.3', [382], '5.2'],
-            ['ncurses_start_color', '5.3', [383], '5.2'],
-            ['ncurses_termattrs', '5.3', [384], '5.2'],
-            ['ncurses_termname', '5.3', [385], '5.2'],
-            ['ncurses_timeout', '5.3', [386], '5.2'],
-            ['ncurses_top_panel', '5.3', [387], '5.2'],
-            ['ncurses_typeahead', '5.3', [388], '5.2'],
-            ['ncurses_ungetch', '5.3', [389], '5.2'],
-            ['ncurses_ungetmouse', '5.3', [390], '5.2'],
-            ['ncurses_update_panels', '5.3', [391], '5.2'],
-            ['ncurses_use_default_colors', '5.3', [392], '5.2'],
-            ['ncurses_use_env', '5.3', [393], '5.2'],
-            ['ncurses_use_extended_names', '5.3', [394], '5.2'],
-            ['ncurses_vidattr', '5.3', [395], '5.2'],
-            ['ncurses_vline', '5.3', [396], '5.2'],
-            ['ncurses_waddch', '5.3', [397], '5.2'],
-            ['ncurses_waddstr', '5.3', [398], '5.2'],
-            ['ncurses_wattroff', '5.3', [399], '5.2'],
-            ['ncurses_wattron', '5.3', [400], '5.2'],
-            ['ncurses_wattrset', '5.3', [401], '5.2'],
-            ['ncurses_wborder', '5.3', [402], '5.2'],
-            ['ncurses_wclear', '5.3', [403], '5.2'],
-            ['ncurses_wcolor_set', '5.3', [404], '5.2'],
-            ['ncurses_werase', '5.3', [405], '5.2'],
-            ['ncurses_wgetch', '5.3', [406], '5.2'],
-            ['ncurses_whline', '5.3', [407], '5.2'],
-            ['ncurses_wmouse_trafo', '5.3', [408], '5.2'],
-            ['ncurses_wmove', '5.3', [409], '5.2'],
-            ['ncurses_wnoutrefresh', '5.3', [410], '5.2'],
-            ['ncurses_wrefresh', '5.3', [411], '5.2'],
-            ['ncurses_wstandend', '5.3', [412], '5.2'],
-            ['ncurses_wstandout', '5.3', [413], '5.2'],
-            ['ncurses_wvline', '5.3', [414], '5.2'],
-            ['fdf_add_doc_javascript', '5.3', [469], '5.2'],
-            ['fdf_add_template', '5.3', [470], '5.2'],
-            ['fdf_close', '5.3', [471], '5.2'],
-            ['fdf_create', '5.3', [472], '5.2'],
-            ['fdf_enum_values', '5.3', [473], '5.2'],
-            ['fdf_errno', '5.3', [474], '5.2'],
-            ['fdf_error', '5.3', [475], '5.2'],
-            ['fdf_get_ap', '5.3', [476], '5.2'],
-            ['fdf_get_attachment', '5.3', [477], '5.2'],
-            ['fdf_get_encoding', '5.3', [478], '5.2'],
-            ['fdf_get_file', '5.3', [479], '5.2'],
-            ['fdf_get_flags', '5.3', [480], '5.2'],
-            ['fdf_get_opt', '5.3', [481], '5.2'],
-            ['fdf_get_status', '5.3', [482], '5.2'],
-            ['fdf_get_value', '5.3', [483], '5.2'],
-            ['fdf_get_version', '5.3', [484], '5.2'],
-            ['fdf_header', '5.3', [485], '5.2'],
-            ['fdf_next_field_name', '5.3', [486], '5.2'],
-            ['fdf_open_string', '5.3', [487], '5.2'],
-            ['fdf_open', '5.3', [488], '5.2'],
-            ['fdf_remove_item', '5.3', [489], '5.2'],
-            ['fdf_save_string', '5.3', [490], '5.2'],
-            ['fdf_save', '5.3', [491], '5.2'],
-            ['fdf_set_ap', '5.3', [492], '5.2'],
-            ['fdf_set_encoding', '5.3', [493], '5.2'],
-            ['fdf_set_file', '5.3', [494], '5.2'],
-            ['fdf_set_flags', '5.3', [495], '5.2'],
-            ['fdf_set_javascript_action', '5.3', [496], '5.2'],
-            ['fdf_set_on_import_javascript', '5.3', [497], '5.2'],
-            ['fdf_set_opt', '5.3', [498], '5.2'],
-            ['fdf_set_status', '5.3', [499], '5.2'],
-            ['fdf_set_submit_form_action', '5.3', [500], '5.2'],
-            ['fdf_set_target_frame', '5.3', [501], '5.2'],
-            ['fdf_set_value', '5.3', [502], '5.2'],
-            ['fdf_set_version', '5.3', [503], '5.2'],
-            ['ming_keypress', '5.3', [506], '5.2'],
-            ['ming_setcubicthreshold', '5.3', [507], '5.2'],
-            ['ming_setscale', '5.3', [508], '5.2'],
-            ['ming_setswfcompression', '5.3', [509], '5.2'],
-            ['ming_useconstants', '5.3', [510], '5.2'],
-            ['ming_useswfversion', '5.3', [511], '5.2'],
-            ['dbase_add_record', '5.3', [708], '5.2'],
-            ['dbase_close', '5.3', [709], '5.2'],
-            ['dbase_create', '5.3', [710], '5.2'],
-            ['dbase_delete_record', '5.3', [711], '5.2'],
-            ['dbase_get_header_info', '5.3', [712], '5.2'],
-            ['dbase_get_record_with_names', '5.3', [713], '5.2'],
-            ['dbase_get_record', '5.3', [714], '5.2'],
-            ['dbase_numfields', '5.3', [715], '5.2'],
-            ['dbase_numrecords', '5.3', [716], '5.2'],
-            ['dbase_open', '5.3', [717], '5.2'],
-            ['dbase_pack', '5.3', [718], '5.2'],
-            ['dbase_replace_record', '5.3', [719], '5.2'],
-            ['fbsql_affected_rows', '5.3', [728], '5.2'],
-            ['fbsql_autocommit', '5.3', [729], '5.2'],
-            ['fbsql_blob_size', '5.3', [730], '5.2'],
-            ['fbsql_change_user', '5.3', [731], '5.2'],
-            ['fbsql_clob_size', '5.3', [732], '5.2'],
-            ['fbsql_close', '5.3', [733], '5.2'],
-            ['fbsql_commit', '5.3', [734], '5.2'],
-            ['fbsql_connect', '5.3', [735], '5.2'],
-            ['fbsql_create_blob', '5.3', [736], '5.2'],
-            ['fbsql_create_clob', '5.3', [737], '5.2'],
-            ['fbsql_create_db', '5.3', [738], '5.2'],
-            ['fbsql_data_seek', '5.3', [739], '5.2'],
-            ['fbsql_database_password', '5.3', [740], '5.2'],
-            ['fbsql_database', '5.3', [741], '5.2'],
-            ['fbsql_db_query', '5.3', [742], '5.2'],
-            ['fbsql_db_status', '5.3', [743], '5.2'],
-            ['fbsql_drop_db', '5.3', [744], '5.2'],
-            ['fbsql_errno', '5.3', [745], '5.2'],
-            ['fbsql_error', '5.3', [746], '5.2'],
-            ['fbsql_fetch_array', '5.3', [747], '5.2'],
-            ['fbsql_fetch_assoc', '5.3', [748], '5.2'],
-            ['fbsql_fetch_field', '5.3', [749], '5.2'],
-            ['fbsql_fetch_lengths', '5.3', [750], '5.2'],
-            ['fbsql_fetch_object', '5.3', [751], '5.2'],
-            ['fbsql_fetch_row', '5.3', [752], '5.2'],
-            ['fbsql_field_flags', '5.3', [753], '5.2'],
-            ['fbsql_field_len', '5.3', [754], '5.2'],
-            ['fbsql_field_name', '5.3', [755], '5.2'],
-            ['fbsql_field_seek', '5.3', [756], '5.2'],
-            ['fbsql_field_table', '5.3', [757], '5.2'],
-            ['fbsql_field_type', '5.3', [758], '5.2'],
-            ['fbsql_free_result', '5.3', [759], '5.2'],
-            ['fbsql_get_autostart_info', '5.3', [760], '5.2'],
-            ['fbsql_hostname', '5.3', [761], '5.2'],
-            ['fbsql_insert_id', '5.3', [762], '5.2'],
-            ['fbsql_list_dbs', '5.3', [763], '5.2'],
-            ['fbsql_list_fields', '5.3', [764], '5.2'],
-            ['fbsql_list_tables', '5.3', [765], '5.2'],
-            ['fbsql_next_result', '5.3', [766], '5.2'],
-            ['fbsql_num_fields', '5.3', [767], '5.2'],
-            ['fbsql_num_rows', '5.3', [768], '5.2'],
-            ['fbsql_password', '5.3', [769], '5.2'],
-            ['fbsql_pconnect', '5.3', [770], '5.2'],
-            ['fbsql_query', '5.3', [771], '5.2'],
-            ['fbsql_read_blob', '5.3', [772], '5.2'],
-            ['fbsql_read_clob', '5.3', [773], '5.2'],
-            ['fbsql_result', '5.3', [774], '5.2'],
-            ['fbsql_rollback', '5.3', [775], '5.2'],
-            ['fbsql_rows_fetched', '5.3', [776], '5.2'],
-            ['fbsql_select_db', '5.3', [777], '5.2'],
-            ['fbsql_set_characterset', '5.3', [778], '5.2'],
-            ['fbsql_set_lob_mode', '5.3', [779], '5.2'],
-            ['fbsql_set_password', '5.3', [780], '5.2'],
-            ['fbsql_set_transaction', '5.3', [781], '5.2'],
-            ['fbsql_start_db', '5.3', [782], '5.2'],
-            ['fbsql_stop_db', '5.3', [783], '5.2'],
-            ['fbsql_table_name', '5.3', [784], '5.2'],
-            ['fbsql_tablename', '5.3', [785], '5.2'],
-            ['fbsql_username', '5.3', [786], '5.2'],
-            ['fbsql_warnings', '5.3', [787], '5.2'],
-            ['msql_affected_rows', '5.3', [813], '5.2'],
-            ['msql_close', '5.3', [814], '5.2'],
-            ['msql_connect', '5.3', [815], '5.2'],
-            ['msql_create_db', '5.3', [816], '5.2'],
-            ['msql_createdb', '5.3', [817], '5.2'],
-            ['msql_data_seek', '5.3', [818], '5.2'],
-            ['msql_db_query', '5.3', [819], '5.2'],
-            ['msql_dbname', '5.3', [820], '5.2'],
-            ['msql_drop_db', '5.3', [821], '5.2'],
-            ['msql_error', '5.3', [822], '5.2'],
-            ['msql_fetch_array', '5.3', [823], '5.2'],
-            ['msql_fetch_field', '5.3', [824], '5.2'],
-            ['msql_fetch_object', '5.3', [825], '5.2'],
-            ['msql_fetch_row', '5.3', [826], '5.2'],
-            ['msql_field_flags', '5.3', [827], '5.2'],
-            ['msql_field_len', '5.3', [828], '5.2'],
-            ['msql_field_name', '5.3', [829], '5.2'],
-            ['msql_field_seek', '5.3', [830], '5.2'],
-            ['msql_field_table', '5.3', [831], '5.2'],
-            ['msql_field_type', '5.3', [832], '5.2'],
-            ['msql_fieldflags', '5.3', [833], '5.2'],
-            ['msql_fieldlen', '5.3', [834], '5.2'],
-            ['msql_fieldname', '5.3', [835], '5.2'],
-            ['msql_fieldtable', '5.3', [836], '5.2'],
-            ['msql_fieldtype', '5.3', [837], '5.2'],
-            ['msql_free_result', '5.3', [838], '5.2'],
-            ['msql_list_dbs', '5.3', [839], '5.2'],
-            ['msql_list_fields', '5.3', [840], '5.2'],
-            ['msql_list_tables', '5.3', [841], '5.2'],
-            ['msql_num_fields', '5.3', [842], '5.2'],
-            ['msql_num_rows', '5.3', [843], '5.2'],
-            ['msql_numfields', '5.3', [844], '5.2'],
-            ['msql_numrows', '5.3', [845], '5.2'],
-            ['msql_pconnect', '5.3', [846], '5.2'],
-            ['msql_query', '5.3', [847], '5.2'],
-            ['msql_regcase', '5.3', [848], '5.2'],
-            ['msql_result', '5.3', [849], '5.2'],
-            ['msql_select_db', '5.3', [850], '5.2'],
-            ['msql_tablename', '5.3', [851], '5.2'],
-            ['msql', '5.3', [852], '5.2'],
-            ['mysqli_disable_reads_from_master', '5.3', [1144], '5.2'],
-            ['mysqli_disable_rpl_parse', '5.3', [1145], '5.2'],
-            ['mysqli_enable_reads_from_master', '5.3', [1149], '5.2'],
-            ['mysqli_enable_rpl_parse', '5.3', [1150], '5.2'],
-            ['mysqli_master_query', '5.3', [1151], '5.2'],
-            ['mysqli_rpl_parse_enabled', '5.3', [1153], '5.2'],
-            ['mysqli_rpl_probe', '5.3', [1154], '5.2'],
-            ['mysqli_slave_query', '5.3', [1157], '5.2'],
-
-            ['sqlite_array_query', '5.4', [883], '5.3'],
-            ['sqlite_busy_timeout', '5.4', [884], '5.3'],
-            ['sqlite_changes', '5.4', [885], '5.3'],
-            ['sqlite_close', '5.4', [886], '5.3'],
-            ['sqlite_column', '5.4', [887], '5.3'],
-            ['sqlite_create_aggregate', '5.4', [888], '5.3'],
-            ['sqlite_create_function', '5.4', [889], '5.3'],
-            ['sqlite_current', '5.4', [890], '5.3'],
-            ['sqlite_error_string', '5.4', [891], '5.3'],
-            ['sqlite_escape_string', '5.4', [892], '5.3'],
-            ['sqlite_exec', '5.4', [893], '5.3'],
-            ['sqlite_factory', '5.4', [894], '5.3'],
-            ['sqlite_fetch_all', '5.4', [895], '5.3'],
-            ['sqlite_fetch_array', '5.4', [896], '5.3'],
-            ['sqlite_fetch_column_types', '5.4', [897], '5.3'],
-            ['sqlite_fetch_object', '5.4', [898], '5.3'],
-            ['sqlite_fetch_single', '5.4', [899], '5.3'],
-            ['sqlite_fetch_string', '5.4', [900], '5.3'],
-            ['sqlite_field_name', '5.4', [901], '5.3'],
-            ['sqlite_has_more', '5.4', [902], '5.3'],
-            ['sqlite_has_prev', '5.4', [903], '5.3'],
-            ['sqlite_key', '5.4', [904], '5.3'],
-            ['sqlite_last_error', '5.4', [905], '5.3'],
-            ['sqlite_last_insert_rowid', '5.4', [906], '5.3'],
-            ['sqlite_libencoding', '5.4', [907], '5.3'],
-            ['sqlite_libversion', '5.4', [908], '5.3'],
-            ['sqlite_next', '5.4', [909], '5.3'],
-            ['sqlite_num_fields', '5.4', [910], '5.3'],
-            ['sqlite_num_rows', '5.4', [911], '5.3'],
-            ['sqlite_open', '5.4', [912], '5.3'],
-            ['sqlite_popen', '5.4', [913], '5.3'],
-            ['sqlite_prev', '5.4', [914], '5.3'],
-            ['sqlite_query', '5.4', [915], '5.3'],
-            ['sqlite_rewind', '5.4', [916], '5.3'],
-            ['sqlite_seek', '5.4', [917], '5.3'],
-            ['sqlite_single_query', '5.4', [918], '5.3'],
-            ['sqlite_udf_decode_binary', '5.4', [919], '5.3'],
-            ['sqlite_udf_encode_binary', '5.4', [920], '5.3'],
-            ['sqlite_unbuffered_query', '5.4', [921], '5.3'],
-            ['sqlite_valid', '5.4', [922], '5.3'],
-
-            ['php_logo_guid', '5.5', [32], '5.4'],
-            ['php_egg_logo_guid', '5.5', [33], '5.4'],
-            ['php_real_logo_guid', '5.5', [34], '5.4'],
-            ['imagepsbbox', '7.0', [90], '5.6'],
-            ['imagepsencodefont', '7.0', [91], '5.6'],
-            ['imagepsextendfont', '7.0', [92], '5.6'],
-            ['imagepsfreefont', '7.0', [93], '5.6'],
-            ['imagepsloadfont', '7.0', [94], '5.6'],
-            ['imagepsslantfont', '7.0', [95], '5.6'],
-            ['imagepstext', '7.0', [96], '5.6'],
-            ['mssql_bind', '7.0', [853], '5.6'],
-            ['mssql_close', '7.0', [854], '5.6'],
-            ['mssql_connect', '7.0', [855], '5.6'],
-            ['mssql_data_seek', '7.0', [856], '5.6'],
-            ['mssql_execute', '7.0', [857], '5.6'],
-            ['mssql_fetch_array', '7.0', [858], '5.6'],
-            ['mssql_fetch_assoc', '7.0', [859], '5.6'],
-            ['mssql_fetch_batch', '7.0', [860], '5.6'],
-            ['mssql_fetch_field', '7.0', [861], '5.6'],
-            ['mssql_fetch_object', '7.0', [862], '5.6'],
-            ['mssql_fetch_row', '7.0', [863], '5.6'],
-            ['mssql_field_length', '7.0', [864], '5.6'],
-            ['mssql_field_name', '7.0', [865], '5.6'],
-            ['mssql_field_seek', '7.0', [866], '5.6'],
-            ['mssql_field_type', '7.0', [867], '5.6'],
-            ['mssql_free_result', '7.0', [868], '5.6'],
-            ['mssql_free_statement', '7.0', [869], '5.6'],
-            ['mssql_get_last_message', '7.0', [870], '5.6'],
-            ['mssql_guid_string', '7.0', [871], '5.6'],
-            ['mssql_init', '7.0', [872], '5.6'],
-            ['mssql_min_error_severity', '7.0', [873], '5.6'],
-            ['mssql_min_message_severity', '7.0', [874], '5.6'],
-            ['mssql_next_result', '7.0', [875], '5.6'],
-            ['mssql_num_fields', '7.0', [876], '5.6'],
-            ['mssql_num_rows', '7.0', [877], '5.6'],
-            ['mssql_pconnect', '7.0', [878], '5.6'],
-            ['mssql_query', '7.0', [879], '5.6'],
-            ['mssql_result', '7.0', [880], '5.6'],
-            ['mssql_rows_affected', '7.0', [881], '5.6'],
-            ['mssql_select_db', '7.0', [882], '5.6'],
-            ['sybase_affected_rows', '7.0', [1081], '5.6'],
-            ['sybase_close', '7.0', [1082], '5.6'],
-            ['sybase_connect', '7.0', [1083], '5.6'],
-            ['sybase_data_seek', '7.0', [1084], '5.6'],
-            ['sybase_deadlock_retry_count', '7.0', [1085], '5.6'],
-            ['sybase_fetch_array', '7.0', [1086], '5.6'],
-            ['sybase_fetch_assoc', '7.0', [1087], '5.6'],
-            ['sybase_fetch_field', '7.0', [1088], '5.6'],
-            ['sybase_fetch_object', '7.0', [1089], '5.6'],
-            ['sybase_fetch_row', '7.0', [1090], '5.6'],
-            ['sybase_field_seek', '7.0', [1091], '5.6'],
-            ['sybase_free_result', '7.0', [1092], '5.6'],
-            ['sybase_get_last_message', '7.0', [1093], '5.6'],
-            ['sybase_min_client_severity', '7.0', [1094], '5.6'],
-            ['sybase_min_error_severity', '7.0', [1095], '5.6'],
-            ['sybase_min_message_severity', '7.0', [1096], '5.6'],
-            ['sybase_min_server_severity', '7.0', [1097], '5.6'],
-            ['sybase_num_fields', '7.0', [1098], '5.6'],
-            ['sybase_num_rows', '7.0', [1099], '5.6'],
-            ['sybase_pconnect', '7.0', [1100], '5.6'],
-            ['sybase_query', '7.0', [1101], '5.6'],
-            ['sybase_result', '7.0', [1102], '5.6'],
-            ['sybase_select_db', '7.0', [1103], '5.6'],
-            ['sybase_set_message_handler', '7.0', [1104], '5.6'],
-            ['sybase_unbuffered_query', '7.0', [1105], '5.6'],
-
-            ['php_check_syntax', '5.0.5', [98], '5.0', '5.1'],
-            ['mysqli_get_cache_stats', '5.4', [99], '5.3'],
-            ['ibase_add_user', '7.4', [171], '7.3'],
-            ['ibase_affected_rows', '7.4', [172], '7.3'],
-            ['ibase_backup', '7.4', [173], '7.3'],
-            ['ibase_blob_add', '7.4', [174], '7.3'],
-            ['ibase_blob_cancel', '7.4', [175], '7.3'],
-            ['ibase_blob_close', '7.4', [176], '7.3'],
-            ['ibase_blob_create', '7.4', [177], '7.3'],
-            ['ibase_blob_echo', '7.4', [178], '7.3'],
-            ['ibase_blob_get', '7.4', [179], '7.3'],
-            ['ibase_blob_import', '7.4', [180], '7.3'],
-            ['ibase_blob_info', '7.4', [181], '7.3'],
-            ['ibase_blob_open', '7.4', [182], '7.3'],
-            ['ibase_close', '7.4', [183], '7.3'],
-            ['ibase_commit_ret', '7.4', [184], '7.3'],
-            ['ibase_commit', '7.4', [185], '7.3'],
-            ['ibase_connect', '7.4', [186], '7.3'],
-            ['ibase_db_info', '7.4', [187], '7.3'],
-            ['ibase_delete_user', '7.4', [188], '7.3'],
-            ['ibase_drop_db', '7.4', [189], '7.3'],
-            ['ibase_errcode', '7.4', [190], '7.3'],
-            ['ibase_errmsg', '7.4', [191], '7.3'],
-            ['ibase_execute', '7.4', [192], '7.3'],
-            ['ibase_fetch_assoc', '7.4', [193], '7.3'],
-            ['ibase_fetch_object', '7.4', [194], '7.3'],
-            ['ibase_fetch_row', '7.4', [195], '7.3'],
-            ['ibase_field_info', '7.4', [196], '7.3'],
-            ['ibase_free_event_handler', '7.4', [197], '7.3'],
-            ['ibase_free_query', '7.4', [198], '7.3'],
-            ['ibase_free_result', '7.4', [199], '7.3'],
-            ['ibase_gen_id', '7.4', [200], '7.3'],
-            ['ibase_maintain_db', '7.4', [201], '7.3'],
-            ['ibase_modify_user', '7.4', [202], '7.3'],
-            ['ibase_name_result', '7.4', [203], '7.3'],
-            ['ibase_num_fields', '7.4', [204], '7.3'],
-            ['ibase_num_params', '7.4', [205], '7.3'],
-            ['ibase_param_info', '7.4', [206], '7.3'],
-            ['ibase_pconnect', '7.4', [207], '7.3'],
-            ['ibase_prepare', '7.4', [208], '7.3'],
-            ['ibase_query', '7.4', [209], '7.3'],
-            ['ibase_restore', '7.4', [210], '7.3'],
-            ['ibase_rollback_ret', '7.4', [211], '7.3'],
-            ['ibase_rollback', '7.4', [212], '7.3'],
-            ['ibase_server_info', '7.4', [213], '7.3'],
-            ['ibase_service_attach', '7.4', [214], '7.3'],
-            ['ibase_service_detach', '7.4', [215], '7.3'],
-            ['ibase_set_event_handler', '7.4', [216], '7.3'],
-            ['ibase_trans', '7.4', [217], '7.3'],
-            ['ibase_wait_event', '7.4', [218], '7.3'],
-            ['fbird_add_user', '7.4', [987], '7.3'],
-            ['fbird_affected_rows', '7.4', [988], '7.3'],
-            ['fbird_backup', '7.4', [989], '7.3'],
-            ['fbird_blob_add', '7.4', [990], '7.3'],
-            ['fbird_blob_cancel', '7.4', [991], '7.3'],
-            ['fbird_blob_close', '7.4', [992], '7.3'],
-            ['fbird_blob_create', '7.4', [993], '7.3'],
-            ['fbird_blob_echo', '7.4', [994], '7.3'],
-            ['fbird_blob_get', '7.4', [995], '7.3'],
-            ['fbird_blob_import', '7.4', [996], '7.3'],
-            ['fbird_blob_info', '7.4', [997], '7.3'],
-            ['fbird_blob_open', '7.4', [998], '7.3'],
-            ['fbird_close', '7.4', [999], '7.3'],
-            ['fbird_commit_ret', '7.4', [1000], '7.3'],
-            ['fbird_commit', '7.4', [1001], '7.3'],
-            ['fbird_connect', '7.4', [1002], '7.3'],
-            ['fbird_db_info', '7.4', [1003], '7.3'],
-            ['fbird_delete_user', '7.4', [1004], '7.3'],
-            ['fbird_drop_db', '7.4', [1005], '7.3'],
-            ['fbird_errcode', '7.4', [1006], '7.3'],
-            ['fbird_errmsg', '7.4', [1007], '7.3'],
-            ['fbird_execute', '7.4', [1008], '7.3'],
-            ['fbird_fetch_assoc', '7.4', [1009], '7.3'],
-            ['fbird_fetch_object', '7.4', [1010], '7.3'],
-            ['fbird_fetch_row', '7.4', [1011], '7.3'],
-            ['fbird_field_info', '7.4', [1012], '7.3'],
-            ['fbird_free_event_handler', '7.4', [1013], '7.3'],
-            ['fbird_free_query', '7.4', [1014], '7.3'],
-            ['fbird_free_result', '7.4', [1015], '7.3'],
-            ['fbird_gen_id', '7.4', [1016], '7.3'],
-            ['fbird_maintain_db', '7.4', [1017], '7.3'],
-            ['fbird_modify_user', '7.4', [1018], '7.3'],
-            ['fbird_name_result', '7.4', [1019], '7.3'],
-            ['fbird_num_fields', '7.4', [1020], '7.3'],
-            ['fbird_num_params', '7.4', [1021], '7.3'],
-            ['fbird_param_info', '7.4', [1022], '7.3'],
-            ['fbird_pconnect', '7.4', [1023], '7.3'],
-            ['fbird_prepare', '7.4', [1024], '7.3'],
-            ['fbird_query', '7.4', [1025], '7.3'],
-            ['fbird_restore', '7.4', [1026], '7.3'],
-            ['fbird_rollback_ret', '7.4', [1027], '7.3'],
-            ['fbird_rollback', '7.4', [1028], '7.3'],
-            ['fbird_server_info', '7.4', [1029], '7.3'],
-            ['fbird_service_attach', '7.4', [1030], '7.3'],
-            ['fbird_service_detach', '7.4', [1031], '7.3'],
-            ['fbird_set_event_handler', '7.4', [1032], '7.3'],
-            ['fbird_trans', '7.4', [1033], '7.3'],
-            ['fbird_wait_event', '7.4', [1034], '7.3'],
-
-            ['wddx_add_vars', '7.4', [228], '7.3'],
-            ['wddx_deserialize', '7.4', [229], '7.3'],
-            ['wddx_packet_end', '7.4', [230], '7.3'],
-            ['wddx_packet_start', '7.4', [231], '7.3'],
-            ['wddx_serialize_value', '7.4', [232], '7.3'],
-            ['wddx_serialize_vars', '7.4', [233], '7.3'],
-            ['mysqli_embedded_server_end', '7.4', [1147], '7.3'],
-            ['mysqli_embedded_server_start', '7.4', [1148], '7.3'],
-
-            ['oci_internal_debug', '8.0', [1178], '7.4'],
-            ['xmlrpc_decode_request', '8.0', [1158], '7.4'],
-            ['xmlrpc_decode', '8.0', [1159], '7.4'],
-            ['xmlrpc_encode_request', '8.0', [1160], '7.4'],
-            ['xmlrpc_encode', '8.0', [1161], '7.4'],
-            ['xmlrpc_get_type', '8.0', [1162], '7.4'],
-            ['xmlrpc_is_fault', '8.0', [1163], '7.4'],
-            ['xmlrpc_parse_method_descriptions', '8.0', [1164], '7.4'],
-            ['xmlrpc_server_add_introspection_data', '8.0', [1165], '7.4'],
-            ['xmlrpc_server_call_method', '8.0', [1166], '7.4'],
-            ['xmlrpc_server_create', '8.0', [1167], '7.4'],
-            ['xmlrpc_server_destroy', '8.0', [1168], '7.4'],
-            ['xmlrpc_server_register_introspection_callback', '8.0', [1169], '7.4'],
-            ['xmlrpc_server_register_method', '8.0', [1170], '7.4'],
-            ['xmlrpc_set_type', '8.0', [1171], '7.4'],
-        ];
-    }
-
-
-    /**
-     * testRemovedFunctionWithAlternative
-     *
-     * @dataProvider dataRemovedFunctionWithAlternative
-     *
-     * @param string $functionName   Name of the function.
-     * @param string $removedIn      The PHP version in which the function was removed.
-     * @param string $alternative    An alternative function.
-     * @param array  $lines          The line numbers in the test file which apply to this function.
-     * @param string $okVersion      A PHP version in which the function was still valid.
-     * @param string $removedVersion Optional PHP version to test removed message with -
-     *                               if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testRemovedFunctionWithAlternative($functionName, $removedIn, $alternative, $lines, $okVersion, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is removed since PHP {$removedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedFunctionWithAlternative()
-     *
-     * @return array
-     */
-    public function dataRemovedFunctionWithAlternative()
-    {
-        return [
-            ['zend_logo_guid', '5.5', 'text string "PHPE9568F35-D428-11d2-A769-00AA001ACF42"', [35], '5.4'],
-
-            ['recode_file', '7.4', 'the iconv or mbstring extension', [236], '7.3'],
-            ['recode_string', '7.4', 'the iconv or mbstring extension', [237], '7.3'],
-            ['recode', '7.4', 'the iconv or mbstring extension', [238], '7.3'],
-
-            ['imap_header', '8.0', 'imap_headerinfo()', [1216], '7.4'],
-        ];
-    }
-
-
-    /**
-     * testDeprecatedRemovedFunction
-     *
-     * @dataProvider dataDeprecatedRemovedFunction
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param string $removedIn         The PHP version in which the function was removed.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     * @param string $removedVersion    Optional PHP version to test removed message with -
-     *                                  if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedRemovedFunction($functionName, $deprecatedIn, $removedIn, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedRemovedFunction()
-     *
-     * @return array
-     */
-    public function dataDeprecatedRemovedFunction()
-    {
-        return [
-            ['define_syslog_variables', '5.3', '5.4', [5], '5.2'],
-            ['import_request_variables', '5.3', '5.4', [11], '5.2'],
-            ['mysql_list_dbs', '5.4', '7.0', [15], '5.3'],
-            ['magic_quotes_runtime', '5.3', '7.0', [23], '5.2'],
-            ['set_magic_quotes_runtime', '5.3', '7.0', [27], '5.2'],
-            ['sql_regcase', '5.3', '7.0', [31], '5.2'],
-            ['mysql_affected_rows', '5.5', '7.0', [923], '5.4'],
-            ['mysql_client_encoding', '5.5', '7.0', [924], '5.4'],
-            ['mysql_close', '5.5', '7.0', [925], '5.4'],
-            ['mysql_connect', '5.5', '7.0', [926], '5.4'],
-            ['mysql_create_db', '4.3', '7.0', [927], '4.2'],
-            ['mysql_data_seek', '5.5', '7.0', [928], '5.4'],
-            ['mysql_db_name', '5.5', '7.0', [929], '5.4'],
-            ['mysql_drop_db', '4.3', '7.0', [930], '4.2'],
-            ['mysql_errno', '5.5', '7.0', [931], '5.4'],
-            ['mysql_error', '5.5', '7.0', [932], '5.4'],
-            ['mysql_fetch_array', '5.5', '7.0', [933], '5.4'],
-            ['mysql_fetch_assoc', '5.5', '7.0', [934], '5.4'],
-            ['mysql_fetch_field', '5.5', '7.0', [935], '5.4'],
-            ['mysql_fetch_lengths', '5.5', '7.0', [936], '5.4'],
-            ['mysql_fetch_object', '5.5', '7.0', [937], '5.4'],
-            ['mysql_fetch_row', '5.5', '7.0', [938], '5.4'],
-            ['mysql_field_flags', '5.5', '7.0', [939], '5.4'],
-            ['mysql_field_len', '5.5', '7.0', [940], '5.4'],
-            ['mysql_field_name', '5.5', '7.0', [941], '5.4'],
-            ['mysql_field_seek', '5.5', '7.0', [942], '5.4'],
-            ['mysql_field_table', '5.5', '7.0', [943], '5.4'],
-            ['mysql_field_type', '5.5', '7.0', [944], '5.4'],
-            ['mysql_free_result', '5.5', '7.0', [945], '5.4'],
-            ['mysql_get_client_info', '5.5', '7.0', [946], '5.4'],
-            ['mysql_get_host_info', '5.5', '7.0', [947], '5.4'],
-            ['mysql_get_proto_info', '5.5', '7.0', [948], '5.4'],
-            ['mysql_get_server_info', '5.5', '7.0', [949], '5.4'],
-            ['mysql_info', '5.5', '7.0', [950], '5.4'],
-            ['mysql_insert_id', '5.5', '7.0', [951], '5.4'],
-            ['mysql_list_fields', '5.4', '7.0', [952], '5.3'],
-            ['mysql_list_processes', '5.5', '7.0', [953], '5.4'],
-            ['mysql_list_tables', '4.3.7', '7.0', [954], '4.3', '4.4'],
-            ['mysql_num_fields', '5.5', '7.0', [955], '5.4'],
-            ['mysql_num_rows', '5.5', '7.0', [956], '5.4'],
-            ['mysql_pconnect', '5.5', '7.0', [957], '5.4'],
-            ['mysql_ping', '5.5', '7.0', [958], '5.4'],
-            ['mysql_query', '5.5', '7.0', [959], '5.4'],
-            ['mysql_real_escape_string', '5.5', '7.0', [960], '5.4'],
-            ['mysql_result', '5.5', '7.0', [961], '5.4'],
-            ['mysql_select_db', '5.5', '7.0', [962], '5.4'],
-            ['mysql_set_charset', '5.5', '7.0', [963], '5.4'],
-            ['mysql_stat', '5.5', '7.0', [964], '5.4'],
-            ['mysql_tablename', '5.5', '7.0', [965], '5.4'],
-            ['mysql_thread_id', '5.5', '7.0', [966], '5.4'],
-            ['mysql_unbuffered_query', '5.5', '7.0', [967], '5.4'],
-            ['mysql', '5.5', '7.0', [968], '5.4'],
-            ['mysql_fieldname', '5.5', '7.0', [969], '5.4'],
-            ['mysql_fieldtable', '5.5', '7.0', [970], '5.4'],
-            ['mysql_fieldlen', '5.5', '7.0', [971], '5.4'],
-            ['mysql_fieldtype', '5.5', '7.0', [972], '5.4'],
-            ['mysql_fieldflags', '5.5', '7.0', [973], '5.4'],
-            ['mysql_selectdb', '5.5', '7.0', [974], '5.4'],
-            ['mysql_freeresult', '5.5', '7.0', [977], '5.4'],
-            ['mysql_numfields', '5.5', '7.0', [978], '5.4'],
-            ['mysql_numrows', '5.5', '7.0', [979], '5.4'],
-            ['mysql_listdbs', '5.5', '7.0', [980], '5.4'],
-            ['mysql_listfields', '5.5', '7.0', [982], '5.4'],
-            ['mysql_dbname', '5.5', '7.0', [983], '5.4'],
-            ['mysql_table_name', '5.5', '7.0', [984], '5.4'],
-
-            ['ldap_sort', '7.0', '8.0', [97], '5.6'],
-            ['fgetss', '7.3', '8.0', [167], '7.2'],
-            ['gzgetss', '7.3', '8.0', [168], '7.2'],
-            ['ezmlm_hash', '7.4', '8.0', [245], '7.3'],
-            ['get_magic_quotes_gpc', '7.4', '8.0', [240], '7.3'],
-            ['get_magic_quotes_runtime', '7.4', '8.0', [241], '7.3'],
-            ['hebrevc', '7.4', '8.0', [242], '7.3'],
-        ];
-    }
-
-
-    /**
-     * testDeprecatedRemovedFunctionWithAlternative
-     *
-     * @dataProvider dataDeprecatedRemovedFunctionWithAlternative
-     *
-     * @param string $functionName      Name of the function.
-     * @param string $deprecatedIn      The PHP version in which the function was deprecated.
-     * @param string $removedIn         The PHP version in which the function was removed.
-     * @param string $alternative       An alternative function.
-     * @param array  $lines             The line numbers in the test file which apply to this function.
-     * @param string $okVersion         A PHP version in which the function was still valid.
-     * @param string $deprecatedVersion Optional PHP version to test deprecation message with -
-     *                                  if different from the $deprecatedIn version.
-     * @param string $removedVersion    Optional PHP version to test removed message with -
-     *                                  if different from the $removedIn version.
-     *
-     * @return void
-     */
-    public function testDeprecatedRemovedFunctionWithAlternative($functionName, $deprecatedIn, $removedIn, $alternative, $lines, $okVersion, $deprecatedVersion = null, $removedVersion = null)
-    {
-        $file = $this->sniffFile(__FILE__, $okVersion);
-        foreach ($lines as $line) {
-            $this->assertNoViolation($file, $line);
-        }
-
-        $errorVersion = (isset($deprecatedVersion)) ? $deprecatedVersion : $deprecatedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertWarning($file, $line, $error);
-        }
-
-        $errorVersion = (isset($removedVersion)) ? $removedVersion : $removedIn;
-        $file         = $this->sniffFile(__FILE__, $errorVersion);
-        $error        = "Function {$functionName}() is deprecated since PHP {$deprecatedIn} and removed since PHP {$removedIn}; Use {$alternative} instead";
-        foreach ($lines as $line) {
-            $this->assertError($file, $line, $error);
-        }
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testDeprecatedRemovedFunctionWithAlternative()
-     *
-     * @return array
-     */
-    public function dataDeprecatedRemovedFunctionWithAlternative()
-    {
-        return [
-            ['call_user_method', '4.1', '7.0', 'call_user_func()', [3], '4.0'],
-            ['call_user_method_array', '4.1', '7.0', 'call_user_func_array()', [4], '4.0'],
-            ['ereg', '5.3', '7.0', 'preg_match()', [7], '5.2'],
-            ['ereg_replace', '5.3', '7.0', 'preg_replace()', [8], '5.2'],
-            ['eregi', '5.3', '7.0', 'preg_match() (with the i modifier)', [9], '5.2'],
-            ['eregi_replace', '5.3', '7.0', 'preg_replace() (with the i modifier)', [10], '5.2'],
-            ['mcrypt_generic_end', '5.3', '7.0', 'mcrypt_generic_deinit()', [12], '5.2'],
-            ['mcrypt_ecb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [37], '5.4'],
-            ['mcrypt_cbc', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [38], '5.4'],
-            ['mcrypt_cfb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [39], '5.4'],
-            ['mcrypt_ofb', '5.5', '7.0', 'mcrypt_decrypt()/mcrypt_encrypt()', [40], '5.4'],
-            ['mysql_db_query', '5.3', '7.0', 'mysqli::select_db() and mysqli::query()', [13], '5.2'],
-            ['mysql_escape_string', '4.3', '7.0', 'mysqli::real_escape_string()', [14], '4.2'],
-            ['mysqli_bind_param', '5.3', '5.4', 'mysqli_stmt::bind_param()', [16], '5.2'],
-            ['mysqli_bind_result', '5.3', '5.4', 'mysqli_stmt::bind_result()', [17], '5.2'],
-            ['mysqli_client_encoding', '5.3', '5.4', 'mysqli::character_set_name()', [18], '5.2'],
-            ['mysqli_fetch', '5.3', '5.4', 'mysqli_stmt::fetch()', [19], '5.2'],
-            ['mysqli_param_count', '5.3', '5.4', 'mysqli_stmt_param_count()', [20], '5.2'],
-            ['mysqli_get_metadata', '5.3', '5.4', 'mysqli_stmt::result_metadata()', [21], '5.2'],
-            ['mysqli_send_long_data', '5.3', '5.4', 'mysqli_stmt::send_long_data()', [22], '5.2'],
-            ['session_register', '5.3', '5.4', '$_SESSION', [24], '5.2'],
-            ['session_unregister', '5.3', '5.4', '$_SESSION', [25], '5.2'],
-            ['session_is_registered', '5.3', '5.4', '$_SESSION', [26], '5.2'],
-            ['set_socket_blocking', '5.3', '7.0', 'stream_set_blocking()', [28], '5.2'],
-            ['split', '5.3', '7.0', 'preg_split(), explode() or str_split()', [29], '5.2'],
-            ['spliti', '5.3', '7.0', 'preg_split() (with the i modifier)', [30], '5.2'],
-            ['datefmt_set_timezone_id', '5.5', '7.0', 'IntlDateFormatter::setTimeZone()', [36], '5.4'],
-
-            ['mcrypt_create_iv', '7.1', '7.2', 'random_bytes() or OpenSSL', [100], '7.0'],
-            ['mcrypt_decrypt', '7.1', '7.2', 'OpenSSL', [101], '7.0'],
-            ['mcrypt_enc_get_algorithms_name', '7.1', '7.2', 'OpenSSL', [102], '7.0'],
-            ['mcrypt_enc_get_block_size', '7.1', '7.2', 'OpenSSL', [103], '7.0'],
-            ['mcrypt_enc_get_iv_size', '7.1', '7.2', 'OpenSSL', [104], '7.0'],
-            ['mcrypt_enc_get_key_size', '7.1', '7.2', 'OpenSSL', [105], '7.0'],
-            ['mcrypt_enc_get_modes_name', '7.1', '7.2', 'OpenSSL', [106], '7.0'],
-            ['mcrypt_enc_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [107], '7.0'],
-            ['mcrypt_enc_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [108], '7.0'],
-            ['mcrypt_enc_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [109], '7.0'],
-            ['mcrypt_enc_is_block_mode', '7.1', '7.2', 'OpenSSL', [110], '7.0'],
-            ['mcrypt_enc_self_test', '7.1', '7.2', 'OpenSSL', [111], '7.0'],
-            ['mcrypt_encrypt', '7.1', '7.2', 'OpenSSL', [112], '7.0'],
-            ['mcrypt_generic_deinit', '7.1', '7.2', 'OpenSSL', [113], '7.0'],
-            ['mcrypt_generic_init', '7.1', '7.2', 'OpenSSL', [114], '7.0'],
-            ['mcrypt_generic', '7.1', '7.2', 'OpenSSL', [115], '7.0'],
-            ['mcrypt_get_block_size', '7.1', '7.2', 'OpenSSL', [116], '7.0'],
-            ['mcrypt_get_cipher_name', '7.1', '7.2', 'OpenSSL', [117], '7.0'],
-            ['mcrypt_get_iv_size', '7.1', '7.2', 'OpenSSL', [118], '7.0'],
-            ['mcrypt_get_key_size', '7.1', '7.2', 'OpenSSL', [119], '7.0'],
-            ['mcrypt_list_algorithms', '7.1', '7.2', 'OpenSSL', [120], '7.0'],
-            ['mcrypt_list_modes', '7.1', '7.2', 'OpenSSL', [121], '7.0'],
-            ['mcrypt_module_close', '7.1', '7.2', 'OpenSSL', [122], '7.0'],
-            ['mcrypt_module_get_algo_block_size', '7.1', '7.2', 'OpenSSL', [123], '7.0'],
-            ['mcrypt_module_get_algo_key_size', '7.1', '7.2', 'OpenSSL', [124], '7.0'],
-            ['mcrypt_module_get_supported_key_sizes', '7.1', '7.2', 'OpenSSL', [125], '7.0'],
-            ['mcrypt_module_is_block_algorithm_mode', '7.1', '7.2', 'OpenSSL', [126], '7.0'],
-            ['mcrypt_module_is_block_algorithm', '7.1', '7.2', 'OpenSSL', [127], '7.0'],
-            ['mcrypt_module_is_block_mode', '7.1', '7.2', 'OpenSSL', [128], '7.0'],
-            ['mcrypt_module_open', '7.1', '7.2', 'OpenSSL', [129], '7.0'],
-            ['mcrypt_module_self_test', '7.1', '7.2', 'OpenSSL', [130], '7.0'],
-            ['mdecrypt_generic', '7.1', '7.2', 'OpenSSL', [131], '7.0'],
-
-            ['create_function', '7.2', '8.0', 'an anonymous function', [146], '7.1'],
-            ['each', '7.2', '8.0', 'a foreach loop or ArrayIterator', [147], '7.1'],
-            ['read_exif_data', '7.2', '8.0', 'exif_read_data()', [149], '7.1'],
-            ['jpeg2wbmp', '7.2', '8.0', 'imagecreatefromjpeg() and imagewbmp()', [144], '7.1'],
-            ['png2wbmp', '7.2', '8.0', 'imagecreatefrompng() or imagewbmp()', [145], '7.1'],
-            ['gmp_random', '7.2', '8.0', 'gmp_random_bits() or gmp_random_range()', [148], '7.1'],
-
-            ['image2wbmp', '7.3', '8.0', 'imagewbmp()', [152], '7.2'],
-            ['mbregex_encoding', '7.3', '8.0', 'mb_regex_encoding()', [153], '7.2'],
-            ['mbereg', '7.3', '8.0', 'mb_ereg()', [154], '7.2'],
-            ['mberegi', '7.3', '8.0', 'mb_eregi()', [155], '7.2'],
-            ['mbereg_replace', '7.3', '8.0', 'mb_ereg_replace()', [156], '7.2'],
-            ['mberegi_replace', '7.3', '8.0', 'mb_eregi_replace()', [157], '7.2'],
-            ['mbsplit', '7.3', '8.0', 'mb_split()', [158], '7.2'],
-            ['mbereg_match', '7.3', '8.0', 'mb_ereg_match()', [159], '7.2'],
-            ['mbereg_search', '7.3', '8.0', 'mb_ereg_search()', [160], '7.2'],
-            ['mbereg_search_pos', '7.3', '8.0', 'mb_ereg_search_pos()', [161], '7.2'],
-            ['mbereg_search_regs', '7.3', '8.0', 'mb_ereg_search_regs()', [162], '7.2'],
-            ['mbereg_search_init', '7.3', '8.0', 'mb_ereg_search_init()', [163], '7.2'],
-            ['mbereg_search_getregs', '7.3', '8.0', 'mb_ereg_search_getregs()', [164], '7.2'],
-            ['mbereg_search_getpos', '7.3', '8.0', 'mb_ereg_search_getpos()', [165], '7.2'],
-            ['mbereg_search_setpos', '7.3', '8.0', 'mb_ereg_search_setpos()', [166], '7.2'],
-
-            ['convert_cyr_string', '7.4', '8.0', 'mb_convert_encoding(), iconv() or UConverter', [243], '7.3'],
-            ['money_format', '7.4', '8.0', 'NumberFormatter::formatCurrency()', [244], '7.3'],
-            ['restore_include_path', '7.4', '8.0', "ini_restore('include_path')", [246], '7.3'],
-            ['ociinternaldebug', '5.4', '8.0', 'oci_internal_debug() (PHP < 8.0)', [69], '5.3'],
-            ['ldap_control_paged_result_response', '7.4', '8.0', 'ldap_search()', [234], '7.3'],
-            ['ldap_control_paged_result', '7.4', '8.0', 'ldap_search()', [235], '7.3'],
-        ];
-    }
-
-
-    /**
-     * testNoFalsePositives
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line The line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '99.0'); // High version beyond latest deprecation.
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        return [
-            [134],
-            [135],
-            [136],
-            [137],
-            [138],
-            [139],
-            [140],
-            [141],
-            [249],
-            [250],
-            [251],
-            [252],
-            [1232],
-        ];
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '4.0'); // Low version below the first deprecation.
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc
deleted file mode 100644
index 1690d84c..00000000
--- a/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-// OK.
-sem_get( $key, $max_acquire, $perm, );
-sem_get($SHM_KEY, 1024, 0644 | IPC_CREAT);
-sem_get( $SEMKey, 2, 0666, true);
-sem_get( $SEMKey, 2, 0666, false);
-ob_implicit_flush();
-ob_implicit_flush(true);
-
-// Ignore as undetermined.
-sem_get( $key, $max_acquire, $perm, $auto_release );
-sem_get( $key, $max_acquire, $perm, SEMVER_RELEASE );
-sem_get( $key, $max_acquire, $perm, self::RELEASE_TOGGLE );
-ob_implicit_flush($flag);
-
-// Ignore for complexity + could be valid cross-version toggle.
-sem_get( $key, $max_acquire, $perm, $test ? 1 : true );
-
-// Error.
-sem_get( $key, $max_acquire, $perm, 0 );
-sem_get( $key, $max_acquire, $perm, 1 );
-sem_get( $key, $max_acquire, $perm, -1 );
-Sem_Get( $key, $max_acquire, $perm, 0 );
-sem_get( $key, $max_acquire, $perm, 1.0 );
-sem_get( $key, auto_release: 1 * 1);
-ob_implicit_flush(0);
-ob_implicit_flush(enable: 1);
diff --git a/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php b/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php
deleted file mode 100644
index e8e0643f..00000000
--- a/PHPCompatibility/Tests/ParameterValues/ChangedIntToBoolParamTypeUnitTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\ParameterValues;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the ChangedIntToBoolParamType sniff.
- *
- * @group changedIntToBoolParamType
- * @group parameterValues
- *
- * @covers \PHPCompatibility\Sniffs\ParameterValues\ChangedIntToBoolParamTypeSniff
- *
- * @since 10.0.0
- */
-class ChangedIntToBoolParamTypeUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Test that numeric values being passed as $auto_release to sem_get() throw an error.
-     *
-     * @dataProvider dataChangedIntToBoolParamType
-     *
-     * @param int    $line         Line number where the error should occur.
-     * @param string $since        The PHP version in which the change was made.
-     * @param string $paramName    The name of the parameter the error relates to.
-     * @param string $functionName The name of the function the error relates to.
-     *
-     * @return void
-     */
-    public function testChangedIntToBoolParamType($line, $since, $paramName, $functionName)
-    {
-        $file  = $this->sniffFile(__FILE__, $since);
-        $error = "The {$paramName} parameter of {$functionName}() expects a boolean value instead of an integer since PHP {$since}";
-
-        $this->assertError($file, $line, $error);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testChangedIntToBoolParamType)
-     *
-     * @return array
-     */
-    public function dataChangedIntToBoolParamType()
-    {
-        return [
-            [21, '8.0', '$auto_release', 'sem_get'],
-            [22, '8.0', '$auto_release', 'sem_get'],
-            [23, '8.0', '$auto_release', 'sem_get'],
-            [24, '8.0', '$auto_release', 'sem_get'],
-            [25, '8.0', '$auto_release', 'sem_get'],
-            [26, '8.0', '$auto_release', 'sem_get'],
-            [27, '8.0', '$enable', 'ob_implicit_flush'],
-            [28, '8.0', '$enable', 'ob_implicit_flush'],
-        ];
-    }
-
-
-    /**
-     * Verify no false positives are thrown for valid code.
-     *
-     * @dataProvider dataNoFalsePositives
-     *
-     * @param int $line Line number.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($line)
-    {
-        $file = $this->sniffFile(__FILE__, '99.0');
-        $this->assertNoViolation($file, $line);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testNoFalsePositives()
-     *
-     * @return array
-     */
-    public function dataNoFalsePositives()
-    {
-        $data = [];
-
-        // No errors expected on the first 19 lines.
-        for ($line = 1; $line <= 19; $line++) {
-            $data[] = [$line];
-        }
-
-        return $data;
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.4'); // Version before first change.
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.inc
deleted file mode 100644
index 2f0d9d2e..00000000
--- a/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-// Incorrect call. Ignore.
-assert();
-
-// OK in all versions.
-assert(false);
-assert(true);
-
-// Undetermined. Ignore.
-assert($assertion);
-
-// Expression, PHP 7+, not our concern.
-assert(true == false);
-assert((bool) ($input));
-
-// Deprecated as of PHP 7.2.
-assert('mysql_query("")');
-assert("2 < 1" /* just a demo */, 'Two is less than one');
-assert(<<<'EOT'
-    is_string($result) &&
-    (strlen($result) > 0);
-EOT
-);
-assert(
-    'is_int($int)'
-    . '&& $int > 10'
-);
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php b/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php
deleted file mode 100644
index fd6326e1..00000000
--- a/PHPCompatibility/Tests/ParameterValues/RemovedAssertStringAssertionUnitTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\ParameterValues;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedAssertStringAssertion sniff.
- *
- * @group removedAssertStringAssertion
- * @group parameterValues
- *
- * @covers \PHPCompatibility\Sniffs\ParameterValues\RemovedAssertStringAssertionSniff
- *
- * @since 10.0.0
- */
-class RemovedAssertStringAssertionUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Test the sniff correctly detects assertions passed as strings.
-     *
-     * @dataProvider dataRemovedAssertStringAssertion
-     *
-     * @param int $line Line number where the warning should occur.
-     *
-     * @return void
-     */
-    public function testRemovedAssertStringAssertion($line)
-    {
-        $file  = $this->sniffFile(__FILE__, '7.2');
-        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2';
-        $this->assertWarning($file, $line, $error);
-
-        $file  = $this->sniffFile(__FILE__, '8.0');
-        $error = 'Using a string as the assertion passed to assert() is deprecated since PHP 7.2 and removed since PHP 8.0';
-        $this->assertError($file, $line, $error);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedAssertStringAssertion()
-     *
-     * @return array
-     */
-    public function dataRemovedAssertStringAssertion()
-    {
-        return [
-            [18],
-            [19],
-            [20],
-            [25],
-        ];
-    }
-
-
-    /**
-     * Verify there are no false positives on code this sniff should ignore.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '7.2');
-
-        // No errors expected on the first 16 lines.
-        for ($line = 1; $line <= 16; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.1');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
deleted file mode 100644
index 257e89fd..00000000
--- a/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/*
- * Test get_defined_functions() PHP 8.0 change in accepted values.
- */
-
-// OK.
-get_defined_functions();
-get_defined_functions(exclude_disabled: $exclude_disabled);
-
-// Not OK.
-get_defined_functions(false);
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
deleted file mode 100644
index 4e738ed9..00000000
--- a/PHPCompatibility/Tests/ParameterValues/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\ParameterValues;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedGetDefinedFunctionsExcludeDisabledFalse sniff.
- *
- * @group removedGetDefinedFunctionsExcludeDisabledFalse
- * @group parameterValues
- *
- * @covers \PHPCompatibility\Sniffs\ParameterValues\RemovedGetDefinedFunctionsExcludeDisabledFalseSniff
- *
- * @since 10.0.0
- */
-class RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest extends BaseSniffTest
-{
-
-    /**
-     * testRemovedGetDefinedFunctionsExcludeDisabledFalse
-     *
-     * @dataProvider dataRemovedGetDefinedFunctionsExcludeDisabledFalse
-     *
-     * @param int $line Line number where the error should occur.
-     *
-     * @return void
-     */
-    public function testRemovedGetDefinedFunctionsExcludeDisabledFalse($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $exclude_disabled to get_defined_functions() is deprecated since PHP 8.0.');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedGetDefinedFunctionsExcludeDisabledFalse()
-     *
-     * @return array
-     */
-    public function dataRemovedGetDefinedFunctionsExcludeDisabledFalse()
-    {
-        return [
-            [11],
-        ];
-    }
-
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-
-        // No errors expected on the first 9 lines.
-        for ($line = 1; $line <= 9; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc b/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
deleted file mode 100644
index 7703e396..00000000
--- a/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*
- * Test spl_autoload_register() PHP 8.0 change in accepted values.
- */
-
-// OK.
-spl_autoload_register();
-spl_autoload_register($autoload_function);
-spl_autoload_register($autoload_function, true, false);
-spl_autoload_register($autoload_function, $throw, $prepend);
-spl_autoload_register(callback: $autoload_function, prepend: false);
-
-// Not OK.
-spl_autoload_register($autoload_function, false);
-spl_autoload_register(prepend: false, callback: $autoload_function, throw: false);
diff --git a/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
deleted file mode 100644
index 8bec42c5..00000000
--- a/PHPCompatibility/Tests/ParameterValues/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2020 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\ParameterValues;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedSplAutoloadRegisterThrowFalse sniff.
- *
- * @group removedSplAutoloadRegisterThrowFalse
- * @group parameterValues
- *
- * @covers \PHPCompatibility\Sniffs\ParameterValues\RemovedSplAutoloadRegisterThrowFalseSniff
- *
- * @since 10.0.0
- */
-class RemovedSplAutoloadRegisterThrowFalseUnitTest extends BaseSniffTest
-{
-
-    /**
-     * Verify a warning is thrown when an explicit false is passed as the second parameter.
-     *
-     * @dataProvider dataRemovedSplAutoloadRegisterThrowFalse
-     *
-     * @param int $line Line number where the error should occur.
-     *
-     * @return void
-     */
-    public function testRemovedSplAutoloadRegisterThrowFalse($line)
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-        $this->assertWarning($file, $line, 'Explicitly passing "false" as the value for $throw to spl_autoload_register() is deprecated since PHP 8.0.');
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedSplAutoloadRegisterThrowFalse()
-     *
-     * @return array
-     */
-    public function dataRemovedSplAutoloadRegisterThrowFalse()
-    {
-        return [
-            [14],
-            [15],
-        ];
-    }
-
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives()
-    {
-        $file = $this->sniffFile(__FILE__, '8.0');
-
-        // No errors expected on the first 12 lines.
-        for ($line = 1; $line <= 12; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion()
-    {
-        $file = $this->sniffFile(__FILE__, '7.4');
-        $this->assertNoViolation($file);
-    }
-}
diff --git a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc
deleted file mode 100644
index 4ec71d18..00000000
--- a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.1.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- * Embedded variables which are supported cross-version.
- */
-
-// Type 1: directly embedding variables.
-echo "$foo";
-echo "$$foo";
-echo "$foo[bar]";
-echo "$foo->bar";
-$text = "some text $var some text";
-
-$heredoc = <<<EOD
-some text $var some text
-EOD;
-
-// Type 2: Braces around the variable/expression.
-echo "{$foo}";
-echo "{$$foo}";
-echo "{$foo['bar']}";
-echo "{$foo->bar}";
-echo "{$foo->bar()}";
-echo "{$foo['bar']->baz()()}";
-echo "{${$bar}}";
-echo "{$foo()}";
-echo "{${$object->getMethod()}}"
-$text = "some text {$var} some text";
-
-$heredoc = <<<"EOD"
-some text {$var} some text
-EOD;
-
-/*
- * Not our target.
- */
-
-// Ordinary variable variables outside strings.
-$foo = ${'bar'};
-
-// Heredoc without embeds.
-echo <<<EOD
-Some text
-EOD;
-
-// Not actually interpolated - $ is escaped. The second $foo is to force T_DOUBLE_QUOTED_STRING tokenization.
-echo "\${foo} and $foo";
-echo "\${foo[\"bar\"]} and $foo";
-echo "$\{foo} and $foo";
-
-
-/*
- * PHP 8.2: deprecated forms of embedding variables.
- */
-
-// Type 3: Braces after the dollar sign.
-echo "${foo}";
-echo "${foo['bar']}";
-$text = "some text ${foo} some ${text}";
-
-$heredoc = <<<EOD
-some text ${foo} some text
-EOD;
-
-echo "\\${foo}"; // Not actually escaped, the backslash escapes the backslash, not the dollar sign.
-
-// Type 4: Variable variables.
-echo "${$bar}";
-echo "${(foo)}";
-echo "${foo->bar}";
-echo "${$object->getMethod()}"
-$text = "some text ${(foo)} some text";
-echo "${substr('laruence', 0, 2)}";
-
-echo "${foo["${bar}"]}";
-echo "${foo["${bar['baz']}"]}";
-echo "${foo->{$baz}}";
-echo "${foo->{${'a'}}}";
-echo "${foo->{"${'a'}"}}";
-
-// Verify correct handling of stack pointers in multi-token code.
-$text = "Line without embed
-some text ${foo["${bar}"]} some text
-some text ${foo["${bar['baz']}"]} some text
-some text ${foo->{${'a'}}} some text
-";
-
-$heredoc = <<<"EOD"
-some text ${(foo)} some text
-EOD;
diff --git a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.2.inc b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.2.inc
deleted file mode 100644
index f637fbf1..00000000
--- a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.2.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * The tests involving PHP 7.3+ indented heredocs are in a separate test case file
- * as any code after an indented heredoc will be tokenizer garbage on PHP < 7.3.
- */
-
-// No embeds.
-$php73IndentedHeredoc = <<<"EOD"
-    some text some text
-    EOD;
-
-/*
- * Embedded variables which are supported cross-version.
- */
-
-// Type 1: directly embedding variables.
-$php73IndentedHeredoc = <<<"EOD"
-    some text $foo[bar] some text
-    EOD;
-
-// Type 2: Braces around the variable/expression.
-$php73IndentedHeredoc = <<<EOD
-    some text {${$bar}} some text
-    EOD;
-
-/*
- * PHP 8.2: deprecated forms of embedding variables.
- */
-
-// Type 3: Braces after the dollar sign.
-$php73IndentedHeredoc = <<<"EOD"
-    some text ${foo['bar']} some text
-    EOD;
-
-// Type 4: Variable variables.
-$php73IndentedHeredoc = <<<EOD
-    Line without embed
-    some text ${$object->getMethod()} some text
-    some text ${foo["${bar['baz']}"]} some text
-    some text ${foo->{${'a'}}} some text
-    EOD;
diff --git a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php b/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php
deleted file mode 100644
index 25d0c939..00000000
--- a/PHPCompatibility/Tests/TextStrings/RemovedDollarBraceStringEmbedsUnitTest.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2022 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- */
-
-namespace PHPCompatibility\Tests\TextStrings;
-
-use PHPCompatibility\Tests\BaseSniffTest;
-
-/**
- * Test the RemovedDollarBraceStringEmbeds sniff.
- *
- * @group removedDollarBraceStringEmbeds
- * @group textstrings
- *
- * @covers \PHPCompatibility\Sniffs\TextStrings\RemovedDollarBraceStringEmbedsSniff
- *
- * @since 10.0.0
- */
-class RemovedDollarBraceStringEmbedsUnitTest extends BaseSniffTest
-{
-
-    /**
-     * The name of the primary test case file.
-     *
-     * @var string
-     */
-    const TEST_FILE = 'RemovedDollarBraceStringEmbedsUnitTest.1.inc';
-
-    /**
-     * The name of a secondary test case file containing PHP 7.3+ indented heredocs.
-     *
-     * @var string
-     */
-    const TEST_FILE_PHP73HEREDOCS = 'RemovedDollarBraceStringEmbedsUnitTest.2.inc';
-
-    /**
-     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
-     * are correctly detected.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType3
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded variable found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType3($line, $found)
-    {
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
-        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType3()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType3()
-    {
-        return [
-            [57, '${foo}'],
-            [58, '${foo[\'bar\']}'],
-            [59, '${foo}'],
-            [59, '${text}'],
-            [62, '${foo}'],
-            [65, '${foo}'],
-        ];
-    }
-
-
-    /**
-     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
-     * (string) ${expr}) - are correctly detected.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType4
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded expression found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType4($line, $found)
-    {
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE, '8.2');
-        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType4()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType4()
-    {
-        return [
-            [68, '${$bar}'],
-            [69, '${(foo)}'],
-            [70, '${foo->bar}'],
-            [71, '${$object->getMethod()}'],
-            [72, '${(foo)}'],
-            [73, '${substr(\'laruence\', 0, 2)}'],
-            [75, '${foo["${bar}"]}'],
-            [76, '${foo["${bar[\'baz\']}"]}'],
-            [77, '${foo->{$baz}}'],
-            [78, '${foo->{${\'a\'}}}'],
-            [79, '${foo->{"${\'a\'}"}}'],
-            [83, '${foo["${bar}"]}'],
-            [84, '${foo["${bar[\'baz\']}"]}'],
-            [85, '${foo->{${\'a\'}}}'],
-            [89, '${(foo)}'],
-        ];
-    }
-
-
-    /**
-     * Test that variable embeds of "type 3" - Braces after the dollar sign (�${foo}�) -
-     * are correctly detected in PHP 7.3+ indented heredocs.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded variable found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc($line, $found)
-    {
-        if (\PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
-        $this->assertWarning($file, $line, 'Using ${var} in strings is deprecated since PHP 8.2, use {$var} instead. Found: ' . $found);
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType3InIndentedHeredoc()
-    {
-        return [
-            [33, '${foo[\'bar\']}'],
-        ];
-    }
-
-
-    /**
-     * Test that variable embeds of "type 4" - Variable variables (�${expr}�, equivalent to
-     * (string) ${expr}) - are correctly detected in PHP 7.3+ indented heredocs.
-     *
-     * @dataProvider dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc
-     *
-     * @param int    $line  The line number.
-     * @param string $found The embedded expression found.
-     *
-     * @return void
-     */
-    public function testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc($line, $found)
-    {
-        if (\PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . self::TEST_FILE_PHP73HEREDOCS, '8.2');
-        $this->assertWarning($file, $line, "Using {$found} (variable variables) in strings is deprecated since PHP 8.2, use {\${expr}} instead.");
-    }
-
-    /**
-     * Data provider.
-     *
-     * @see testRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
-     *
-     * @return array
-     */
-    public function dataRemovedDollarBraceStringEmbedsType4InIndentedHeredoc()
-    {
-        return [
-            [39, '${$object->getMethod()}'],
-            [40, '${foo["${bar[\'baz\']}"]}'],
-            [41, '${foo->{${\'a\'}}}'],
-        ];
-    }
-
-
-    /**
-     * Verify the sniff does not throw false positives for valid code.
-     *
-     * @dataProvider dataTestFiles
-     *
-     * @param string $testFile File name for the test case file to use.
-     * @param int    $lines    Number of lines at the top of the file for which we don't expect errors.
-     *
-     * @return void
-     */
-    public function testNoFalsePositives($testFile, $lines)
-    {
-        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.2');
-
-        // No errors expected on the first # lines.
-        for ($line = 1; $line <= $lines; $line++) {
-            $this->assertNoViolation($file, $line);
-        }
-    }
-
-
-    /**
-     * Verify no notices are thrown at all.
-     *
-     * @dataProvider dataTestFiles
-     *
-     * @param string $testFile File name for the test case file to use.
-     *
-     * @return void
-     */
-    public function testNoViolationsInFileOnValidVersion($testFile)
-    {
-        if ($testFile === self::TEST_FILE_PHP73HEREDOCS && \PHP_VERSION_ID < 70300) {
-            $this->markTestSkipped('Test code involving PHP 7.3 heredocs will not tokenize correctly on PHP < 7.3');
-        }
-
-        $file = $this->sniffFile(__DIR__ . '/' . $testFile, '8.1');
-        $this->assertNoViolation($file);
-    }
-
-
-    /**
-     * Data provider.
-     *
-     * @return array
-     */
-    public function dataTestFiles()
-    {
-        return [
-            [self::TEST_FILE, 51],
-            [self::TEST_FILE_PHP73HEREDOCS, 26],
-        ];
-    }
-}
diff --git a/composer.json b/composer.json
index c3fed220..e4c0c17b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.15.10",
         "symfony/polyfill": "^1.16",
-        "phpcsstandards/phpcsutils": "~1.0.5"
+        "phpcsstandards/phpcsutils": "^1.0.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8",
@@ -33,8 +33,7 @@
         ],
         "psr-4": {
             "Magento2\\": "Magento2/",
-            "Magento2Framework\\": "Magento2Framework/",
-            "PHPCompatibility\\": "PHPCompatibility/"
+            "Magento2Framework\\": "Magento2Framework/"
         }
     },
     "scripts": {
diff --git a/composer.lock b/composer.lock
index 56d67192..eb5742d8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9ddd67b442b71fc7f10119eac7e40140",
+    "content-hash": "005e2882d6bfb6ebf35f0acfa890efac",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
diff --git a/phpunit-bootstrap.php b/phpunit-bootstrap.php
index 487e0170..585cf634 100644
--- a/phpunit-bootstrap.php
+++ b/phpunit-bootstrap.php
@@ -1,15 +1,7 @@
 <?php
+
 /**
- * PHPCompatibility, an external standard for PHP_CodeSniffer.
- *
  * Bootstrap file for tests.
- *
- * @package   PHPCompatibility
- * @copyright 2012-2019 PHPCompatibility Contributors
- * @license   https://opensource.org/licenses/LGPL-3.0 LGPL3
- * @link      https://github.com/PHPCompatibility/PHPCompatibility
- *
- * @since 5.5
  */
 
 if (defined('PHP_CODESNIFFER_IN_TESTS') === false) {
@@ -25,67 +17,5 @@
     define('PHP_CODESNIFFER_VERBOSITY', 0);
 }
 
-/**
- * Define PHP 8.1 tokens
- */
-if (!defined('T_READONLY')) {
-    define('T_READONLY', 42401);
-}
-
-$ds = DIRECTORY_SEPARATOR;
-
-// Get the PHPCS dir from an environment variable.
-$phpcsDir = getenv('PHPCS_DIR');
-
-// This may be a Composer install.
-if ($phpcsDir === false && is_dir(__DIR__ . $ds . 'vendor' . $ds . 'squizlabs' . $ds . 'php_codesniffer')) {
-    $vendorDir = __DIR__ . $ds . 'vendor';
-    $phpcsDir  = $vendorDir . $ds . 'squizlabs' . $ds . 'php_codesniffer';
-} elseif ($phpcsDir !== false) {
-    $phpcsDir = realpath($phpcsDir);
-}
-
-// Try and load the PHPCS autoloader.
-if ($phpcsDir !== false && file_exists($phpcsDir . $ds . 'autoload.php')) {
-    // PHPCS 3.x.
-    require_once $phpcsDir . $ds . 'autoload.php';
-
-    /*
-     * Alias the PHPCS 3.x classes to their PHPCS 2.x equivalent if necessary.
-     * Also provide a custom autoloader for our abstract base classes as the PHPCS native autoloader
-     * has trouble with them in combination with the PHPCompatibility custom unit test suite.
-     */
-    require_once __DIR__ . $ds . 'vendor/phpcompatibility/php-compatibility/PHPCSAliases.php';
-
-} elseif ($phpcsDir !== false && file_exists($phpcsDir . $ds . 'CodeSniffer.php')) {
-    // PHPCS 2.x.
-    require_once $phpcsDir . $ds . 'CodeSniffer.php';
-
-    if (isset($vendorDir) && file_exists($vendorDir . $ds . 'autoload.php')) {
-        require_once $vendorDir . $ds . 'autoload.php';
-    }
-
-} else {
-    echo 'Uh oh... can\'t find PHPCS.
-
-If you use Composer, please run `composer install --prefer-source`.
-Otherwise, make sure you set a `PHPCS_DIR` environment variable in your phpunit.xml file
-pointing to the PHPCS directory.
-
-Please read the contributors guidelines for more information:
-https://is.gd/PHPCompatibilityContrib
-';
-
-    die(1);
-}
-
-
-// PHPUnit cross version compatibility.
-if (class_exists('PHPUnit\Runner\Version')
-    && version_compare(PHPUnit\Runner\Version::id(), '6.0', '>=')
-    && class_exists('PHPUnit_Framework_TestCase') === false
-) {
-    class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
-}
-
-unset($ds, $phpcsDir, $vendorDir);
+require_once __DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php';
+require_once __DIR__ . '/vendor/phpcompatibility/php-compatibility/PHPCSAliases.php';

From 8d37ab7b8eb9c204abf2adcb2e637065595021c5 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Sun, 28 May 2023 18:32:02 +0100
Subject: [PATCH 563/630] Update supported PHP versions

---
 .github/workflows/php.yml | 6 +-----
 Magento2/ruleset.xml      | 4 ++--
 composer.json             | 2 +-
 composer.lock             | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index ac9fc0a0..52b6a97f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,15 +13,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
         dependencies:
           - "lowest"
           - "highest"
-        exclude:
-          - php-version: "8.1"
-            dependencies: "lowest"
     name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 6234fb1b..4ff483e4 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -350,7 +350,7 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-   
+
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <severity>7</severity>
@@ -762,7 +762,7 @@
     </rule>
 
     <!-- PHPCompatibility configuration. -->
-    <config name="testVersion" value="7.4-"/>
+    <config name="testVersion" value="8.1-8.2"/>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
         <!-- Following sniffs have been updated or renamed in PHPCompatibility 10 -->
diff --git a/composer.json b/composer.json
index c3fed220..bca16d28 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "type": "phpcodesniffer-standard",
     "version": "31",
     "require": {
-        "php": ">=7.4",
+        "php": "~8.1.0 || ~8.2.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index 56d67192..8c9becb7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9ddd67b442b71fc7f10119eac7e40140",
+    "content-hash": "d941f20e7ac60684443f46eca9c86f5d",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2377,7 +2377,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4",
+        "php": "~8.1.0 || ~8.2.0",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },

From d95dff812afd308a03e635fad60d1691fc73f7ea Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Mon, 29 May 2023 11:37:28 +0100
Subject: [PATCH 564/630] Remove now-unused file

---
 Magento2/Internal/FileProxy.php | 465 --------------------------------
 1 file changed, 465 deletions(-)
 delete mode 100644 Magento2/Internal/FileProxy.php

diff --git a/Magento2/Internal/FileProxy.php b/Magento2/Internal/FileProxy.php
deleted file mode 100644
index a95043d7..00000000
--- a/Magento2/Internal/FileProxy.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento2\Internal;
-
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Proxy class for \PHP_CodeSniffer\Files\File
- *
- * @internal
- */
-class FileProxy extends \PHP_CodeSniffer\Files\File
-{
-    private \PHP_CodeSniffer\Files\File $file;
-
-    private array $proxies;
-
-    /**
-     * @param File $file
-     * @param callable[] $proxies associative array of method name => callable. For example: ['addError' => fn() => {}]
-     */
-    public function __construct(\PHP_CodeSniffer\Files\File $file, array $proxies = [])
-    {
-        $this->file = $file;
-        $this->proxies = $proxies;
-        // parent constructor is not called intentionally
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setContent($content)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($content);
-        }
-        return $this->file->setContent($content);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function reloadContent()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            ($this->proxies[__FUNCTION__])();
-        }
-        $this->file->reloadContent();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function disableCaching()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            ($this->proxies[__FUNCTION__])();
-        }
-        $this->file->disableCaching();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->process();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function parse()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->parse();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getTokens()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getTokens();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function cleanUp()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            ($this->proxies[__FUNCTION__])();
-        }
-        $this->file->cleanUp();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function addError($error, $stackPtr, $code, $data = [], $severity = 0, $fixable = false)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($error, $stackPtr, $code, $data, $severity, $fixable);
-        }
-        return $this->file->addError($error, $stackPtr, $code, $data, $severity, $fixable);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function addWarning($warning, $stackPtr, $code, $data = [], $severity = 0, $fixable = false)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($warning, $stackPtr, $code, $data, $severity, $fixable);
-        }
-        return $this->file->addFixableWarning($warning, $stackPtr, $code, $data, $severity);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function addErrorOnLine($error, $line, $code, $data = [], $severity = 0)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($error, $line, $code, $data, $severity);
-        }
-        return $this->file->addErrorOnLine($error, $line, $code, $data, $severity);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function addWarningOnLine($warning, $line, $code, $data = [], $severity = 0)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($warning, $line, $code, $data, $severity);
-        }
-        return $this->file->addWarningOnLine($warning, $line, $code, $data, $severity);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function addFixableError($error, $stackPtr, $code, $data = [], $severity = 0)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($error, $stackPtr, $code, $data, $severity);
-        }
-        return $this->file->addFixableError($error, $stackPtr, $code, $data, $severity);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function addFixableWarning($warning, $stackPtr, $code, $data = [], $severity = 0)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($warning, $stackPtr, $code, $data, $severity);
-        }
-        return $this->file->addFixableWarning($warning, $stackPtr, $code, $data, $severity);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function recordMetric($stackPtr, $metric, $value)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr, $metric, $value);
-        }
-        return $this->file->recordMetric($stackPtr, $metric, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getErrorCount()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getErrorCount();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningCount()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getWarningCount();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getFixableCount()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getFixableCount();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getFixedCount()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getFixedCount();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getIgnoredLines()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getIgnoredLines();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getErrors()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getErrors();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarnings()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getWarnings();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getMetrics()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getMetrics();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getFilename()
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])();
-        }
-        return $this->file->getFilename();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getDeclarationName($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->getDeclarationName($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getMethodParameters($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->getMethodParameters($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getMethodProperties($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->getMethodProperties($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getMemberProperties($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->getMemberProperties($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getClassProperties($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->getClassProperties($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function isReference($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->isReference($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getTokensAsString($start, $length, $origContent = false)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($start, $length, $origContent);
-        }
-        return $this->file->getTokensAsString($start, $length, $origContent);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function findPrevious($types, $start, $end = null, $exclude = false, $value = null, $local = false)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($types, $start, $end, $exclude, $value, $local);
-        }
-        return $this->file->findPrevious($types, $start, $end, $exclude, $value, $local);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function findNext($types, $start, $end = null, $exclude = false, $value = null, $local = false)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($types, $start, $end, $exclude, $value, $local);
-        }
-        return $this->file->findNext($types, $start, $end, $exclude, $value, $local);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function findStartOfStatement($start, $ignore = null)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($start, $ignore);
-        }
-        return $this->file->findStartOfStatement($start, $ignore);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function findEndOfStatement($start, $ignore = null)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($start, $ignore);
-        }
-        return $this->file->findEndOfStatement($start, $ignore);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function findFirstOnLine($types, $start, $exclude = false, $value = null)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($types, $start, $exclude, $value);
-        }
-        return $this->file->findFirstOnLine($types, $start, $exclude, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function hasCondition($stackPtr, $types)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr, $types);
-        }
-        return $this->file->hasCondition($stackPtr, $types);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getCondition($stackPtr, $type, $first = true)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr, $type, $first);
-        }
-        return $this->file->getCondition($stackPtr, $type, $first);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function findExtendedClassName($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->findExtendedClassName($stackPtr);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    /**
-     * @inheritdoc
-     */
-    public function findImplementedInterfaceNames($stackPtr)
-    {
-        if (isset($this->proxies[__FUNCTION__])) {
-            return ($this->proxies[__FUNCTION__])($stackPtr);
-        }
-        return $this->file->findImplementedInterfaceNames($stackPtr);
-    }
-}

From 053efe7414788b71ed3e8310dd020f757bfba297 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Mon, 29 May 2023 12:17:52 +0100
Subject: [PATCH 565/630] Increase minimum version of PHPUnit to fix tests

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index bca16d28..6b493d7a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "phpcsstandards/phpcsutils": "~1.0.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.8",
+        "phpunit/phpunit": "^9.5.10",
         "yoast/phpunit-polyfills": "^1.0"
     },
     "autoload-dev": {
diff --git a/composer.lock b/composer.lock
index 8c9becb7..b778b3da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d941f20e7ac60684443f46eca9c86f5d",
+    "content-hash": "93c2fcc45c74921ed7ed7b99da7505fa",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",

From 28cd6683ab15b9684ffe22d1303a4041566056ae Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Tue, 6 Jun 2023 14:08:27 -0500
Subject: [PATCH 566/630] ACP2E-2032: Fix failed builds

---
 phpunit-bootstrap.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/phpunit-bootstrap.php b/phpunit-bootstrap.php
index 585cf634..94f424dd 100644
--- a/phpunit-bootstrap.php
+++ b/phpunit-bootstrap.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * Bootstrap file for tests.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
-if (defined('PHP_CODESNIFFER_IN_TESTS') === false) {
-    define('PHP_CODESNIFFER_IN_TESTS', true);
-}
-
-// The below two defines are needed for PHPCS 3.x.
-if (defined('PHP_CODESNIFFER_CBF') === false) {
-    define('PHP_CODESNIFFER_CBF', false);
-}
-
-if (defined('PHP_CODESNIFFER_VERBOSITY') === false) {
-    define('PHP_CODESNIFFER_VERBOSITY', 0);
+/**
+ * Define PHP 8.1 tokens
+ */
+if (!defined('T_READONLY')) {
+    define('T_READONLY', 42401);
 }
 
-require_once __DIR__ . '/vendor/squizlabs/php_codesniffer/autoload.php';
-require_once __DIR__ . '/vendor/phpcompatibility/php-compatibility/PHPCSAliases.php';
+require_once __DIR__ . '/vendor/squizlabs/php_codesniffer/tests/bootstrap.php';

From 0127c4c310ce97d42798dda6b85ce4720672a216 Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Tue, 6 Jun 2023 14:38:16 -0500
Subject: [PATCH 567/630] ACP2E-2032: Fix ruleset

---
 Magento2/ruleset.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 770b3643..ceca9e7e 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -168,6 +168,10 @@
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions">
+        <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>
@@ -763,7 +767,5 @@
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
-        <!-- Following sniffs have an equivalent in Magento2 -->
-        <exclude name="PHPCompatibility.FunctionUse.RemovedFunctions" />
     </rule>
 </ruleset>

From 889b4d21076d2ddef54d948c63688770a6449310 Mon Sep 17 00:00:00 2001
From: sandip <sandip.chandela@klevu.com>
Date: Mon, 12 Jun 2023 15:42:27 +0530
Subject: [PATCH 568/630] Add test case for readonly property

---
 .../ClassPropertyPHPDocFormattingUnitTest.inc          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index cde71269..aca8a73b 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -200,4 +200,14 @@ class correctlyFormattedClassMemberDocBlock
      * @deprecated This property will be removed in version 1.0.0 without replacement
      */
     protected string $deprecatedWithKeyword;
+
+    /**
+     * @var string
+     */
+    protected readonly string $readOnlyString;
+
+    /**
+     * @var int
+     */
+    protected readonly int $readOnlyInteger;
 }

From 7b6bd743937183d00390a9fdd9d3fa7af389ac30 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Thu, 6 Jul 2023 14:48:29 +0100
Subject: [PATCH 569/630] Add sniff for deprecated use of $block->escape...

---
 .../Legacy/EscapeMethodsOnBlockClassSniff.php | 100 ++++++++++++++++++
 .../EscapeMethodsOnBlockClassUnitTest.inc     |  87 +++++++++++++++
 ...scapeMethodsOnBlockClassUnitTest.inc.fixed |  87 +++++++++++++++
 .../EscapeMethodsOnBlockClassUnitTest.php     |  45 ++++++++
 4 files changed, 319 insertions(+)
 create mode 100644 Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
 create mode 100644 Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc
 create mode 100644 Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc.fixed
 create mode 100644 Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.php

diff --git a/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php b/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
new file mode 100644
index 00000000..f44e3d0c
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+
+class EscapeMethodsOnBlockClassSniff implements Sniff
+{
+    private const ESCAPER_METHODS = [
+        'escapeCss' => true,
+        'escapeHtml' => true,
+        'escapeHtmlAttr' => true,
+        'escapeJs' => true,
+        'escapeJsQuote' => true,
+        'escapeQuote' => true,
+        'escapeUrl' => true,
+        'escapeXssInUrl' => true,
+    ];
+
+    public function register()
+    {
+        return [
+            T_OBJECT_OPERATOR,
+        ];
+    }
+
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if ($stackPtr <= 1 || !isset($tokens[$stackPtr + 2])) {
+            return;
+        }
+
+        $objectPtr = $stackPtr - 1;
+        if ($tokens[$objectPtr]['code'] !== T_VARIABLE) {
+            $objectPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $objectPtr, null, true);
+
+            if (!$objectPtr) {
+                return;
+            }
+        }
+
+        if ($tokens[$objectPtr]['code'] !== T_VARIABLE
+            || $tokens[$objectPtr]['content'] !== '$block'
+        ) {
+            return;
+        }
+
+        $methodPtr = $stackPtr + 1;
+        if ($tokens[$methodPtr]['code'] !== T_STRING) {
+            $methodPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $methodPtr, null, true);
+
+            if (!$methodPtr) {
+                return;
+            }
+        }
+
+        if ($tokens[$methodPtr]['code'] !== T_STRING
+            || !isset(self::ESCAPER_METHODS[$tokens[$methodPtr]['content']])
+        ) {
+            return;
+        }
+
+        $openParenPtr = $methodPtr + 1;
+        if ($tokens[$openParenPtr]['code'] !== T_OPEN_PARENTHESIS) {
+            $openParenPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $openParenPtr, null, true);
+
+            if (!$openParenPtr) {
+                return;
+            }
+        }
+
+        if ($tokens[$openParenPtr]['code'] !== T_OPEN_PARENTHESIS) {
+            return;
+        }
+
+        $fix = $phpcsFile->addFixableWarning(
+            'Using %s on $block is deprecated. Please use equivalent method on $escaper',
+            $methodPtr,
+            'Found',
+            [
+                $tokens[$methodPtr]['content'], // method name
+            ]
+        );
+
+        if ($fix) {
+            $phpcsFile->fixer->replaceToken($objectPtr, '$escaper');
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc b/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc
new file mode 100644
index 00000000..260f0c93
--- /dev/null
+++ b/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc
@@ -0,0 +1,87 @@
+<?php
+/** @var Magento\Framework\View\Element\Template $block */
+/** @var Magento\Framework\Escaper $escaper */
+?>
+
+<section>
+    <h1>This unescaped output is fine here; other sniffs will complain about it though.</h1>
+
+    <?php echo $block->getSomeString(); ?>
+    <?= $block->getSomeString(); ?>
+    <?= /** @noEscape */ $block->getSomeString(); ?>
+    <?= /** @escapeNotVerified */ $block->getSomeString(); ?>
+</section>
+
+<section>
+    <h1>These should be using equivalent methods on the `$escaper` class, not the `$block` class.</h1>
+
+    Note that I couldn't find any use of this method in any templates within Magento.
+    <?= $block->escapeCss($block->getSomeString()); ?>
+
+    <?= $block->escapeHtml(__($block->getSomeString())) ?>
+    <?= $block->escapeHtml(__($block->getSomeString())); ?>
+    <?= $block->escapeHtml(__($block->getSomeString()), ['strong', 'em', 'span']) ?>
+
+    <div class="<?= $block->escapeHtmlAttr($block->getSomeString()) ?>"></div>
+    <div class="<?= $block->escapeHtmlAttr($block->getSomeString(), true) ?>"></div>
+    <div class="<?= $block->escapeHtmlAttr($block->getSomeString(), false); ?>"></div>
+
+    <script type="text/x-magento-init">
+    {
+        "#chart_<?= $block->escapeJs($block->getData('html_id')) ?>_period": {
+            "Magento_Backend/js/dashboard/chart": {}
+        }
+    }
+    </script>
+
+    The only example of this method being used was in a block class, rather than a template.
+    <?php
+    foreach ($block->getItems() as $item) {
+        $item['sku'] = $block->escapeJsQuote($item['sku']);
+    }
+    ?>
+
+    The only example of this method being used was in a block class, rather than a template.
+    <?= $block->escapeQuote(__($block->getData('welcome'))); ?>
+
+    <a href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"> link text </a>
+
+    Note that I couldn't find any use of this method in any templates within Magento.
+    <?= $block->escapeXssInUrl($block->getSomeString()); ?>
+</section>
+
+<section>
+    <h1>These are edge cases for formatting differences</h1>
+
+    <?php
+        $block->escapeHtml('');
+        $block ->escapeHtml('');
+        $block-> escapeHtml('');
+        $block
+            ->escapeHtml('');
+        $block
+
+            ->escapeHtml('');
+        $block->
+            escapeHtml('');
+        $block-> // comment
+            escapeHtml('');
+        $block /* comment */
+            ->escapeHtml('');
+
+        $block /* comment */ -> /* comment */ escapeHtml('');
+    ?>
+</section>
+
+<section>
+    <h1>These close-matches shouldn't be flagged by this sniff.</h1>
+
+    <?= $block->escapeHTML(__($block->getSomeString())) ?>
+    <?= $block->escapeHtmlString(__($block->getSomeString())) ?>
+    <?= $block->escapeHtmlAttribute($block->getSomeString()) ?>
+    <?= $block->escapeCSS($block->getSomeString()); ?>
+    <?= $block->escapeJS($block->getData('html_id')) ?>
+    <?= $block->escapeJavaScript($block->getData('html_id')) ?>
+    <?= $block->escapeQuotes(__($block->getData('welcome'))); ?>
+    <?= $block->escapeURL($block->getUrl('adminhtml/notification/index')) ?>
+</section>
diff --git a/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc.fixed b/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc.fixed
new file mode 100644
index 00000000..80c4f22c
--- /dev/null
+++ b/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.inc.fixed
@@ -0,0 +1,87 @@
+<?php
+/** @var Magento\Framework\View\Element\Template $block */
+/** @var Magento\Framework\Escaper $escaper */
+?>
+
+<section>
+    <h1>This unescaped output is fine here; other sniffs will complain about it though.</h1>
+
+    <?php echo $block->getSomeString(); ?>
+    <?= $block->getSomeString(); ?>
+    <?= /** @noEscape */ $block->getSomeString(); ?>
+    <?= /** @escapeNotVerified */ $block->getSomeString(); ?>
+</section>
+
+<section>
+    <h1>These should be using equivalent methods on the `$escaper` class, not the `$block` class.</h1>
+
+    Note that I couldn't find any use of this method in any templates within Magento.
+    <?= $escaper->escapeCss($block->getSomeString()); ?>
+
+    <?= $escaper->escapeHtml(__($block->getSomeString())) ?>
+    <?= $escaper->escapeHtml(__($block->getSomeString())); ?>
+    <?= $escaper->escapeHtml(__($block->getSomeString()), ['strong', 'em', 'span']) ?>
+
+    <div class="<?= $escaper->escapeHtmlAttr($block->getSomeString()) ?>"></div>
+    <div class="<?= $escaper->escapeHtmlAttr($block->getSomeString(), true) ?>"></div>
+    <div class="<?= $escaper->escapeHtmlAttr($block->getSomeString(), false); ?>"></div>
+
+    <script type="text/x-magento-init">
+    {
+        "#chart_<?= $escaper->escapeJs($block->getData('html_id')) ?>_period": {
+            "Magento_Backend/js/dashboard/chart": {}
+        }
+    }
+    </script>
+
+    The only example of this method being used was in a block class, rather than a template.
+    <?php
+    foreach ($block->getItems() as $item) {
+        $item['sku'] = $escaper->escapeJsQuote($item['sku']);
+    }
+    ?>
+
+    The only example of this method being used was in a block class, rather than a template.
+    <?= $escaper->escapeQuote(__($block->getData('welcome'))); ?>
+
+    <a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"> link text </a>
+
+    Note that I couldn't find any use of this method in any templates within Magento.
+    <?= $escaper->escapeXssInUrl($block->getSomeString()); ?>
+</section>
+
+<section>
+    <h1>These are edge cases for formatting differences</h1>
+
+    <?php
+        $escaper->escapeHtml('');
+        $escaper ->escapeHtml('');
+        $escaper-> escapeHtml('');
+        $escaper
+            ->escapeHtml('');
+        $escaper
+
+            ->escapeHtml('');
+        $escaper->
+            escapeHtml('');
+        $escaper-> // comment
+            escapeHtml('');
+        $escaper /* comment */
+            ->escapeHtml('');
+
+        $escaper /* comment */ -> /* comment */ escapeHtml('');
+    ?>
+</section>
+
+<section>
+    <h1>These close-matches shouldn't be flagged by this sniff.</h1>
+
+    <?= $block->escapeHTML(__($block->getSomeString())) ?>
+    <?= $block->escapeHtmlString(__($block->getSomeString())) ?>
+    <?= $block->escapeHtmlAttribute($block->getSomeString()) ?>
+    <?= $block->escapeCSS($block->getSomeString()); ?>
+    <?= $block->escapeJS($block->getData('html_id')) ?>
+    <?= $block->escapeJavaScript($block->getData('html_id')) ?>
+    <?= $block->escapeQuotes(__($block->getData('welcome'))); ?>
+    <?= $block->escapeURL($block->getUrl('adminhtml/notification/index')) ?>
+</section>
diff --git a/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.php b/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.php
new file mode 100644
index 00000000..feead3d1
--- /dev/null
+++ b/Magento2/Tests/Legacy/EscapeMethodsOnBlockClassUnitTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class EscapeMethodsOnBlockClassUnitTest extends AbstractSniffUnitTest
+{
+    protected function getErrorList()
+    {
+        return [];
+    }
+
+    protected function getWarningList()
+    {
+        return [
+            19 => 1,
+            21 => 1,
+            22 => 1,
+            23 => 1,
+            25 => 1,
+            26 => 1,
+            27 => 1,
+            31 => 1,
+            40 => 1,
+            45 => 1,
+            47 => 1,
+            50 => 1,
+            57 => 1,
+            58 => 1,
+            59 => 1,
+            61 => 1,
+            64 => 1,
+            66 => 1,
+            68 => 1,
+            70 => 1,
+            72 => 1,
+        ];
+    }
+}

From b8acb6c61a735b9770470ea44cefbebf70139f69 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Thu, 6 Jul 2023 15:25:49 +0100
Subject: [PATCH 570/630] Add docblock to appease coding standard

Note that these are useless, as it's the default behaviour to inherit from the
parent docblock.
---
 Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php b/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
index f44e3d0c..4d6d8288 100644
--- a/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
+++ b/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
@@ -26,6 +26,9 @@ class EscapeMethodsOnBlockClassSniff implements Sniff
         'escapeXssInUrl' => true,
     ];
 
+    /**
+     * @inheritDoc
+     */
     public function register()
     {
         return [
@@ -33,6 +36,9 @@ public function register()
         ];
     }
 
+    /**
+     * @inheritDoc
+     */
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();

From 0c945598626e0a9c4a9379f65e2547827f7a5544 Mon Sep 17 00:00:00 2001
From: Atul-glo35265 <glo35265@adobe.com>
Date: Tue, 25 Jul 2023 13:32:36 +0530
Subject: [PATCH 571/630] AC-9184::Static Tests Failure on using Adobe
 copyright content - Added condition to use copyright in new format

---
 Magento2Framework/Sniffs/Header/CopyrightSniff.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Magento2Framework/Sniffs/Header/CopyrightSniff.php b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
index 81442207..e23aaba4 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
@@ -16,6 +16,7 @@ class CopyrightSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
 
     /**
      * @inheritdoc
@@ -48,7 +49,9 @@ public function process(File $phpcsFile, $stackPtr)
         $content = $phpcsFile->getTokens()[$positionComment]['content'];
         $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $content);
 
-        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
+        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false ||
+                $adobeCopyrightFound ||
+                    strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
             return;
         }
 

From 5497f3f9f4b7c478ce6d1bef2f792ee16de33e4f Mon Sep 17 00:00:00 2001
From: Zach Stein <snoop0x7b@gmail.com>
Date: Wed, 26 Jul 2023 14:19:57 -0400
Subject: [PATCH 572/630] Update README.md

Fixed a typo in readme.md
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3cfd6c0a..8ca973e1 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ npm run eslint -- path/to/analyze
 ```
 
 ### RECTOR PHP
-From `magento-condign-standard` project, you can execute rector php as follows:
+From `magento-coding-standard` project, you can execute rector php as follows:
 ```bash
 vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php
 ```

From 1aced4b2a1a380bb052607ab94f62c14dd8e6c5e Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 27 Jul 2023 17:14:01 +0530
Subject: [PATCH 573/630] AC-9184::Static Tests Failure on using Adobe
 copyright content - Update Version

---
 composer.json | 2 +-
 composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index e4c0c17b..e3c79454 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "31",
+    "version": "32",
     "require": {
         "php": ">=7.4",
         "webonyx/graphql-php": "^15.0",
diff --git a/composer.lock b/composer.lock
index eb5742d8..993e2d97 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "005e2882d6bfb6ebf35f0acfa890efac",
+    "content-hash": "527277cebca41c223661e203e2f5f5e7",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2382,5 +2382,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 7704854ed6b9c8bb29fa62a946e15ee8abcb434b Mon Sep 17 00:00:00 2001
From: Atul-glo35265 <glo35265@adobe.com>
Date: Fri, 28 Jul 2023 11:50:24 +0530
Subject: [PATCH 574/630] AC-9184::Static Tests Failure on using Adobe
 copyright content - Added condition to use copyright in new format

---
 .../Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php   | 2 ++
 Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php    | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
index 3bafbb1f..3310e667 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
@@ -16,6 +16,7 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
 
     /**
      * Defines the tokenizers that this sniff is using.
@@ -48,6 +49,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false
             || preg_match(self::COPYRIGHT_ADOBE, $fileText)
+                || strpos($fileText, self::COPYRIGHT_ADOBE_TEXT) !== false
         ) {
             return;
         }
diff --git a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
index 1e488e69..5eae2b5e 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
@@ -16,6 +16,7 @@ class CopyrightGraphQLSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
 
     private const FILE_EXTENSION = 'graphqls';
 
@@ -44,7 +45,9 @@ public function process(File $phpcsFile, $stackPtr)
         // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
         $content = file_get_contents($phpcsFile->getFilename());
 
-        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || preg_match(self::COPYRIGHT_ADOBE, $content)) {
+        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false
+            || preg_match(self::COPYRIGHT_ADOBE, $content)
+                || strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
             return;
         }
 

From 42f012962c566b552c43b12bb8f59e7c5ef798ee Mon Sep 17 00:00:00 2001
From: Atul-glo35265 <glo35265@adobe.com>
Date: Mon, 14 Aug 2023 16:47:33 +0530
Subject: [PATCH 575/630] Resolve Conflict

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 993e2d97..4a94589d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "527277cebca41c223661e203e2f5f5e7",
+    "content-hash": "2cb0816434787b635536aa2fd6ac017f",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2377,10 +2377,10 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4",
+        "php": "~8.1.0 || ~8.2.0",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
-}
+    "plugin-api-version": "2.3.0"
+}
\ No newline at end of file

From e52de693a38700c1a577c29af45527e9246bd2fa Mon Sep 17 00:00:00 2001
From: Atul-glo35265 <glo35265@adobe.com>
Date: Thu, 24 Aug 2023 15:55:37 +0530
Subject: [PATCH 576/630] AC-9184::Static Tests Failure on using Adobe
 copyright content - Update Rector Dependency

---
 composer.json |  2 +-
 composer.lock | 45 ++++++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index 04d1abc9..2d2c9974 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.15.10",
+        "rector/rector": "^0.18.0",
         "symfony/polyfill": "^1.16",
         "phpcsstandards/phpcsutils": "^1.0.5"
     },
diff --git a/composer.lock b/composer.lock
index 4a94589d..f63a6852 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2cb0816434787b635536aa2fd6ac017f",
+    "content-hash": "fecbeaf15a13fcb2776f3ac54efa39fb",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -222,16 +222,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.14",
+            "version": "1.10.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e5fcc96289cf737304286a9b505fbed091f02e58"
+                "reference": "2910afdd3fe33e5afd71c09f3fb0d0845b48c410"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58",
-                "reference": "e5fcc96289cf737304286a9b505fbed091f02e58",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2910afdd3fe33e5afd71c09f3fb0d0845b48c410",
+                "reference": "2910afdd3fe33e5afd71c09f3fb0d0845b48c410",
                 "shasum": ""
             },
             "require": {
@@ -260,8 +260,11 @@
                 "static analysis"
             ],
             "support": {
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.14"
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
             },
             "funding": [
                 {
@@ -277,30 +280,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-19T10:47:09+00:00"
+            "time": "2023-08-22T13:48:25+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.15.10",
+            "version": "0.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "000bfb6f7974449399f39e1a210458395b75c887"
+                "reference": "758ada29b5c80d933f906735d3026520390a2a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/000bfb6f7974449399f39e1a210458395b75c887",
-                "reference": "000bfb6f7974449399f39e1a210458395b75c887",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/758ada29b5c80d933f906735d3026520390a2a1d",
+                "reference": "758ada29b5c80d933f906735d3026520390a2a1d",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.9.7"
+                "phpstan/phpstan": "^1.10.26"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
                 "rector/rector-downgrade-php": "*",
-                "rector/rector-php-parser": "*",
                 "rector/rector-phpunit": "*",
                 "rector/rector-symfony": "*"
             },
@@ -308,11 +310,6 @@
                 "bin/rector"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "0.14-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -323,9 +320,15 @@
                 "MIT"
             ],
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "keywords": [
+                "automation",
+                "dev",
+                "migration",
+                "refactoring"
+            ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.15.10"
+                "source": "https://github.com/rectorphp/rector/tree/0.18.0"
             },
             "funding": [
                 {
@@ -333,7 +336,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-21T14:30:16+00:00"
+            "time": "2023-08-17T12:53:22+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -2383,4 +2386,4 @@
     },
     "platform-dev": [],
     "plugin-api-version": "2.3.0"
-}
\ No newline at end of file
+}

From 5e4ef1363044093aaf7d54ce7cd98fac914b01aa Mon Sep 17 00:00:00 2001
From: Atul-glo35265 <glo35265@adobe.com>
Date: Thu, 24 Aug 2023 16:32:55 +0530
Subject: [PATCH 577/630] AC-9184::Static Tests Failure on using Adobe
 copyright content - Update Rector Dependency

---
 composer.json |  2 +-
 composer.lock | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 2d2c9974..54c62c61 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.18.0",
+        "rector/rector": "^0.16.0",
         "symfony/polyfill": "^1.16",
         "phpcsstandards/phpcsutils": "^1.0.5"
     },
diff --git a/composer.lock b/composer.lock
index f63a6852..833823d8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fecbeaf15a13fcb2776f3ac54efa39fb",
+    "content-hash": "85706157c667b84ac6386062a90f04cb",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -284,21 +284,21 @@
         },
         {
             "name": "rector/rector",
-            "version": "0.18.0",
+            "version": "0.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "758ada29b5c80d933f906735d3026520390a2a1d"
+                "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/758ada29b5c80d933f906735d3026520390a2a1d",
-                "reference": "758ada29b5c80d933f906735d3026520390a2a1d",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/2125ff71ea05b079562a8f59ca48a97eb78dc07f",
+                "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.26"
+                "phpstan/phpstan": "^1.10.14"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -310,6 +310,11 @@
                 "bin/rector"
             ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.15-dev"
+                }
+            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -328,7 +333,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.18.0"
+                "source": "https://github.com/rectorphp/rector/tree/0.16.0"
             },
             "funding": [
                 {
@@ -336,7 +341,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-17T12:53:22+00:00"
+            "time": "2023-05-05T12:12:17+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From a7257ac1e063dcab3cb27049046927a28c7aed5f Mon Sep 17 00:00:00 2001
From: Atul-glo35265 <glo35265@adobe.com>
Date: Thu, 24 Aug 2023 16:59:28 +0530
Subject: [PATCH 578/630] AC-9184::Static Tests Failure on using Adobe
 copyright content - Update Rector Dependency

AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency

AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency to latest version
---
 composer.json |  2 +-
 composer.lock | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 54c62c61..afee6829 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.16.0",
+        "rector/rector": "0.17.12",
         "symfony/polyfill": "^1.16",
         "phpcsstandards/phpcsutils": "^1.0.5"
     },
diff --git a/composer.lock b/composer.lock
index 833823d8..daf77a82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "85706157c667b84ac6386062a90f04cb",
+    "content-hash": "ed90b6398ecbe9407a63634ecf205431",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -284,21 +284,21 @@
         },
         {
             "name": "rector/rector",
-            "version": "0.16.0",
+            "version": "0.17.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f"
+                "reference": "af3a14a8a9fffa3100b730571c356f6c658d5e09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/2125ff71ea05b079562a8f59ca48a97eb78dc07f",
-                "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/af3a14a8a9fffa3100b730571c356f6c658d5e09",
+                "reference": "af3a14a8a9fffa3100b730571c356f6c658d5e09",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.14"
+                "phpstan/phpstan": "^1.10.26"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -310,11 +310,6 @@
                 "bin/rector"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "0.15-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -333,7 +328,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.16.0"
+                "source": "https://github.com/rectorphp/rector/tree/0.17.12"
             },
             "funding": [
                 {
@@ -341,7 +336,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-05T12:12:17+00:00"
+            "time": "2023-08-10T15:22:02+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From cac60586a14e7420bc316acd9699b8dec575aaaf Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 15 Sep 2023 00:44:54 +0100
Subject: [PATCH 579/630] Allow more recent versions of rector

---
 composer.json | 2 +-
 composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index afee6829..3668d05d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "0.17.12",
+        "rector/rector": "^0.17.12",
         "symfony/polyfill": "^1.16",
         "phpcsstandards/phpcsutils": "^1.0.5"
     },
diff --git a/composer.lock b/composer.lock
index daf77a82..dbe0c9be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ed90b6398ecbe9407a63634ecf205431",
+    "content-hash": "2898da982b9bfa7d7caa896d1a5d8944",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2385,5 +2385,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From 8f01c09f3da14785754495420718ce56cf89a4b6 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Wed, 20 Sep 2023 16:58:09 +0200
Subject: [PATCH 580/630] Removing dependency on symfony/polyfill, is no longer
 required now that we dropped support for PHP 7.4

---
 composer.json |   1 -
 composer.lock | 119 +-------------------------------------------------
 2 files changed, 1 insertion(+), 119 deletions(-)

diff --git a/composer.json b/composer.json
index 3668d05d..7fb04c15 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,6 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.17.12",
-        "symfony/polyfill": "^1.16",
         "phpcsstandards/phpcsutils": "^1.0.5"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index dbe0c9be..9ab29109 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2898da982b9bfa7d7caa896d1a5d8944",
+    "content-hash": "1a1a72f8272e9cd2cb0dd520a56aeea2",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -394,123 +394,6 @@
             },
             "time": "2022-06-18T07:21:10+00:00"
         },
-        {
-            "name": "symfony/polyfill",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill.git",
-                "reference": "b78222a273aac3e5bab6358bf499d7f1fb88e48b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill/zipball/b78222a273aac3e5bab6358bf499d7f1fb88e48b",
-                "reference": "b78222a273aac3e5bab6358bf499d7f1fb88e48b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "replace": {
-                "symfony/polyfill-apcu": "self.version",
-                "symfony/polyfill-ctype": "self.version",
-                "symfony/polyfill-iconv": "self.version",
-                "symfony/polyfill-intl-grapheme": "self.version",
-                "symfony/polyfill-intl-icu": "self.version",
-                "symfony/polyfill-intl-idn": "self.version",
-                "symfony/polyfill-intl-messageformatter": "self.version",
-                "symfony/polyfill-intl-normalizer": "self.version",
-                "symfony/polyfill-mbstring": "self.version",
-                "symfony/polyfill-php72": "self.version",
-                "symfony/polyfill-php73": "self.version",
-                "symfony/polyfill-php74": "self.version",
-                "symfony/polyfill-php80": "self.version",
-                "symfony/polyfill-php81": "self.version",
-                "symfony/polyfill-php82": "self.version",
-                "symfony/polyfill-php83": "self.version",
-                "symfony/polyfill-util": "self.version",
-                "symfony/polyfill-uuid": "self.version",
-                "symfony/polyfill-xml": "self.version"
-            },
-            "require-dev": {
-                "symfony/intl": "^4.4|^5.0|^6.0",
-                "symfony/phpunit-bridge": "^5.3|^6.0",
-                "symfony/var-dumper": "^4.4|^5.1|^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/bootstrap.php",
-                    "src/Apcu/bootstrap.php",
-                    "src/Ctype/bootstrap.php",
-                    "src/Uuid/bootstrap.php",
-                    "src/Iconv/bootstrap.php",
-                    "src/Intl/Grapheme/bootstrap.php",
-                    "src/Intl/Idn/bootstrap.php",
-                    "src/Intl/Icu/bootstrap.php",
-                    "src/Intl/MessageFormatter/bootstrap.php",
-                    "src/Intl/Normalizer/bootstrap.php",
-                    "src/Mbstring/bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\": "src/"
-                },
-                "classmap": [
-                    "src/Intl/Icu/Resources/stubs",
-                    "src/Intl/MessageFormatter/Resources/stubs",
-                    "src/Intl/Normalizer/Resources/stubs",
-                    "src/Php82/Resources/stubs",
-                    "src/Php80/Resources/stubs",
-                    "src/Php73/Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfills backporting features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compat",
-                "compatibility",
-                "polyfill",
-                "shim"
-            ],
-            "support": {
-                "issues": "https://github.com/symfony/polyfill/issues",
-                "source": "https://github.com/symfony/polyfill/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-10T10:11:03+00:00"
-        },
         {
             "name": "webonyx/graphql-php",
             "version": "v15.0.0",

From 045be185b47acbc1fe077eb175c225de279d950f Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 11 Jan 2022 22:05:24 +0000
Subject: [PATCH 581/630] Enforce consistent spacing around keywords

---
 eslint/.eslintrc-magento | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 8ae28b85..e74a6f95 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -19,7 +19,7 @@
         "eqeqeq": [2, "smart"],
         "guard-for-in": 2,
         "indent": [2, 4],
-        "keyword-spacing": [2, {}],
+        "keyword-spacing": [2, {"after": true, "before": true}],
         "lines-around-comment": [
             2,
             {

From 6db538bfbfee7b2e03ae2e9c7342d182f85771d0 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 14 Nov 2023 19:15:34 +0530
Subject: [PATCH 582/630] AC-9670::Adobe Commerce 2.4.7 core code is compatible
 with PHP 8.3

---
 composer.json | 10 ++++--
 composer.lock | 89 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index 7fb04c15..952f85c8 100644
--- a/composer.json
+++ b/composer.json
@@ -5,14 +5,20 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "repositories": [
+        {
+            "type" : "vcs",
+            "url" : "git@github.com:PHPCompatibility/PHPCompatibility.git"
+        }
+    ],
     "type": "phpcodesniffer-standard",
     "version": "32",
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
-        "phpcompatibility/php-compatibility": "^9.3",
+        "phpcompatibility/php-compatibility": "dev-develop",
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.17.12",
         "phpcsstandards/phpcsutils": "^1.0.5"
diff --git a/composer.lock b/composer.lock
index 9ab29109..f323f67c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1a1a72f8272e9cd2cb0dd520a56aeea2",
+    "content-hash": "48f468df1de5e3e7239a0e87f1b63b00",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -86,47 +86,93 @@
         },
         {
             "name": "phpcompatibility/php-compatibility",
-            "version": "9.3.5",
+            "version": "dev-develop",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
-                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+                "reference": "302dffedd8f1acfc0ed5c7ee096ea2237553ae1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
-                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/302dffedd8f1acfc0ed5c7ee096ea2237553ae1a",
+                "reference": "302dffedd8f1acfc0ed5c7ee096ea2237553ae1a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+                "php": ">=5.4",
+                "phpcsstandards/phpcsutils": "^1.0.5",
+                "squizlabs/php_codesniffer": "^3.7.1"
             },
-            "conflict": {
-                "squizlabs/php_codesniffer": "2.6.2"
+            "replace": {
+                "wimg/php-compatibility": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcsstandards/phpcsdevcs": "^1.1.3",
+                "phpcsstandards/phpcsdevtools": "^1.2.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4 || ^10.1.0",
+                "yoast/phpunit-polyfills": "^1.0.5 || ^2.0.0"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
+            "default-branch": true,
             "type": "phpcodesniffer-standard",
-            "notification-url": "https://packagist.org/downloads/",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.x-dev",
+                    "dev-develop": "10.x-dev"
+                }
+            },
+            "scripts": {
+                "test": [
+                    "@php ./vendor/phpunit/phpunit/phpunit --no-coverage"
+                ],
+                "test10": [
+                    "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist --no-coverage"
+                ],
+                "coverage": [
+                    "@php ./vendor/phpunit/phpunit/phpunit"
+                ],
+                "coverage10": [
+                    "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist"
+                ],
+                "coverage-local": [
+                    "@php ./vendor/phpunit/phpunit/phpunit --coverage-html ./build/logs"
+                ],
+                "coverage-local10": [
+                    "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist --coverage-html ./build/logs"
+                ],
+                "lint": [
+                    "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
+                ],
+                "check-complete": [
+                    "@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness -q ./PHPCompatibility"
+                ],
+                "check-complete-strict": [
+                    "@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness ./PHPCompatibility"
+                ],
+                "checkcs": [
+                    "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
+                ],
+                "fixcs": [
+                    "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
+                ]
+            },
             "license": [
                 "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
                     "name": "Wim Godden",
-                    "homepage": "https://github.com/wimg",
-                    "role": "lead"
+                    "role": "lead",
+                    "homepage": "https://github.com/wimg"
                 },
                 {
                     "name": "Juliette Reinders Folmer",
-                    "homepage": "https://github.com/jrfnl",
-                    "role": "lead"
+                    "role": "lead",
+                    "homepage": "https://github.com/jrfnl"
                 },
                 {
                     "name": "Contributors",
@@ -138,13 +184,14 @@
             "keywords": [
                 "compatibility",
                 "phpcs",
-                "standards"
+                "standards",
+                "static analysis"
             ],
             "support": {
                 "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
                 "source": "https://github.com/PHPCompatibility/PHPCompatibility"
             },
-            "time": "2019-12-27T09:44:58+00:00"
+            "time": "2023-09-13T12:40:15+00:00"
         },
         {
             "name": "phpcsstandards/phpcsutils",
@@ -2259,11 +2306,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "phpcompatibility/php-compatibility": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },

From 3b504d5faa56d31e053fabd6a6c1c7de1817791a Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 14 Nov 2023 19:19:56 +0530
Subject: [PATCH 583/630] AC-9670::Adobe Commerce 2.4.7 core code is compatible
 with PHP 8.3

---
 composer.json |  8 +----
 composer.lock | 87 +++++++++++----------------------------------------
 2 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/composer.json b/composer.json
index 952f85c8..2f1ebceb 100644
--- a/composer.json
+++ b/composer.json
@@ -5,12 +5,6 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "repositories": [
-        {
-            "type" : "vcs",
-            "url" : "git@github.com:PHPCompatibility/PHPCompatibility.git"
-        }
-    ],
     "type": "phpcodesniffer-standard",
     "version": "32",
     "require": {
@@ -18,7 +12,7 @@
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
-        "phpcompatibility/php-compatibility": "dev-develop",
+        "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.17.12",
         "phpcsstandards/phpcsutils": "^1.0.5"
diff --git a/composer.lock b/composer.lock
index f323f67c..80e8f50e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "48f468df1de5e3e7239a0e87f1b63b00",
+    "content-hash": "cbdbbc742e102665104a6943ccca2481",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -86,93 +86,47 @@
         },
         {
             "name": "phpcompatibility/php-compatibility",
-            "version": "dev-develop",
+            "version": "9.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
-                "reference": "302dffedd8f1acfc0ed5c7ee096ea2237553ae1a"
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/302dffedd8f1acfc0ed5c7ee096ea2237553ae1a",
-                "reference": "302dffedd8f1acfc0ed5c7ee096ea2237553ae1a",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4",
-                "phpcsstandards/phpcsutils": "^1.0.5",
-                "squizlabs/php_codesniffer": "^3.7.1"
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
             },
-            "replace": {
-                "wimg/php-compatibility": "*"
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
             },
             "require-dev": {
-                "php-parallel-lint/php-console-highlighter": "^1.0.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcsstandards/phpcsdevcs": "^1.1.3",
-                "phpcsstandards/phpcsdevtools": "^1.2.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4 || ^10.1.0",
-                "yoast/phpunit-polyfills": "^1.0.5 || ^2.0.0"
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
             },
             "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
-            "default-branch": true,
             "type": "phpcodesniffer-standard",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.x-dev",
-                    "dev-develop": "10.x-dev"
-                }
-            },
-            "scripts": {
-                "test": [
-                    "@php ./vendor/phpunit/phpunit/phpunit --no-coverage"
-                ],
-                "test10": [
-                    "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist --no-coverage"
-                ],
-                "coverage": [
-                    "@php ./vendor/phpunit/phpunit/phpunit"
-                ],
-                "coverage10": [
-                    "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist"
-                ],
-                "coverage-local": [
-                    "@php ./vendor/phpunit/phpunit/phpunit --coverage-html ./build/logs"
-                ],
-                "coverage-local10": [
-                    "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist --coverage-html ./build/logs"
-                ],
-                "lint": [
-                    "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
-                ],
-                "check-complete": [
-                    "@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness -q ./PHPCompatibility"
-                ],
-                "check-complete-strict": [
-                    "@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness ./PHPCompatibility"
-                ],
-                "checkcs": [
-                    "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
-                ],
-                "fixcs": [
-                    "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
-                ]
-            },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
                     "name": "Wim Godden",
-                    "role": "lead",
-                    "homepage": "https://github.com/wimg"
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
                 },
                 {
                     "name": "Juliette Reinders Folmer",
-                    "role": "lead",
-                    "homepage": "https://github.com/jrfnl"
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
                 },
                 {
                     "name": "Contributors",
@@ -184,14 +138,13 @@
             "keywords": [
                 "compatibility",
                 "phpcs",
-                "standards",
-                "static analysis"
+                "standards"
             ],
             "support": {
                 "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
                 "source": "https://github.com/PHPCompatibility/PHPCompatibility"
             },
-            "time": "2023-09-13T12:40:15+00:00"
+            "time": "2019-12-27T09:44:58+00:00"
         },
         {
             "name": "phpcsstandards/phpcsutils",
@@ -2306,9 +2259,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "phpcompatibility/php-compatibility": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From 2a50cc7d2c671f3b1ad71b4b76faa50d4018a10f Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Thu, 30 Nov 2023 09:20:57 -0600
Subject: [PATCH 584/630] ACP2E-2635: Replace
 phpcompatibility/php-compatibility with magento/php-compatibility-fork

* Fix fatal error in MethodAnnotationStructureSniff when there is no comment preceding a function or class method
---
 .github/workflows/php.yml                     |  2 +-
 .../MethodAnnotationStructureSniff.php        | 27 ++++++++--
 .../MethodAnnotationStructureUnitTest.inc     | 54 ++++++++++++++++++-
 .../MethodAnnotationStructureUnitTest.php     |  4 ++
 Magento2/ruleset.xml                          |  2 +-
 composer.json                                 | 10 ++--
 composer.lock                                 | 39 ++++++++------
 7 files changed, 110 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 52b6a97f..9e9d024d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -89,4 +89,4 @@ jobs:
         run: composer install
 
       - name: Run rector
-        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php --autoload-file vendor/phpcompatibility/php-compatibility/PHPCSAliases.php
+        run: vendor/bin/rector process Magento2 Magento2Framework PHP_CodeSniffer --dry-run --autoload-file vendor/squizlabs/php_codesniffer/autoload.php --autoload-file vendor/magento/php-compatibility-fork/PHPCSAliases.php
diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index d6f7ca3c..f4250a17 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -51,14 +51,33 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
-        $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
-        $prevSemicolon = $phpcsFile->findPrevious(T_SEMICOLON, $stackPtr, $commentEndPtr);
-        if (!$commentStartPtr || $prevSemicolon) {
+        $commentEndPtr = $stackPtr;
+        $tokensToFind = [
+            \T_SEMICOLON,
+            \T_OPEN_CURLY_BRACKET,
+            \T_CLOSE_CURLY_BRACKET,
+            \T_ATTRIBUTE_END,
+            \T_DOC_COMMENT_CLOSE_TAG
+        ];
+
+        do {
+            $commentEndPtr = $phpcsFile->findPrevious($tokensToFind, $commentEndPtr - 1);
+            if ($commentEndPtr !== false
+                && $tokens[$commentEndPtr]['code'] === \T_ATTRIBUTE_END
+                && isset($tokens[$commentEndPtr]['attribute_opener'])
+            ) {
+                $commentEndPtr = $tokens[$commentEndPtr]['attribute_opener'];
+            }
+        } while ($commentEndPtr !== false && !in_array($tokens[$commentEndPtr]['code'], $tokensToFind, true));
+
+        if ($commentEndPtr === false || $tokens[$commentEndPtr]['code'] !== \T_DOC_COMMENT_CLOSE_TAG) {
             $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
             return;
         }
 
+        $commentStartPtr = $tokens[$commentEndPtr]['comment_opener']
+            ?? $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $commentEndPtr - 1);
+
         if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) {
             $phpcsFile->addWarning(
                 'Motivation behind the added @deprecated tag MUST be explained. '
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
index 6402dad8..94512c01 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
@@ -1,5 +1,5 @@
 <?php
-
+function functionWithNoPrecedingDocBlock() {}
 /**
 * Class for method structure for annotations test cases
 */
@@ -398,3 +398,55 @@ class MethodAnnotationFixture
         return false;
     }
 }
+
+/**
+ * Class with comment
+ */
+class ClassWithDocBlock
+{
+    private function methodWithNoDocBlock(): bool
+    {
+        return false;
+    }
+
+    #[
+        /**
+         * This docBloc is not for the method but for the attribute
+         */
+        \ReturnTypeWillChange
+    ]
+    public function methodWithDocBlockInsideAttributesDelimiters(string $text): string
+    {
+        return $text;
+    }
+
+    #[\ReturnTypeWillChange]
+    public function methodWithAttributeAndNoDocBlock(string $text): string
+    {
+        return $text;
+    }
+
+    /**
+     * Short description.
+     *
+     * @param string $text
+     * @return string
+     */
+    #[\ReturnTypeWillChange]
+    public function methodWithAttributeAndValidDocBlock(string $text): string
+    {
+        return $text;
+    }
+
+    #[\ReturnTypeWillChange]
+    /**
+     * Short description.
+     *
+     * @param string $text
+     * @return string
+     */
+    public function methodWithAttributeAndValidDocBlock2(string $text): string
+    {
+        return $text;
+    }
+}
diff --git a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
index 9494e2d1..bccdd97f 100644
--- a/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
+++ b/Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php
@@ -15,6 +15,7 @@ class MethodAnnotationStructureUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
+            2 => 1,
             10 => 1,
             18 => 1,
             30 => 1,
@@ -40,6 +41,9 @@ public function getErrorList()
             289 => 1,
             298 => 1,
             396 => 1,
+            407 => 1,
+            418 => 1,
+            424 => 1,
         ];
     }
 
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index e7ce2ee8..0090ed94 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -770,6 +770,6 @@
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
-        <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
+        <exclude name="PHPCompatibility.Keywords.ForbiddenNames" />
     </rule>
 </ruleset>
diff --git a/composer.json b/composer.json
index 7fb04c15..70878734 100644
--- a/composer.json
+++ b/composer.json
@@ -6,16 +6,16 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "32",
+    "version": "33",
     "require": {
         "php": "~8.1.0 || ~8.2.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
-        "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.17.12",
-        "phpcsstandards/phpcsutils": "^1.0.5"
+        "phpcsstandards/phpcsutils": "^1.0.5",
+        "magento/php-compatibility-fork": "^0.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.10",
@@ -36,8 +36,8 @@
         }
     },
     "scripts": {
-        "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility",
-        "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../phpcompatibility/php-compatibility/PHPCompatibility"
+        "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../magento/php-compatibility-fork/PHPCompatibility",
+        "post-update-cmd": "vendor/bin/phpcs --config-set installed_paths ../../..,../../magento/php-compatibility-fork/PHPCompatibility"
     },
     "config": {
         "allow-plugins": {
diff --git a/composer.lock b/composer.lock
index 9ab29109..9642857a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1a1a72f8272e9cd2cb0dd520a56aeea2",
+    "content-hash": "e110c856856bed580d6d373c21e4b90e",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -85,31 +85,37 @@
             "time": "2023-01-05T11:28:13+00:00"
         },
         {
-            "name": "phpcompatibility/php-compatibility",
-            "version": "9.3.5",
+            "name": "magento/php-compatibility-fork",
+            "version": "v0.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
-                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+                "url": "https://github.com/magento/PHPCompatibilityFork.git",
+                "reference": "1cf031c2a68e3e52e460c5690ed8d1d6d45f4653"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
-                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "url": "https://api.github.com/repos/magento/PHPCompatibilityFork/zipball/1cf031c2a68e3e52e460c5690ed8d1d6d45f4653",
+                "reference": "1cf031c2a68e3e52e460c5690ed8d1d6d45f4653",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+                "php": ">=5.4",
+                "phpcsstandards/phpcsutils": "^1.0.5",
+                "squizlabs/php_codesniffer": "^3.7.1"
             },
-            "conflict": {
-                "squizlabs/php_codesniffer": "2.6.2"
+            "replace": {
+                "phpcompatibility/php-compatibility": "*",
+                "wimg/php-compatibility": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcsstandards/phpcsdevcs": "^1.1.3",
+                "phpcsstandards/phpcsdevtools": "^1.2.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4 || ^10.1.0",
+                "yoast/phpunit-polyfills": "^1.0.5 || ^2.0.0"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
             "type": "phpcodesniffer-standard",
@@ -133,18 +139,19 @@
                     "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
                 }
             ],
-            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility. This is a fork of phpcompatibility/php-compatibility",
             "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
             "keywords": [
                 "compatibility",
                 "phpcs",
-                "standards"
+                "standards",
+                "static analysis"
             ],
             "support": {
                 "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
                 "source": "https://github.com/PHPCompatibility/PHPCompatibility"
             },
-            "time": "2019-12-27T09:44:58+00:00"
+            "time": "2023-11-29T22:34:17+00:00"
         },
         {
             "name": "phpcsstandards/phpcsutils",

From a72c1665e06a864dd1092342b178f71e454af48e Mon Sep 17 00:00:00 2001
From: soumah <soumah@adobe.com>
Date: Mon, 4 Dec 2023 11:28:59 -0600
Subject: [PATCH 585/630] ACP2E-2674: [MCS] Fix duplicate "Comment block is
 missing"

---
 Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php | 2 +-
 Magento2/ruleset.xml                                          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index f4250a17..a76240c7 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -71,7 +71,7 @@ public function process(File $phpcsFile, $stackPtr)
         } while ($commentEndPtr !== false && !in_array($tokens[$commentEndPtr]['code'], $tokensToFind, true));
 
         if ($commentEndPtr === false || $tokens[$commentEndPtr]['code'] !== \T_DOC_COMMENT_CLOSE_TAG) {
-            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
+            $phpcsFile->addError('Comment block is missing', $stackPtr, 'NoCommentBlock');
             return;
         }
 
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 0090ed94..4ac058c0 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -758,6 +758,8 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
+        <!-- duplicates Magento2.Annotation.MethodAnnotationStructure.NoCommentBlock-->
+        <exclude name="Magento2.Annotation.MethodArguments.NoCommentBlock"/>
     </rule>
 
     <rule ref="Internal.NoCodeFound">

From cf0c76178588aed68967d16f70c571b84e5a91cd Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Fri, 15 Dec 2023 14:51:13 +0530
Subject: [PATCH 586/630] AC-9670::Adobe Commerce 2.4.7 core code is compatible
 with PHP 8.3

---
 .github/workflows/php.yml |  1 +
 composer.json             |  2 +-
 composer.lock             | 20 +++++++++++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9e9d024d..3d907aa4 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -15,6 +15,7 @@ jobs:
         php-version:
           - "8.1"
           - "8.2"
+          - "8.3"
         dependencies:
           - "lowest"
           - "highest"
diff --git a/composer.json b/composer.json
index 36eabf64..d9e7e369 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "33",
+    "version": "34",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "webonyx/graphql-php": "^15.0",
diff --git a/composer.lock b/composer.lock
index d7fdc84e..d2303da0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e110c856856bed580d6d373c21e4b90e",
+    "content-hash": "92b77ce15a04f22e2c65643b97e96404",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -350,12 +350,12 @@
             "version": "3.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
                 "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
                 "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
                 "shasum": ""
             },
@@ -399,6 +399,20 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2022-06-18T07:21:10+00:00"
         },
         {

From 3b9314d19b3dd2409d411a906b15af70bf64da89 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 19 Dec 2023 22:36:13 +0530
Subject: [PATCH 587/630] AC-9670::Adobe Commerce 2.4.7 core code is compatible
 with PHP 8.3

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index d9e7e369..36eabf64 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "34",
+    "version": "33",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "webonyx/graphql-php": "^15.0",
diff --git a/composer.lock b/composer.lock
index d2303da0..93fc23da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "92b77ce15a04f22e2c65643b97e96404",
+    "content-hash": "2538347534e520207948a130ccd78862",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",

From b16708662cd1aad3eb8983452c8f288c76b383e0 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 19 Dec 2023 22:42:14 +0530
Subject: [PATCH 588/630] AC-9670::Adobe Commerce 2.4.7 core code is compatible
 with PHP 8.3

---
 composer.lock | 298 +++++++++++++++++++++++++++-----------------------
 1 file changed, 164 insertions(+), 134 deletions(-)

diff --git a/composer.lock b/composer.lock
index 93fc23da..bac99425 100644
--- a/composer.lock
+++ b/composer.lock
@@ -155,30 +155,29 @@
         },
         {
             "name": "phpcsstandards/phpcsutils",
-            "version": "1.0.5",
+            "version": "1.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
-                "reference": "0cfef5193e68e8ff179333d8ae937db62939b656"
+                "reference": "908247bc65010c7b7541a9551e002db12e9dae70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/0cfef5193e68e8ff179333d8ae937db62939b656",
-                "reference": "0cfef5193e68e8ff179333d8ae937db62939b656",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/908247bc65010c7b7541a9551e002db12e9dae70",
+                "reference": "908247bc65010c7b7541a9551e002db12e9dae70",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
                 "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^3.7.1 || 4.0.x-dev@dev"
+                "squizlabs/php_codesniffer": "^3.8.0 || 4.0.x-dev@dev"
             },
             "require-dev": {
                 "ext-filter": "*",
                 "php-parallel-lint/php-console-highlighter": "^1.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcsstandards/phpcsdevcs": "^1.1.3",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3",
-                "yoast/phpunit-polyfills": "^1.0.1"
+                "phpcsstandards/phpcsdevcs": "^1.1.6",
+                "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -223,22 +222,37 @@
             "support": {
                 "docs": "https://phpcsutils.com/",
                 "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+                "security": "https://github.com/PHPCSStandards/PHPCSUtils/security/policy",
                 "source": "https://github.com/PHPCSStandards/PHPCSUtils"
             },
-            "time": "2023-04-17T16:27:27+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-12-08T14:50:00+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.30",
+            "version": "1.10.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "2910afdd3fe33e5afd71c09f3fb0d0845b48c410"
+                "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2910afdd3fe33e5afd71c09f3fb0d0845b48c410",
-                "reference": "2910afdd3fe33e5afd71c09f3fb0d0845b48c410",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4",
+                "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4",
                 "shasum": ""
             },
             "require": {
@@ -287,20 +301,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-22T13:48:25+00:00"
+            "time": "2023-12-13T10:59:42+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.17.12",
+            "version": "0.17.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "af3a14a8a9fffa3100b730571c356f6c658d5e09"
+                "reference": "e2003ba7c5bda06d7bb419cf4be8dae5f8672132"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/af3a14a8a9fffa3100b730571c356f6c658d5e09",
-                "reference": "af3a14a8a9fffa3100b730571c356f6c658d5e09",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/e2003ba7c5bda06d7bb419cf4be8dae5f8672132",
+                "reference": "e2003ba7c5bda06d7bb419cf4be8dae5f8672132",
                 "shasum": ""
             },
             "require": {
@@ -335,7 +349,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.17.12"
+                "source": "https://github.com/rectorphp/rector/tree/0.17.13"
             },
             "funding": [
                 {
@@ -343,20 +357,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-10T15:22:02+00:00"
+            "time": "2023-08-14T16:33:29+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.1",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
+                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
                 "shasum": ""
             },
             "require": {
@@ -366,7 +380,7 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/phpcs",
@@ -385,19 +399,29 @@
             "authors": [
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
-                "standards"
+                "standards",
+                "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
             "funding": [
                 {
@@ -413,20 +437,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-06-18T07:21:10+00:00"
+            "time": "2023-12-08T12:32:31+00:00"
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v15.0.0",
+            "version": "v15.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "dc754edf765479644a82d96105bd2979530d7f8d"
+                "reference": "575ac95f13adfb38219a748572355385c101fdf7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/dc754edf765479644a82d96105bd2979530d7f8d",
-                "reference": "dc754edf765479644a82d96105bd2979530d7f8d",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/575ac95f13adfb38219a748572355385c101fdf7",
+                "reference": "575ac95f13adfb38219a748572355385c101fdf7",
                 "shasum": ""
             },
             "require": {
@@ -436,24 +460,28 @@
             },
             "require-dev": {
                 "amphp/amp": "^2.6",
-                "dms/phpunit-arraysubset-asserts": "^0.4",
+                "amphp/http-server": "^2.1",
+                "dms/phpunit-arraysubset-asserts": "dev-master",
                 "ergebnis/composer-normalize": "^2.28",
-                "mll-lab/php-cs-fixer-config": "^4.4",
+                "friendsofphp/php-cs-fixer": "3.30.0",
+                "mll-lab/php-cs-fixer-config": "^5",
                 "nyholm/psr7": "^1.5",
                 "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "1.9.7",
-                "phpstan/phpstan-phpunit": "1.3.3",
-                "phpstan/phpstan-strict-rules": "1.4.4",
-                "phpunit/phpunit": "^9.5",
-                "psr/http-message": "^1",
+                "phpstan/phpstan": "1.10.47",
+                "phpstan/phpstan-phpunit": "1.3.15",
+                "phpstan/phpstan-strict-rules": "1.5.2",
+                "phpunit/phpunit": "^9.5 || ^10",
+                "psr/http-message": "^1 || ^2",
                 "react/http": "^1.6",
                 "react/promise": "^2.9",
+                "rector/rector": "^0.18",
                 "symfony/polyfill-php81": "^1.23",
-                "symfony/var-exporter": "^5 || ^6",
-                "thecodingmachine/safe": "^1.3"
+                "symfony/var-exporter": "^5 || ^6 || ^7",
+                "thecodingmachine/safe": "^1.3 || ^2"
             },
             "suggest": {
+                "amphp/http-server": "To leverage async resolving with webserver on AMPHP platform",
                 "psr/http-message": "To use standard GraphQL server",
                 "react/promise": "To leverage async resolving on React PHP platform"
             },
@@ -475,7 +503,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v15.0.0"
+                "source": "https://github.com/webonyx/graphql-php/tree/v15.8.1"
             },
             "funding": [
                 {
@@ -483,36 +511,36 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-01-06T12:18:04+00:00"
+            "time": "2023-12-05T17:23:35+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
             "autoload": {
@@ -539,7 +567,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -555,20 +583,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:23:10+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.0",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                 "shasum": ""
             },
             "require": {
@@ -606,7 +634,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
             },
             "funding": [
                 {
@@ -614,20 +642,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2023-03-08T13:26:56+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v4.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
                 "shasum": ""
             },
             "require": {
@@ -668,9 +696,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
             },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2023-12-10T21:03:43+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -785,23 +813,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.20",
+            "version": "9.2.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "af7463c955007de36db0c5e26d03e2f933c2e980"
+                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/af7463c955007de36db0c5e26d03e2f933c2e980",
-                "reference": "af7463c955007de36db0c5e26d03e2f933c2e980",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.14",
+                "nikic/php-parser": "^4.15",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -816,8 +844,8 @@
                 "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
@@ -850,7 +878,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.20"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
             },
             "funding": [
                 {
@@ -858,7 +887,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-12-13T07:49:28+00:00"
+            "time": "2023-09-19T04:57:46+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1103,20 +1132,20 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.27",
+            "version": "9.6.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
+                "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
+                "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -1127,7 +1156,7 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-code-coverage": "^9.2.28",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
@@ -1145,8 +1174,8 @@
                 "sebastian/version": "^3.0.2"
             },
             "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "bin": [
                 "phpunit"
@@ -1154,7 +1183,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
@@ -1185,7 +1214,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
             },
             "funding": [
                 {
@@ -1201,7 +1231,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-09T07:31:23+00:00"
+            "time": "2023-12-01T16:55:19+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1503,16 +1533,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
                 "shasum": ""
             },
             "require": {
@@ -1557,7 +1587,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
             },
             "funding": [
                 {
@@ -1565,20 +1595,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-05-07T05:35:17+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
@@ -1620,7 +1650,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -1628,7 +1658,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -1709,16 +1739,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
                 "shasum": ""
             },
             "require": {
@@ -1761,7 +1791,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
             },
             "funding": [
                 {
@@ -1769,7 +1799,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2023-08-02T09:26:13+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -1942,16 +1972,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
@@ -1990,10 +2020,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
@@ -2001,7 +2031,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
         },
         {
             "name": "sebastian/resource-operations",
@@ -2060,16 +2090,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
@@ -2104,7 +2134,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
@@ -2112,7 +2142,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2169,16 +2199,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
                 "shasum": ""
             },
             "require": {
@@ -2207,7 +2237,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
             },
             "funding": [
                 {
@@ -2215,20 +2245,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2023-11-20T00:12:19+00:00"
         },
         {
             "name": "yoast/phpunit-polyfills",
-            "version": "1.0.5",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171"
+                "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/3b59adeef77fb1c03ff5381dbb9d68b0aaff3171",
-                "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/224e4a1329c03d8bad520e3fc4ec980034a4b212",
+                "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212",
                 "shasum": ""
             },
             "require": {
@@ -2275,7 +2305,7 @@
                 "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2023-03-30T23:39:05+00:00"
+            "time": "2023-08-19T14:25:08+00:00"
         }
     ],
     "aliases": [],

From ac4d030a8e999b0a30bc1e98a5fffaecd0ea79fb Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Wed, 28 Feb 2024 14:51:24 +0530
Subject: [PATCH 589/630] AC-11385::Investigate phpstan/phpstan latest versions

---
 composer.json |  2 +-
 composer.lock | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 36eabf64..39afe8ee 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "ext-simplexml": "*",
         "ext-dom": "*",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.17.12",
+        "rector/rector": "^0.19.0",
         "phpcsstandards/phpcsutils": "^1.0.5",
         "magento/php-compatibility-fork": "^0.1"
     },
diff --git a/composer.lock b/composer.lock
index bac99425..161bea71 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2538347534e520207948a130ccd78862",
+    "content-hash": "4dcee8d6315463cd4dbfdfdb9eb65cd2",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -243,16 +243,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.50",
+            "version": "1.10.59",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4"
+                "reference": "e607609388d3a6d418a50a49f7940e8086798281"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4",
-                "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
+                "reference": "e607609388d3a6d418a50a49f7940e8086798281",
                 "shasum": ""
             },
             "require": {
@@ -301,25 +301,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-13T10:59:42+00:00"
+            "time": "2024-02-20T13:59:13+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.17.13",
+            "version": "0.19.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "e2003ba7c5bda06d7bb419cf4be8dae5f8672132"
+                "reference": "de3b3bb159abd704b144aa86fb244f7f1f4ac947"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/e2003ba7c5bda06d7bb419cf4be8dae5f8672132",
-                "reference": "e2003ba7c5bda06d7bb419cf4be8dae5f8672132",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/de3b3bb159abd704b144aa86fb244f7f1f4ac947",
+                "reference": "de3b3bb159abd704b144aa86fb244f7f1f4ac947",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.26"
+                "phpstan/phpstan": "^1.10.56"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -349,7 +349,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.17.13"
+                "source": "https://github.com/rectorphp/rector/tree/0.19.8"
             },
             "funding": [
                 {
@@ -357,7 +357,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-14T16:33:29+00:00"
+            "time": "2024-02-05T10:59:13+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From ae93ecf24574b84ee0f867909bebb45283936ddb Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Mon, 18 Mar 2024 18:18:10 +0530
Subject: [PATCH 590/630] Fixed tests after update the latest versions

---
 Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php | 2 +-
 Magento2/Rector/Src/ReplaceMbStrposNullLimit.php           | 2 +-
 Magento2/Rector/Src/ReplaceNewDateTimeNull.php             | 2 +-
 Magento2/Rector/Src/ReplacePregSplitNullLimit.php          | 2 +-
 composer.json                                              | 2 +-
 composer.lock                                              | 2 +-
 rector.php                                                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
index a09fd34a..d7c38345 100644
--- a/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
+++ b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
@@ -9,7 +9,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
diff --git a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
index 06ffaf25..06f04629 100644
--- a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
+++ b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
@@ -10,7 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Scalar\LNumber;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
diff --git a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
index 1bf54f0a..0ddabe51 100644
--- a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
+++ b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
@@ -10,7 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Scalar\String_;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
diff --git a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
index cc918eb4..b3f1d318 100644
--- a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
+++ b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
@@ -10,7 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
diff --git a/composer.json b/composer.json
index 39afe8ee..172e6b5b 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "33",
+    "version": "34",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "webonyx/graphql-php": "^15.0",
diff --git a/composer.lock b/composer.lock
index 161bea71..42089b48 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4dcee8d6315463cd4dbfdfdb9eb65cd2",
+    "content-hash": "82233b04ee4b5f65e33f6cc501ed3b4e",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
diff --git a/rector.php b/rector.php
index 8bc53e56..bbb7a817 100644
--- a/rector.php
+++ b/rector.php
@@ -5,7 +5,7 @@
 use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
 use Magento2\Rector\Src\ReplaceNewDateTimeNull;
 use Rector\Config\RectorConfig;
-use Rector\Core\ValueObject\PhpVersion;
+use Rector\ValueObject\PhpVersion;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
 use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
 use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;

From df25dabc17e357e27508232eabcbb957b4a9bc53 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Mon, 18 Mar 2024 18:46:51 +0530
Subject: [PATCH 591/630] Fixed tests after update the latest versions

---
 rector.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/rector.php b/rector.php
index bbb7a817..9b240393 100644
--- a/rector.php
+++ b/rector.php
@@ -18,15 +18,15 @@
     $rectorConfig->phpVersion(PhpVersion::PHP_81);
 
     // get services (needed for register a single rule)
-    $services = $rectorConfig->services();
+//    $services = $rectorConfig->services();
 
     // register a single rule
-    $services->set(FinalPrivateToPrivateVisibilityRector::class);
-    $services->set(OptionalParametersAfterRequiredRector::class);
-    $services->set(SetStateToStaticRector::class);
-    $services->set(StringableForToStringRector::class);
-    $services->set(Php81ResourceReturnToObjectRector::class);
-    $services->set(ReplacePregSplitNullLimit::class);
-    $services->set(ReplaceMbStrposNullLimit::class);
-    $services->set(ReplaceNewDateTimeNull::class);
+    $rectorConfig->singleton(FinalPrivateToPrivateVisibilityRector::class);
+    $rectorConfig->singleton(OptionalParametersAfterRequiredRector::class);
+    $rectorConfig->singleton(SetStateToStaticRector::class);
+    $rectorConfig->singleton(StringableForToStringRector::class);
+    $rectorConfig->singleton(Php81ResourceReturnToObjectRector::class);
+    $rectorConfig->singleton(ReplacePregSplitNullLimit::class);
+    $rectorConfig->singleton(ReplaceMbStrposNullLimit::class);
+    $rectorConfig->singleton(ReplaceNewDateTimeNull::class);
 };

From 88f7055304450c78099c6364089b57b13d92d27d Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Mon, 18 Mar 2024 19:07:28 +0530
Subject: [PATCH 592/630] Fixed tests after update the latest versions

---
 rector.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rector.php b/rector.php
index 9b240393..bd9da885 100644
--- a/rector.php
+++ b/rector.php
@@ -17,9 +17,6 @@
     $rectorConfig->phpVersion(PhpVersion::PHP_80);
     $rectorConfig->phpVersion(PhpVersion::PHP_81);
 
-    // get services (needed for register a single rule)
-//    $services = $rectorConfig->services();
-
     // register a single rule
     $rectorConfig->singleton(FinalPrivateToPrivateVisibilityRector::class);
     $rectorConfig->singleton(OptionalParametersAfterRequiredRector::class);

From 5b71a74b293170aa29c3b86a03e646e95931adca Mon Sep 17 00:00:00 2001
From: Olga Moyseyenko <moyseyen@adobe.com>
Date: Fri, 26 Apr 2024 17:27:15 -0500
Subject: [PATCH 593/630] ACP2E-2977: Implement Static test which will check
 for no usage of object manager in .phtml files

---
 .../Phtml/PhtmlTemplateObjectManagerSniff.php | 56 +++++++++++++++++++
 .../PhtmlTemplateObjectManager.1.phtml.inc    | 25 +++++++++
 .../PhtmlTemplateObjectManagerUnitTest.php    | 45 +++++++++++++++
 Magento2/ruleset.xml                          |  5 ++
 4 files changed, 131 insertions(+)
 create mode 100644 Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
 create mode 100644 Magento2/Tests/Phtml/PhtmlTemplateObjectManager.1.phtml.inc
 create mode 100644 Magento2/Tests/Phtml/PhtmlTemplateObjectManagerUnitTest.php

diff --git a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php b/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
new file mode 100644
index 00000000..ea2a1b2e
--- /dev/null
+++ b/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * **********************************************************************
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Phtml;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class PhtmlTemplateObjectManagerSniff implements Sniff
+{
+    private const WARNING_CODE_OBJECT_MANAGER_USAGE = 'ObjectManagerUsageFound';
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [T_DOUBLE_COLON];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if ($tokens[$stackPtr - 1]['content'] !== 'ObjectManager'
+            && $tokens[$stackPtr + 1]['content'] !== 'getInstance'
+        ) {
+            return;
+        }
+
+        $phpcsFile->addWarning(
+            'ObjectManager should not be used in .phtml template ' .
+            'as it’s not a template’s responsibility to create objects.',
+            $stackPtr,
+            self::WARNING_CODE_OBJECT_MANAGER_USAGE
+        );
+    }
+}
diff --git a/Magento2/Tests/Phtml/PhtmlTemplateObjectManager.1.phtml.inc b/Magento2/Tests/Phtml/PhtmlTemplateObjectManager.1.phtml.inc
new file mode 100644
index 00000000..badbf38c
--- /dev/null
+++ b/Magento2/Tests/Phtml/PhtmlTemplateObjectManager.1.phtml.inc
@@ -0,0 +1,25 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * **********************************************************************
+ */
+
+    $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+?>
+
+<div class="block test">
+</div>
+<script type="jquery/ui">
+</script>
+
diff --git a/Magento2/Tests/Phtml/PhtmlTemplateObjectManagerUnitTest.php b/Magento2/Tests/Phtml/PhtmlTemplateObjectManagerUnitTest.php
new file mode 100644
index 00000000..be871dff
--- /dev/null
+++ b/Magento2/Tests/Phtml/PhtmlTemplateObjectManagerUnitTest.php
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * **********************************************************************
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Tests\Phtml;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class PhtmlTemplateObjectManagerUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($filename = '')
+    {
+        if ($filename === 'PhtmlTemplateObjectManager.1.phtml.inc') {
+            return [
+                7 => 1
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($filename = '')
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 4ac058c0..6e4ff7ad 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -350,6 +350,11 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Phtml.PhtmlTemplateObjectManager">
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>8</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Magento2.Legacy.ObsoleteConnection">
         <severity>8</severity>
         <type>warning</type>

From 81676df23dd25beda75a28d395c1ef854b5f13bc Mon Sep 17 00:00:00 2001
From: Olga Moyseyenko <moyseyen@adobe.com>
Date: Tue, 30 Apr 2024 12:21:18 -0500
Subject: [PATCH 594/630] ACP2E-2977: Implement Static test which will check
 for no usage of object manager in .phtml files

---
 .../Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php b/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
index ea2a1b2e..e2446a10 100644
--- a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
+++ b/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
@@ -21,6 +21,14 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
+/**
+ * Class PhtmlTemplateObjectManagerSniff
+ *
+ * Templates must not instantiate new objects within their code.
+ * All objects must be passed from the Block object.
+ *
+ * @link https://developer.adobe.com/commerce/frontend-core/guide/templates/override/#getting-argument-values-from-layout
+ */
 class PhtmlTemplateObjectManagerSniff implements Sniff
 {
     private const WARNING_CODE_OBJECT_MANAGER_USAGE = 'ObjectManagerUsageFound';
@@ -48,7 +56,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $phpcsFile->addWarning(
             'ObjectManager should not be used in .phtml template ' .
-            'as it’s not a template’s responsibility to create objects.',
+            'as it\'s not a template\'s responsibility to create objects.',
             $stackPtr,
             self::WARNING_CODE_OBJECT_MANAGER_USAGE
         );

From 06a96f8fd1fe2d316b10e055c74154d6eeb457b4 Mon Sep 17 00:00:00 2001
From: Olga Moyseyenko <moyseyen@adobe.com>
Date: Tue, 30 Apr 2024 13:52:59 -0500
Subject: [PATCH 595/630] ACP2E-2977: Implement Static test which will check
 for no usage of object manager in .phtml files

---
 Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php b/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
index e2446a10..a8371d47 100644
--- a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
+++ b/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
@@ -55,8 +55,9 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $phpcsFile->addWarning(
-            'ObjectManager should not be used in .phtml template ' .
-            'as it\'s not a template\'s responsibility to create objects.',
+            'ObjectManager should not be used in .phtml template. ' .
+            'Templates must not instantiate new objects within their code. ' .
+            'All objects must be passed from the Block object.',
             $stackPtr,
             self::WARNING_CODE_OBJECT_MANAGER_USAGE
         );

From 8850ff7a03a0de4e506d810a045156b2fb7a0c7c Mon Sep 17 00:00:00 2001
From: Olga Moyseyenko <moyseyen@adobe.com>
Date: Thu, 27 Jun 2024 19:52:54 -0500
Subject: [PATCH 596/630] ACP2E-2977: Implement Static test which will check
 for no usage of object manager in .phtml files

---
 .../ObjectManagerSniff.php}                   |  6 ++---
 .../ObjectManager.1.phtml}                    |  0
 .../Tests/Templates/ObjectManager.1.phtml.inc | 25 +++++++++++++++++++
 .../ObjectManagerUnitTest.php}                |  0
 Magento2/ruleset.xml                          |  2 +-
 5 files changed, 29 insertions(+), 4 deletions(-)
 rename Magento2/Sniffs/{Phtml/PhtmlTemplateObjectManagerSniff.php => Templates/ObjectManagerSniff.php} (87%)
 rename Magento2/Tests/{Phtml/PhtmlTemplateObjectManager.1.phtml.inc => Templates/ObjectManager.1.phtml} (100%)
 create mode 100644 Magento2/Tests/Templates/ObjectManager.1.phtml.inc
 rename Magento2/Tests/{Phtml/PhtmlTemplateObjectManagerUnitTest.php => Templates/ObjectManagerUnitTest.php} (100%)

diff --git a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php b/Magento2/Sniffs/Templates/ObjectManagerSniff.php
similarity index 87%
rename from Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
rename to Magento2/Sniffs/Templates/ObjectManagerSniff.php
index a8371d47..3bb2ab98 100644
--- a/Magento2/Sniffs/Phtml/PhtmlTemplateObjectManagerSniff.php
+++ b/Magento2/Sniffs/Templates/ObjectManagerSniff.php
@@ -16,17 +16,17 @@
  */
 declare(strict_types = 1);
 
-namespace Magento2\Sniffs\Phtml;
+namespace Magento2\Sniffs\Templates;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * Class PhtmlTemplateObjectManagerSniff
- *
  * Templates must not instantiate new objects within their code.
  * All objects must be passed from the Block object.
  *
+ * @see https://developer.adobe.com/commerce/php/coding-standards/technical-guidelines/#62-presentation-layer 6.2.6
+ * @link https://developer.adobe.com/commerce/frontend-core/guide/layouts/xml-instructions/#obtain-arguments-examples-in-template
  * @link https://developer.adobe.com/commerce/frontend-core/guide/templates/override/#getting-argument-values-from-layout
  */
 class PhtmlTemplateObjectManagerSniff implements Sniff
diff --git a/Magento2/Tests/Phtml/PhtmlTemplateObjectManager.1.phtml.inc b/Magento2/Tests/Templates/ObjectManager.1.phtml
similarity index 100%
rename from Magento2/Tests/Phtml/PhtmlTemplateObjectManager.1.phtml.inc
rename to Magento2/Tests/Templates/ObjectManager.1.phtml
diff --git a/Magento2/Tests/Templates/ObjectManager.1.phtml.inc b/Magento2/Tests/Templates/ObjectManager.1.phtml.inc
new file mode 100644
index 00000000..badbf38c
--- /dev/null
+++ b/Magento2/Tests/Templates/ObjectManager.1.phtml.inc
@@ -0,0 +1,25 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * **********************************************************************
+ */
+
+    $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+?>
+
+<div class="block test">
+</div>
+<script type="jquery/ui">
+</script>
+
diff --git a/Magento2/Tests/Phtml/PhtmlTemplateObjectManagerUnitTest.php b/Magento2/Tests/Templates/ObjectManagerUnitTest.php
similarity index 100%
rename from Magento2/Tests/Phtml/PhtmlTemplateObjectManagerUnitTest.php
rename to Magento2/Tests/Templates/ObjectManagerUnitTest.php
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 6e4ff7ad..c425aea7 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -350,7 +350,7 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Phtml.PhtmlTemplateObjectManager">
+    <rule ref="Magento2.Templates.ObjectManager">
         <include-pattern>*\.phtml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>

From b421a21f3b779216606299eebd0e821905ca3f8a Mon Sep 17 00:00:00 2001
From: Olga Moyseyenko <moyseyen@adobe.com>
Date: Thu, 27 Jun 2024 20:02:02 -0500
Subject: [PATCH 597/630] ACP2E-2977: Implement Static test which will check
 for no usage of object manager in .phtml files

---
 .../Sniffs/Templates/ObjectManagerSniff.php   |  2 +-
 .../Tests/Templates/ObjectManager.1.phtml     | 25 -------------------
 .../Tests/Templates/ObjectManagerUnitTest.php |  8 +++---
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 Magento2/Tests/Templates/ObjectManager.1.phtml

diff --git a/Magento2/Sniffs/Templates/ObjectManagerSniff.php b/Magento2/Sniffs/Templates/ObjectManagerSniff.php
index 3bb2ab98..24d4c19e 100644
--- a/Magento2/Sniffs/Templates/ObjectManagerSniff.php
+++ b/Magento2/Sniffs/Templates/ObjectManagerSniff.php
@@ -29,7 +29,7 @@
  * @link https://developer.adobe.com/commerce/frontend-core/guide/layouts/xml-instructions/#obtain-arguments-examples-in-template
  * @link https://developer.adobe.com/commerce/frontend-core/guide/templates/override/#getting-argument-values-from-layout
  */
-class PhtmlTemplateObjectManagerSniff implements Sniff
+class ObjectManagerSniff implements Sniff
 {
     private const WARNING_CODE_OBJECT_MANAGER_USAGE = 'ObjectManagerUsageFound';
 
diff --git a/Magento2/Tests/Templates/ObjectManager.1.phtml b/Magento2/Tests/Templates/ObjectManager.1.phtml
deleted file mode 100644
index badbf38c..00000000
--- a/Magento2/Tests/Templates/ObjectManager.1.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/************************************************************************
- *
- * Copyright 2024 Adobe
- * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * **********************************************************************
- */
-
-    $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-?>
-
-<div class="block test">
-</div>
-<script type="jquery/ui">
-</script>
-
diff --git a/Magento2/Tests/Templates/ObjectManagerUnitTest.php b/Magento2/Tests/Templates/ObjectManagerUnitTest.php
index be871dff..9a21f5ec 100644
--- a/Magento2/Tests/Templates/ObjectManagerUnitTest.php
+++ b/Magento2/Tests/Templates/ObjectManagerUnitTest.php
@@ -16,20 +16,20 @@
  */
 declare(strict_types = 1);
 
-namespace Magento2\Tests\Phtml;
+namespace Magento2\Tests\Templates;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class PhtmlTemplateObjectManagerUnitTest extends AbstractSniffUnitTest
+class ObjectManagerUnitTest extends AbstractSniffUnitTest
 {
     /**
      * @inheritdoc
      */
     public function getWarningList($filename = '')
     {
-        if ($filename === 'PhtmlTemplateObjectManager.1.phtml.inc') {
+        if ($filename === 'ObjectManager.1.phtml.inc') {
             return [
-                7 => 1
+                18 => 1
             ];
         }
         return [];

From a539f9633222cffbc8e6b596dbc3ee328504fcda Mon Sep 17 00:00:00 2001
From: Olga Moyseyenko <moyseyen@adobe.com>
Date: Thu, 27 Jun 2024 21:51:15 -0500
Subject: [PATCH 598/630] ACP2E-2977: Implement Static test which will check
 for no usage of object manager in .phtml files

---
 ...ectManager.1.phtml.inc => ObjectManagerUnitTest.1.phtml.inc} | 0
 Magento2/Tests/Templates/ObjectManagerUnitTest.php              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Magento2/Tests/Templates/{ObjectManager.1.phtml.inc => ObjectManagerUnitTest.1.phtml.inc} (100%)

diff --git a/Magento2/Tests/Templates/ObjectManager.1.phtml.inc b/Magento2/Tests/Templates/ObjectManagerUnitTest.1.phtml.inc
similarity index 100%
rename from Magento2/Tests/Templates/ObjectManager.1.phtml.inc
rename to Magento2/Tests/Templates/ObjectManagerUnitTest.1.phtml.inc
diff --git a/Magento2/Tests/Templates/ObjectManagerUnitTest.php b/Magento2/Tests/Templates/ObjectManagerUnitTest.php
index 9a21f5ec..755b18bb 100644
--- a/Magento2/Tests/Templates/ObjectManagerUnitTest.php
+++ b/Magento2/Tests/Templates/ObjectManagerUnitTest.php
@@ -27,7 +27,7 @@ class ObjectManagerUnitTest extends AbstractSniffUnitTest
      */
     public function getWarningList($filename = '')
     {
-        if ($filename === 'ObjectManager.1.phtml.inc') {
+        if ($filename === 'ObjectManagerUnitTest.1.phtml.inc') {
             return [
                 18 => 1
             ];

From 388a93852ec575f396f22a89c8e36b2667965f09 Mon Sep 17 00:00:00 2001
From: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Date: Fri, 16 Aug 2024 19:05:35 +0530
Subject: [PATCH 599/630] AC-9098:Ability to use Adobe copyright for Adobe
 Commerce source code for Magento Open Source (CE)-Validation

---
 .../CopyrightAnotherExtensionsFilesSniff.php  | 25 +++++---------
 .../Sniffs/Header/CopyrightGraphQLSniff.php   | 21 ++++--------
 .../Sniffs/Header/CopyrightSniff.php          | 30 +++++++----------
 .../Sniffs/Header/CopyrightValidation.php     | 33 +++++++++++++++++++
 ...pyrightAnotherExtensionsFilesUnitTest.4.js |  4 +--
 .../CopyrightGraphQLUnitTest.1.graphqls       |  4 +--
 .../CopyrightGraphQLUnitTest.2.graphqls       |  2 +-
 .../Tests/Header/CopyrightGraphQLUnitTest.php | 18 +++++-----
 .../Tests/Header/CopyrightUnitTest.4.inc      |  4 +--
 .../Tests/Header/CopyrightUnitTest.php        |  3 +-
 10 files changed, 79 insertions(+), 65 deletions(-)
 create mode 100644 Magento2Framework/Sniffs/Header/CopyrightValidation.php

diff --git a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
index 3310e667..bd4a1133 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
@@ -12,12 +12,9 @@
 
 class CopyrightAnotherExtensionsFilesSniff implements Sniff
 {
+    use CopyrightValidation;
     private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
 
-    private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
-    private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
-    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
-
     /**
      * Defines the tokenizers that this sniff is using.
      *
@@ -45,19 +42,15 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $fileText = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+      // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
+        $content = file_get_contents($phpcsFile->getFilename());
 
-        if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false
-            || preg_match(self::COPYRIGHT_ADOBE, $fileText)
-                || strpos($fileText, self::COPYRIGHT_ADOBE_TEXT) !== false
-        ) {
-            return;
+        if ($this->isCopyrightYearValid($content) === false) {
+            $phpcsFile->addWarningOnLine(
+                'Copyright is missing or has wrong format',
+                null,
+                self::WARNING_CODE
+            );
         }
-
-        $phpcsFile->addWarningOnLine(
-            'Copyright is missing or has wrong format',
-            null,
-            self::WARNING_CODE
-        );
     }
 }
diff --git a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
index 5eae2b5e..e093d892 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
@@ -12,12 +12,9 @@
 
 class CopyrightGraphQLSniff implements Sniff
 {
+    use CopyrightValidation;
     private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
 
-    private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
-    private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
-    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
-
     private const FILE_EXTENSION = 'graphqls';
 
     /**
@@ -45,16 +42,12 @@ public function process(File $phpcsFile, $stackPtr)
         // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
         $content = file_get_contents($phpcsFile->getFilename());
 
-        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false
-            || preg_match(self::COPYRIGHT_ADOBE, $content)
-                || strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
-            return;
+        if ($this->isCopyrightYearValid($content) === false) {
+            $phpcsFile->addWarningOnLine(
+                'Copyright is missing or has wrong format',
+                null,
+                self::WARNING_CODE
+            );
         }
-
-        $phpcsFile->addWarningOnLine(
-            'Copyright is missing or has wrong format',
-            null,
-            self::WARNING_CODE
-        );
     }
 }
diff --git a/Magento2Framework/Sniffs/Header/CopyrightSniff.php b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
index e23aaba4..151c01de 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
@@ -12,11 +12,9 @@
 
 class CopyrightSniff implements Sniff
 {
-    private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
+    use CopyrightValidation;
 
-    private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
-    private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
-    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
+    private const WARNING_CODE = 'FoundCopyrightMissingOrWrongFormat';
 
     /**
      * @inheritdoc
@@ -46,19 +44,15 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $content = $phpcsFile->getTokens()[$positionComment]['content'];
-        $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $content);
+        // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
+        $content = file_get_contents($phpcsFile->getFilename());
 
-        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false ||
-                $adobeCopyrightFound ||
-                    strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
-            return;
+        if ($this->isCopyrightYearValid($content) === false) {
+            $phpcsFile->addWarningOnLine(
+                'Copyright is missing or has wrong format',
+                null,
+                self::WARNING_CODE
+            );
         }
-
-        $phpcsFile->addWarningOnLine(
-            'Copyright is missing or has wrong format',
-            $phpcsFile->getTokens()[$positionComment]['line'],
-            self::WARNING_CODE
-        );
     }
 }
diff --git a/Magento2Framework/Sniffs/Header/CopyrightValidation.php b/Magento2Framework/Sniffs/Header/CopyrightValidation.php
new file mode 100644
index 00000000..78ed5a26
--- /dev/null
+++ b/Magento2Framework/Sniffs/Header/CopyrightValidation.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types = 1);
+
+namespace Magento2Framework\Sniffs\Header;
+
+trait CopyrightValidation
+{
+
+  /**
+   * Check is copyright year valid or not
+   *
+   * @param string $content
+   * @return bool
+   */
+    private function isCopyrightYearValid(string $content): bool
+    {
+        $pattern = '/Copyright (\d{4}) Adobe/';
+        if (preg_match($pattern, $content, $matches)) {
+            $year = (int) $matches[1];
+            if ($year >= 2010 && $year <= date("Y")) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.4.js b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.4.js
index b47bf9d5..1027c04d 100644
--- a/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.4.js
+++ b/Magento2Framework/Tests/Header/CopyrightAnotherExtensionsFilesUnitTest.4.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 define([
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls
index 6d212f25..29462f8c 100644
--- a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.1.graphqls
@@ -1,5 +1,5 @@
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
+# Copyright 2021 Adobe
+# All Rights Reserved.
 
 enum PriceAdjustmentCodesEnum {
     WEEE @deprecated(reason: "WEEE code is deprecated, use fixed_product_taxes.label")
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls
index 786f22ca..42e7b595 100644
--- a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.2.graphqls
@@ -1,5 +1,5 @@
 # Copyright 2020 Adobe
-# See COPYING.txt for license details.
+# All Rights Reserved.
 
 enum PriceAdjustmentCodesEnum {
     WEEE @deprecated(reason: "WEEE code is deprecated, use fixed_product_taxes.label")
diff --git a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
index 7323bd96..58fc7346 100644
--- a/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightGraphQLUnitTest.php
@@ -9,28 +9,28 @@
 
 class CopyrightGraphQLUnitTest extends AbstractGraphQLSniffUnitTestCase
 {
-    /**
-     * @inheritdoc
-     */
+  /**
+   * @inheritdoc
+   */
     public function getErrorList(): array
     {
         return [];
     }
 
-    /**
-     * @inheritdoc
-     */
+  /**
+   * @inheritdoc
+   */
     public function getWarningList($testFile = ''): array
     {
         if ($testFile === 'CopyrightGraphQLUnitTest.1.graphqls' ||
-            $testFile === 'CopyrightGraphQLUnitTest.2.graphqls') {
+        $testFile === 'CopyrightGraphQLUnitTest.2.graphqls') {
             return [];
         }
 
         if ($testFile === 'CopyrightGraphQLUnitTest.3.graphqls' ||
-            $testFile === 'CopyrightGraphQLUnitTest.4.graphqls') {
+        $testFile === 'CopyrightGraphQLUnitTest.4.graphqls') {
             return [
-                null => 1
+            null => 1
             ];
         }
 
diff --git a/Magento2Framework/Tests/Header/CopyrightUnitTest.4.inc b/Magento2Framework/Tests/Header/CopyrightUnitTest.4.inc
index 1cadcad0..e785253e 100644
--- a/Magento2Framework/Tests/Header/CopyrightUnitTest.4.inc
+++ b/Magento2Framework/Tests/Header/CopyrightUnitTest.4.inc
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 
diff --git a/Magento2Framework/Tests/Header/CopyrightUnitTest.php b/Magento2Framework/Tests/Header/CopyrightUnitTest.php
index 065f6460..aae381f7 100644
--- a/Magento2Framework/Tests/Header/CopyrightUnitTest.php
+++ b/Magento2Framework/Tests/Header/CopyrightUnitTest.php
@@ -31,9 +31,10 @@ public function getWarningList($testFile = ''): array
                 1 => 1,
             ];
         }
+
         if ($testFile === 'CopyrightUnitTest.2.inc' || $testFile === 'CopyrightUnitTest.3.inc') {
             return [
-                3 => 1,
+                null => 1,
             ];
         }
 

From 98d3f1950ccab582611ddae7ea892349af082648 Mon Sep 17 00:00:00 2001
From: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:00:18 +0530
Subject: [PATCH 600/630] AC-9098:Ability to use Adobe copyright for Adobe
 Commerce source code for Magento Open Source (CE)-Validatio

---
 Magento2/Helpers/Assert.php                                 | 4 ++--
 Magento2/Helpers/Commenting/PHPDocFormattingValidator.php   | 4 ++--
 Magento2/Helpers/Tokenizer/AbstractTokenizer.php            | 4 ++--
 Magento2/Helpers/Tokenizer/Parameter.php                    | 4 ++--
 Magento2/Helpers/Tokenizer/Variable.php                     | 5 ++---
 Magento2/Sniffs/Annotation/AnnotationFormatValidator.php    | 4 ++--
 .../Sniffs/Annotation/MethodAnnotationStructureSniff.php    | 4 ++--
 Magento2/Sniffs/Annotation/MethodArgumentsSniff.php         | 4 ++--
 Magento2/Sniffs/Classes/AbstractApiSniff.php                | 4 ++--
 Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php    | 4 ++--
 Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php            | 4 ++--
 .../Commenting/ClassAndInterfacePHPDocFormattingSniff.php   | 4 ++--
 .../Commenting/ClassPropertyPHPDocFormattingSniff.php       | 4 ++--
 .../Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php    | 4 ++--
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php             | 4 ++--
 Magento2/Sniffs/Exceptions/ThrowCatchSniff.php              | 5 ++---
 .../Sniffs/Exceptions/TryProcessSystemResourcesSniff.php    | 4 ++--
 Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php      | 4 ++--
 .../Functions/FunctionsDeprecatedWithoutArgumentSniff.php   | 4 ++--
 Magento2/Sniffs/Functions/StaticFunctionSniff.php           | 4 ++--
 Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php            | 4 ++--
 Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php          | 5 ++---
 Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php             | 5 ++---
 Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php             | 4 ++--
 Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php     | 4 ++--
 Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php              | 4 ++--
 Magento2/Sniffs/Html/HtmlBindingSniff.php                   | 5 ++---
 Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php           | 4 ++--
 Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php      | 5 ++---
 Magento2/Sniffs/Html/HtmlDirectiveSniff.php                 | 5 ++---
 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php           | 5 ++---
 Magento2/Sniffs/Legacy/AbstractBlockSniff.php               | 4 ++--
 .../Legacy/ClassReferencesInConfigurationFilesSniff.php     | 4 ++--
 Magento2/Sniffs/Legacy/DiConfigSniff.php                    | 5 ++---
 Magento2/Sniffs/Legacy/EmailTemplateSniff.php               | 5 ++---
 Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php   | 5 ++---
 Magento2/Sniffs/Legacy/InstallUpgradeSniff.php              | 4 ++--
 Magento2/Sniffs/Legacy/LayoutSniff.php                      | 4 ++--
 Magento2/Sniffs/Legacy/MageEntitySniff.php                  | 4 ++--
 Magento2/Sniffs/Legacy/ModuleXMLSniff.php                   | 5 ++---
 Magento2/Sniffs/Legacy/ObsoleteAclSniff.php                 | 4 ++--
 Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php         | 5 ++---
 Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php          | 4 ++--
 Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php                | 4 ++--
 Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php | 5 ++---
 Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php               | 4 ++--
 Magento2/Sniffs/Legacy/RestrictedCodeSniff.php              | 4 ++--
 Magento2/Sniffs/Legacy/TableNameSniff.php                   | 4 ++--
 Magento2/Sniffs/Legacy/WidgetXMLSniff.php                   | 5 ++---
 Magento2/Sniffs/Legacy/_files/restricted_classes.php        | 4 ++--
 Magento2/Sniffs/Less/AvoidIdSniff.php                       | 4 ++--
 Magento2/Sniffs/Less/BracesFormattingSniff.php              | 4 ++--
 Magento2/Sniffs/Less/ClassNamingSniff.php                   | 4 ++--
 Magento2/Sniffs/Less/ColonSpacingSniff.php                  | 4 ++--
 Magento2/Sniffs/Less/ColourDefinitionSniff.php              | 4 ++--
 Magento2/Sniffs/Less/CombinatorIndentationSniff.php         | 4 ++--
 Magento2/Sniffs/Less/CommentLevelsSniff.php                 | 4 ++--
 Magento2/Sniffs/Less/ImportantPropertySniff.php             | 4 ++--
 Magento2/Sniffs/Less/IndentationSniff.php                   | 4 ++--
 Magento2/Sniffs/Less/PropertiesLineBreakSniff.php           | 4 ++--
 Magento2/Sniffs/Less/PropertiesSortingSniff.php             | 4 ++--
 Magento2/Sniffs/Less/QuotesSniff.php                        | 4 ++--
 Magento2/Sniffs/Less/SelectorDelimiterSniff.php             | 4 ++--
 Magento2/Sniffs/Less/SemicolonSpacingSniff.php              | 4 ++--
 Magento2/Sniffs/Less/TokenizerSymbolsInterface.php          | 4 ++--
 Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php     | 4 ++--
 Magento2/Sniffs/Less/TypeSelectorsSniff.php                 | 4 ++--
 Magento2/Sniffs/Less/VariablesSniff.php                     | 4 ++--
 Magento2/Sniffs/Less/ZeroUnitsSniff.php                     | 4 ++--
 Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php      | 4 ++--
 .../Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php     | 4 ++--
 Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php     | 4 ++--
 Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php     | 4 ++--
 Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php          | 4 ++--
 .../Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php  | 4 ++--
 Magento2/Sniffs/PHP/FinalImplementationSniff.php            | 4 ++--
 Magento2/Sniffs/PHP/GotoSniff.php                           | 4 ++--
 Magento2/Sniffs/PHP/LiteralNamespacesSniff.php              | 4 ++--
 Magento2/Sniffs/PHP/ReturnValueCheckSniff.php               | 4 ++--
 Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php                | 4 ++--
 Magento2/Sniffs/PHP/VarSniff.php                            | 4 ++--
 Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php      | 4 ++--
 Magento2/Sniffs/SQL/RawQuerySniff.php                       | 4 ++--
 Magento2/Sniffs/Security/IncludeFileSniff.php               | 4 ++--
 Magento2/Sniffs/Security/InsecureFunctionSniff.php          | 4 ++--
 Magento2/Sniffs/Security/LanguageConstructSniff.php         | 4 ++--
 Magento2/Sniffs/Security/SuperglobalSniff.php               | 4 ++--
 Magento2/Sniffs/Security/XssTemplateSniff.php               | 4 ++--
 Magento2/Sniffs/Strings/ExecutableRegExSniff.php            | 4 ++--
 Magento2/Sniffs/Strings/StringConcatSniff.php               | 4 ++--
 Magento2/Sniffs/Templates/ThisInTemplateSniff.php           | 4 ++--
 Magento2/Sniffs/Translation/ConstantUsageSniff.php          | 4 ++--
 Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php      | 4 ++--
 .../Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php  | 6 +++---
 Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php   | 6 +++---
 Magento2Framework/Sniffs/Header/CopyrightSniff.php          | 2 +-
 Magento2Framework/Sniffs/Header/LicenseSniff.php            | 4 ++--
 97 files changed, 195 insertions(+), 210 deletions(-)

diff --git a/Magento2/Helpers/Assert.php b/Magento2/Helpers/Assert.php
index 9b3eb0dc..54bb3995 100644
--- a/Magento2/Helpers/Assert.php
+++ b/Magento2/Helpers/Assert.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
index a87312d5..1a9b77c1 100644
--- a/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+++ b/Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Helpers\Commenting;
 
diff --git a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
index 1a3c4a63..e6b81b49 100644
--- a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
+++ b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Helpers\Tokenizer;
 
diff --git a/Magento2/Helpers/Tokenizer/Parameter.php b/Magento2/Helpers/Tokenizer/Parameter.php
index ec3a3564..ed02038d 100644
--- a/Magento2/Helpers/Tokenizer/Parameter.php
+++ b/Magento2/Helpers/Tokenizer/Parameter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Helpers\Tokenizer;
 
diff --git a/Magento2/Helpers/Tokenizer/Variable.php b/Magento2/Helpers/Tokenizer/Variable.php
index 43938c03..1ede8ae2 100644
--- a/Magento2/Helpers/Tokenizer/Variable.php
+++ b/Magento2/Helpers/Tokenizer/Variable.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Helpers\Tokenizer;
 
 /**
diff --git a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
index b69d2ad6..fb0d4e2e 100644
--- a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
+++ b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
index a76240c7..e9139fdf 100644
--- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
index 27ac0dfd..830984cd 100644
--- a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
+++ b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/Classes/AbstractApiSniff.php b/Magento2/Sniffs/Classes/AbstractApiSniff.php
index bb8a6571..19500772 100644
--- a/Magento2/Sniffs/Classes/AbstractApiSniff.php
+++ b/Magento2/Sniffs/Classes/AbstractApiSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Classes;
 
diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index fbaad301..0f6d8bbf 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Classes;
 
diff --git a/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
index 87c60a62..852e0f7d 100644
--- a/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
+++ b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\CodeAnalysis;
 
diff --git a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
index b23b2858..0144fae4 100644
--- a/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassAndInterfacePHPDocFormattingSniff.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Commenting;
 
diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index 0913be26..e6823c16 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
index 5d715af5..4d76e615 100644
--- a/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ConstantsPHPDocFormattingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Commenting;
 
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 576d2066..0687ecf7 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Exceptions;
 
diff --git a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
index c2510168..1149056d 100644
--- a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
+++ b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Exceptions;
 
 use function array_slice;
diff --git a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
index 0fa28149..dafb3b83 100644
--- a/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
+++ b/Magento2/Sniffs/Exceptions/TryProcessSystemResourcesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Exceptions;
 
diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index 45e00eb7..20de5755 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Functions;
 
diff --git a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
index e410c4d9..3400a482 100644
--- a/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
+++ b/Magento2/Sniffs/Functions/FunctionsDeprecatedWithoutArgumentSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/Functions/StaticFunctionSniff.php b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
index 2ae706d0..1d6d98ec 100644
--- a/Magento2/Sniffs/Functions/StaticFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/StaticFunctionSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Functions;
 
diff --git a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
index 889e7b4a..cfd8d082 100644
--- a/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
+++ b/Magento2/Sniffs/GraphQL/AbstractGraphQLSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\GraphQL;
 
diff --git a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
index bb7ad250..8f93b5e0 100644
--- a/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidArgumentNameSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\GraphQL;
 
 use GraphQL\Error\SyntaxError;
diff --git a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
index d009b9a0..074947be 100644
--- a/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidEnumValueSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\GraphQL;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
index d54f8e0b..7672ae24 100644
--- a/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidFieldNameSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\GraphQL;
 
diff --git a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
index f2f872fa..d9eea928 100644
--- a/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTopLevelFieldNameSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\GraphQL;
 
diff --git a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
index 602225fe..ffe8d243 100644
--- a/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
+++ b/Magento2/Sniffs/GraphQL/ValidTypeNameSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\GraphQL;
 
diff --git a/Magento2/Sniffs/Html/HtmlBindingSniff.php b/Magento2/Sniffs/Html/HtmlBindingSniff.php
index cf498da1..0032fa07 100644
--- a/Magento2/Sniffs/Html/HtmlBindingSniff.php
+++ b/Magento2/Sniffs/Html/HtmlBindingSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Html;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 5ce7c20d..ac4a0240 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
index 8798c416..fa093cda 100644
--- a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
+++ b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Html;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
index 2fdc0518..fcb934cd 100644
--- a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
+++ b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento2\Sniffs\Html;
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index ecbdca44..9cae28e7 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento2\Sniffs\Html;
diff --git a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
index 705db1b0..eb10729b 100644
--- a/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
+++ b/Magento2/Sniffs/Legacy/AbstractBlockSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
index f2b5b400..b49c0606 100644
--- a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
+++ b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/DiConfigSniff.php b/Magento2/Sniffs/Legacy/DiConfigSniff.php
index 7495dd44..dbb7f83c 100644
--- a/Magento2/Sniffs/Legacy/DiConfigSniff.php
+++ b/Magento2/Sniffs/Legacy/DiConfigSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Legacy;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
index 85d6b9a0..61295bc0 100644
--- a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Legacy;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php b/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
index 4d6d8288..fd5f3f7f 100644
--- a/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
+++ b/Magento2/Sniffs/Legacy/EscapeMethodsOnBlockClassSniff.php
@@ -1,10 +1,9 @@
 <?php
 
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento2\Sniffs\Legacy;
diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index 09dbedfb..7ade771c 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
index 4b2fe240..eddb60c7 100644
--- a/Magento2/Sniffs/Legacy/LayoutSniff.php
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index de8b7dbf..3e5c1c03 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Legacy;
 
diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
index 338834a8..bb6be3b3 100644
--- a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Legacy;
 
 use DOMDocument;
diff --git a/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php b/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
index 58f54910..3b6f276c 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Legacy;
 
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
index efc5fae7..c0df2211 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -1,10 +1,9 @@
 <?php
 
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Legacy;
 
 use DOMDocument;
diff --git a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
index 74a74394..965841f4 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteConnectionSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php b/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
index 1955e2e7..8a4342f7 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Legacy;
 
diff --git a/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
index e9de6db8..6c1280b7 100644
--- a/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
+++ b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
@@ -1,10 +1,9 @@
 <?php
 
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Legacy;
 
 use DOMDocument;
diff --git a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
index fa5eb70e..9611ee05 100644
--- a/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
+++ b/Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
index 5b6c860c..eafb1eff 100644
--- a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
+++ b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/TableNameSniff.php b/Magento2/Sniffs/Legacy/TableNameSniff.php
index 4569f7fc..9c8fbdb3 100644
--- a/Magento2/Sniffs/Legacy/TableNameSniff.php
+++ b/Magento2/Sniffs/Legacy/TableNameSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
index aee84dc8..5a59433f 100644
--- a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
+++ b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento2\Sniffs\Legacy;
 
 use DOMDocument;
diff --git a/Magento2/Sniffs/Legacy/_files/restricted_classes.php b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
index 90092aa7..84d7026c 100644
--- a/Magento2/Sniffs/Legacy/_files/restricted_classes.php
+++ b/Magento2/Sniffs/Legacy/_files/restricted_classes.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
index e0c09940..18dabfa2 100644
--- a/Magento2/Sniffs/Less/AvoidIdSniff.php
+++ b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/BracesFormattingSniff.php b/Magento2/Sniffs/Less/BracesFormattingSniff.php
index 54575160..91b2a92b 100644
--- a/Magento2/Sniffs/Less/BracesFormattingSniff.php
+++ b/Magento2/Sniffs/Less/BracesFormattingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
index 3c3d1a86..20aa6823 100644
--- a/Magento2/Sniffs/Less/ClassNamingSniff.php
+++ b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/ColonSpacingSniff.php b/Magento2/Sniffs/Less/ColonSpacingSniff.php
index 6b68ea65..d6461d7b 100644
--- a/Magento2/Sniffs/Less/ColonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/ColonSpacingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/ColourDefinitionSniff.php b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
index 945abffd..c7a0eacf 100644
--- a/Magento2/Sniffs/Less/ColourDefinitionSniff.php
+++ b/Magento2/Sniffs/Less/ColourDefinitionSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/CombinatorIndentationSniff.php b/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
index e6954c31..1bba8fa4 100644
--- a/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
+++ b/Magento2/Sniffs/Less/CombinatorIndentationSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/CommentLevelsSniff.php b/Magento2/Sniffs/Less/CommentLevelsSniff.php
index be7c93c9..d86f3be8 100644
--- a/Magento2/Sniffs/Less/CommentLevelsSniff.php
+++ b/Magento2/Sniffs/Less/CommentLevelsSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/ImportantPropertySniff.php b/Magento2/Sniffs/Less/ImportantPropertySniff.php
index ad1fd10c..509852e6 100644
--- a/Magento2/Sniffs/Less/ImportantPropertySniff.php
+++ b/Magento2/Sniffs/Less/ImportantPropertySniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/IndentationSniff.php b/Magento2/Sniffs/Less/IndentationSniff.php
index 57947a07..c4e52ed2 100644
--- a/Magento2/Sniffs/Less/IndentationSniff.php
+++ b/Magento2/Sniffs/Less/IndentationSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php b/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
index 06eb9c6a..e459bca7 100644
--- a/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/Magento2/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/PropertiesSortingSniff.php b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
index 2c5fe9e5..03c62e29 100644
--- a/Magento2/Sniffs/Less/PropertiesSortingSniff.php
+++ b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/QuotesSniff.php b/Magento2/Sniffs/Less/QuotesSniff.php
index a1328c51..30ba635a 100644
--- a/Magento2/Sniffs/Less/QuotesSniff.php
+++ b/Magento2/Sniffs/Less/QuotesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/SelectorDelimiterSniff.php b/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
index cdbd5117..4b8aff11 100644
--- a/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
+++ b/Magento2/Sniffs/Less/SelectorDelimiterSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
index 16783481..97f3800e 100644
--- a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
index c640e27a..8f39a5da 100644
--- a/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
+++ b/Magento2/Sniffs/Less/TokenizerSymbolsInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php b/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
index 5b42c9b2..b4e52041 100644
--- a/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
+++ b/Magento2/Sniffs/Less/TypeSelectorConcatenationSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/TypeSelectorsSniff.php b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
index 4735c761..62b33dfb 100644
--- a/Magento2/Sniffs/Less/TypeSelectorsSniff.php
+++ b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/VariablesSniff.php b/Magento2/Sniffs/Less/VariablesSniff.php
index ec9986a6..7e029633 100644
--- a/Magento2/Sniffs/Less/VariablesSniff.php
+++ b/Magento2/Sniffs/Less/VariablesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
index 7117bdb8..61183b34 100644
--- a/Magento2/Sniffs/Less/ZeroUnitsSniff.php
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Less;
 
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index 41a9f97b..2c0e3bd4 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Methods;
 
diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
index 765631d4..653fb40b 100644
--- a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
+++ b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Namespaces;
 
diff --git a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
index a460d924..2f07059a 100644
--- a/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
+++ b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\NamingConvention;
 
diff --git a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
index 9c6e453a..2859c15d 100644
--- a/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
+++ b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\NamingConvention;
 
diff --git a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
index 852aed30..feeeb6bf 100644
--- a/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
+++ b/Magento2/Sniffs/PHP/ArrayAutovivificationSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
index 6b074a2e..abbe3d1d 100644
--- a/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
+++ b/Magento2/Sniffs/PHP/AutogeneratedClassNotInConstructorSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
diff --git a/Magento2/Sniffs/PHP/FinalImplementationSniff.php b/Magento2/Sniffs/PHP/FinalImplementationSniff.php
index 15270a40..a8766d4d 100644
--- a/Magento2/Sniffs/PHP/FinalImplementationSniff.php
+++ b/Magento2/Sniffs/PHP/FinalImplementationSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Sniffs/PHP/GotoSniff.php b/Magento2/Sniffs/PHP/GotoSniff.php
index 4a5f06ca..b0e8cfd3 100644
--- a/Magento2/Sniffs/PHP/GotoSniff.php
+++ b/Magento2/Sniffs/PHP/GotoSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php b/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php
index d76dae3e..dc142fe8 100644
--- a/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php
+++ b/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
index 9929d46b..66337b5b 100644
--- a/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
+++ b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php b/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php
index da1aa279..4221a6cb 100644
--- a/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php
+++ b/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Sniffs/PHP/VarSniff.php b/Magento2/Sniffs/PHP/VarSniff.php
index fa7b28b7..80b82cea 100644
--- a/Magento2/Sniffs/PHP/VarSniff.php
+++ b/Magento2/Sniffs/PHP/VarSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\PHP;
 
diff --git a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
index 9ab6c8cc..0282fd78 100644
--- a/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
+++ b/Magento2/Sniffs/Performance/ForeachArrayMergeSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Performance;
 
diff --git a/Magento2/Sniffs/SQL/RawQuerySniff.php b/Magento2/Sniffs/SQL/RawQuerySniff.php
index a32d4eb0..4309457a 100644
--- a/Magento2/Sniffs/SQL/RawQuerySniff.php
+++ b/Magento2/Sniffs/SQL/RawQuerySniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\SQL;
 
diff --git a/Magento2/Sniffs/Security/IncludeFileSniff.php b/Magento2/Sniffs/Security/IncludeFileSniff.php
index 567f3224..dec0b61b 100644
--- a/Magento2/Sniffs/Security/IncludeFileSniff.php
+++ b/Magento2/Sniffs/Security/IncludeFileSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Security;
 
diff --git a/Magento2/Sniffs/Security/InsecureFunctionSniff.php b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
index 78a3e696..8216db8e 100644
--- a/Magento2/Sniffs/Security/InsecureFunctionSniff.php
+++ b/Magento2/Sniffs/Security/InsecureFunctionSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Security;
 
diff --git a/Magento2/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php
index 9b10ae4a..c9437b84 100644
--- a/Magento2/Sniffs/Security/LanguageConstructSniff.php
+++ b/Magento2/Sniffs/Security/LanguageConstructSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Security;
 
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index 136f991f..921b9d1c 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Security;
 
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index ba200daf..bd536624 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Security;
 
diff --git a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
index 09706ed6..36616521 100644
--- a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
+++ b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Strings;
 
diff --git a/Magento2/Sniffs/Strings/StringConcatSniff.php b/Magento2/Sniffs/Strings/StringConcatSniff.php
index 89c8dc9b..198a2229 100644
--- a/Magento2/Sniffs/Strings/StringConcatSniff.php
+++ b/Magento2/Sniffs/Strings/StringConcatSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Strings;
 
diff --git a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
index 74c27a6e..2e0616d8 100644
--- a/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+++ b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Templates;
 
diff --git a/Magento2/Sniffs/Translation/ConstantUsageSniff.php b/Magento2/Sniffs/Translation/ConstantUsageSniff.php
index bdf8b732..d80e4e17 100644
--- a/Magento2/Sniffs/Translation/ConstantUsageSniff.php
+++ b/Magento2/Sniffs/Translation/ConstantUsageSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Translation;
 
diff --git a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index 4d74a29e..79c64d67 100644
--- a/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento2\Sniffs\Whitespace;
 
diff --git a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
index bd4a1133..9af6a64d 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
@@ -47,7 +47,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($this->isCopyrightYearValid($content) === false) {
             $phpcsFile->addWarningOnLine(
-                'Copyright is missing or has wrong format',
+                'Copyright is missing or Copyright content/year is not valid',
                 null,
                 self::WARNING_CODE
             );
diff --git a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
index e093d892..22e8615f 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
@@ -44,7 +44,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($this->isCopyrightYearValid($content) === false) {
             $phpcsFile->addWarningOnLine(
-                'Copyright is missing or has wrong format',
+                'Copyright is missing or Copyright content/year is not valid',
                 null,
                 self::WARNING_CODE
             );
diff --git a/Magento2Framework/Sniffs/Header/CopyrightSniff.php b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
index 151c01de..eef4d578 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightSniff.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
@@ -49,7 +49,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($this->isCopyrightYearValid($content) === false) {
             $phpcsFile->addWarningOnLine(
-                'Copyright is missing or has wrong format',
+                'Copyright is missing or Copyright content/year is not valid',
                 null,
                 self::WARNING_CODE
             );
diff --git a/Magento2Framework/Sniffs/Header/LicenseSniff.php b/Magento2Framework/Sniffs/Header/LicenseSniff.php
index cf7a5479..f5562421 100644
--- a/Magento2Framework/Sniffs/Header/LicenseSniff.php
+++ b/Magento2Framework/Sniffs/Header/LicenseSniff.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 

From 3ce8c97898fe0d6becf2b946b45ee53283072387 Mon Sep 17 00:00:00 2001
From: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:45:43 +0530
Subject: [PATCH 601/630] AC-9098:Ability to use Adobe copyright for Adobe
 Commerce source code for Magento Open Source (CE)-Validation

---
 Magento2Framework/Sniffs/Header/CopyrightValidation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2Framework/Sniffs/Header/CopyrightValidation.php b/Magento2Framework/Sniffs/Header/CopyrightValidation.php
index 78ed5a26..589e26aa 100644
--- a/Magento2Framework/Sniffs/Header/CopyrightValidation.php
+++ b/Magento2Framework/Sniffs/Header/CopyrightValidation.php
@@ -11,7 +11,7 @@ trait CopyrightValidation
 {
 
   /**
-   * Check is copyright year valid or not
+   * Check if copyright content/year valid or not
    *
    * @param string $content
    * @return bool

From 33a79a65b626acba68a4ae9da584ec6ce230a5a8 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Fri, 6 Sep 2024 12:41:16 +0530
Subject: [PATCH 602/630] AC-12715::Investigate the laminas composer
 dependencies upgrading to latest version

---
 composer.json |  2 +-
 composer.lock | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 172e6b5b..300f8ddc 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "ext-simplexml": "*",
         "ext-dom": "*",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.19.0",
+        "rector/rector": "^1.2.4",
         "phpcsstandards/phpcsutils": "^1.0.5",
         "magento/php-compatibility-fork": "^0.1"
     },
diff --git a/composer.lock b/composer.lock
index 42089b48..96395de9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "82233b04ee4b5f65e33f6cc501ed3b4e",
+    "content-hash": "05d8d7651a86d5880335013ba0dce696",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -243,16 +243,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.59",
+            "version": "1.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e607609388d3a6d418a50a49f7940e8086798281"
+                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
-                "reference": "e607609388d3a6d418a50a49f7940e8086798281",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
+                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
                 "shasum": ""
             },
             "require": {
@@ -295,31 +295,27 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T13:59:13+00:00"
+            "time": "2024-09-05T16:09:28+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.19.8",
+            "version": "1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "de3b3bb159abd704b144aa86fb244f7f1f4ac947"
+                "reference": "42a4aa23b48b4cfc8ebfeac2b570364e27744381"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/de3b3bb159abd704b144aa86fb244f7f1f4ac947",
-                "reference": "de3b3bb159abd704b144aa86fb244f7f1f4ac947",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/42a4aa23b48b4cfc8ebfeac2b570364e27744381",
+                "reference": "42a4aa23b48b4cfc8ebfeac2b570364e27744381",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.56"
+                "phpstan/phpstan": "^1.11.11"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -327,6 +323,9 @@
                 "rector/rector-phpunit": "*",
                 "rector/rector-symfony": "*"
             },
+            "suggest": {
+                "ext-dom": "To manipulate phpunit.xml via the custom-rule command"
+            },
             "bin": [
                 "bin/rector"
             ],
@@ -349,7 +348,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.19.8"
+                "source": "https://github.com/rectorphp/rector/tree/1.2.4"
             },
             "funding": [
                 {
@@ -357,7 +356,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-05T10:59:13+00:00"
+            "time": "2024-08-23T09:03:01+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",

From 345382c88a7d621c016dc59dd928d1526ee94a9e Mon Sep 17 00:00:00 2001
From: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Date: Mon, 7 Oct 2024 12:42:28 +0530
Subject: [PATCH 603/630] AC-9098:Ability to use Adobe copyright for Adobe
 Commerce source code Magento Open Source (CE)-version Changed

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 300f8ddc..c80111c5 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "34",
+    "version": "35",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "webonyx/graphql-php": "^15.0",

From 00938f811fbb3a1878b73173243f28ec01a192d8 Mon Sep 17 00:00:00 2001
From: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Date: Mon, 7 Oct 2024 12:47:05 +0530
Subject: [PATCH 604/630] AC-9098:Ability to use Adobe copyright for Adobe
 Commerce source code Magento Open Source (CE)-version Changed

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 96395de9..43e60b65 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "05d8d7651a86d5880335013ba0dce696",
+    "content-hash": "e2b70ce9c22c7b443187cd24724bcf7d",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",

From 7ab4885d19f559e303b8c42a34d06cf2bbcbbb74 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 3 Dec 2024 16:49:28 +0530
Subject: [PATCH 605/630] Added support php8.4

---
 .github/workflows/php.yml |   2 +-
 composer.json             |   2 +-
 composer.lock             | 342 ++++++++++++++++++++------------------
 3 files changed, 179 insertions(+), 167 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 3d907aa4..c0a5099c 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,9 +13,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"
diff --git a/composer.json b/composer.json
index c80111c5..3434fdd2 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "type": "phpcodesniffer-standard",
     "version": "35",
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index 43e60b65..79447a0e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e2b70ce9c22c7b443187cd24724bcf7d",
+    "content-hash": "5bf37d2ec01f04f910d68afc4192b70b",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -155,22 +155,22 @@
         },
         {
             "name": "phpcsstandards/phpcsutils",
-            "version": "1.0.9",
+            "version": "1.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
-                "reference": "908247bc65010c7b7541a9551e002db12e9dae70"
+                "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/908247bc65010c7b7541a9551e002db12e9dae70",
-                "reference": "908247bc65010c7b7541a9551e002db12e9dae70",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/87b233b00daf83fb70f40c9a28692be017ea7c6c",
+                "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
                 "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^3.8.0 || 4.0.x-dev@dev"
+                "squizlabs/php_codesniffer": "^3.10.0 || 4.0.x-dev@dev"
             },
             "require-dev": {
                 "ext-filter": "*",
@@ -239,20 +239,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-08T14:50:00+00:00"
+            "time": "2024-05-20T13:34:27+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.2",
+            "version": "1.12.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1"
+                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
-                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
                 "shasum": ""
             },
             "require": {
@@ -297,25 +297,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-05T16:09:28+00:00"
+            "time": "2024-11-28T22:13:23+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "1.2.4",
+            "version": "1.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "42a4aa23b48b4cfc8ebfeac2b570364e27744381"
+                "reference": "40f9cf38c05296bd32f444121336a521a293fa61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/42a4aa23b48b4cfc8ebfeac2b570364e27744381",
-                "reference": "42a4aa23b48b4cfc8ebfeac2b570364e27744381",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/40f9cf38c05296bd32f444121336a521a293fa61",
+                "reference": "40f9cf38c05296bd32f444121336a521a293fa61",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.11.11"
+                "phpstan/phpstan": "^1.12.5"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -348,7 +348,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/1.2.4"
+                "source": "https://github.com/rectorphp/rector/tree/1.2.10"
             },
             "funding": [
                 {
@@ -356,20 +356,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-23T09:03:01+00:00"
+            "time": "2024-11-08T13:59:10+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.8.0",
+            "version": "3.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
+                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
-                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
+                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
                 "shasum": ""
             },
             "require": {
@@ -379,11 +379,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ],
             "type": "library",
             "extra": {
@@ -436,20 +436,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-08T12:32:31+00:00"
+            "time": "2024-11-16T12:02:36+00:00"
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v15.8.1",
+            "version": "v15.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "575ac95f13adfb38219a748572355385c101fdf7"
+                "reference": "a167afab66d8aa74b7f552759c0bbd906afb4134"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/575ac95f13adfb38219a748572355385c101fdf7",
-                "reference": "575ac95f13adfb38219a748572355385c101fdf7",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/a167afab66d8aa74b7f552759c0bbd906afb4134",
+                "reference": "a167afab66d8aa74b7f552759c0bbd906afb4134",
                 "shasum": ""
             },
             "require": {
@@ -462,19 +462,19 @@
                 "amphp/http-server": "^2.1",
                 "dms/phpunit-arraysubset-asserts": "dev-master",
                 "ergebnis/composer-normalize": "^2.28",
-                "friendsofphp/php-cs-fixer": "3.30.0",
-                "mll-lab/php-cs-fixer-config": "^5",
+                "friendsofphp/php-cs-fixer": "3.64.0",
+                "mll-lab/php-cs-fixer-config": "^5.9.2",
                 "nyholm/psr7": "^1.5",
                 "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "1.10.47",
-                "phpstan/phpstan-phpunit": "1.3.15",
-                "phpstan/phpstan-strict-rules": "1.5.2",
-                "phpunit/phpunit": "^9.5 || ^10",
+                "phpstan/phpstan": "1.12.10",
+                "phpstan/phpstan-phpunit": "1.4.1",
+                "phpstan/phpstan-strict-rules": "1.6.1",
+                "phpunit/phpunit": "^9.5 || ^10.5.21 || ^11",
                 "psr/http-message": "^1 || ^2",
                 "react/http": "^1.6",
-                "react/promise": "^2.9",
-                "rector/rector": "^0.18",
+                "react/promise": "^2.0 || ^3.0",
+                "rector/rector": "^1.0",
                 "symfony/polyfill-php81": "^1.23",
                 "symfony/var-exporter": "^5 || ^6 || ^7",
                 "thecodingmachine/safe": "^1.3 || ^2"
@@ -502,7 +502,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v15.8.1"
+                "source": "https://github.com/webonyx/graphql-php/tree/v15.18.1"
             },
             "funding": [
                 {
@@ -510,7 +510,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-05T17:23:35+00:00"
+            "time": "2024-11-13T16:21:54+00:00"
         }
     ],
     "packages-dev": [
@@ -586,16 +586,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                 "shasum": ""
             },
             "require": {
@@ -603,11 +603,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -633,7 +634,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
             },
             "funding": [
                 {
@@ -641,29 +642,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.18.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -671,7 +674,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -695,26 +698,27 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2023-12-10T21:03:43+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -755,9 +759,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -812,35 +822,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.29",
+            "version": "9.2.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -849,7 +859,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "9.2.x-dev"
                 }
             },
             "autoload": {
@@ -878,7 +888,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
             },
             "funding": [
                 {
@@ -886,7 +896,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-19T04:57:46+00:00"
+            "time": "2024-08-22T04:23:01+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1131,45 +1141,45 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.15",
+            "version": "9.6.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
+                "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
-                "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa",
+                "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
+                "doctrine/instantiator": "^1.5.0 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
+                "myclabs/deep-copy": "^1.12.0",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
                 "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.28",
-                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-code-coverage": "^9.2.32",
+                "phpunit/php-file-iterator": "^3.0.6",
                 "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "phpunit/php-timer": "^5.0.3",
+                "sebastian/cli-parser": "^1.0.2",
+                "sebastian/code-unit": "^1.0.8",
                 "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
+                "sebastian/diff": "^4.0.6",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/exporter": "^4.0.6",
+                "sebastian/global-state": "^5.0.7",
+                "sebastian/object-enumerator": "^4.0.4",
+                "sebastian/resource-operations": "^3.0.4",
+                "sebastian/type": "^3.2.1",
                 "sebastian/version": "^3.0.2"
             },
             "suggest": {
@@ -1214,7 +1224,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21"
             },
             "funding": [
                 {
@@ -1230,20 +1240,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-01T16:55:19+00:00"
+            "time": "2024-09-19T10:50:18+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
@@ -1278,7 +1288,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -1286,7 +1296,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -1475,20 +1485,20 @@
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -1520,7 +1530,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -1528,20 +1538,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -1586,7 +1596,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -1594,7 +1604,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1661,16 +1671,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
@@ -1726,7 +1736,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -1734,20 +1744,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.6",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
@@ -1790,7 +1800,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -1798,24 +1808,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-02T09:26:13+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -1847,7 +1857,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -1855,7 +1865,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -2034,16 +2044,16 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
@@ -2055,7 +2065,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2076,8 +2086,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
             "funding": [
                 {
@@ -2085,7 +2094,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
@@ -2198,16 +2207,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -2236,7 +2245,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -2244,20 +2253,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-20T00:12:19+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         },
         {
             "name": "yoast/phpunit-polyfills",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212"
+                "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/224e4a1329c03d8bad520e3fc4ec980034a4b212",
-                "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+                "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
                 "shasum": ""
             },
             "require": {
@@ -2265,12 +2274,14 @@
                 "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
             },
             "require-dev": {
-                "yoast/yoastcs": "^2.3.0"
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.4.0",
+                "yoast/yoastcs": "^3.1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -2302,21 +2313,22 @@
             ],
             "support": {
                 "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
+                "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2023-08-19T14:25:08+00:00"
+            "time": "2024-09-06T22:03:10+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

From 045a4f9927053f4db0ade753b3bc43ec5ae14a9a Mon Sep 17 00:00:00 2001
From: "arpit.khare" <glo42707@adobe.com>
Date: Thu, 19 Dec 2024 15:34:59 +0530
Subject: [PATCH 606/630] Update magento-coding-standard-version

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3434fdd2..4dfd718e 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "35",
+    "version": "36",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "webonyx/graphql-php": "^15.0",
diff --git a/composer.lock b/composer.lock
index 79447a0e..0059d92b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5bf37d2ec01f04f910d68afc4192b70b",
+    "content-hash": "deba7764572db661a95a09a1b2e6708b",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",

From c8e0ee9f05852242b1f2aab9a79c250d56b76a0b Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 02:55:28 +0530
Subject: [PATCH 607/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/eslint.config.mjs                      | 30 +++++++++++++++++++
 eslint/index.js                               | 24 +++++++++++++++
 eslint/package.json                           | 12 ++++++++
 eslint/rules/jquery-no-andSelf.js             |  7 +++--
 eslint/rules/jquery-no-bind-unbind.js         |  7 +++--
 eslint/rules/jquery-no-delegate-undelegate.js |  7 +++--
 eslint/rules/jquery-no-deprecated-expr.js     |  7 +++--
 eslint/rules/jquery-no-event-shorthand.js     |  7 +++--
 .../rules/jquery-no-input-event-shorthand.js  |  7 +++--
 .../jquery-no-misc-deprecated-functions.js    |  7 +++--
 eslint/rules/jquery-no-size.js                |  7 +++--
 eslint/rules/jquery-no-trim.js                |  7 +++--
 eslint/rules/utils.js                         |  2 +-
 package.json                                  |  7 ++---
 14 files changed, 105 insertions(+), 33 deletions(-)
 create mode 100644 eslint/eslint.config.mjs
 create mode 100644 eslint/index.js
 create mode 100644 eslint/package.json

diff --git a/eslint/eslint.config.mjs b/eslint/eslint.config.mjs
new file mode 100644
index 00000000..fe7d7a55
--- /dev/null
+++ b/eslint/eslint.config.mjs
@@ -0,0 +1,30 @@
+import { defineConfig } from "eslint/config";
+import magentoCodingStandardEslintPlugin from "magento-coding-standard-eslint-plugin";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+export default defineConfig([{
+    plugins: {
+        "magento-coding-standard-eslint-plugin": magentoCodingStandardEslintPlugin,  // This is in flat config format (object)
+    },
+    rules: {
+        "magento-coding-standard-eslint-plugin/jquery-no-andSelf": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-bind-unbind": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-delegate-undelegate": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-deprecated-expr": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-event-shorthand": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-input-event-shorthand": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-misc-deprecated-functions": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-size": "warn",
+        "magento-coding-standard-eslint-plugin/jquery-no-trim": "warn",
+    },
+}]);
diff --git a/eslint/index.js b/eslint/index.js
new file mode 100644
index 00000000..a2bd7622
--- /dev/null
+++ b/eslint/index.js
@@ -0,0 +1,24 @@
+// Import individual rule files as modules
+import jqueryNoAndSelf from './rules/jquery-no-andSelf.js';
+import jqueryNoBindUnbind from './rules/jquery-no-bind-unbind.js';
+import jqueryNoDelegateUndelegate from './rules/jquery-no-delegate-undelegate.js';
+import jqueryNoDeprecatedExpr from './rules/jquery-no-deprecated-expr.js';
+import jqueryNoEventShorthand from './rules/jquery-no-event-shorthand.js';
+import jqueryNoInputEventShorthand from './rules/jquery-no-input-event-shorthand.js';
+import jqueryNoMiscDeprecatedFunctions from './rules/jquery-no-misc-deprecated-functions.js';
+import jqueryNoSize from './rules/jquery-no-size.js';
+import jqueryNoTrim from './rules/jquery-no-trim.js';
+
+export default {
+    rules: {
+        'jquery-no-andSelf': jqueryNoAndSelf,
+        'jquery-no-bind-unbind': jqueryNoBindUnbind,
+        'jquery-no-delegate-undelegate': jqueryNoDelegateUndelegate,
+        'jquery-no-deprecated-expr': jqueryNoDeprecatedExpr,
+        'jquery-no-event-shorthand': jqueryNoEventShorthand,
+        'jquery-no-input-event-shorthand': jqueryNoInputEventShorthand,
+        'jquery-no-misc-deprecated-functions': jqueryNoMiscDeprecatedFunctions,
+        'jquery-no-size': jqueryNoSize,
+        'jquery-no-trim': jqueryNoTrim
+    }
+};
diff --git a/eslint/package.json b/eslint/package.json
new file mode 100644
index 00000000..e8c921af
--- /dev/null
+++ b/eslint/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "magento-coding-standard-eslint-plugin",
+  "version": "1.0.0",
+  "main": "index.js",
+  "resolutions": {
+    "eslint": "~9.22.0"
+  },
+  "eslintConfig": {
+    "plugins": ["magento-coding-standard-eslint-plugin"]
+  },
+  "type": "module"
+}
diff --git a/eslint/rules/jquery-no-andSelf.js b/eslint/rules/jquery-no-andSelf.js
index ad08cbb1..fe6b20fd 100644
--- a/eslint/rules/jquery-no-andSelf.js
+++ b/eslint/rules/jquery-no-andSelf.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -22,8 +25,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if andSelf is used in the node and reports it.
diff --git a/eslint/rules/jquery-no-bind-unbind.js b/eslint/rules/jquery-no-bind-unbind.js
index 58b4e92c..e6b9ea7a 100644
--- a/eslint/rules/jquery-no-bind-unbind.js
+++ b/eslint/rules/jquery-no-bind-unbind.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -22,8 +25,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if bind and unbind are used in the node and reports it.
diff --git a/eslint/rules/jquery-no-delegate-undelegate.js b/eslint/rules/jquery-no-delegate-undelegate.js
index fd96c9f2..6a7b0b18 100644
--- a/eslint/rules/jquery-no-delegate-undelegate.js
+++ b/eslint/rules/jquery-no-delegate-undelegate.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -22,8 +25,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if delegate and undelegate are used in the node and reports it.
diff --git a/eslint/rules/jquery-no-deprecated-expr.js b/eslint/rules/jquery-no-deprecated-expr.js
index 2a9e2377..aad4fd2e 100644
--- a/eslint/rules/jquery-no-deprecated-expr.js
+++ b/eslint/rules/jquery-no-deprecated-expr.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -19,8 +22,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks for jQuery.expr[':']
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 28e66353..648c7762 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -19,8 +22,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if shorthand event methods are used.
diff --git a/eslint/rules/jquery-no-input-event-shorthand.js b/eslint/rules/jquery-no-input-event-shorthand.js
index 6983fa5e..8e443e9e 100644
--- a/eslint/rules/jquery-no-input-event-shorthand.js
+++ b/eslint/rules/jquery-no-input-event-shorthand.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -19,8 +22,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if shortcuts are used to trigger events and reports it.
diff --git a/eslint/rules/jquery-no-misc-deprecated-functions.js b/eslint/rules/jquery-no-misc-deprecated-functions.js
index b4b7b52e..38724e09 100644
--- a/eslint/rules/jquery-no-misc-deprecated-functions.js
+++ b/eslint/rules/jquery-no-misc-deprecated-functions.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -19,8 +22,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if deprecated methods are used and reports it.
diff --git a/eslint/rules/jquery-no-size.js b/eslint/rules/jquery-no-size.js
index dc8b6477..39427964 100644
--- a/eslint/rules/jquery-no-size.js
+++ b/eslint/rules/jquery-no-size.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -22,8 +25,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if size method is used and reports it.
diff --git a/eslint/rules/jquery-no-trim.js b/eslint/rules/jquery-no-trim.js
index cd122294..2b98a766 100644
--- a/eslint/rules/jquery-no-trim.js
+++ b/eslint/rules/jquery-no-trim.js
@@ -1,4 +1,7 @@
-module.exports = {
+// Import utils using ES module syntax
+import utils from './utils.js';
+
+export default {
     meta: {
         type: 'suggestion',
         docs: {
@@ -22,8 +25,6 @@ module.exports = {
     create: function (context) {
         'use strict';
 
-        var utils = require('./utils.js');
-
         return {
             /**
              * Checks if trim method is used and reports it.
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index 398e2b86..9835dc0c 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -116,7 +116,7 @@ function isjQuery(node) {
     return id && jQueryId && id.name === jQueryId.name;
 }
 
-module.exports = {
+export default {
     traverse: getExpressionId,
     isjQuery: isjQuery
 };
diff --git a/package.json b/package.json
index c3a1d9dd..ca1a9d83 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,10 @@
   "name": "js",
   "version": "1.0.0",
   "description": "",
-  "main": "eslint/.eslintrc",
-  "scripts": {
-    "eslint": "./node_modules/.bin/eslint -c eslint/.eslintrc --rulesdir eslint/rules"
-  },
+  "main": "eslint/eslint.config.mjs",
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "^8.8.0"
+    "eslint": "~9.22.0"
   }
 }

From df249c8c783b7cb852ca7300793b802dec4bb5f2 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 11:54:22 +0530
Subject: [PATCH 608/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-jquery  | 18 +++++++++---------
 eslint/eslint.config.mjs |  6 ++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/eslint/.eslintrc-jquery b/eslint/.eslintrc-jquery
index d9363e15..9040713f 100644
--- a/eslint/.eslintrc-jquery
+++ b/eslint/.eslintrc-jquery
@@ -1,14 +1,14 @@
 {
     "ignorePatterns": ["**/vendor/**/*.js", "**/node_modules/**/*.js"],
     "rules": {
-        "jquery-no-andSelf": 2,
-        "jquery-no-bind-unbind": 2,
-        "jquery-no-input-event-shorthand": 2,
-        "jquery-no-delegate-undelegate": 2,
-        "jquery-no-event-shorthand": 2,
-        "jquery-no-size": 2,
-        "jquery-no-trim": 2,
-        "jquery-no-misc-deprecated-functions": 2,
-        "jquery-no-deprecated-expr": 2
+        "magento-coding-standard-eslint-plugin/jquery-no-andSelf": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-bind-unbind": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-input-event-shorthand": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-delegate-undelegate": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-event-shorthand": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-size": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-trim": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-misc-deprecated-functions": 2,
+        "magento-coding-standard-eslint-plugin/jquery-no-deprecated-expr": 2
     }
 }
diff --git a/eslint/eslint.config.mjs b/eslint/eslint.config.mjs
index fe7d7a55..1010aef1 100644
--- a/eslint/eslint.config.mjs
+++ b/eslint/eslint.config.mjs
@@ -13,6 +13,12 @@ const compat = new FlatCompat({
     allConfig: js.configs.all
 });
 export default defineConfig([{
+    extends: compat.extends(
+        "./.eslintrc-reset",
+        "./.eslintrc-magento",
+        "./.eslintrc-jquery",
+        "./.eslintrc-misc",
+    ),
     plugins: {
         "magento-coding-standard-eslint-plugin": magentoCodingStandardEslintPlugin,  // This is in flat config format (object)
     },

From 1177082bd8e85356487b110ce2eb4caf803a0efb Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 16:05:09 +0530
Subject: [PATCH 609/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/eslint.config.mjs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/eslint/eslint.config.mjs b/eslint/eslint.config.mjs
index 1010aef1..aa37b66b 100644
--- a/eslint/eslint.config.mjs
+++ b/eslint/eslint.config.mjs
@@ -21,16 +21,5 @@ export default defineConfig([{
     ),
     plugins: {
         "magento-coding-standard-eslint-plugin": magentoCodingStandardEslintPlugin,  // This is in flat config format (object)
-    },
-    rules: {
-        "magento-coding-standard-eslint-plugin/jquery-no-andSelf": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-bind-unbind": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-delegate-undelegate": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-deprecated-expr": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-event-shorthand": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-input-event-shorthand": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-misc-deprecated-functions": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-size": "warn",
-        "magento-coding-standard-eslint-plugin/jquery-no-trim": "warn",
-    },
+    }
 }]);

From 8df734c57e9b3807e846d335394ff45652e66938 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 19:14:16 +0530
Subject: [PATCH 610/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/rules/jquery-no-andSelf.js             |    2 -
 eslint/rules/jquery-no-bind-unbind.js         |    2 -
 eslint/rules/jquery-no-delegate-undelegate.js |    2 -
 eslint/rules/jquery-no-deprecated-expr.js     |    2 -
 eslint/rules/jquery-no-event-shorthand.js     |    2 -
 .../rules/jquery-no-input-event-shorthand.js  |    2 -
 .../jquery-no-misc-deprecated-functions.js    |    2 -
 eslint/rules/jquery-no-size.js                |    2 -
 eslint/rules/jquery-no-trim.js                |    2 -
 eslint/rules/utils.js                         |    5 -
 package-lock.json                             | 1189 +++++++++--------
 package.json                                  |    3 +
 12 files changed, 655 insertions(+), 560 deletions(-)

diff --git a/eslint/rules/jquery-no-andSelf.js b/eslint/rules/jquery-no-andSelf.js
index fe6b20fd..01c08367 100644
--- a/eslint/rules/jquery-no-andSelf.js
+++ b/eslint/rules/jquery-no-andSelf.js
@@ -23,8 +23,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if andSelf is used in the node and reports it.
diff --git a/eslint/rules/jquery-no-bind-unbind.js b/eslint/rules/jquery-no-bind-unbind.js
index e6b9ea7a..6401926c 100644
--- a/eslint/rules/jquery-no-bind-unbind.js
+++ b/eslint/rules/jquery-no-bind-unbind.js
@@ -23,8 +23,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if bind and unbind are used in the node and reports it.
diff --git a/eslint/rules/jquery-no-delegate-undelegate.js b/eslint/rules/jquery-no-delegate-undelegate.js
index 6a7b0b18..de316c54 100644
--- a/eslint/rules/jquery-no-delegate-undelegate.js
+++ b/eslint/rules/jquery-no-delegate-undelegate.js
@@ -23,8 +23,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if delegate and undelegate are used in the node and reports it.
diff --git a/eslint/rules/jquery-no-deprecated-expr.js b/eslint/rules/jquery-no-deprecated-expr.js
index aad4fd2e..e52f83c0 100644
--- a/eslint/rules/jquery-no-deprecated-expr.js
+++ b/eslint/rules/jquery-no-deprecated-expr.js
@@ -20,8 +20,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks for jQuery.expr[':']
diff --git a/eslint/rules/jquery-no-event-shorthand.js b/eslint/rules/jquery-no-event-shorthand.js
index 648c7762..28aebe02 100644
--- a/eslint/rules/jquery-no-event-shorthand.js
+++ b/eslint/rules/jquery-no-event-shorthand.js
@@ -20,8 +20,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if shorthand event methods are used.
diff --git a/eslint/rules/jquery-no-input-event-shorthand.js b/eslint/rules/jquery-no-input-event-shorthand.js
index 8e443e9e..79d816b8 100644
--- a/eslint/rules/jquery-no-input-event-shorthand.js
+++ b/eslint/rules/jquery-no-input-event-shorthand.js
@@ -20,8 +20,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if shortcuts are used to trigger events and reports it.
diff --git a/eslint/rules/jquery-no-misc-deprecated-functions.js b/eslint/rules/jquery-no-misc-deprecated-functions.js
index 38724e09..a2397e4e 100644
--- a/eslint/rules/jquery-no-misc-deprecated-functions.js
+++ b/eslint/rules/jquery-no-misc-deprecated-functions.js
@@ -20,8 +20,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if deprecated methods are used and reports it.
diff --git a/eslint/rules/jquery-no-size.js b/eslint/rules/jquery-no-size.js
index 39427964..55a63c7b 100644
--- a/eslint/rules/jquery-no-size.js
+++ b/eslint/rules/jquery-no-size.js
@@ -23,8 +23,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if size method is used and reports it.
diff --git a/eslint/rules/jquery-no-trim.js b/eslint/rules/jquery-no-trim.js
index 2b98a766..c7460e94 100644
--- a/eslint/rules/jquery-no-trim.js
+++ b/eslint/rules/jquery-no-trim.js
@@ -23,8 +23,6 @@ export default {
      * @returns {Object}
      */
     create: function (context) {
-        'use strict';
-
         return {
             /**
              * Checks if trim method is used and reports it.
diff --git a/eslint/rules/utils.js b/eslint/rules/utils.js
index 9835dc0c..e199279b 100644
--- a/eslint/rules/utils.js
+++ b/eslint/rules/utils.js
@@ -4,7 +4,6 @@
  * @returns object
  */
 function define(node) {
-    'use strict';
     var defineStmt, args;
 
     defineStmt = node.body.find(function (stmt) {
@@ -36,7 +35,6 @@ function define(node) {
  * @returns {null|*}
  */
 function getJqueryName(defineObject) {
-    'use strict';
 
     var jQueryPathIndex;
 
@@ -57,7 +55,6 @@ function getJqueryName(defineObject) {
  * Get Root Program node
  */
 function getProgramNode(node) {
-    'use strict';
     if (!node.parent) {
         return node;
     }
@@ -71,7 +68,6 @@ function getProgramNode(node) {
  * @returns {Object|Null}
  */
 function getExpressionId(node) {
-    'use strict';
 
     while (node) {
         switch (node.type) {
@@ -102,7 +98,6 @@ function getExpressionId(node) {
  */
 
 function isjQuery(node) {
-    'use strict';
     var parentNode, defineNode, jQueryId, id;
 
     parentNode = getProgramNode(node);
diff --git a/package-lock.json b/package-lock.json
index 614d29c4..1b5cc0ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,53 +9,214 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "eslint": "^8.8.0"
+        "eslint": "~9.22.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
+      "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz",
+      "integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
-      "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.3.1",
-        "globals": "^13.9.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
+      "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
+      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "@eslint/core": "^0.12.0",
+        "levn": "^0.4.1"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dev": true,
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -89,15 +250,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -181,13 +333,13 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -199,12 +351,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -221,18 +373,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -246,124 +386,114 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
-      "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz",
+      "integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.2.1",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/config-helpers": "^0.1.0",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "9.22.0",
+        "@eslint/plugin-kit": "^0.2.7",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.1",
-        "esquery": "^1.4.0",
+        "eslint-scope": "^8.3.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.6.0",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/espree": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
-      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.7.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^3.3.0"
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -417,72 +547,56 @@
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "node_modules/flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=16"
       }
     },
+    "node_modules/flatted": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true
+    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -496,15 +610,12 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.13.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -520,18 +631,18 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -553,22 +664,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -593,7 +688,7 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "node_modules/js-yaml": {
@@ -608,6 +703,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -620,6 +721,15 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -633,6 +743,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -652,9 +777,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/natural-compare": {
@@ -663,19 +788,10 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
@@ -683,12 +799,42 @@
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
         "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -701,13 +847,13 @@
         "node": ">=6"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/path-key": {
@@ -729,26 +875,14 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -758,21 +892,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -794,18 +913,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -830,12 +937,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -848,18 +949,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -869,12 +958,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -891,60 +974,168 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   },
   "dependencies": {
+    "@eslint-community/eslint-utils": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
+      "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+          "dev": true
+        }
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "dev": true
+    },
+    "@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "dev": true,
+      "requires": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      }
+    },
+    "@eslint/config-helpers": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz",
+      "integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==",
+      "dev": true
+    },
+    "@eslint/core": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.15"
+      }
+    },
     "@eslint/eslintrc": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
-      "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.3.1",
-        "globals": "^13.9.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       }
     },
-    "@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+    "@eslint/js": {
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
+      "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
+      "dev": true
+    },
+    "@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "dev": true
+    },
+    "@eslint/plugin-kit": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
+      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
       "dev": true,
       "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "@eslint/core": "^0.12.0",
+        "levn": "^0.4.1"
       }
     },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+    "@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true
+    },
+    "@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dev": true,
+      "requires": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
+      },
+      "dependencies": {
+        "@humanwhocodes/retry": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+          "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+          "dev": true
+        }
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/retry": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "dev": true
+    },
+    "@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true
+    },
+    "@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
     "acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -966,12 +1157,6 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
     "ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -1037,13 +1222,13 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -1052,12 +1237,12 @@
       }
     },
     "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "requires": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       }
     },
     "deep-is": {
@@ -1066,15 +1251,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
     "escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1082,96 +1258,79 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
-      "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz",
+      "integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.2.1",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/config-helpers": "^0.1.0",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "9.22.0",
+        "@eslint/plugin-kit": "^0.2.7",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.1",
-        "esquery": "^1.4.0",
+        "eslint-scope": "^8.3.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.6.0",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "optionator": "^0.9.3"
       }
     },
     "eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       }
     },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
-      }
-    },
     "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true
     },
     "espree": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
-      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
       "requires": {
-        "acorn": "^8.7.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^3.3.0"
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
       }
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
@@ -1213,60 +1372,44 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
     "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
       "requires": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       }
     },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       }
     },
-    "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
       }
     },
+    "flatted": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true
+    },
     "glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -1277,13 +1420,10 @@
       }
     },
     "globals": {
-      "version": "13.13.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true
     },
     "has-flag": {
       "version": "4.0.0",
@@ -1292,15 +1432,15 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true
     },
     "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
@@ -1313,22 +1453,6 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1347,7 +1471,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "js-yaml": {
@@ -1359,6 +1483,12 @@
         "argparse": "^2.0.1"
       }
     },
+    "json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1371,6 +1501,15 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.1"
+      }
+    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1381,6 +1520,15 @@
         "type-check": "~0.4.0"
       }
     },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^5.0.0"
+      }
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -1397,9 +1545,9 @@
       }
     },
     "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "natural-compare": {
@@ -1408,19 +1556,10 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
@@ -1428,7 +1567,25 @@
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
         "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "word-wrap": "^1.2.5"
+      }
+    },
+    "p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "requires": {
+        "yocto-queue": "^0.1.0"
+      }
+    },
+    "p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^3.0.2"
       }
     },
     "parent-module": {
@@ -1440,10 +1597,10 @@
         "callsites": "^3.0.0"
       }
     },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true
     },
     "path-key": {
@@ -1459,15 +1616,9 @@
       "dev": true
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true
     },
     "resolve-from": {
@@ -1476,15 +1627,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -1500,15 +1642,6 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -1524,12 +1657,6 @@
         "has-flag": "^4.0.0"
       }
     },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -1539,12 +1666,6 @@
         "prelude-ls": "^1.2.1"
       }
     },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -1554,12 +1675,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -1570,15 +1685,15 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true
     },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index ca1a9d83..c1c4e46e 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,9 @@
   "version": "1.0.0",
   "description": "",
   "main": "eslint/eslint.config.mjs",
+  "scripts": {
+    "eslint": "./node_modules/.bin/eslint -c eslint/eslint.config.mjs"
+  },
   "author": "",
   "license": "ISC",
   "devDependencies": {

From 24207a32cfd9a246c2071f47e41f875e2a5245e8 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 19:20:46 +0530
Subject: [PATCH 611/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/package-lock.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 eslint/package-lock.json

diff --git a/eslint/package-lock.json b/eslint/package-lock.json
new file mode 100644
index 00000000..c5b9c125
--- /dev/null
+++ b/eslint/package-lock.json
@@ -0,0 +1,12 @@
+{
+  "name": "magento-coding-standard-eslint-plugin",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "magento-coding-standard-eslint-plugin",
+      "version": "1.0.0"
+    }
+  }
+}

From 4b9e7e0e14b4096a8cf12918426f3e214dc8be6c Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 19:33:34 +0530
Subject: [PATCH 612/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/package-lock.json | 12 ------------
 package.json             |  3 ++-
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 eslint/package-lock.json

diff --git a/eslint/package-lock.json b/eslint/package-lock.json
deleted file mode 100644
index c5b9c125..00000000
--- a/eslint/package-lock.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "magento-coding-standard-eslint-plugin",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "magento-coding-standard-eslint-plugin",
-      "version": "1.0.0"
-    }
-  }
-}
diff --git a/package.json b/package.json
index c1c4e46e..7e2b3581 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "~9.22.0"
+    "eslint": "~9.22.0",
+    "magento-coding-standard-eslint-plugin": "1.0.0"
   }
 }

From 95bd7e2890920444298facd3482c6ac11578b4e6 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 19:37:10 +0530
Subject: [PATCH 613/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7e2b3581..e3ad868a 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
   "license": "ISC",
   "devDependencies": {
     "eslint": "~9.22.0",
-    "magento-coding-standard-eslint-plugin": "1.0.0"
+    "magento-coding-standard-eslint-plugin": "file:eslint/index.js"
   }
 }

From fbb7aa6c7fb4fbbe83fd27572fb951e5ada78b27 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 19:39:48 +0530
Subject: [PATCH 614/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3ad868a..c5719c6a 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
   "license": "ISC",
   "devDependencies": {
     "eslint": "~9.22.0",
-    "magento-coding-standard-eslint-plugin": "file:eslint/index.js"
+    "magento-coding-standard-eslint-plugin": "file:./eslint"
   }
 }

From c598f0a88a4532dbab81c181c769f84b656e89e2 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 20:40:11 +0530
Subject: [PATCH 615/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-reset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index 631a5a98..6fc1979e 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -44,7 +44,7 @@
   "rules": {
     ////////// Possible Errors //////////
 
-    "no-comma-dangle": 0,         // disallow trailing commas in object literals
+    "no-comma-dangle": "off",         // disallow trailing commas in object literals
     "no-cond-assign": 0,          // disallow assignment in conditional expressions
     "no-console": 0,              // disallow use of console (off by default in the node environment)
     "no-constant-condition": 0,   // disallow use of constant expressions in conditions

From 7c0d0eed9f5d1891a12ea8f7a1f0d4ab3c56de6f Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 20:45:45 +0530
Subject: [PATCH 616/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-reset | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index 6fc1979e..8d7049a4 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -22,6 +22,8 @@
   },
 
   "env": {
+    "node": true,
+    "es2020": true,
     "browser": false,     // browser global variables.
     "node": false,        // Node.js global variables and Node.js-specific rules.
     "amd": false,         // defines require() and define() as global variables as per the amd spec.
@@ -44,7 +46,7 @@
   "rules": {
     ////////// Possible Errors //////////
 
-    "no-comma-dangle": "off",         // disallow trailing commas in object literals
+    "no-comma-dangle": 0,         // disallow trailing commas in object literals
     "no-cond-assign": 0,          // disallow assignment in conditional expressions
     "no-console": 0,              // disallow use of console (off by default in the node environment)
     "no-constant-condition": 0,   // disallow use of constant expressions in conditions

From d8f6f043050f3c31519779ce8f0e4519b5a55a2a Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 20:47:14 +0530
Subject: [PATCH 617/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-reset | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index 8d7049a4..631a5a98 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -22,8 +22,6 @@
   },
 
   "env": {
-    "node": true,
-    "es2020": true,
     "browser": false,     // browser global variables.
     "node": false,        // Node.js global variables and Node.js-specific rules.
     "amd": false,         // defines require() and define() as global variables as per the amd spec.

From 42ea64a567cf49ca264880af215383708d5ccb64 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 20:53:32 +0530
Subject: [PATCH 618/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-reset | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index 631a5a98..ad847b00 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -2,6 +2,8 @@
   // http://eslint.org/docs/rules/
 
   "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module",
     "ecmaFeatures": {
       "binaryLiterals": false,                    // enable binary literals
       "blockBindings": false,                     // enable let and const (aka block bindings)
@@ -22,6 +24,7 @@
   },
 
   "env": {
+    "es2020": true,
     "browser": false,     // browser global variables.
     "node": false,        // Node.js global variables and Node.js-specific rules.
     "amd": false,         // defines require() and define() as global variables as per the amd spec.

From 48570557c2f599aebc9245906bd21cea3eef1f98 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 20:54:35 +0530
Subject: [PATCH 619/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-reset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index ad847b00..12b0d8ca 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -26,7 +26,7 @@
   "env": {
     "es2020": true,
     "browser": false,     // browser global variables.
-    "node": false,        // Node.js global variables and Node.js-specific rules.
+    "node": true,        // Node.js global variables and Node.js-specific rules.
     "amd": false,         // defines require() and define() as global variables as per the amd spec.
     "mocha": false,       // adds all of the Mocha testing global variables.
     "jasmine": false,     // adds all of the Jasmine testing global variables for version 1.3 and 2.0.

From aa9d24a8003ba56bf9163c80d86724c0a2965618 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 20:57:17 +0530
Subject: [PATCH 620/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc-reset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index 12b0d8ca..533e2696 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -47,7 +47,7 @@
   "rules": {
     ////////// Possible Errors //////////
 
-    "no-comma-dangle": 0,         // disallow trailing commas in object literals
+    "no-comma-dangle": "off",     // disallow trailing commas in object literals
     "no-cond-assign": 0,          // disallow assignment in conditional expressions
     "no-console": 0,              // disallow use of console (off by default in the node environment)
     "no-constant-condition": 0,   // disallow use of constant expressions in conditions

From 1dad01ba9607d64b86dc175e151e47ccc483ad05 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 21:06:19 +0530
Subject: [PATCH 621/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 .github/workflows/php.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c0a5099c..995a05f0 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup node
       uses: actions/setup-node@v2
       with:
-        node-version: '16'
+        node-version: '17'
 
     - uses: actions/checkout@v2
 
@@ -65,7 +65,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '17'
 
       - uses: actions/checkout@v2
 
@@ -82,7 +82,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '17'
 
       - uses: actions/checkout@v2
 

From 930715afc62daa3db4dc7aee1e4c6d820ee554ae Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 21:11:49 +0530
Subject: [PATCH 622/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 .github/workflows/php.yml |  4 ++--
 eslint/.eslintrc-reset    |  7 ++-----
 package-lock.json         | 15 ++++++++++++++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 995a05f0..0d36b41c 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '17'
+          node-version: '21'
 
       - uses: actions/checkout@v2
 
@@ -82,7 +82,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '17'
+          node-version: '21'
 
       - uses: actions/checkout@v2
 
diff --git a/eslint/.eslintrc-reset b/eslint/.eslintrc-reset
index 533e2696..631a5a98 100644
--- a/eslint/.eslintrc-reset
+++ b/eslint/.eslintrc-reset
@@ -2,8 +2,6 @@
   // http://eslint.org/docs/rules/
 
   "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module",
     "ecmaFeatures": {
       "binaryLiterals": false,                    // enable binary literals
       "blockBindings": false,                     // enable let and const (aka block bindings)
@@ -24,9 +22,8 @@
   },
 
   "env": {
-    "es2020": true,
     "browser": false,     // browser global variables.
-    "node": true,        // Node.js global variables and Node.js-specific rules.
+    "node": false,        // Node.js global variables and Node.js-specific rules.
     "amd": false,         // defines require() and define() as global variables as per the amd spec.
     "mocha": false,       // adds all of the Mocha testing global variables.
     "jasmine": false,     // adds all of the Jasmine testing global variables for version 1.3 and 2.0.
@@ -47,7 +44,7 @@
   "rules": {
     ////////// Possible Errors //////////
 
-    "no-comma-dangle": "off",     // disallow trailing commas in object literals
+    "no-comma-dangle": 0,         // disallow trailing commas in object literals
     "no-cond-assign": 0,          // disallow assignment in conditional expressions
     "no-console": 0,              // disallow use of console (off by default in the node environment)
     "no-constant-condition": 0,   // disallow use of constant expressions in conditions
diff --git a/package-lock.json b/package-lock.json
index 1b5cc0ae..b582c7e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,9 +9,15 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "eslint": "~9.22.0"
+        "eslint": "~9.22.0",
+        "magento-coding-standard-eslint-plugin": "file:./eslint"
       }
     },
+    "eslint": {
+      "name": "magento-coding-standard-eslint-plugin",
+      "version": "1.0.0",
+      "dev": true
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
@@ -764,6 +770,10 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "node_modules/magento-coding-standard-eslint-plugin": {
+      "resolved": "eslint",
+      "link": true
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -1535,6 +1545,9 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "magento-coding-standard-eslint-plugin": {
+      "version": "file:eslint"
+    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",

From 6feb339a9d79069f119b83021b81104c561fcf04 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Thu, 20 Mar 2025 21:35:13 +0530
Subject: [PATCH 623/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/.eslintrc | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 eslint/.eslintrc

diff --git a/eslint/.eslintrc b/eslint/.eslintrc
deleted file mode 100644
index 8f800d85..00000000
--- a/eslint/.eslintrc
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": [
-    	"./.eslintrc-reset",
-    	"./.eslintrc-magento",
-    	"./.eslintrc-jquery",
-    	"./.eslintrc-misc"
-    ]
-}

From efb2a1726669805a0f2fc17b8936f31c2052c740 Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Fri, 21 Mar 2025 12:30:06 +0530
Subject: [PATCH 624/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 0d36b41c..3a8ebd4a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup node
       uses: actions/setup-node@v2
       with:
-        node-version: '17'
+        node-version: '21'
 
     - uses: actions/checkout@v2
 

From 4d17750c057a3c5d070da15cd593ae90a292296f Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Wed, 26 Mar 2025 15:32:47 +0530
Subject: [PATCH 625/630] AC-13683::Investigate latest patch version of
 grunt-eslint

---
 eslint/eslint.config.mjs | 16 ++++++++++++----
 eslint/index.js          |  5 ++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/eslint/eslint.config.mjs b/eslint/eslint.config.mjs
index aa37b66b..d3852e98 100644
--- a/eslint/eslint.config.mjs
+++ b/eslint/eslint.config.mjs
@@ -1,3 +1,11 @@
+/**
+ * ESLint Configuration for Magento Project
+ *
+ * This configuration extends Magento, jQuery, and reset ESLint rules,
+ * while enforcing Magento coding standards using the `magento-coding-standard-eslint-plugin`.
+ * It uses FlatCompat to handle multiple config files in a modular way.
+ */
+
 import { defineConfig } from "eslint/config";
 import magentoCodingStandardEslintPlugin from "magento-coding-standard-eslint-plugin";
 import path from "node:path";
@@ -14,10 +22,10 @@ const compat = new FlatCompat({
 });
 export default defineConfig([{
     extends: compat.extends(
-        "./.eslintrc-reset",
-        "./.eslintrc-magento",
-        "./.eslintrc-jquery",
-        "./.eslintrc-misc",
+        "./.eslintrc-reset", // Resets all rules before applying custom ones
+        "./.eslintrc-magento", // Magento-specific coding standards
+        "./.eslintrc-jquery", // jQuery-related ESLint Rules
+        "./.eslintrc-misc", // Miscellaneous Rules
     ),
     plugins: {
         "magento-coding-standard-eslint-plugin": magentoCodingStandardEslintPlugin,  // This is in flat config format (object)
diff --git a/eslint/index.js b/eslint/index.js
index a2bd7622..035a4f70 100644
--- a/eslint/index.js
+++ b/eslint/index.js
@@ -1,4 +1,7 @@
-// Import individual rule files as modules
+/**
+ * ESLint Plugin for jQuery Deprecation Rules
+ * This module aggregates individual jQuery-related rules into a single .
+ */
 import jqueryNoAndSelf from './rules/jquery-no-andSelf.js';
 import jqueryNoBindUnbind from './rules/jquery-no-bind-unbind.js';
 import jqueryNoDelegateUndelegate from './rules/jquery-no-delegate-undelegate.js';

From d200b5cfcc9578a91f15c76907f7650a3b766751 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 15 Apr 2025 18:54:13 +0530
Subject: [PATCH 626/630] Update the new version

---
 composer.json | 2 +-
 composer.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 4dfd718e..6c8d584a 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "36",
+    "version": "37",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "webonyx/graphql-php": "^15.0",
diff --git a/composer.lock b/composer.lock
index 0059d92b..7b993a73 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "deba7764572db661a95a09a1b2e6708b",
+    "content-hash": "afe10d0482423054a6970b75b5457194",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2321,7 +2321,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -2329,6 +2329,6 @@
         "ext-simplexml": "*",
         "ext-dom": "*"
     },
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "platform-dev": [],
+    "plugin-api-version": "2.2.0"
 }

From 873cb3d54991e1fad0a3dc268a4ed154eff08f2f Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 15 Apr 2025 19:06:24 +0530
Subject: [PATCH 627/630] Added metadata.json file which is needed for merging

---
 .github/.metadata.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/.metadata.json

diff --git a/.github/.metadata.json b/.github/.metadata.json
new file mode 100644
index 00000000..5f74c50d
--- /dev/null
+++ b/.github/.metadata.json
@@ -0,0 +1,25 @@
+{
+    "templateVersion": "0.2",
+    "product": {
+        "name": "magento/magento-coding-standard",
+        "description": "A set of Magento specific PHP CodeSniffer rules"
+    },
+    "contacts": {
+        "team": {
+            "name": "HAMMER",
+            "DL": "Grp-RQ-HAMMER",
+            "slackChannel": "gl-hammer-team"
+        }
+    },
+    "ticketTracker": {
+        "functionalJiraQueue": {
+            "projectKey": "AC",
+            "component": "Github"
+        },
+        "securityJiraQueue": {
+            "projectKey": "MAGREQ",
+            "component": "Commerce M2"
+        }
+    },
+    "productionCodeBranches": ["develop"]
+}
\ No newline at end of file

From 9f1fd4a54af1be9249fc3fc997b826bdd8bf337e Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Fri, 9 May 2025 12:39:04 +0530
Subject: [PATCH 628/630] AC-14517: use strict is unnecessary issue

---
 eslint/eslint.config.mjs | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/eslint/eslint.config.mjs b/eslint/eslint.config.mjs
index d3852e98..a9eb6ab1 100644
--- a/eslint/eslint.config.mjs
+++ b/eslint/eslint.config.mjs
@@ -20,14 +20,25 @@ const compat = new FlatCompat({
     recommendedConfig: js.configs.recommended,
     allConfig: js.configs.all
 });
-export default defineConfig([{
-    extends: compat.extends(
-        "./.eslintrc-reset", // Resets all rules before applying custom ones
-        "./.eslintrc-magento", // Magento-specific coding standards
-        "./.eslintrc-jquery", // jQuery-related ESLint Rules
-        "./.eslintrc-misc", // Miscellaneous Rules
-    ),
-    plugins: {
-        "magento-coding-standard-eslint-plugin": magentoCodingStandardEslintPlugin,  // This is in flat config format (object)
+export default defineConfig([
+    {
+        extends: compat.extends(
+            "./.eslintrc-reset", // Resets all rules before applying custom ones
+            "./.eslintrc-magento", // Magento-specific coding standards
+            "./.eslintrc-jquery", // jQuery-related ESLint Rules
+            "./.eslintrc-misc", // Miscellaneous Rules
+        ),
+        plugins: {
+            "magento-coding-standard-eslint-plugin": magentoCodingStandardEslintPlugin,  // This is in flat config format (object)
+        }
+    },
+    {
+        ignores: ['**/eslint/rules/*.js'],
+        languageOptions: {
+            sourceType: "script"  // ensures non-module (classic script) parsing
+        },
+        rules: {
+            strict: ["error", "function"]  // enforces "use strict" inside functions
+        }
     }
-}]);
+]);

From b3f24f3bdac6da4e43745fd98d94b36ee1bbd16c Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Wed, 14 May 2025 15:24:41 +0530
Subject: [PATCH 629/630] AC-14517:use strict is unnecessary issue

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6c8d584a..57ea1eb5 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "37",
+    "version": "38",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "webonyx/graphql-php": "^15.0",

From 83eaa9d7ca5d96b13fd34395afd4b2fcb16a510c Mon Sep 17 00:00:00 2001
From: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Date: Wed, 14 May 2025 15:29:18 +0530
Subject: [PATCH 630/630] AC-14517:use strict is unnecessary issue

---
 composer.lock | 116 ++++++++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/composer.lock b/composer.lock
index 7b993a73..962d1fc3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "afe10d0482423054a6970b75b5457194",
+    "content-hash": "3dbbd1b747f17f4a6040df26e8c1b5b1",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -243,16 +243,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.12",
+            "version": "1.12.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
+                "reference": "e310849a19e02b8bfcbb63147f495d8f872dd96f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e310849a19e02b8bfcbb63147f495d8f872dd96f",
+                "reference": "e310849a19e02b8bfcbb63147f495d8f872dd96f",
                 "shasum": ""
             },
             "require": {
@@ -297,7 +297,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-28T22:13:23+00:00"
+            "time": "2025-04-27T12:20:45+00:00"
         },
         {
             "name": "rector/rector",
@@ -360,16 +360,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.1",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87"
+                "reference": "65ff2489553b83b4597e89c3b8b721487011d186"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
-                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186",
+                "reference": "65ff2489553b83b4597e89c3b8b721487011d186",
                 "shasum": ""
             },
             "require": {
@@ -434,22 +434,26 @@
                 {
                     "url": "https://opencollective.com/php_codesniffer",
                     "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/phpcsstandards",
+                    "type": "thanks_dev"
                 }
             ],
-            "time": "2024-11-16T12:02:36+00:00"
+            "time": "2025-05-11T03:36:00+00:00"
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v15.18.1",
+            "version": "v15.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "a167afab66d8aa74b7f552759c0bbd906afb4134"
+                "reference": "60feb7ad5023c0ef411efbdf9792d3df5812e28f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/a167afab66d8aa74b7f552759c0bbd906afb4134",
-                "reference": "a167afab66d8aa74b7f552759c0bbd906afb4134",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/60feb7ad5023c0ef411efbdf9792d3df5812e28f",
+                "reference": "60feb7ad5023c0ef411efbdf9792d3df5812e28f",
                 "shasum": ""
             },
             "require": {
@@ -462,22 +466,22 @@
                 "amphp/http-server": "^2.1",
                 "dms/phpunit-arraysubset-asserts": "dev-master",
                 "ergebnis/composer-normalize": "^2.28",
-                "friendsofphp/php-cs-fixer": "3.64.0",
-                "mll-lab/php-cs-fixer-config": "^5.9.2",
+                "friendsofphp/php-cs-fixer": "3.73.1",
+                "mll-lab/php-cs-fixer-config": "5.11.0",
                 "nyholm/psr7": "^1.5",
                 "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "1.12.10",
-                "phpstan/phpstan-phpunit": "1.4.1",
-                "phpstan/phpstan-strict-rules": "1.6.1",
+                "phpstan/phpstan": "2.1.8",
+                "phpstan/phpstan-phpunit": "2.0.4",
+                "phpstan/phpstan-strict-rules": "2.0.4",
                 "phpunit/phpunit": "^9.5 || ^10.5.21 || ^11",
                 "psr/http-message": "^1 || ^2",
                 "react/http": "^1.6",
                 "react/promise": "^2.0 || ^3.0",
-                "rector/rector": "^1.0",
+                "rector/rector": "^2.0",
                 "symfony/polyfill-php81": "^1.23",
                 "symfony/var-exporter": "^5 || ^6 || ^7",
-                "thecodingmachine/safe": "^1.3 || ^2"
+                "thecodingmachine/safe": "^1.3 || ^2 || ^3"
             },
             "suggest": {
                 "amphp/http-server": "To leverage async resolving with webserver on AMPHP platform",
@@ -502,7 +506,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v15.18.1"
+                "source": "https://github.com/webonyx/graphql-php/tree/v15.20.0"
             },
             "funding": [
                 {
@@ -510,7 +514,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-11-13T16:21:54+00:00"
+            "time": "2025-03-21T08:45:04+00:00"
         }
     ],
     "packages-dev": [
@@ -586,16 +590,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.1",
+            "version": "1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
+                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
                 "shasum": ""
             },
             "require": {
@@ -634,7 +638,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
             },
             "funding": [
                 {
@@ -642,20 +646,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T17:47:46+00:00"
+            "time": "2025-04-29T12:36:36+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.3.1",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
-                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
                 "shasum": ""
             },
             "require": {
@@ -698,9 +702,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
             },
-            "time": "2024-10-08T18:51:32+00:00"
+            "time": "2024-12-30T11:07:19+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1141,16 +1145,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.21",
+            "version": "9.6.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa"
+                "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa",
-                "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
+                "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
                 "shasum": ""
             },
             "require": {
@@ -1161,7 +1165,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.0",
+                "myclabs/deep-copy": "^1.13.1",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=7.3",
@@ -1224,7 +1228,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23"
             },
             "funding": [
                 {
@@ -1235,12 +1239,20 @@
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T10:50:18+00:00"
+            "time": "2025-05-02T06:40:34+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2257,16 +2269,16 @@
         },
         {
             "name": "yoast/phpunit-polyfills",
-            "version": "1.1.2",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+                "reference": "e6faedf5e34cea4438e341f660e2f719760c531d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
-                "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e6faedf5e34cea4438e341f660e2f719760c531d",
+                "reference": "e6faedf5e34cea4438e341f660e2f719760c531d",
                 "shasum": ""
             },
             "require": {
@@ -2281,7 +2293,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.x-dev"
+                    "dev-main": "4.x-dev"
                 }
             },
             "autoload": {
@@ -2316,12 +2328,12 @@
                 "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2024-09-06T22:03:10+00:00"
+            "time": "2025-02-09T18:13:44+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -2329,6 +2341,6 @@
         "ext-simplexml": "*",
         "ext-dom": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }