Skip to content

Commit 3485230

Browse files
committed
Namespace conflict with core rules
- changed namespace from Magento to Magento2
1 parent ad471bf commit 3485230

File tree

92 files changed

+105
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+105
-112
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ php:
77
install: composer install --no-interaction --prefer-source
88
script:
99
- vendor/bin/phpunit
10-
- vendor/bin/phpcs --standard=Magento Magento/ --extensions=php
10+
- vendor/bin/phpcs --standard=Magento2 Magento2/ --extensions=php

Magento/Sniffs/Classes/AbstractApiSniff.php renamed to Magento2/Sniffs/Classes/AbstractApiSniff.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
namespace Magento\Sniffs\Classes;
6+
namespace Magento2\Sniffs\Classes;
87

98
use PHP_CodeSniffer\Sniffs\Sniff;
109
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Classes/ObjectInstantiationSniff.php renamed to Magento2/Sniffs/Classes/ObjectInstantiationSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Classes;
6+
namespace Magento2\Sniffs\Classes;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;
@@ -16,7 +16,7 @@ class ObjectInstantiationSniff implements Sniff
1616
/**
1717
* String representation of warning.
1818
*
19-
* phpcs:disable Magento.Files.LineLength.MaxExceeded
19+
* phpcs:disable Magento2.Files.LineLength.MaxExceeded
2020
*
2121
* @var string
2222
*/

Magento/Sniffs/CodeAnalysis/EmptyBlockSniff.php renamed to Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\CodeAnalysis;
6+
namespace Magento2\Sniffs\CodeAnalysis;
77

88
use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff;
99

Magento/Sniffs/Exceptions/DirectThrowSniff.php renamed to Magento2/Sniffs/Exceptions/DirectThrowSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Exceptions;
6+
namespace Magento2\Sniffs\Exceptions;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Exceptions/NamespaceSniff.php renamed to Magento2/Sniffs/Exceptions/NamespaceSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Exceptions;
6+
namespace Magento2\Sniffs\Exceptions;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Exceptions/ThrowCatchSniff.php renamed to Magento2/Sniffs/Exceptions/ThrowCatchSniff.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
namespace Magento\Sniffs\Exceptions;
6+
namespace Magento2\Sniffs\Exceptions;
87

98
use function array_slice;
109
use PHP_CodeSniffer\Sniffs\Sniff;

Magento/Sniffs/Files/LineLengthSniff.php renamed to Magento2/Sniffs/Files/LineLengthSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Files;
6+
namespace Magento2\Sniffs\Files;
77

88
use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff as FilesLineLengthSniff;
99

Magento/Sniffs/Functions/StaticFunctionSniff.php renamed to Magento2/Sniffs/Functions/StaticFunctionSniff.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
namespace Magento\Sniffs\Functions;
6+
namespace Magento2\Sniffs\Functions;
87

98
use PHP_CodeSniffer\Sniffs\Sniff;
109
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Legacy/MageEntitySniff.php renamed to Magento2/Sniffs/Legacy/MageEntitySniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Legacy;
6+
namespace Magento2\Sniffs\Legacy;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/NamingConvention/InterfaceNameSniff.php renamed to Magento2/Sniffs/NamingConvention/InterfaceNameSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\NamingConvention;
6+
namespace Magento2\Sniffs\NamingConvention;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/NamingConvention/ReservedWordsSniff.php renamed to Magento2/Sniffs/NamingConvention/ReservedWordsSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\NamingConvention;
6+
namespace Magento2\Sniffs\NamingConvention;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/DateTimeSniff.php renamed to Magento2/Sniffs/PHP/DateTimeSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;
@@ -16,7 +16,7 @@ class DateTimeSniff implements Sniff
1616
/**
1717
* String representation of warning.
1818
*
19-
* phpcs:disable Magento.Files.LineLength.MaxExceeded
19+
* phpcs:disable Magento2.Files.LineLength.MaxExceeded
2020
*
2121
* @var string
2222
*/

