From 9aecf4a995fb96cd3659686d4203132a71f79256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Thu, 19 Sep 2013 11:22:15 +0200 Subject: [PATCH] Allow guzzle 3.7 Because lot of other dependencies rely on guzzle 3.7, and so it's impossible to satisfy everybody. --- composer.json | 2 +- composer.lock | 74 +++++++++++++++++++++++++-------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/composer.json b/composer.json index 19ef9be..b604ced 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ , "require": { "php": ">=5.3.3" , "react/socket": "0.2.*" - , "guzzle/http": "3.6.*" + , "guzzle/http": "~3.6" , "symfony/http-foundation": "~2.1" } } diff --git a/composer.lock b/composer.lock index 1e4474f..4fd0c11 100644 --- a/composer.lock +++ b/composer.lock @@ -3,20 +3,20 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "b5fee3d5d9c4f60b01030a234d8673f5", + "hash": "08db5ac23e372fcb0aaac0f009f7a3ad", "packages": [ { "name": "evenement/evenement", "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/igorw/evenement", - "reference": "v1.0.0" + "url": "https://github.com/igorw/evenement.git", + "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d" }, "dist": { "type": "zip", - "url": "https://github.com/igorw/evenement/zipball/v1.0.0", - "reference": "v1.0.0", + "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d", + "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d", "shasum": "" }, "require": { @@ -43,7 +43,7 @@ "keywords": [ "event-dispatcher" ], - "time": "2012-05-30 08:01:08" + "time": "2012-05-30 15:01:08" }, { "name": "guzzle/common", @@ -52,12 +52,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/common.git", - "reference": "v3.6.0" + "reference": "eb55772f5c5e2c11ac34f7b9382de72ad4e65343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/common/zipball/v3.6.0", - "reference": "v3.6.0", + "url": "https://api.github.com/repos/guzzle/common/zipball/eb55772f5c5e2c11ac34f7b9382de72ad4e65343", + "reference": "eb55772f5c5e2c11ac34f7b9382de72ad4e65343", "shasum": "" }, "require": { @@ -96,12 +96,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/http.git", - "reference": "v3.6.0" + "reference": "66359e4e0ff3b55e77614912390c727fbb05d636" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/http/zipball/v3.6.0", - "reference": "v3.6.0", + "url": "https://api.github.com/repos/guzzle/http/zipball/66359e4e0ff3b55e77614912390c727fbb05d636", + "reference": "66359e4e0ff3b55e77614912390c727fbb05d636", "shasum": "" }, "require": { @@ -153,12 +153,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/parser.git", - "reference": "v3.6.0" + "reference": "d4c1c0e8683b2aff9cf802bdc4c91cca250e01c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/parser/zipball/v3.6.0", - "reference": "v3.6.0", + "url": "https://api.github.com/repos/guzzle/parser/zipball/d4c1c0e8683b2aff9cf802bdc4c91cca250e01c7", + "reference": "d4c1c0e8683b2aff9cf802bdc4c91cca250e01c7", "shasum": "" }, "require": { @@ -197,12 +197,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/stream.git", - "reference": "v3.6.0" + "reference": "a62a192836d4f5ebf788fda22c076aae373984e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/stream/zipball/v3.6.0", - "reference": "v3.6.0", + "url": "https://api.github.com/repos/guzzle/stream/zipball/a62a192836d4f5ebf788fda22c076aae373984e8", + "reference": "a62a192836d4f5ebf788fda22c076aae373984e8", "shasum": "" }, "require": { @@ -249,13 +249,13 @@ "target-dir": "React/EventLoop", "source": { "type": "git", - "url": "https://github.com/reactphp/event-loop", - "reference": "v0.2.7" + "url": "https://github.com/reactphp/event-loop.git", + "reference": "bf8f09df7d8abb4a481771e64716c94178b13904" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/event-loop/archive/v0.2.7.zip", - "reference": "v0.2.7", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bf8f09df7d8abb4a481771e64716c94178b13904", + "reference": "bf8f09df7d8abb4a481771e64716c94178b13904", "shasum": "" }, "require": { @@ -292,13 +292,13 @@ "target-dir": "React/Socket", "source": { "type": "git", - "url": "https://github.com/reactphp/socket", - "reference": "v0.2.7" + "url": "https://github.com/reactphp/socket.git", + "reference": "1619a117df4ebb8aa97f804b5afd7abd4d32d8bf" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/socket/archive/v0.2.7.zip", - "reference": "v0.2.7", + "url": "https://api.github.com/repos/reactphp/socket/zipball/1619a117df4ebb8aa97f804b5afd7abd4d32d8bf", + "reference": "1619a117df4ebb8aa97f804b5afd7abd4d32d8bf", "shasum": "" }, "require": { @@ -334,13 +334,13 @@ "target-dir": "React/Stream", "source": { "type": "git", - "url": "https://github.com/reactphp/stream", - "reference": "v0.2.7" + "url": "https://github.com/reactphp/stream.git", + "reference": "98cb36bc8c4d6111c584d63f680e886b2167bee5" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/stream/archive/v0.2.7.zip", - "reference": "v0.2.7", + "url": "https://api.github.com/repos/reactphp/stream/zipball/98cb36bc8c4d6111c584d63f680e886b2167bee5", + "reference": "98cb36bc8c4d6111c584d63f680e886b2167bee5", "shasum": "" }, "require": { @@ -375,17 +375,17 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.3.3", + "version": "v2.3.4", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.3.3" + "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.3", - "reference": "v2.3.3", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8", + "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8", "shasum": "" }, "require": { @@ -434,12 +434,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.3.3" + "reference": "d14aca0449278b9fc6e5334ff02dedd0d2167085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.3", - "reference": "v2.3.3", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d14aca0449278b9fc6e5334ff02dedd0d2167085", + "reference": "d14aca0449278b9fc6e5334ff02dedd0d2167085", "shasum": "" }, "require": {