Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 1ba1b38

Browse files
committed
Merge remote-tracking branch 'engcom-pr/MAGETWO-88148-magento-engcom-php-7.2-support-85' into 2.3-develop-prs
2 parents e95241f + 3447bb7 commit 1ba1b38

File tree

5 files changed

+46
-290
lines changed

5 files changed

+46
-290
lines changed

.php_cs.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
/**
8-
* Pre-commit hook installation:
9-
* vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
8+
* PHP Coding Standards fixer configuration
109
*/
10+
1111
$finder = PhpCsFixer\Finder::create()
1212
->name('*.phtml')
1313
->exclude('dev/tests/functional/generated')

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"pelago/emogrifier": "^2.0.0",
4545
"phpseclib/phpseclib": "2.0.*",
4646
"ramsey/uuid": "3.6.1",
47-
"sjparkinson/static-review": "~4.1",
4847
"symfony/console": "~2.3, !=2.7.0",
4948
"symfony/event-dispatcher": "~2.1",
5049
"symfony/process": "~2.1",

0 commit comments

Comments
 (0)