Magento/Sniffs/PHP/DiscouragedFunctionSniff.php renamed to Magento2/Sniffs/PHP/DiscouragedFunctionSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Files\File;
99
use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\ForbiddenFunctionsSniff;

Magento/Sniffs/PHP/FinalImplementationSniff.php renamed to Magento2/Sniffs/PHP/FinalImplementationSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;
@@ -27,7 +27,7 @@ public function register()
2727
public function process(File $phpcsFile, $stackPtr)
2828
{
2929
$phpcsFile->addError(
30-
// phpcs:ignore Magento.Files.LineLength.MaxExceeded
30+
// phpcs:ignore Magento2.Files.LineLength.MaxExceeded
3131
'Final keyword is prohibited in Magento. It decreases extensibility and is not compatible with plugins and proxies.',
3232
$stackPtr,
3333
'FoundFinal'

Magento/Sniffs/PHP/GotoSniff.php renamed to Magento2/Sniffs/PHP/GotoSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/LiteralNamespacesSniff.php renamed to Magento2/Sniffs/PHP/LiteralNamespacesSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/ReturnValueCheckSniff.php renamed to Magento2/Sniffs/PHP/ReturnValueCheckSniff.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
87

98
use PHP_CodeSniffer\Sniffs\Sniff;
109
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/ShortEchoSyntaxSniff.php renamed to Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/PHP/VarSniff.php renamed to Magento2/Sniffs/PHP/VarSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\PHP;
6+
namespace Magento2\Sniffs\PHP;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Performance/EmptyCheckSniff.php renamed to Magento2/Sniffs/Performance/EmptyCheckSniff.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Performance;
6+
namespace Magento2\Sniffs\Performance;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;
@@ -20,12 +20,12 @@ class EmptyCheckSniff implements Sniff
2020
*/
2121
protected $map = [
2222
'count' => [
23-
// phpcs:ignore Magento.Files.LineLength.MaxExceeded
23+
// phpcs:ignore Magento2.Files.LineLength.MaxExceeded
2424
'message' => 'count(...) function should not be used to check if array is empty. Use empty(...) language construct instead',
2525
'code' => 'FoundCount'
2626
],
2727
'strlen' => [
28-
// phpcs:ignore Magento.Files.LineLength.MaxExceeded
28+
// phpcs:ignore Magento2.Files.LineLength.MaxExceeded
2929
'message' => 'strlen(...) function should not be used to check if string is empty. Consider replace with (... === "") or (... !== "")',
3030
'code' => 'FoundStrlen'
3131
],
@@ -114,7 +114,7 @@ public function process(File $phpcsFile, $stackPtr)
114114
$phpcsFile->addWarning($message, $stackPtr, $code);
115115
}
116116
} else {
117-
// phpcs:ignore Magento.Files.LineLength.MaxExceeded
117+
// phpcs:ignore Magento2.Files.LineLength.MaxExceeded
118118
if ($phpcsFile->findNext($this->otherComparisonOperators, $functionPosition, $endOfStatementPosition) === false) {
119119
$phpcsFile->addWarning($message, $stackPtr, $code);
120120
}
@@ -130,7 +130,7 @@ public function process(File $phpcsFile, $stackPtr)
130130
*/
131131
private function findFunctionPosition($index)
132132
{
133-
// phpcs:ignore Magento.Files.LineLength.MaxExceeded
133+
// phpcs:ignore Magento2.Files.LineLength.MaxExceeded
134134
for ($i = $this->tokens[$index]['parenthesis_opener'] + 1; $i < $this->tokens[$index]['parenthesis_closer']; $i++) {
135135
if (array_key_exists($this->tokens[$i]['content'], $this->map)) {
136136
return $i;

Magento/Sniffs/SQL/RawQuerySniff.php renamed to Magento2/Sniffs/SQL/RawQuerySniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\SQL;
6+
namespace Magento2\Sniffs\SQL;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Security/IncludeFileSniff.php renamed to Magento2/Sniffs/Security/IncludeFileSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Security;
6+
namespace Magento2\Sniffs\Security;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Security/LanguageConstructSniff.php renamed to Magento2/Sniffs/Security/LanguageConstructSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Security;
6+
namespace Magento2\Sniffs\Security;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;
@@ -23,7 +23,7 @@ class LanguageConstructSniff implements Sniff
2323
/**
2424
* String representation of backtick error.
2525
*
26-
* phpcs:disable Magento.Files.LineLength.MaxExceeded
26+
* phpcs:disable Magento2.Files.LineLength.MaxExceeded
2727
*
2828
* @var string
2929
*/

Magento/Sniffs/Security/SuperglobalSniff.php renamed to Magento2/Sniffs/Security/SuperglobalSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Security;
6+
namespace Magento2\Sniffs\Security;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Security/XssTemplateSniff.php renamed to Magento2/Sniffs/Security/XssTemplateSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Security;
6+
namespace Magento2\Sniffs\Security;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Strings/ExecutableRegExSniff.php renamed to Magento2/Sniffs/Strings/ExecutableRegExSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Strings;
6+
namespace Magento2\Sniffs\Strings;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;
@@ -17,7 +17,7 @@ class ExecutableRegExSniff implements Sniff
1717
/**
1818
* String representation of error.
1919
*
20-
* phpcs:disable Magento.Files.LineLength.MaxExceeded
20+
* phpcs:disable Magento2.Files.LineLength.MaxExceeded
2121
*
2222
* @var string
2323
*/

Magento/Sniffs/Strings/StringConcatSniff.php renamed to Magento2/Sniffs/Strings/StringConcatSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Strings;
6+
namespace Magento2\Sniffs\Strings;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Templates/ThisInTemplateSniff.php renamed to Magento2/Sniffs/Templates/ThisInTemplateSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Templates;
6+
namespace Magento2\Sniffs\Templates;
77

88
use PHP_CodeSniffer\Sniffs\Sniff;
99
use PHP_CodeSniffer\Files\File;

Magento/Sniffs/Translation/ConstantUsageSniff.php renamed to Magento2/Sniffs/Translation/ConstantUsageSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Translation;
6+
namespace Magento2\Sniffs\Translation;
77

88
use PHP_CodeSniffer\Files\File;
99
use PHP_CodeSniffer\Sniffs\Sniff;
@@ -65,7 +65,7 @@ public function process(File $phpcsFile, $stackPtr)
6565
}
6666

6767
/**
68-
* Checks if first argument of \Magento\Framework\Phrase or translation function is a constant
68+
* Checks if first argument of \Magento2\Framework\Phrase or translation function is a constant
6969
*
7070
* @param File $phpcsFile
7171
* @param int $stackPtr

Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php renamed to Magento2/Sniffs/Whitespace/MultipleEmptyLinesSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sniffs\Whitespace;
6+
namespace Magento2\Sniffs\Whitespace;
77

88
use PHP_CodeSniffer\Files\File;
99
use PHP_CodeSniffer\Sniffs\Sniff;

Magento/Tests/Classes/AbstractApiUnitTest.php renamed to Magento2/Tests/Classes/AbstractApiUnitTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
namespace Magento\Tests\Classes;
6+
namespace Magento2\Tests\Classes;
87

98
use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
109

Magento/Tests/Classes/ObjectInstantiationUnitTest.php renamed to Magento2/Tests/Classes/ObjectInstantiationUnitTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Tests\Classes;
6+
namespace Magento2\Tests\Classes;
77

88
use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
99

Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.php renamed to Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Tests\CodeAnalysis;
6+
namespace Magento2\Tests\CodeAnalysis;
77

88
use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
99

0 commit comments

Comments
 (0)