Skip to content

Commit f08e103

Browse files
committed
MAGETWO-89569: Update composer/composer dependency
1 parent 1913e4d commit f08e103

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,16 @@
4040
"colinmollenhour/cache-backend-redis": "1.10.4",
4141
"colinmollenhour/credis": "1.8.2",
4242
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
43-
"composer/composer": "~1.6.0",
44-
"magento/composer": "1.3.0.x-dev",
43+
"composer/composer": "^1.6",
4544
"elasticsearch/elasticsearch": "~2.0|~5.1",
45+
"magento/composer": "1.3.0.x-dev",
4646
"magento/magento-composer-installer": ">=0.1.11",
4747
"magento/zendframework1": "dev-master",
4848
"monolog/monolog": "^1.17",
4949
"oyejorge/less.php": "~1.7.0",
5050
"pelago/emogrifier": "^2.0.0",
5151
"php-amqplib/php-amqplib": "2.5.*",
52+
"phpseclib/mcrypt_compat": "1.0.4",
5253
"phpseclib/phpseclib": "2.0.*",
5354
"ramsey/uuid": "~3.7.3",
5455
"symfony/console": "~4.0.0",
@@ -83,8 +84,7 @@
8384
"zendframework/zend-text": "^2.6.0",
8485
"zendframework/zend-uri": "^2.5.1",
8586
"zendframework/zend-validator": "^2.6.0",
86-
"zendframework/zend-view": "^2.8.1",
87-
"phpseclib/mcrypt_compat": "1.0.4"
87+
"zendframework/zend-view": "^2.8.1"
8888
},
8989
"require-dev": {
9090
"friendsofphp/php-cs-fixer": "~2.10.0",

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ext-xsl": "*",
2424
"lib-libxml": "*",
2525
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
26-
"composer/composer": "~1.6.0",
26+
"composer/composer": "^1.6",
2727
"magento/zendframework1": "~1.13.0",
2828
"monolog/monolog": "^1.17",
2929
"oyejorge/less.php": "~1.7.0",

0 commit comments

Comments
 (0)