From dbd39e73c2c6e22c3211ebca9f0262aea24c8c41 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 16 Apr 2012 18:00:40 -0400 Subject: [PATCH 1/4] doc version update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5231fe6..a411bee 100644 --- a/README.md +++ b/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 From f87dfa23bd12f4693eaf6c37637b6be6df3e470c Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 16 Apr 2012 18:39:06 -0400 Subject: [PATCH 2/4] Updated CI conf --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7263f6..4c8107d 100644 --- a/.travis.yml +++ b/.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 From e7088cee5f63b52c7f47d5309d8f7618dc929ea7 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 16 Apr 2012 20:00:30 -0400 Subject: [PATCH 3/4] Updated README for Travis --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index a411bee..39fd4b2 100644 --- a/README.md +++ b/README.md @@ -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 From ca79e69056ca99dc2a6b06ee7996c1f4fa3e7491 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 16 Apr 2012 20:03:06 -0400 Subject: [PATCH 4/4] Composer fix/update --- composer.json | 3 ++- composer.lock | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3000123..e54a528 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ } , "repositories": { "guzzle": { - "package": { + "type": "package" + , "package": { "name": "guzzle" , "type": "library" , "version": "2.0.2" diff --git a/composer.lock b/composer.lock index 4e02f7a..c3e0e39 100644 --- a/composer.lock +++ b/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" } - ] -} \ No newline at end of file + ], + "packages-dev": null, + "aliases": [] +}