From 38df97676833303faf56a22026b119132dadb9b5 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sat, 27 Apr 2013 11:22:56 -0400 Subject: [PATCH] [Http] Fixed tests, upgraded React --- composer.json | 2 +- composer.lock | 52 +++++++++---------- .../bin/fuzzingserver-libev.php | 2 +- .../bin/fuzzingserver-libevent.php | 2 +- .../bin/fuzzingserver-libuv.php | 2 +- .../bin/fuzzingserver-noutf8.php | 5 +- .../bin/fuzzingserver-stream.php | 2 +- .../Http/Message/RequestFactoryTest.php | 2 +- .../Tests/Http/HtpRequestParserTest.php | 2 +- 9 files changed, 36 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index a7a7953..89eec01 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ } , "require": { "php": ">=5.3.9" - , "react/socket": "0.2.*" + , "react/socket": "~0.2" , "guzzle/http": "~3.0" , "symfony/http-foundation": "~2.2" , "symfony/routing": "~2.2" diff --git a/composer.lock b/composer.lock index 882649e..f7408e1 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": "b51075c0a68acb956c32e59869790571", + "hash": "6006ea344879ef78bf1a490e630a74fc", "packages": [ { "name": "evenement/evenement", @@ -244,17 +244,17 @@ }, { "name": "react/event-loop", - "version": "v0.2.7", + "version": "v0.3.1", "target-dir": "React/EventLoop", "source": { "type": "git", - "url": "https://github.com/reactphp/event-loop", - "reference": "v0.2.7" + "url": "https://github.com/reactphp/event-loop.git", + "reference": "v0.3.1" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/event-loop/archive/v0.2.7.zip", - "reference": "v0.2.7", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/v0.3.1", + "reference": "v0.3.1", "shasum": "" }, "require": { @@ -267,7 +267,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "0.3-dev" } }, "autoload": { @@ -283,33 +283,33 @@ "keywords": [ "event-loop" ], - "time": "2013-01-05 11:41:26" + "time": "2013-01-14 23:11:47" }, { "name": "react/socket", - "version": "v0.2.7", + "version": "v0.3.1", "target-dir": "React/Socket", "source": { "type": "git", - "url": "https://github.com/reactphp/socket", - "reference": "v0.2.7" + "url": "https://github.com/reactphp/socket.git", + "reference": "v0.3.1" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/socket/archive/v0.2.7.zip", - "reference": "v0.2.7", + "url": "https://api.github.com/repos/reactphp/socket/zipball/v0.3.1", + "reference": "v0.3.1", "shasum": "" }, "require": { "evenement/evenement": "1.0.*", "php": ">=5.3.3", - "react/event-loop": "0.2.*", - "react/stream": "0.2.*" + "react/event-loop": "0.3.*", + "react/stream": "0.3.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "0.3-dev" } }, "autoload": { @@ -325,21 +325,21 @@ "keywords": [ "Socket" ], - "time": "2012-12-14 00:58:14" + "time": "2013-04-20 14:53:10" }, { "name": "react/stream", - "version": "v0.2.7", + "version": "v0.3.1", "target-dir": "React/Stream", "source": { "type": "git", - "url": "https://github.com/reactphp/stream", - "reference": "v0.2.7" + "url": "https://github.com/reactphp/stream.git", + "reference": "v0.3.1" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/stream/archive/v0.2.7.zip", - "reference": "v0.2.7", + "url": "https://api.github.com/repos/reactphp/stream/zipball/v0.3.1", + "reference": "v0.3.1", "shasum": "" }, "require": { @@ -347,13 +347,13 @@ "php": ">=5.3.3" }, "suggest": { - "react/event-loop": "0.2.*", - "react/promise": "1.0.*" + "react/event-loop": "0.3.*", + "react/promise": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "0.3-dev" } }, "autoload": { @@ -370,7 +370,7 @@ "pipe", "stream" ], - "time": "2012-12-14 00:58:14" + "time": "2013-04-21 13:25:49" }, { "name": "symfony/event-dispatcher", diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php b/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php index ccd0613..fb6d03f 100644 --- a/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php +++ b/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php @@ -4,7 +4,7 @@ $loop = new React\EventLoop\LibEvLoop; $sock = new React\Socket\Server($loop); - $app = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer); + $app = new Ratchet\Http\HttpServer(new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer)); $port = $argc > 1 ? $argv[1] : 8000; $sock->listen($port, '0.0.0.0'); diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php b/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php index 166bd45..ea1fbad 100644 --- a/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php +++ b/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php @@ -4,7 +4,7 @@ $loop = new React\EventLoop\LibEventLoop; $sock = new React\Socket\Server($loop); - $app = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer); + $app = new Ratchet\Http\HttpServer(new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer)); $port = $argc > 1 ? $argv[1] : 8000; $sock->listen($port, '0.0.0.0'); diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-libuv.php b/tests/AutobahnTestSuite/bin/fuzzingserver-libuv.php index ccd0613..fb6d03f 100644 --- a/tests/AutobahnTestSuite/bin/fuzzingserver-libuv.php +++ b/tests/AutobahnTestSuite/bin/fuzzingserver-libuv.php @@ -4,7 +4,7 @@ $loop = new React\EventLoop\LibEvLoop; $sock = new React\Socket\Server($loop); - $app = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer); + $app = new Ratchet\Http\HttpServer(new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer)); $port = $argc > 1 ? $argv[1] : 8000; $sock->listen($port, '0.0.0.0'); diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php b/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php index 589cdd9..f63893a 100644 --- a/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php +++ b/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php @@ -4,8 +4,9 @@ $loop = new React\EventLoop\StreamSelectLoop; $sock = new React\Socket\Server($loop); - $app = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer); - $app->setEncodingChecks(false); + $web = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer) + $app = new Ratchet\Http\HttpServer($web); + $web->setEncodingChecks(false); $port = $argc > 1 ? $argv[1] : 8000; $sock->listen($port, '0.0.0.0'); diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php b/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php index 4e3e797..98b4448 100644 --- a/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php +++ b/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php @@ -4,7 +4,7 @@ $loop = new React\EventLoop\StreamSelectLoop; $sock = new React\Socket\Server($loop); - $app = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer); + $app = new Ratchet\Http\HttpServer(new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer)); $port = $argc > 1 ? $argv[1] : 8000; $sock->listen($port, '0.0.0.0'); diff --git a/tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php b/tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php index cb67bf5..9709745 100644 --- a/tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php +++ b/tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php @@ -3,7 +3,7 @@ namespace Ratchet\Tests\Http\Guzzle\Http\Message; use Ratchet\Http\Guzzle\Http\Message\RequestFactory; /** - * @covers Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory + * @covers Ratchet\Http\Guzzle\Http\Message\RequestFactory */ class RequestFactoryTest extends \PHPUnit_Framework_TestCase { protected $factory; diff --git a/tests/Ratchet/Tests/Http/HtpRequestParserTest.php b/tests/Ratchet/Tests/Http/HtpRequestParserTest.php index a32a6da..4de396c 100644 --- a/tests/Ratchet/Tests/Http/HtpRequestParserTest.php +++ b/tests/Ratchet/Tests/Http/HtpRequestParserTest.php @@ -3,7 +3,7 @@ namespace Ratchet\Tests\Http; use Ratchet\Http\HttpRequestParser; /** - * @covers Ratchet\WebSocket\HttpRequestParser + * @covers Ratchet\Http\HttpRequestParser */ class HttpRequestParserTest extends \PHPUnit_Framework_TestCase { protected $parser;