Namespace conflict with core rules

.travis.yml

@@ -7,4 +7,4 @@ php:
 install: composer install --no-interaction --prefer-source
 script:
   - vendor/bin/phpunit
-  - vendor/bin/phpcs --standard=Magento Magento/ --extensions=php
+  - vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php

Magento/Sniffs/Classes/AbstractApiSniff.php → Magento2/Sniffs/Classes/AbstractApiSniff.php

@@ -3,8 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Sniffs\Classes;
+namespace Magento2\Sniffs\Classes;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Classes/ObjectInstantiationSniff.php → Magento2/Sniffs/Classes/ObjectInstantiationSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Classes;
+namespace Magento2\Sniffs\Classes;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -16,7 +16,7 @@ class ObjectInstantiationSniff implements Sniff
     /**
      * String representation of warning.
      *
-     * phpcs:disable Magento.Files.LineLength.MaxExceeded
+     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
      *
      * @var string
      */

Magento/Sniffs/CodeAnalysis/EmptyBlockSniff.php → Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\CodeAnalysis;
+namespace Magento2\Sniffs\CodeAnalysis;
 
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff;
 

Magento/Sniffs/Exceptions/DirectThrowSniff.php → Magento2/Sniffs/Exceptions/DirectThrowSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Exceptions;
+namespace Magento2\Sniffs\Exceptions;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Exceptions/NamespaceSniff.php → Magento2/Sniffs/Exceptions/NamespaceSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Exceptions;
+namespace Magento2\Sniffs\Exceptions;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Exceptions/ThrowCatchSniff.php → Magento2/Sniffs/Exceptions/ThrowCatchSniff.php

@@ -3,8 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Sniffs\Exceptions;
+namespace Magento2\Sniffs\Exceptions;
 
 use function array_slice;
 use PHP_CodeSniffer\Sniffs\Sniff;

Magento/Sniffs/Files/LineLengthSniff.php → Magento2/Sniffs/Files/LineLengthSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Files;
+namespace Magento2\Sniffs\Files;
 
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff as FilesLineLengthSniff;
 

Magento/Sniffs/Functions/StaticFunctionSniff.php → Magento2/Sniffs/Functions/StaticFunctionSniff.php

@@ -3,8 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Sniffs\Functions;
+namespace Magento2\Sniffs\Functions;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Legacy/MageEntitySniff.php → Magento2/Sniffs/Legacy/MageEntitySniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Legacy;
+namespace Magento2\Sniffs\Legacy;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/NamingConvention/InterfaceNameSniff.php → Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\NamingConvention;
+namespace Magento2\Sniffs\NamingConvention;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/NamingConvention/ReservedWordsSniff.php → Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\NamingConvention;
+namespace Magento2\Sniffs\NamingConvention;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/DateTimeSniff.php → Magento2/Sniffs/PHP/DateTimeSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -16,7 +16,7 @@ class DateTimeSniff implements Sniff
     /**
      * String representation of warning.
      *
-     * phpcs:disable Magento.Files.LineLength.MaxExceeded
+     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
      *
      * @var string
      */

Magento/Sniffs/PHP/DiscouragedFunctionSniff.php → Magento2/Sniffs/PHP/DiscouragedFunctionSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\ForbiddenFunctionsSniff;

