[Http] Fixed tests, upgraded React

This commit is contained in:
Chris Boden 2013-04-27 11:22:56 -04:00
parent 5c41b2fbe1
commit 38df976768
9 changed files with 36 additions and 35 deletions

View File

@ -26,7 +26,7 @@
} }
, "require": { , "require": {
"php": ">=5.3.9" "php": ">=5.3.9"
, "react/socket": "0.2.*" , "react/socket": "~0.2"
, "guzzle/http": "~3.0" , "guzzle/http": "~3.0"
, "symfony/http-foundation": "~2.2" , "symfony/http-foundation": "~2.2"
, "symfony/routing": "~2.2" , "symfony/routing": "~2.2"

52
composer.lock generated
View File

@ -3,7 +3,7 @@
"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": "b51075c0a68acb956c32e59869790571", "hash": "6006ea344879ef78bf1a490e630a74fc",
"packages": [ "packages": [
{ {
"name": "evenement/evenement", "name": "evenement/evenement",
@ -244,17 +244,17 @@
}, },
{ {
"name": "react/event-loop", "name": "react/event-loop",
"version": "v0.2.7", "version": "v0.3.1",
"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": "v0.3.1"
}, },
"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/v0.3.1",
"reference": "v0.2.7", "reference": "v0.3.1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -267,7 +267,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.2-dev" "dev-master": "0.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -283,33 +283,33 @@
"keywords": [ "keywords": [
"event-loop" "event-loop"
], ],
"time": "2013-01-05 11:41:26" "time": "2013-01-14 23:11:47"
}, },
{ {
"name": "react/socket", "name": "react/socket",
"version": "v0.2.7", "version": "v0.3.1",
"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": "v0.3.1"
}, },
"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/v0.3.1",
"reference": "v0.2.7", "reference": "v0.3.1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"evenement/evenement": "1.0.*", "evenement/evenement": "1.0.*",
"php": ">=5.3.3", "php": ">=5.3.3",
"react/event-loop": "0.2.*", "react/event-loop": "0.3.*",
"react/stream": "0.2.*" "react/stream": "0.3.*"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.2-dev" "dev-master": "0.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -325,21 +325,21 @@
"keywords": [ "keywords": [
"Socket" "Socket"
], ],
"time": "2012-12-14 00:58:14" "time": "2013-04-20 14:53:10"
}, },
{ {
"name": "react/stream", "name": "react/stream",
"version": "v0.2.7", "version": "v0.3.1",
"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": "v0.3.1"
}, },
"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/v0.3.1",
"reference": "v0.2.7", "reference": "v0.3.1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -347,13 +347,13 @@
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"suggest": { "suggest": {
"react/event-loop": "0.2.*", "react/event-loop": "0.3.*",
"react/promise": "1.0.*" "react/promise": "~1.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.2-dev" "dev-master": "0.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -370,7 +370,7 @@
"pipe", "pipe",
"stream" "stream"
], ],
"time": "2012-12-14 00:58:14" "time": "2013-04-21 13:25:49"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",

View File

@ -4,7 +4,7 @@
$loop = new React\EventLoop\LibEvLoop; $loop = new React\EventLoop\LibEvLoop;
$sock = new React\Socket\Server($loop); $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; $port = $argc > 1 ? $argv[1] : 8000;
$sock->listen($port, '0.0.0.0'); $sock->listen($port, '0.0.0.0');

View File

@ -4,7 +4,7 @@
$loop = new React\EventLoop\LibEventLoop; $loop = new React\EventLoop\LibEventLoop;
$sock = new React\Socket\Server($loop); $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; $port = $argc > 1 ? $argv[1] : 8000;
$sock->listen($port, '0.0.0.0'); $sock->listen($port, '0.0.0.0');

View File

@ -4,7 +4,7 @@
$loop = new React\EventLoop\LibEvLoop; $loop = new React\EventLoop\LibEvLoop;
$sock = new React\Socket\Server($loop); $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; $port = $argc > 1 ? $argv[1] : 8000;
$sock->listen($port, '0.0.0.0'); $sock->listen($port, '0.0.0.0');

View File

@ -4,8 +4,9 @@
$loop = new React\EventLoop\StreamSelectLoop; $loop = new React\EventLoop\StreamSelectLoop;
$sock = new React\Socket\Server($loop); $sock = new React\Socket\Server($loop);
$app = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer); $web = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer)
$app->setEncodingChecks(false); $app = new Ratchet\Http\HttpServer($web);
$web->setEncodingChecks(false);
$port = $argc > 1 ? $argv[1] : 8000; $port = $argc > 1 ? $argv[1] : 8000;
$sock->listen($port, '0.0.0.0'); $sock->listen($port, '0.0.0.0');

View File

@ -4,7 +4,7 @@
$loop = new React\EventLoop\StreamSelectLoop; $loop = new React\EventLoop\StreamSelectLoop;
$sock = new React\Socket\Server($loop); $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; $port = $argc > 1 ? $argv[1] : 8000;
$sock->listen($port, '0.0.0.0'); $sock->listen($port, '0.0.0.0');

View File

@ -3,7 +3,7 @@ namespace Ratchet\Tests\Http\Guzzle\Http\Message;
use Ratchet\Http\Guzzle\Http\Message\RequestFactory; 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 { class RequestFactoryTest extends \PHPUnit_Framework_TestCase {
protected $factory; protected $factory;

View File

@ -3,7 +3,7 @@ namespace Ratchet\Tests\Http;
use Ratchet\Http\HttpRequestParser; use Ratchet\Http\HttpRequestParser;
/** /**
* @covers Ratchet\WebSocket\HttpRequestParser * @covers Ratchet\Http\HttpRequestParser
*/ */
class HttpRequestParserTest extends \PHPUnit_Framework_TestCase { class HttpRequestParserTest extends \PHPUnit_Framework_TestCase {
protected $parser; protected $parser;