From 1c479040bca41d84d760d6d3bad43f1e008eb6fa Mon Sep 17 00:00:00 2001 From: Gordon Lesti Date: Thu, 24 Mar 2016 13:55:44 +0100 Subject: [PATCH 1/4] magento/framework should require zendframework/zend-http --- lib/internal/Magento/Framework/composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 5592df350a562..be12b2ef82856 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -20,7 +20,8 @@ "ext-openssl": "*", "lib-libxml": "*", "ext-xsl": "*", - "symfony/process": "~2.1" + "symfony/process": "~2.1", + "zendframework/zend-http": "~2.4.6" }, "suggest": { "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library" From a4ec8fbf55ac2a1b495642410d0f1242c11d6b8c Mon Sep 17 00:00:00 2001 From: Gordon Lesti Date: Fri, 8 Apr 2016 11:55:05 +0200 Subject: [PATCH 2/4] add all dependencies of magento/framework --- lib/internal/Magento/Framework/composer.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index be12b2ef82856..b83d1a4cc4df3 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -20,8 +20,24 @@ "ext-openssl": "*", "lib-libxml": "*", "ext-xsl": "*", + "zendframework/zend-stdlib": "~2.4.6", + "zendframework/zend-code": "~2.4.6", + "zendframework/zend-uri": "~2.4.6", + "zendframework/zend-validator": "~2.4.6", + "zendframework/zend-crypt": "~2.4.6", + "zendframework/zend-mvc": "~2.4.6", + "zendframework/zend-http": "~2.4.6", + "zendframework/zend-escaper": "~2.4.6", + "colinmollenhour/php-redis-session-abstract": "1.0", + "composer/composer": "1.0.0-beta1", + "monolog/monolog": "1.16.0", + "oyejorge/less.php": "1.7.0.3", + "tubalmartin/cssmin": "2.4.8-p4", + "symfony/console": "~2.3 <2.7", "symfony/process": "~2.1", - "zendframework/zend-http": "~2.4.6" + "tedivm/jshrink": "~1.0.1", + "magento/composer": "~1.0.0", + "psr/log": "^1.0", }, "suggest": { "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library" From 9b336324590e9488cf1b4895118395439b26ff7a Mon Sep 17 00:00:00 2001 From: Gordon Lesti Date: Tue, 28 Mar 2017 15:29:50 +0200 Subject: [PATCH 3/4] alphabetical order of third party dependencies --- lib/internal/Magento/Framework/composer.json | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 35938625da110..033db6e0a081f 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -20,24 +20,24 @@ "ext-openssl": "*", "lib-libxml": "*", "ext-xsl": "*", - "zendframework/zend-stdlib": "~2.4.6", - "zendframework/zend-code": "~2.4.6", - "zendframework/zend-uri": "~2.4.6", - "zendframework/zend-validator": "~2.4.6", - "zendframework/zend-crypt": "~2.4.6", - "zendframework/zend-mvc": "~2.4.6", - "zendframework/zend-http": "~2.4.6", - "zendframework/zend-escaper": "~2.4.6", "colinmollenhour/php-redis-session-abstract": "1.0", "composer/composer": "1.0.0-beta1", + "magento/composer": "~1.0.0", "monolog/monolog": "1.16.0", "oyejorge/less.php": "1.7.0.3", - "tubalmartin/cssmin": "2.4.8-p4", + "psr/log": "^1.0", "symfony/console": "~2.3 <2.7", "symfony/process": "~2.1", "tedivm/jshrink": "~1.0.1", - "magento/composer": "~1.0.0", - "psr/log": "^1.0", + "tubalmartin/cssmin": "2.4.8-p4", + "zendframework/zend-code": "~2.4.6", + "zendframework/zend-crypt": "~2.4.6", + "zendframework/zend-escaper": "~2.4.6", + "zendframework/zend-http": "~2.4.6", + "zendframework/zend-mvc": "~2.4.6", + "zendframework/zend-stdlib": "~2.4.6", + "zendframework/zend-uri": "~2.4.6", + "zendframework/zend-validator": "~2.4.6" }, "suggest": { "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library" From e12db94192fb896d40c49c3f32768a72955deed5 Mon Sep 17 00:00:00 2001 From: Gordon Lesti Date: Tue, 28 Mar 2017 15:39:14 +0200 Subject: [PATCH 4/4] update version of dependencies --- lib/internal/Magento/Framework/composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 033db6e0a081f..9f159b2ba5356 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -20,16 +20,16 @@ "ext-openssl": "*", "lib-libxml": "*", "ext-xsl": "*", - "colinmollenhour/php-redis-session-abstract": "1.0", + "colinmollenhour/php-redis-session-abstract": "1.2", "composer/composer": "1.0.0-beta1", "magento/composer": "~1.0.0", - "monolog/monolog": "1.16.0", - "oyejorge/less.php": "1.7.0.3", + "monolog/monolog": "^1.17", + "oyejorge/less.php": "~1.7.0", "psr/log": "^1.0", - "symfony/console": "~2.3 <2.7", + "symfony/console": "~2.3, !=2.7.0", "symfony/process": "~2.1", "tedivm/jshrink": "~1.0.1", - "tubalmartin/cssmin": "2.4.8-p4", + "tubalmartin/cssmin": "2.4.8-p6", "zendframework/zend-code": "~2.4.6", "zendframework/zend-crypt": "~2.4.6", "zendframework/zend-escaper": "~2.4.6",