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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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;

0 commit comments

Comments
 (0)