Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RequestParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @event headers
* @event error
*/
class RequestParser extends EventEmitter
class RequestParser extends EventEmitter implements RequestParserInterface
{
private $buffer = '';
private $maxSize = 4096;
Expand Down
12 changes: 12 additions & 0 deletions src/RequestParserFactory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php namespace React\Http;

class RequestParserFactory implements RequestParserFactoryInterface
{
/**
* @return RequestParser
*/
public function create()
{
return new RequestParser();
}
}
9 changes: 9 additions & 0 deletions src/RequestParserFactoryInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php namespace React\Http;

interface RequestParserFactoryInterface
{
/**
* @return RequestParserInterface
*/
public function create();
}
19 changes: 19 additions & 0 deletions src/RequestParserInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

namespace React\Http;

use Evenement\EventEmitterInterface;

/**
* @event headers
* @event error
*/
interface RequestParserInterface extends EventEmitterInterface {

/**
* @param $data
* @return null
*/
public function feed($data);

}
7 changes: 4 additions & 3 deletions src/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ class Server extends EventEmitter implements ServerInterface
{
private $io;

public function __construct(SocketServerInterface $io)
public function __construct(SocketServerInterface $io, RequestParserFactoryInterface $parserFactory = null)
{
$this->io = $io;

$this->io->on('connection', function (ConnectionInterface $conn) {
$this->io->on('connection', function (ConnectionInterface $conn) use ($parserFactory) {
// TODO: http 1.1 keep-alive
// TODO: chunked transfer encoding (also for outgoing data)

$parser = new RequestParser();
$parserFactory = $parserFactory ?: new RequestParserFactory();
$parser = $parserFactory->create();
$parser->on('headers', function (Request $request, $bodyBuffer) use ($conn, $parser) {
// attach remote ip to the request as metadata
$request->remoteAddress = $conn->getRemoteAddress();
Expand Down
18 changes: 18 additions & 0 deletions tests/ServerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,24 @@ public function testResponseContainsPoweredByHeader()
$this->assertContains("\r\nX-Powered-By: React/alpha\r\n", $conn->getData());
}

public function testServerUsesProvidedRequestParserFactory()
{
$io = new ServerStub();

/** @var \React\Http\RequestParser|\PHPUnit_Framework_MockObject_MockObject $parser */
$parser = $this->getMockBuilder('React\Http\RequestParser')->getMock();
$parser->expects($this->once())->method('on');

/** @var \React\Http\RequestParserFactory | \PHPUnit_Framework_MockObject_MockObject $parserFactory */
$parserFactory = $this->getMockBuilder('React\Http\RequestParserFactory')->getMock();
$parserFactory->expects($this->once())->method('create')->willReturn($parser);

new Server($io, $parserFactory);

$conn = new ConnectionStub();
$io->emit('connection', array($conn));
}

private function createGetRequest()
{
$data = "GET / HTTP/1.1\r\n";
Expand Down