From 59823fc2dedbe3d6272b812dab7f06c1fea2fc8f Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Wed, 18 Apr 2012 21:48:21 -0400
Subject: [PATCH] Attempting dependency fix

---
 README.md     |  6 +++---
 composer.json | 21 ++++++++++++---------
 composer.lock | 11 +++--------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 39fd4b2..64be92c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/cboden/Ratchet.png)](http://travis-ci.org/cboden/Ratchet)
+[![Build Status](https://secure.travis-ci.org/cboden/Ratchet.png?branch=master)](http://travis-ci.org/cboden/Ratchet)
 
 #Ratchet
 
@@ -21,13 +21,13 @@ Note that you can not run two applications (Apache and Ratchet) on the same port
 Cookies from your domain will be passed to the socket server, allowing you to identify users.
 Accessing your website's session data in Ratchet is a [feature in the works](https://github.com/cboden/Ratchet/tree/symfony/sessions).
 
-See https://github.com/cboden/socket-demos for some out-of-the-box working demos using Ratchet.
+See https://github.com/cboden/Ratchet-examples for some out-of-the-box working demos using Ratchet.
 
 ###Future considerations
 
 Ideally, soon, web servers will start supporting WebSockets to some capacity and PHP will no longer need to run its self from the command line.
 In theory, the server (like Nginx) would recognize the HTTP handshake request to upgrade the protocol to WebSockets and run/pass data through to a user 
-configured PHP file. When this happens, you can keep your script the same, just remove the Server Application wrapper and maybe eventually the 
+configured PHP file. When this happens, you can keep your script the same, just remove the IOServerComponent wrapper and maybe eventually the 
 WebSocket Application wrapper if the servers recognize the protocol message framing. 
 
 ---
diff --git a/composer.json b/composer.json
index e1c6a63..899d359 100644
--- a/composer.json
+++ b/composer.json
@@ -18,13 +18,20 @@
           , "Ratchet": "src"
         }
     }
-  , "repositories": {
-        "guzzle": {
+  , "require": {
+        "php": ">=5.3.2"
+      , "guzzle/guzzle": "v2.0.2"
+    }
+  , "replace": {
+        "guzzle/guzzle": "v2.0.2"
+    }
+  , "repositories": [
+        {
             "type": "package"
           , "package": {
-                "name": "guzzle"
+                "name": "guzzle/guzzle"
               , "type": "library"
-              , "version": "2.0.2"
+              , "version": "v2.0.2"
               , "autoload": {
                     "psr-0": {
                         "Guzzle": "src"
@@ -37,9 +44,5 @@
                 }
             }
         }
-    }
-  , "require": {
-        "php": ">=5.3.2"
-      , "guzzle": "2.0.2"
-    }
+    ]
 }
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 6a2e39f..21b9d7d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,14 +1,9 @@
 {
-    "hash": "b2332c240ecc001df7f0f0623491f8c3",
+    "hash": "3fb51c7b57fb058065e37de578901055",
     "packages": [
         {
-            "package": "guzzle",
-            "version": "2.0.2"
-        },
-        {
-            "package": "symfony/http-foundation",
-            "version": "dev-master",
-            "source-reference": "b9aceabb83f3d03fe451cdd867d987e863e7a25e"
+            "package": "guzzle/guzzle",
+            "version": "v2.0.2"
         }
     ],
     "packages-dev": null,