diff --git a/composer.json b/composer.json index 293c6be..12c95f0 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ , "require": { "php": ">=5.3.9" , "react/socket": "0.3.*" - , "guzzle/http": "3.6.*" + , "guzzle/http": ">=3.6.0,<3.8.0-dev" , "symfony/http-foundation": "~2.2" , "symfony/routing": "~2.2" } diff --git a/composer.lock b/composer.lock index 1ed2a55..4800ed7 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "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": "f5d2fe5b143f2c5d2e8f674dd2f6bc16", + "hash": "a45c5bcb9c18e390adc2a60ffd059a52", "packages": [ { "name": "evenement/evenement", @@ -47,17 +47,17 @@ }, { "name": "guzzle/common", - "version": "v3.6.0", + "version": "v3.7.1", "target-dir": "Guzzle/Common", "source": { "type": "git", "url": "https://github.com/guzzle/common.git", - "reference": "v3.6.0" + "reference": "v3.7.1" }, "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/v3.7.1", + "reference": "v3.7.1", "shasum": "" }, "require": { @@ -67,7 +67,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -87,21 +87,21 @@ "event", "exception" ], - "time": "2013-05-30 07:01:25" + "time": "2013-07-05 20:17:54" }, { "name": "guzzle/http", - "version": "v3.6.0", + "version": "v3.7.1", "target-dir": "Guzzle/Http", "source": { "type": "git", "url": "https://github.com/guzzle/http.git", - "reference": "v3.6.0" + "reference": "v3.7.1" }, "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/v3.7.1", + "reference": "v3.7.1", "shasum": "" }, "require": { @@ -116,7 +116,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -144,21 +144,21 @@ "http", "http client" ], - "time": "2013-05-30 07:01:25" + "time": "2013-07-02 19:53:26" }, { "name": "guzzle/parser", - "version": "v3.6.0", + "version": "v3.7.1", "target-dir": "Guzzle/Parser", "source": { "type": "git", "url": "https://github.com/guzzle/parser.git", - "reference": "v3.6.0" + "reference": "v3.7.1" }, "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/v3.7.1", + "reference": "v3.7.1", "shasum": "" }, "require": { @@ -167,7 +167,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -188,21 +188,21 @@ "message", "url" ], - "time": "2013-05-30 07:01:25" + "time": "2013-06-11 00:24:07" }, { "name": "guzzle/stream", - "version": "v3.6.0", + "version": "v3.7.1", "target-dir": "Guzzle/Stream", "source": { "type": "git", "url": "https://github.com/guzzle/stream.git", - "reference": "v3.6.0" + "reference": "v3.7.1" }, "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/v3.7.1", + "reference": "v3.7.1", "shasum": "" }, "require": { @@ -215,7 +215,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -241,21 +241,21 @@ "component", "stream" ], - "time": "2013-05-30 07:01:25" + "time": "2013-06-27 00:50:43" }, { "name": "react/event-loop", - "version": "v0.3.2", + "version": "v0.3.3", "target-dir": "React/EventLoop", "source": { "type": "git", "url": "https://github.com/reactphp/event-loop.git", - "reference": "v0.3.2" + "reference": "v0.3.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/event-loop/zipball/v0.3.2", - "reference": "v0.3.2", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/v0.3.3", + "reference": "v0.3.3", "shasum": "" }, "require": { @@ -284,7 +284,7 @@ "keywords": [ "event-loop" ], - "time": "2013-01-14 23:11:47" + "time": "2013-07-08 22:38:22" }, { "name": "react/socket", @@ -330,17 +330,17 @@ }, { "name": "react/stream", - "version": "v0.3.2", + "version": "v0.3.3", "target-dir": "React/Stream", "source": { "type": "git", "url": "https://github.com/reactphp/stream.git", - "reference": "v0.3.2" + "reference": "v0.3.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/stream/zipball/v0.3.2", - "reference": "v0.3.2", + "url": "https://api.github.com/repos/reactphp/stream/zipball/v0.3.3", + "reference": "v0.3.3", "shasum": "" }, "require": { @@ -371,28 +371,28 @@ "pipe", "stream" ], - "time": "2013-05-10 15:12:22" + "time": "2013-07-09 00:44:12" }, { "name": "symfony/event-dispatcher", - "version": "v2.3.0", + "version": "v2.3.2", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.2", + "reference": "v2.3.2", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": ">=2.0,<3.0" + "symfony/dependency-injection": "~2.0" }, "suggest": { "symfony/dependency-injection": "", @@ -429,17 +429,17 @@ }, { "name": "symfony/http-foundation", - "version": "v2.3.1", + "version": "v2.3.2", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.3.1" + "reference": "v2.3.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.2", + "reference": "v2.3.2", "shasum": "" }, "require": { @@ -475,31 +475,31 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-05-10 06:00:03" + "time": "2013-07-17 05:57:53" }, { "name": "symfony/routing", - "version": "v2.3.0", + "version": "v2.3.2", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "v2.3.0" + "reference": "v2.3.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.3.2", + "reference": "v2.3.2", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<3.0", - "psr/log": ">=1.0,<2.0", - "symfony/config": ">=2.2,<3.0", - "symfony/yaml": ">=2.0,<3.0" + "doctrine/common": "~2.2", + "psr/log": "~1.0", + "symfony/config": "~2.2", + "symfony/yaml": "~2.0" }, "suggest": { "doctrine/common": "", @@ -533,7 +533,7 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-05-20 08:57:26" + "time": "2013-06-23 08:16:02" } ], "packages-dev": [ diff --git a/src/Ratchet/App.php b/src/Ratchet/App.php index 6728c30..a3db257 100644 --- a/src/Ratchet/App.php +++ b/src/Ratchet/App.php @@ -79,7 +79,7 @@ class App { /** * @param string $path * @param ComponentInterface $controller - * @return Symfony\Component\Routing\Route + * @return \Symfony\Component\Routing\Route */ public function route($path, ComponentInterface $controller) { if ($controller instanceof HttpServerInterface || $controller instanceof WsServer) {