Skip to content

Commit 79797a7

Browse files
committed
Rollback accidental change to Composer files
1 parent e48c617 commit 79797a7

File tree

2 files changed

+70
-2139
lines changed

2 files changed

+70
-2139
lines changed

composer.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@
3535
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3636
"composer/composer": "^1.6",
3737
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
38-
"guzzlehttp/guzzle": "^6.3.3",
3938
"magento/composer": "1.6.x-dev",
40-
"magento/inventory-composer-metapackage-dev": "1.2.0-dev",
4139
"magento/magento-composer-installer": ">=0.1.11",
4240
"magento/zendframework1": "~1.14.2",
4341
"monolog/monolog": "^1.17",
42+
"wikimedia/less.php": "~1.8.0",
4443
"paragonie/sodium_compat": "^1.6",
4544
"pelago/emogrifier": "^2.0.0",
4645
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
@@ -53,7 +52,6 @@
5352
"tedivm/jshrink": "~1.3.0",
5453
"tubalmartin/cssmin": "4.1.1",
5554
"webonyx/graphql-php": "^0.13.8",
56-
"wikimedia/less.php": "~1.8.0",
5755
"zendframework/zend-captcha": "^2.7.1",
5856
"zendframework/zend-code": "~3.3.0",
5957
"zendframework/zend-config": "^2.6.0",
@@ -81,7 +79,8 @@
8179
"zendframework/zend-text": "^2.6.0",
8280
"zendframework/zend-uri": "^2.5.1",
8381
"zendframework/zend-validator": "^2.6.0",
84-
"zendframework/zend-view": "~2.11.2"
82+
"zendframework/zend-view": "~2.11.2",
83+
"guzzlehttp/guzzle": "^6.3.3"
8584
},
8685
"require-dev": {
8786
"allure-framework/allure-phpunit": "~1.2.0",
@@ -347,12 +346,5 @@
347346
"Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
348347
}
349348
},
350-
"prefer-stable": true,
351-
"minimum-stability": "dev",
352-
"repositories": {
353-
"ext": {
354-
"type": "path",
355-
"url": "./ext/*/*/*"
356-
}
357-
}
349+
"prefer-stable": true
358350
}

0 commit comments

Comments
 (0)