diff --git a/src/Responder/ResponderInterface.php b/src/Responder/ResponderInterface.php deleted file mode 100644 index aa32432..0000000 --- a/src/Responder/ResponderInterface.php +++ /dev/null @@ -1,17 +0,0 @@ -dispatch($request, $response, $next); - $responder = $this->getResponder(); - $responder->respond($request, $response); + $transmitter = $this->getTransmitter(); + $transmitter->transmit($request, $response); } // ------------------------------------------------------------------------ @@ -122,11 +122,11 @@ class Server implements DispatchStackInterface /** * Return an instance that will output the response to the client. * - * @return ResponderInterface + * @return TransmitterInterface */ - protected function getResponder() + protected function getTransmitter() { - return new Responder(); + return new Transmitter(); } /** diff --git a/src/Responder/Middleware/ContentLengthHandler.php b/src/Transmission/Middleware/ContentLengthHandler.php similarity index 95% rename from src/Responder/Middleware/ContentLengthHandler.php rename to src/Transmission/Middleware/ContentLengthHandler.php index 7bec7c5..96579a6 100644 --- a/src/Responder/Middleware/ContentLengthHandler.php +++ b/src/Transmission/Middleware/ContentLengthHandler.php @@ -1,6 +1,6 @@ prepareResponse($request, $response); diff --git a/src/Transmission/TransmitterInterface.php b/src/Transmission/TransmitterInterface.php new file mode 100644 index 0000000..b68a691 --- /dev/null +++ b/src/Transmission/TransmitterInterface.php @@ -0,0 +1,25 @@ +request = $this->prophesize('Psr\Http\Message\ServerRequestInterface'); $this->response = $this->prophesize('Psr\Http\Message\ResponseInterface'); - $this->responder = $this->prophesize('WellRESTed\Responder\ResponderInterface'); - $this->responder->respond(Argument::cetera())->willReturn(); + $this->transmitter = $this->prophesize('WellRESTed\Transmission\TransmitterInterface'); + $this->transmitter->transmit(Argument::cetera())->willReturn(); $this->dispatcher = $this->prophesize('WellRESTed\Dispatching\DispatcherInterface'); $this->dispatcher->dispatch(Argument::cetera())->will( function ($args) { @@ -33,7 +33,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase ); $this->server = $this->getMockBuilder('WellRESTed\Server') - ->setMethods(["getDispatcher", "getRequest", "getResponse", "getResponder"]) + ->setMethods(["getDispatcher", "getRequest", "getResponse", "getTransmitter"]) ->disableOriginalConstructor() ->getMock(); $this->server->expects($this->any()) @@ -46,8 +46,8 @@ class ServerTest extends \PHPUnit_Framework_TestCase ->method("getResponse") ->will($this->returnValue($this->response->reveal())); $this->server->expects($this->any()) - ->method("getResponder") - ->will($this->returnValue($this->responder->reveal())); + ->method("getTransmitter") + ->will($this->returnValue($this->transmitter->reveal())); $this->server->__construct(); } @@ -132,7 +132,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase public function testRespondSendsResponseToResponder() { $this->server->respond(); - $this->responder->respond( + $this->transmitter->transmit( $this->request->reveal(), $this->response->reveal() )->shouldHaveBeenCalled(); diff --git a/test/tests/unit/Responder/Middleware/ContentLengthHookTest.php b/test/tests/unit/Transmission/Middleware/ContentLengthHookTest.php similarity index 94% rename from test/tests/unit/Responder/Middleware/ContentLengthHookTest.php rename to test/tests/unit/Transmission/Middleware/ContentLengthHookTest.php index 4f2d220..6abe908 100644 --- a/test/tests/unit/Responder/Middleware/ContentLengthHookTest.php +++ b/test/tests/unit/Transmission/Middleware/ContentLengthHookTest.php @@ -1,13 +1,13 @@ assertNotNull($responder); + $transmitter = new Transmitter(); + $this->assertNotNull($transmitter); } /** - * @covers ::respond + * @covers ::transmit * @covers ::getStatusLine */ public function testSendStatusCodeWithReasonPhrase() @@ -61,13 +61,13 @@ class ResponderTest extends \PHPUnit_Framework_TestCase $this->response->getStatusCode()->willReturn("200"); $this->response->getReasonPhrase()->willReturn("Ok"); - $responder = new Responder(); - $responder->respond($this->request->reveal(), $this->response->reveal()); + $transmitter = new Transmitter(); + $transmitter->transmit($this->request->reveal(), $this->response->reveal()); $this->assertContains("HTTP/1.1 200 Ok", HeaderStack::getHeaders()); } /** - * @covers ::respond + * @covers ::transmit * @covers ::getStatusLine */ public function testSendStatusCodeWithoutReasonPhrase() @@ -75,13 +75,13 @@ class ResponderTest extends \PHPUnit_Framework_TestCase $this->response->getStatusCode()->willReturn("999"); $this->response->getReasonPhrase()->willReturn(null); - $responder = new Responder(); - $responder->respond($this->request->reveal(), $this->response->reveal()); + $transmitter = new Transmitter(); + $transmitter->transmit($this->request->reveal(), $this->response->reveal()); $this->assertContains("HTTP/1.1 999", HeaderStack::getHeaders()); } /** - * @covers ::respond + * @covers ::transmit * @dataProvider headerProvider */ public function testSendsHeaders($header) @@ -91,8 +91,8 @@ class ResponderTest extends \PHPUnit_Framework_TestCase "X-foo" => ["bar", "baz"], ]); - $responder = new Responder(); - $responder->respond($this->request->reveal(), $this->response->reveal()); + $transmitter = new Transmitter(); + $transmitter->transmit($this->request->reveal(), $this->response->reveal()); $this->assertContains($header, HeaderStack::getHeaders()); } @@ -106,7 +106,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase } /** - * @covers ::respond + * @covers ::transmit * @covers ::outputBody */ public function testOutputsBody() @@ -116,10 +116,10 @@ class ResponderTest extends \PHPUnit_Framework_TestCase $this->body->isReadable()->willReturn(true); $this->body->__toString()->willReturn($content); - $responder = new Responder(); + $transmitter = new Transmitter(); ob_start(); - $responder->respond($this->request->reveal(), $this->response->reveal()); + $transmitter->transmit($this->request->reveal(), $this->response->reveal()); $captured = ob_get_contents(); ob_end_clean(); @@ -127,7 +127,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase } /** - * @covers ::respond + * @covers ::transmit * @covers ::setChunkSize * @covers ::outputBody */ @@ -152,11 +152,11 @@ class ResponderTest extends \PHPUnit_Framework_TestCase } ); - $responder = new Responder(); - $responder->setChunkSize($chunkSize); + $transmitter = new Transmitter(); + $transmitter->setChunkSize($chunkSize); ob_start(); - $responder->respond($this->request->reveal(), $this->response->reveal(), $chunkSize); + $transmitter->transmit($this->request->reveal(), $this->response->reveal(), $chunkSize); $captured = ob_get_contents(); ob_end_clean(); @@ -164,7 +164,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase } /** - * @cover ::prepareResponse + * @covers ::prepareResponse */ public function testAddContentLengthHeader() { @@ -176,13 +176,13 @@ class ResponderTest extends \PHPUnit_Framework_TestCase $this->body->__toString()->willReturn(""); $this->body->getSize()->willReturn($bodySize); - $responder = new Responder(); - $responder->respond($this->request->reveal(), $this->response->reveal()); + $transmitter = new Transmitter(); + $transmitter->transmit($this->request->reveal(), $this->response->reveal()); $this->response->withHeader("Content-length", $bodySize)->shouldHaveBeenCalled(); } /** - * @cover ::prepareResponse + * @covers ::prepareResponse */ public function testReplacesBodyForHeadRequeset() { @@ -192,8 +192,8 @@ class ResponderTest extends \PHPUnit_Framework_TestCase $this->body->isReadable()->willReturn(true); $this->body->__toString()->willReturn(""); - $responder = new Responder(); - $responder->respond($this->request->reveal(), $this->response->reveal()); + $transmitter = new Transmitter(); + $transmitter->transmit($this->request->reveal(), $this->response->reveal()); $this->response->withBody(Argument::any())->shouldHaveBeenCalled(); } }