faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

Merge branch 'refs/heads/patch-1'

Browse Source
This commit is contained in:
Chris Boden 2013-09-19 20:30:32 -04:00
commit 3163ab84d5
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -27,7 +27,7 @@
, "require": { , "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
, "react/socket": "0.2.*" , "react/socket": "0.2.*"
, "guzzle/http": "3.6.*" , "guzzle/http": "~3.6"
, "symfony/http-foundation": "~2.1" , "symfony/http-foundation": "~2.1"
} }
} }

74
composer.lock generated
View File

@ -3,20 +3,20 @@
"This file locks the dependencies of your project to a known state", "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" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "b5fee3d5d9c4f60b01030a234d8673f5", "hash": "08db5ac23e372fcb0aaac0f009f7a3ad",
"packages": [ "packages": [
{ {
"name": "evenement/evenement", "name": "evenement/evenement",
"version": "v1.0.0", "version": "v1.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/igorw/evenement", "url": "https://github.com/igorw/evenement.git",
"reference": "v1.0.0" "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/igorw/evenement/zipball/v1.0.0", "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
"reference": "v1.0.0", "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -43,7 +43,7 @@
"keywords": [ "keywords": [
"event-dispatcher" "event-dispatcher"
], ],
"time": "2012-05-30 08:01:08" "time": "2012-05-30 15:01:08"
}, },
{ {
"name": "guzzle/common", "name": "guzzle/common",
@ -52,12 +52,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/common.git", "url": "https://github.com/guzzle/common.git",
"reference": "v3.6.0" "reference": "eb55772f5c5e2c11ac34f7b9382de72ad4e65343"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/common/zipball/v3.6.0", "url": "https://api.github.com/repos/guzzle/common/zipball/eb55772f5c5e2c11ac34f7b9382de72ad4e65343",
"reference": "v3.6.0", "reference": "eb55772f5c5e2c11ac34f7b9382de72ad4e65343",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -96,12 +96,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/http.git", "url": "https://github.com/guzzle/http.git",
"reference": "v3.6.0" "reference": "66359e4e0ff3b55e77614912390c727fbb05d636"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/http/zipball/v3.6.0", "url": "https://api.github.com/repos/guzzle/http/zipball/66359e4e0ff3b55e77614912390c727fbb05d636",
"reference": "v3.6.0", "reference": "66359e4e0ff3b55e77614912390c727fbb05d636",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -153,12 +153,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/parser.git", "url": "https://github.com/guzzle/parser.git",
"reference": "v3.6.0" "reference": "d4c1c0e8683b2aff9cf802bdc4c91cca250e01c7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/parser/zipball/v3.6.0", "url": "https://api.github.com/repos/guzzle/parser/zipball/d4c1c0e8683b2aff9cf802bdc4c91cca250e01c7",
"reference": "v3.6.0", "reference": "d4c1c0e8683b2aff9cf802bdc4c91cca250e01c7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -197,12 +197,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/stream.git", "url": "https://github.com/guzzle/stream.git",
"reference": "v3.6.0" "reference": "a62a192836d4f5ebf788fda22c076aae373984e8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/stream/zipball/v3.6.0", "url": "https://api.github.com/repos/guzzle/stream/zipball/a62a192836d4f5ebf788fda22c076aae373984e8",
"reference": "v3.6.0", "reference": "a62a192836d4f5ebf788fda22c076aae373984e8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -249,13 +249,13 @@
"target-dir": "React/EventLoop", "target-dir": "React/EventLoop",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/reactphp/event-loop", "url": "https://github.com/reactphp/event-loop.git",
"reference": "v0.2.7" "reference": "bf8f09df7d8abb4a481771e64716c94178b13904"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/reactphp/event-loop/archive/v0.2.7.zip", "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bf8f09df7d8abb4a481771e64716c94178b13904",
"reference": "v0.2.7", "reference": "bf8f09df7d8abb4a481771e64716c94178b13904",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -292,13 +292,13 @@
"target-dir": "React/Socket", "target-dir": "React/Socket",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/reactphp/socket", "url": "https://github.com/reactphp/socket.git",
"reference": "v0.2.7" "reference": "1619a117df4ebb8aa97f804b5afd7abd4d32d8bf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/reactphp/socket/archive/v0.2.7.zip", "url": "https://api.github.com/repos/reactphp/socket/zipball/1619a117df4ebb8aa97f804b5afd7abd4d32d8bf",
"reference": "v0.2.7", "reference": "1619a117df4ebb8aa97f804b5afd7abd4d32d8bf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -334,13 +334,13 @@
"target-dir": "React/Stream", "target-dir": "React/Stream",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/reactphp/stream", "url": "https://github.com/reactphp/stream.git",
"reference": "v0.2.7" "reference": "98cb36bc8c4d6111c584d63f680e886b2167bee5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/reactphp/stream/archive/v0.2.7.zip", "url": "https://api.github.com/repos/reactphp/stream/zipball/98cb36bc8c4d6111c584d63f680e886b2167bee5",
"reference": "v0.2.7", "reference": "98cb36bc8c4d6111c584d63f680e886b2167bee5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -375,17 +375,17 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.3.3", "version": "v2.3.4",
"target-dir": "Symfony/Component/EventDispatcher", "target-dir": "Symfony/Component/EventDispatcher",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/EventDispatcher.git", "url": "https://github.com/symfony/EventDispatcher.git",
"reference": "v2.3.3" "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.3", "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8",
"reference": "v2.3.3", "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -434,12 +434,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpFoundation.git", "url": "https://github.com/symfony/HttpFoundation.git",
"reference": "v2.3.3" "reference": "d14aca0449278b9fc6e5334ff02dedd0d2167085"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.3", "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d14aca0449278b9fc6e5334ff02dedd0d2167085",
"reference": "v2.3.3", "reference": "d14aca0449278b9fc6e5334ff02dedd0d2167085",
"shasum": "" "shasum": ""
}, },
"require": { "require": {