Don't hardcode guzzle dependancies

Change-Id: I09eb6c9a70c269f14e1e8309fdc572769c4fc07d

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 3dfca9a..8533741 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -45,12 +45,8 @@ production.
 
 ==== New external libraries ====
 * Added wikimedia/password-blacklist 0.1.4.
 
 ==== New external libraries ====
 * Added wikimedia/password-blacklist 0.1.4.

+* Added guzzlehttp/guzzle 6.3.3.

 * …
 * …

-* Added guzzlehttp/guzzle 6.3.3 and dependents:
-  * guzzlehttp/promises 1.3.1
-  * guzzlehttp/psr7 1.5.0
-  * psr/http-message 1.0.1
-  * ralouphie/getallheaders 2.0.5

 
 ==== Changed external libraries ====
 * Updated wikimedia/xmp-reader from 0.6.0 to 0.6.1.
 
 ==== Changed external libraries ====
 * Updated wikimedia/xmp-reader from 0.6.0 to 0.6.1.

diff --git a/composer.json b/composer.json
index 88f5daa..81dd0d5 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -26,17 +26,13 @@
                "ext-mbstring": "*",
                "ext-xml": "*",
                "guzzlehttp/guzzle": "6.3.3",
                "ext-mbstring": "*",
                "ext-xml": "*",
                "guzzlehttp/guzzle": "6.3.3",

-               "guzzlehttp/promises": "1.3.1",
-               "guzzlehttp/psr7": "1.5.0",

                "liuggio/statsd-php-client": "1.0.18",
                "oojs/oojs-ui": "0.30.0",
                "pear/mail": "1.4.1",
                "pear/mail_mime": "1.10.2",
                "pear/net_smtp": "1.8.0",
                "php": ">=5.6.99",
                "liuggio/statsd-php-client": "1.0.18",
                "oojs/oojs-ui": "0.30.0",
                "pear/mail": "1.4.1",
                "pear/mail_mime": "1.10.2",
                "pear/net_smtp": "1.8.0",
                "php": ">=5.6.99",

-               "psr/http-message": "1.0.1",

                "psr/log": "1.0.2",
                "psr/log": "1.0.2",

-               "ralouphie/getallheaders": "2.0.5",

                "wikimedia/assert": "0.2.2",
                "wikimedia/at-ease": "1.2.0",
                "wikimedia/base-convert": "2.0.0",
                "wikimedia/assert": "0.2.2",
                "wikimedia/at-ease": "1.2.0",
                "wikimedia/base-convert": "2.0.0",