diff --git a/.travis.yml b/.travis.yml index 3e4b8af3..69bd36ef 100644 --- a/.travis.yml +++ b/.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 diff --git a/Magento/Sniffs/Classes/AbstractApiSniff.php b/Magento2/Sniffs/Classes/AbstractApiSniff.php similarity index 97% rename from Magento/Sniffs/Classes/AbstractApiSniff.php rename to Magento2/Sniffs/Classes/AbstractApiSniff.php index 35353988..ac5836d8 100644 --- a/Magento/Sniffs/Classes/AbstractApiSniff.php +++ b/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; diff --git a/Magento/Sniffs/Classes/ObjectInstantiationSniff.php b/Magento2/Sniffs/Classes/ObjectInstantiationSniff.php similarity index 95% rename from Magento/Sniffs/Classes/ObjectInstantiationSniff.php rename to Magento2/Sniffs/Classes/ObjectInstantiationSniff.php index a4ee57e2..8077588c 100644 --- a/Magento/Sniffs/Classes/ObjectInstantiationSniff.php +++ b/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 */ diff --git a/Magento/Sniffs/CodeAnalysis/EmptyBlockSniff.php b/Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php similarity index 92% rename from Magento/Sniffs/CodeAnalysis/EmptyBlockSniff.php rename to Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php index 6b2a6357..2f5b5cc1 100644 --- a/Magento/Sniffs/CodeAnalysis/EmptyBlockSniff.php +++ b/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; diff --git a/Magento/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php similarity index 97% rename from Magento/Sniffs/Exceptions/DirectThrowSniff.php rename to Magento2/Sniffs/Exceptions/DirectThrowSniff.php index 96b4ee54..9612d84c 100644 --- a/Magento/Sniffs/Exceptions/DirectThrowSniff.php +++ b/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; diff --git a/Magento/Sniffs/Exceptions/NamespaceSniff.php b/Magento2/Sniffs/Exceptions/NamespaceSniff.php similarity index 97% rename from Magento/Sniffs/Exceptions/NamespaceSniff.php rename to Magento2/Sniffs/Exceptions/NamespaceSniff.php index 5d0e14eb..463fb43d 100644 --- a/Magento/Sniffs/Exceptions/NamespaceSniff.php +++ b/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; diff --git a/Magento/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php similarity index 98% rename from Magento/Sniffs/Exceptions/ThrowCatchSniff.php rename to Magento2/Sniffs/Exceptions/ThrowCatchSniff.php index b9ebf0d4..50c84307 100644 --- a/Magento/Sniffs/Exceptions/ThrowCatchSniff.php +++ b/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; diff --git a/Magento/Sniffs/Files/LineLengthSniff.php b/Magento2/Sniffs/Files/LineLengthSniff.php similarity index 97% rename from Magento/Sniffs/Files/LineLengthSniff.php rename to Magento2/Sniffs/Files/LineLengthSniff.php index 13bbb21a..7e9188cf 100644 --- a/Magento/Sniffs/Files/LineLengthSniff.php +++ b/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; diff --git a/Magento/Sniffs/Functions/StaticFunctionSniff.php b/Magento2/Sniffs/Functions/StaticFunctionSniff.php similarity index 97% rename from Magento/Sniffs/Functions/StaticFunctionSniff.php rename to Magento2/Sniffs/Functions/StaticFunctionSniff.php index 2a6e537f..e4b47975 100644 --- a/Magento/Sniffs/Functions/StaticFunctionSniff.php +++ b/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; diff --git a/Magento/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php similarity index 98% rename from Magento/Sniffs/Legacy/MageEntitySniff.php rename to Magento2/Sniffs/Legacy/MageEntitySniff.php index e0db60a8..13bc8beb 100644 --- a/Magento/Sniffs/Legacy/MageEntitySniff.php +++ b/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; diff --git a/Magento/Sniffs/NamingConvention/InterfaceNameSniff.php b/Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php similarity index 97% rename from Magento/Sniffs/NamingConvention/InterfaceNameSniff.php rename to Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php index 6e5875f8..461a1705 100644 --- a/Magento/Sniffs/NamingConvention/InterfaceNameSniff.php +++ b/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; diff --git a/Magento/Sniffs/NamingConvention/ReservedWordsSniff.php b/Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php similarity index 98% rename from Magento/Sniffs/NamingConvention/ReservedWordsSniff.php rename to Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php index 9e72bb85..23724a7c 100644 --- a/Magento/Sniffs/NamingConvention/ReservedWordsSniff.php +++ b/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; diff --git a/Magento/Sniffs/PHP/DateTimeSniff.php b/Magento2/Sniffs/PHP/DateTimeSniff.php similarity index 94% rename from Magento/Sniffs/PHP/DateTimeSniff.php rename to Magento2/Sniffs/PHP/DateTimeSniff.php index 497327e0..69daeeee 100644 --- a/Magento/Sniffs/PHP/DateTimeSniff.php +++ b/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 */ diff --git a/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php b/Magento2/Sniffs/PHP/DiscouragedFunctionSniff.php similarity index 99% rename from Magento/Sniffs/PHP/DiscouragedFunctionSniff.php rename to Magento2/Sniffs/PHP/DiscouragedFunctionSniff.php index 7cf74e84..abb9d2d7 100644 --- a/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php +++ b/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; diff --git a/Magento/Sniffs/PHP/FinalImplementationSniff.php b/Magento2/Sniffs/PHP/FinalImplementationSniff.php similarity index 88% rename from Magento/Sniffs/PHP/FinalImplementationSniff.php rename to Magento2/Sniffs/PHP/FinalImplementationSniff.php index 07759570..2010e06d 100644 --- a/Magento/Sniffs/PHP/FinalImplementationSniff.php +++ b/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' diff --git a/Magento/Sniffs/PHP/GotoSniff.php b/Magento2/Sniffs/PHP/GotoSniff.php similarity index 96% rename from Magento/Sniffs/PHP/GotoSniff.php rename to Magento2/Sniffs/PHP/GotoSniff.php index 0a8dcdc4..24bfc0a4 100644 --- a/Magento/Sniffs/PHP/GotoSniff.php +++ b/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; diff --git a/Magento/Sniffs/PHP/LiteralNamespacesSniff.php b/Magento2/Sniffs/PHP/LiteralNamespacesSniff.php similarity index 98% rename from Magento/Sniffs/PHP/LiteralNamespacesSniff.php rename to Magento2/Sniffs/PHP/LiteralNamespacesSniff.php index 7ac38cf7..7b9c85ac 100644 --- a/Magento/Sniffs/PHP/LiteralNamespacesSniff.php +++ b/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; diff --git a/Magento/Sniffs/PHP/ReturnValueCheckSniff.php b/Magento2/Sniffs/PHP/ReturnValueCheckSniff.php similarity index 99% rename from Magento/Sniffs/PHP/ReturnValueCheckSniff.php rename to Magento2/Sniffs/PHP/ReturnValueCheckSniff.php index a51b926f..7c5b9e8b 100644 --- a/Magento/Sniffs/PHP/ReturnValueCheckSniff.php +++ b/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; diff --git a/Magento/Sniffs/PHP/ShortEchoSyntaxSniff.php b/Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php similarity index 97% rename from Magento/Sniffs/PHP/ShortEchoSyntaxSniff.php rename to Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php index 7cbc87e8..946bb273 100644 --- a/Magento/Sniffs/PHP/ShortEchoSyntaxSniff.php +++ b/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; diff --git a/Magento/Sniffs/PHP/VarSniff.php b/Magento2/Sniffs/PHP/VarSniff.php similarity index 96% rename from Magento/Sniffs/PHP/VarSniff.php rename to Magento2/Sniffs/PHP/VarSniff.php index e150bf1e..5cfd8c6f 100644 --- a/Magento/Sniffs/PHP/VarSniff.php +++ b/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; diff --git a/Magento/Sniffs/Performance/EmptyCheckSniff.php b/Magento2/Sniffs/Performance/EmptyCheckSniff.php similarity index 93% rename from Magento/Sniffs/Performance/EmptyCheckSniff.php rename to Magento2/Sniffs/Performance/EmptyCheckSniff.php index 13a635be..9f7143e7 100644 --- a/Magento/Sniffs/Performance/EmptyCheckSniff.php +++ b/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; diff --git a/Magento/Sniffs/SQL/RawQuerySniff.php b/Magento2/Sniffs/SQL/RawQuerySniff.php similarity index 98% rename from Magento/Sniffs/SQL/RawQuerySniff.php rename to Magento2/Sniffs/SQL/RawQuerySniff.php index 00095c6e..c6b105d1 100644 --- a/Magento/Sniffs/SQL/RawQuerySniff.php +++ b/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; diff --git a/Magento/Sniffs/Security/IncludeFileSniff.php b/Magento2/Sniffs/Security/IncludeFileSniff.php similarity index 98% rename from Magento/Sniffs/Security/IncludeFileSniff.php rename to Magento2/Sniffs/Security/IncludeFileSniff.php index 0673f598..542e7f69 100644 --- a/Magento/Sniffs/Security/IncludeFileSniff.php +++ b/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; diff --git a/Magento/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php similarity index 95% rename from Magento/Sniffs/Security/LanguageConstructSniff.php rename to Magento2/Sniffs/Security/LanguageConstructSniff.php index 38496dc5..a0981988 100644 --- a/Magento/Sniffs/Security/LanguageConstructSniff.php +++ b/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 */ diff --git a/Magento/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php similarity index 98% rename from Magento/Sniffs/Security/SuperglobalSniff.php rename to Magento2/Sniffs/Security/SuperglobalSniff.php index a87346f8..466c1cba 100644 --- a/Magento/Sniffs/Security/SuperglobalSniff.php +++ b/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; diff --git a/Magento/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php similarity index 99% rename from Magento/Sniffs/Security/XssTemplateSniff.php rename to Magento2/Sniffs/Security/XssTemplateSniff.php index b737206d..3f89ac0b 100644 --- a/Magento/Sniffs/Security/XssTemplateSniff.php +++ b/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; diff --git a/Magento/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php similarity index 95% rename from Magento/Sniffs/Strings/ExecutableRegExSniff.php rename to Magento2/Sniffs/Strings/ExecutableRegExSniff.php index 18e5fef7..fb129097 100644 --- a/Magento/Sniffs/Strings/ExecutableRegExSniff.php +++ b/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 */ diff --git a/Magento/Sniffs/Strings/StringConcatSniff.php b/Magento2/Sniffs/Strings/StringConcatSniff.php similarity index 97% rename from Magento/Sniffs/Strings/StringConcatSniff.php rename to Magento2/Sniffs/Strings/StringConcatSniff.php index 78366f54..2ba0fbe0 100644 --- a/Magento/Sniffs/Strings/StringConcatSniff.php +++ b/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; diff --git a/Magento/Sniffs/Templates/ThisInTemplateSniff.md b/Magento2/Sniffs/Templates/ThisInTemplateSniff.md similarity index 100% rename from Magento/Sniffs/Templates/ThisInTemplateSniff.md rename to Magento2/Sniffs/Templates/ThisInTemplateSniff.md diff --git a/Magento/Sniffs/Templates/ThisInTemplateSniff.php b/Magento2/Sniffs/Templates/ThisInTemplateSniff.php similarity index 96% rename from Magento/Sniffs/Templates/ThisInTemplateSniff.php rename to Magento2/Sniffs/Templates/ThisInTemplateSniff.php index 8e3d5bb6..be3ec293 100644 --- a/Magento/Sniffs/Templates/ThisInTemplateSniff.php +++ b/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; diff --git a/Magento/Sniffs/Translation/ConstantUsageSniff.php b/Magento2/Sniffs/Translation/ConstantUsageSniff.php similarity index 95% rename from Magento/Sniffs/Translation/ConstantUsageSniff.php rename to Magento2/Sniffs/Translation/ConstantUsageSniff.php index 23c710a5..bdf8b732 100644 --- a/Magento/Sniffs/Translation/ConstantUsageSniff.php +++ b/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 diff --git a/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php similarity index 97% rename from Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php rename to Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php index 639681ea..056a60ab 100644 --- a/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php +++ b/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; diff --git a/Magento/Tests/Classes/AbstractApiUnitTest.inc b/Magento2/Tests/Classes/AbstractApiUnitTest.inc similarity index 100% rename from Magento/Tests/Classes/AbstractApiUnitTest.inc rename to Magento2/Tests/Classes/AbstractApiUnitTest.inc diff --git a/Magento/Tests/Classes/AbstractApiUnitTest.php b/Magento2/Tests/Classes/AbstractApiUnitTest.php similarity index 93% rename from Magento/Tests/Classes/AbstractApiUnitTest.php rename to Magento2/Tests/Classes/AbstractApiUnitTest.php index c7a62cab..29a73068 100644 --- a/Magento/Tests/Classes/AbstractApiUnitTest.php +++ b/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; diff --git a/Magento/Tests/Classes/ObjectInstantiationUnitTest.inc b/Magento2/Tests/Classes/ObjectInstantiationUnitTest.inc similarity index 100% rename from Magento/Tests/Classes/ObjectInstantiationUnitTest.inc rename to Magento2/Tests/Classes/ObjectInstantiationUnitTest.inc diff --git a/Magento/Tests/Classes/ObjectInstantiationUnitTest.php b/Magento2/Tests/Classes/ObjectInstantiationUnitTest.php similarity index 94% rename from Magento/Tests/Classes/ObjectInstantiationUnitTest.php rename to Magento2/Tests/Classes/ObjectInstantiationUnitTest.php index 784da057..b7e0b1c2 100644 --- a/Magento/Tests/Classes/ObjectInstantiationUnitTest.php +++ b/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; diff --git a/Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.inc b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc similarity index 100% rename from Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.inc rename to Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc diff --git a/Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.php b/Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php similarity index 95% rename from Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.php rename to Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php index 488c8015..6e6cea73 100644 --- a/Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.php +++ b/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; diff --git a/Magento/Tests/Exceptions/DirectThrowUnitTest.inc b/Magento2/Tests/Exceptions/DirectThrowUnitTest.inc similarity index 100% rename from Magento/Tests/Exceptions/DirectThrowUnitTest.inc rename to Magento2/Tests/Exceptions/DirectThrowUnitTest.inc diff --git a/Magento/Tests/Exceptions/DirectThrowUnitTest.php b/Magento2/Tests/Exceptions/DirectThrowUnitTest.php similarity index 93% rename from Magento/Tests/Exceptions/DirectThrowUnitTest.php rename to Magento2/Tests/Exceptions/DirectThrowUnitTest.php index cf98deb8..f276ad47 100644 --- a/Magento/Tests/Exceptions/DirectThrowUnitTest.php +++ b/Magento2/Tests/Exceptions/DirectThrowUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\Exceptions; +namespace Magento2\Tests\Exceptions; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/Exceptions/NamespaceUnitTest.inc b/Magento2/Tests/Exceptions/NamespaceUnitTest.inc similarity index 100% rename from Magento/Tests/Exceptions/NamespaceUnitTest.inc rename to Magento2/Tests/Exceptions/NamespaceUnitTest.inc diff --git a/Magento/Tests/Exceptions/NamespaceUnitTest.php b/Magento2/Tests/Exceptions/NamespaceUnitTest.php similarity index 93% rename from Magento/Tests/Exceptions/NamespaceUnitTest.php rename to Magento2/Tests/Exceptions/NamespaceUnitTest.php index e8bcfe94..9b39575b 100644 --- a/Magento/Tests/Exceptions/NamespaceUnitTest.php +++ b/Magento2/Tests/Exceptions/NamespaceUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\Exceptions; +namespace Magento2\Tests\Exceptions; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/Exceptions/ThrowCatchUnitTest.inc b/Magento2/Tests/Exceptions/ThrowCatchUnitTest.inc similarity index 100% rename from Magento/Tests/Exceptions/ThrowCatchUnitTest.inc rename to Magento2/Tests/Exceptions/ThrowCatchUnitTest.inc diff --git a/Magento/Tests/Exceptions/ThrowCatchUnitTest.php b/Magento2/Tests/Exceptions/ThrowCatchUnitTest.php similarity index 94% rename from Magento/Tests/Exceptions/ThrowCatchUnitTest.php rename to Magento2/Tests/Exceptions/ThrowCatchUnitTest.php index 07ff18ea..5e2bb57f 100644 --- a/Magento/Tests/Exceptions/ThrowCatchUnitTest.php +++ b/Magento2/Tests/Exceptions/ThrowCatchUnitTest.php @@ -3,8 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ - -namespace Magento\Tests\Exceptions; +namespace Magento2\Tests\Exceptions; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/Files/LineLengthUnitTest.inc b/Magento2/Tests/Files/LineLengthUnitTest.inc similarity index 100% rename from Magento/Tests/Files/LineLengthUnitTest.inc rename to Magento2/Tests/Files/LineLengthUnitTest.inc diff --git a/Magento/Tests/Files/LineLengthUnitTest.php b/Magento2/Tests/Files/LineLengthUnitTest.php similarity index 93% rename from Magento/Tests/Files/LineLengthUnitTest.php rename to Magento2/Tests/Files/LineLengthUnitTest.php index a3125b00..f8ca1b5a 100644 --- a/Magento/Tests/Files/LineLengthUnitTest.php +++ b/Magento2/Tests/Files/LineLengthUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\Files; +namespace Magento2\Tests\Files; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/Functions/StaticFunctionUnitTest.inc b/Magento2/Tests/Functions/StaticFunctionUnitTest.inc similarity index 100% rename from Magento/Tests/Functions/StaticFunctionUnitTest.inc rename to Magento2/Tests/Functions/StaticFunctionUnitTest.inc diff --git a/Magento/Tests/Functions/StaticFunctionUnitTest.php b/Magento2/Tests/Functions/StaticFunctionUnitTest.php similarity index 93% rename from Magento/Tests/Functions/StaticFunctionUnitTest.php rename to Magento2/Tests/Functions/StaticFunctionUnitTest.php index ca2763c4..e323a577 100644 --- a/Magento/Tests/Functions/StaticFunctionUnitTest.php +++ b/Magento2/Tests/Functions/StaticFunctionUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\Functions; +namespace Magento2\Tests\Functions; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/Legacy/MageEntityUnitTest.inc b/Magento2/Tests/Legacy/MageEntityUnitTest.inc similarity index 100% rename from Magento/Tests/Legacy/MageEntityUnitTest.inc rename to Magento2/Tests/Legacy/MageEntityUnitTest.inc diff --git a/Magento/Tests/Legacy/MageEntityUnitTest.php b/Magento2/Tests/Legacy/MageEntityUnitTest.php similarity index 94% rename from Magento/Tests/Legacy/MageEntityUnitTest.php rename to Magento2/Tests/Legacy/MageEntityUnitTest.php index ebec4d6e..7d2358f7 100644 --- a/Magento/Tests/Legacy/MageEntityUnitTest.php +++ b/Magento2/Tests/Legacy/MageEntityUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\Legacy; +namespace Magento2\Tests\Legacy; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/NamingConvention/InterfaceNameUnitTest.inc b/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.inc similarity index 100% rename from Magento/Tests/NamingConvention/InterfaceNameUnitTest.inc rename to Magento2/Tests/NamingConvention/InterfaceNameUnitTest.inc diff --git a/Magento/Tests/NamingConvention/InterfaceNameUnitTest.php b/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php similarity index 92% rename from Magento/Tests/NamingConvention/InterfaceNameUnitTest.php rename to Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php index c74771a4..2b1110f1 100644 --- a/Magento/Tests/NamingConvention/InterfaceNameUnitTest.php +++ b/Magento2/Tests/NamingConvention/InterfaceNameUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\NamingConvention; +namespace Magento2\Tests\NamingConvention; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/NamingConvention/ReservedWordsUnitTest.inc b/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.inc similarity index 100% rename from Magento/Tests/NamingConvention/ReservedWordsUnitTest.inc rename to Magento2/Tests/NamingConvention/ReservedWordsUnitTest.inc diff --git a/Magento/Tests/NamingConvention/ReservedWordsUnitTest.php b/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php similarity index 94% rename from Magento/Tests/NamingConvention/ReservedWordsUnitTest.php rename to Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php index 0467341d..03c50d17 100644 --- a/Magento/Tests/NamingConvention/ReservedWordsUnitTest.php +++ b/Magento2/Tests/NamingConvention/ReservedWordsUnitTest.php @@ -3,7 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Tests\NamingConvention; +namespace Magento2\Tests\NamingConvention; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; diff --git a/Magento/Tests/PHP/DateTimeUnitTest.inc b/Magento2/Tests/PHP/DateTimeUnitTest.inc similarity index 79% rename from Magento/Tests/PHP/DateTimeUnitTest.inc rename to Magento2/Tests/PHP/DateTimeUnitTest.inc index be0bdf49..7882f090 100644 --- a/Magento/Tests/PHP/DateTimeUnitTest.inc +++ b/Magento2/Tests/PHP/DateTimeUnitTest.inc @@ -1,8 +1,8 @@ 10 error - + 10 error - + 10 error - + 10 error - + 10 error - + 10 error - + 10 error - + 10 error - + 10 error - + 10 error @@ -82,24 +82,24 @@ 9 warning - + 9 warning - + 9 warning - + 9 warning - + *.phtml 9 warning - + 9 warning @@ -109,44 +109,44 @@ - + 8 warning - + 8 warning - + 8 warning - + 8 warning - + 8 warning - + 8 warning - + 8 warning - - *.phtml + 8 warning - + + *.phtml 8 warning - + 8 warning @@ -195,27 +195,27 @@ 0 - + 7 warning - + 7 warning - + 7 warning - + 7 warning - + 7 warning - + 7 warning @@ -287,7 +287,7 @@ 6 warning - + 6 warning diff --git a/README.md b/README.md index 30840574..728896c1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ $ composer create-project magento/magento-coding-standard --stability=dev magent ``` #### Verify installation -Command should return the list of installed coding standards including Magento. +Command should return the list of installed coding standards including Magento2. ``` $ vendor/bin/phpcs -i ```