Magento/Sniffs/PHP/FinalImplementationSniff.php → Magento2/Sniffs/PHP/FinalImplementationSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -27,7 +27,7 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $phpcsFile->addError(
-            // phpcs:ignore Magento.Files.LineLength.MaxExceeded
+            // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
             'Final keyword is prohibited in Magento. It decreases extensibility and is not compatible with plugins and proxies.',
             $stackPtr,
             'FoundFinal'

Magento/Sniffs/PHP/GotoSniff.php → Magento2/Sniffs/PHP/GotoSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/LiteralNamespacesSniff.php → Magento2/Sniffs/PHP/LiteralNamespacesSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/ReturnValueCheckSniff.php → Magento2/Sniffs/PHP/ReturnValueCheckSniff.php

@@ -3,8 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/ShortEchoSyntaxSniff.php → Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/VarSniff.php → Magento2/Sniffs/PHP/VarSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\PHP;
+namespace Magento2\Sniffs\PHP;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Performance/EmptyCheckSniff.php → Magento2/Sniffs/Performance/EmptyCheckSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Performance;
+namespace Magento2\Sniffs\Performance;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -20,12 +20,12 @@ class EmptyCheckSniff implements Sniff
      */
     protected $map = [
         'count' => [
-            // phpcs:ignore Magento.Files.LineLength.MaxExceeded
+            // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
             'message' => 'count(...) function should not be used to check if array is empty. Use empty(...) language construct instead',
             'code' => 'FoundCount'
         ],
         'strlen' => [
-            // phpcs:ignore Magento.Files.LineLength.MaxExceeded
+            // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
             'message' => 'strlen(...) function should not be used to check if string is empty. Consider replace with (... === "") or (... !== "")',
             'code' => 'FoundStrlen'
         ],
@@ -114,7 +114,7 @@ public function process(File $phpcsFile, $stackPtr)
                     $phpcsFile->addWarning($message, $stackPtr, $code);
                 }
             } else {
-                // phpcs:ignore Magento.Files.LineLength.MaxExceeded
+                // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
                 if ($phpcsFile->findNext($this->otherComparisonOperators, $functionPosition, $endOfStatementPosition) === false) {
                     $phpcsFile->addWarning($message, $stackPtr, $code);
                 }
@@ -130,7 +130,7 @@ public function process(File $phpcsFile, $stackPtr)
      */
     private function findFunctionPosition($index)
     {
-        // phpcs:ignore Magento.Files.LineLength.MaxExceeded
+        // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
         for ($i = $this->tokens[$index]['parenthesis_opener'] + 1; $i < $this->tokens[$index]['parenthesis_closer']; $i++) {
             if (array_key_exists($this->tokens[$i]['content'], $this->map)) {
                 return $i;

Magento/Sniffs/SQL/RawQuerySniff.php → Magento2/Sniffs/SQL/RawQuerySniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\SQL;
+namespace Magento2\Sniffs\SQL;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Security/IncludeFileSniff.php → Magento2/Sniffs/Security/IncludeFileSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Security;
+namespace Magento2\Sniffs\Security;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Security/LanguageConstructSniff.php → Magento2/Sniffs/Security/LanguageConstructSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Security;
+namespace Magento2\Sniffs\Security;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -23,7 +23,7 @@ class LanguageConstructSniff implements Sniff
     /**
      * String representation of backtick error.
      *
-     * phpcs:disable Magento.Files.LineLength.MaxExceeded
+     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
      *
      * @var string
      */

Magento/Sniffs/Security/SuperglobalSniff.php → Magento2/Sniffs/Security/SuperglobalSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Security;
+namespace Magento2\Sniffs\Security;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Security/XssTemplateSniff.php → Magento2/Sniffs/Security/XssTemplateSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Security;
+namespace Magento2\Sniffs\Security;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Strings/ExecutableRegExSniff.php → Magento2/Sniffs/Strings/ExecutableRegExSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Strings;
+namespace Magento2\Sniffs\Strings;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -17,7 +17,7 @@ class ExecutableRegExSniff implements Sniff
     /**
      * String representation of error.
      *
-     * phpcs:disable Magento.Files.LineLength.MaxExceeded
+     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
      *
      * @var string
      */

Magento/Sniffs/Strings/StringConcatSniff.php → Magento2/Sniffs/Strings/StringConcatSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Strings;
+namespace Magento2\Sniffs\Strings;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Templates/ThisInTemplateSniff.php → Magento2/Sniffs/Templates/ThisInTemplateSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Templates;
+namespace Magento2\Sniffs\Templates;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Translation/ConstantUsageSniff.php → Magento2/Sniffs/Translation/ConstantUsageSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Translation;
+namespace Magento2\Sniffs\Translation;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -65,7 +65,7 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
-     * Checks if first argument of \Magento\Framework\Phrase or translation function is a constant
+     * Checks if first argument of \Magento2\Framework\Phrase or translation function is a constant
      *
      * @param File $phpcsFile
      * @param int $stackPtr

Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php → Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sniffs\Whitespace;
+namespace Magento2\Sniffs\Whitespace;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;

Magento/Tests/Classes/AbstractApiUnitTest.php → Magento2/Tests/Classes/AbstractApiUnitTest.php

@@ -3,8 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Tests\Classes;
+namespace Magento2\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 

Magento/Tests/Classes/ObjectInstantiationUnitTest.php → Magento2/Tests/Classes/ObjectInstantiationUnitTest.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tests\Classes;
+namespace Magento2\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 

Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.php → Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php

@@ -3,7 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tests\CodeAnalysis;
+namespace Magento2\Tests\CodeAnalysis;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;