Merge branch 'refs/heads/master' into wamp

.travis.yml

@@ -1,7 +1,11 @@
 language: php
+
 php:
   - 5.3
+  - 5.4
+
 before_script:
-  - wget --quiet http://getcomposer.org/composer.phar
+  - curl -s http://getcomposer.org/installer | php
   - php composer.phar install
-script: phpunit
+
+script: phpunit --coverage-text

README.md

@@ -10,7 +10,7 @@ Ratchet's primary intention is to be used as a WebSocket server (and a client in
 ##WebSockets
 
 * Supports the RFC6455, HyBi-10, and Hixie76 protocol versions (at the same time)
-* Tested on Chrome 13 - 16, Firefox 6 - 8, Safari 5, iOS 4.2, iOS 5
+* Tested on Chrome 18 - 16, Firefox 6 - 8, Safari 5, iOS 4.2, iOS 5
 
 ##Requirements
 
@@ -30,9 +30,6 @@ In theory, the server (like Nginx) would recognize the HTTP handshake request to
 configured PHP file. When this happens, you can keep your script the same, just remove the Server Application wrapper and maybe eventually the 
 WebSocket Application wrapper if the servers recognize the protocol message framing. 
 
-I'm currently looking in using Nginx as an I/O control communicating with Ratchet (instead of Ratchet managing I/O).
-I'm looking into a couple daemonized servers written in PHP to run Ratchet on top of.
-
 ---
 
 ###A quick server example

composer.json

@@ -20,7 +20,8 @@
     }
   , "repositories": {
         "guzzle": {
-            "package": {
+            "type": "package"
+          , "package": {
                 "name": "guzzle"
               , "type": "library"
               , "version": "2.0.2"

composer.lock

@@ -1,9 +1,16 @@
 {
-    "hash": "e898a89b9f66807dae53937fe3b089d3",
+    "hash": "be8f67a3964cca0e4ffe4b98a7527daa",
     "packages": [
         {
             "package": "guzzle",
             "version": "2.0.2"
+        },
+        {
+            "package": "symfony/http-foundation",
+            "version": "dev-master",
+            "source-reference": "b9aceabb83f3d03fe451cdd867d987e863e7a25e"
         }
-    ]
-}
+    ],
+    "packages-dev": null,
+    "aliases": []
+}