Skip to content

Commit 45a3627

Browse files
authored
Merge branch 'develop' into MQE-1060
2 parents 81565d9 + 95aa636 commit 45a3627

File tree

131 files changed

+1585
-2263
lines changed

Some content is hidden

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

131 files changed

+1585
-2263
lines changed

bin/blacklist.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# THIS FILE CANNOT CONTAIN BLANK LINES #
55
###################################################################
66
bin/blacklist.txt
7-
dev/tests/static/Magento/Sniffs/Annotations/Helper.php
8-
dev/tests/static/Magento/Sniffs/Annotations/RequireAnnotatedAttributesSniff.php
9-
dev/tests/static/Magento/Sniffs/Annotations/RequireAnnotatedMethodsSniff.php
7+
dev/tests/static/Magento/Sniffs/Commenting/FunctionCommentSniff.php
8+
dev/tests/static/Magento/Sniffs/Commenting/VariableCommentSniff.php
109
dev/tests/verification/_generated

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"vlucas/phpdotenv": "^2.4"
2323
},
2424
"require-dev": {
25-
"squizlabs/php_codesniffer": "1.5.3",
25+
"squizlabs/php_codesniffer": "~3.2",
2626
"sebastian/phpcpd": "~3.0",
2727
"brainmaestro/composer-git-hooks": "^2.3",
2828
"doctrine/cache": "<1.7.0",

composer.lock

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

0 commit comments

Comments
 (0)