Skip to content

Commit 87e96d3

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento-engcom/php-7.2-support#39: Update colinmollenhour/php-redis-session-abstract (by @pmclain)
2 parents 57f4ad2 + fef1988 commit 87e96d3

File tree

10 files changed

+175
-259
lines changed

10 files changed

+175
-259
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: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"colinmollenhour/cache-backend-file": "1.4",
3535
"colinmollenhour/cache-backend-redis": "1.10.2",
3636
"colinmollenhour/credis": "1.6",
37-
"colinmollenhour/php-redis-session-abstract": "~1.2.2",
37+
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
3838
"composer/composer": "1.4.1",
3939
"magento/composer": "~1.2.0",
4040
"magento/magento-composer-installer": ">=0.1.11",
@@ -44,12 +44,12 @@
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",
5150
"tedivm/jshrink": "~1.1.0",
5251
"tubalmartin/cssmin": "4.1.0",
52+
"webonyx/graphql-php": "^0.11.1",
5353
"zendframework/zend-captcha": "^2.7.1",
5454
"zendframework/zend-code": "^3.1.0",
5555
"zendframework/zend-config": "^2.6.0",
@@ -75,8 +75,7 @@
7575
"zendframework/zend-text": "^2.6.0",
7676
"zendframework/zend-uri": "^2.5.1",
7777
"zendframework/zend-validator": "^2.6.0",
78-
"zendframework/zend-view": "^2.8.1",
79-
"webonyx/graphql-php": "^0.11.1"
78+
"zendframework/zend-view": "^2.8.1"
8079
},
8180
"require-dev": {
8281
"friendsofphp/php-cs-fixer": "~2.1.1",

composer.lock

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

dev/tools/Magento/Tools/StaticReview/PhpCsFixerReview.php

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

dev/tools/Magento/Tools/StaticReview/pre-commit

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

0 commit comments

Comments
 (0)