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..34cb7dd3 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;
@@ -108,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,
@@ -121,23 +126,37 @@ 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 ($isShortDescriptionPreviousVar === false) {
+            return;
+        }
+
+        $propertyNamePosition = $phpcsFile->findNext(
+            T_VARIABLE,
+            $foundVar,
+            null,
+            false,
+            null,
+            false
+        );
+        if ($propertyNamePosition === false) {
+            return;
+        };
+        $propertyName = trim($tokens[$propertyNamePosition]['content'], '$');
+        $shortDescription = strtolower($tokens[$isShortDescriptionPreviousVar]['content']);
+
+        if ($shortDescription === strtolower($propertyName)) {
             $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningFulNameVar');
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
             return;
         }
+
+        $propertyNameParts = array_filter(preg_split('/(?=[A-Z])/', $propertyName));
+
+        if ($shortDescription === strtolower(implode(' ', $propertyNameParts))) {
+            $error = 'Short description duplicates class property name.';
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
+        }
     }
 
     /**
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/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/Sniffs/Legacy/CopyrightSniff.php b/Magento2/Sniffs/Legacy/CopyrightSniff.php
new file mode 100644
index 00000000..f4ccd647
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/CopyrightSniff.php
@@ -0,0 +1,61 @@
+<?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];
+    }
+    
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        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
+        );
+    }
+}
diff --git a/Magento2/Sniffs/Legacy/EmailTemplateSniff.php b/Magento2/Sniffs/Legacy/EmailTemplateSniff.php
new file mode 100644
index 00000000..17ebbf08
--- /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 ERROR_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->addError(
+                    $errorMessage,
+                    $stackPtr,
+                    self::ERROR_CODE
+                );
+            }
+        }
+    }
+}
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/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
new file mode 100644
index 00000000..efd62aee
--- /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 widget.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) {
+            $this->invalidXML($phpcsFile, $stackPtr);
+            return;
+        }
+
+        $foundElements = $xml->xpath('/widgets/*[@type]');
+
+        foreach ($foundElements as $element) {
+            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
+                );
+            }
+        }
+
+        $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
+            );
+        }
+    }
+
+    /**
+     * 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();
+    }
+}
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.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
index 6dcccf65..05f9cd13 100644
--- a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -65,11 +65,18 @@ class Bar {
     private $variableName;
 
     /**
-     * Some more invalid description
+     * Correctly Formatted Protected Class Member
      *
-     * @var test
+     * @var correctlyFormattedProtectedClassMember
      */
-    protected $test;
+    protected $correctlyFormattedProtectedClassMember;
+
+    /**
+     * anotherCorrectlyFormattedProtectedClassMember
+     *
+     * @var anotherCorrectlyFormattedProtectedClassMember
+     */
+    protected $anotherCorrectlyFormattedProtectedClassMember;
 }
 
 class correctlyFormattedClassMemberDocBlock
@@ -99,4 +106,18 @@ class correctlyFormattedClassMemberDocBlock
      *      \FooObject_TEST_C
      */
     private $testObject;
+
+    /**
+     * Fallback factory
+     *
+     * @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 8817ab3b..6a49be76 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;
@@ -32,7 +32,8 @@ public function getWarningList()
             49 => 1,
             56 => 1,
             63 => 1,
-            68 => 1
+            68 => 1,
+            75 => 1,
         ];
     }
 }
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/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
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.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
new file mode 100644
index 00000000..1100bc53
--- /dev/null
+++ b/Magento2/Tests/Legacy/CopyrightUnitTest.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. 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' || $testFile === 'CopyrightUnitTest.5.inc') {
+            return [];
+        }
+        
+        if ($testFile === 'CopyrightUnitTest.1.inc') {
+            return [
+                1 => 1,
+            ];
+        }
+        if ($testFile === 'CopyrightUnitTest.2.inc' || $testFile === 'CopyrightUnitTest.3.inc') {
+            return [
+                3 => 1,
+            ];
+        }
+
+        return [];
+    }
+}
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.1.html b/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
new file mode 100644
index 00000000..9516974b
--- /dev/null
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.1.html
@@ -0,0 +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
new file mode 100644
index 00000000..422cea21
--- /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>
diff --git a/Magento2/Tests/Legacy/EmailTemplateUnitTest.php b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
new file mode 100644
index 00000000..7732f0aa
--- /dev/null
+++ b/Magento2/Tests/Legacy/EmailTemplateUnitTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. 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($testFile = '')
+    {
+        if ($testFile === 'EmailTemplateUnitTest.1.html') {
+            return [];
+        }
+        if ($testFile === 'EmailTemplateUnitTest.2.html') {
+            return [
+                1 => 1,
+                2 => 1,
+                3 => 2,
+            ];
+        }
+
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}
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/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.2.xml b/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
new file mode 100644
index 00000000..f99ae1ca
--- /dev/null
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.2.xml
@@ -0,0 +1,33 @@
+<?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.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
new file mode 100644
index 00000000..c52b920b
--- /dev/null
+++ b/Magento2/Tests/Legacy/WidgetXMLUnitTest.php
@@ -0,0 +1,41 @@
+<?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 = '')
+    {
+        if ($testFile === 'WidgetXMLUnitTest.1.xml') {
+            return [
+                9 => 1,
+                12 => 1,
+                14 => 1,
+            ];
+        }
+        if ($testFile === 'WidgetXMLUnitTest.2.xml') {
+            return [
+                9 => 1,
+                17 => 1,
+                24 => 1,
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}
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 5c40ce9c..212bf246 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">
@@ -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,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">
@@ -623,6 +634,14 @@
         <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="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.
  */
 
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",
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",