Skip to content

Commit 90733ec

Browse files
authored
Merge pull request #7121 from magento-lynx/AC-1150
AC-1150 Update magento-coding-standard to v13
2 parents 11c679b + 136d524 commit 90733ec

34 files changed

+118
-1866
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
8686
"friendsofphp/php-cs-fixer": "~3.0.0",
8787
"lusitanian/oauth": "~0.8.10",
88-
"magento/magento-coding-standard": "8",
88+
"magento/magento-coding-standard": "13",
8989
"magento/magento2-functional-testing-framework": "^3.7",
9090
"pdepend/pdepend": "~2.10.0",
9191
"phpcompatibility/php-compatibility": "^9.3",

composer.lock

Lines changed: 20 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/static/phpunit.xml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
<testsuite name="GraphQL Static Code Analysis">
2424
<file>testsuite/Magento/Test/GraphQl/LiveCodeTest.php</file>
2525
</testsuite>
26+
<testsuite name="XML Coding Standard Verification">
27+
<file>testsuite/Magento/Test/Xml/LiveCodeTest.php</file>
28+
</testsuite>
2629
<testsuite name="PHP Coding Standard Verification">
2730
<file>testsuite/Magento/Test/Php/LiveCodeTest.php</file>
2831
</testsuite>

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ lib/web/varien/js.js
1515

1616
// MINIFIED FILES
1717
app/code/**/*.min.js
18+
19+
// TEST
20+
vendor/magento/magento-coding-standard/Magento2/Tests/Eslint/*

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc

Lines changed: 0 additions & 8 deletions
This file was deleted.

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-jquery

Lines changed: 0 additions & 11 deletions
This file was deleted.

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-magento

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)