Clientbase
/
wellrested
mirror of https://github.com/basemaster/wellrested.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Responder namespace 

Move ContentLength and Head middleware to Resonder\Middleware
This commit is contained in:
PJ Dietz 2015-05-10 16:59:50 -04:00
parent 7874484c53
commit b198e83d55
9 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Routing/Hook/ContentLengthHook.php → src/Responder/Middleware/ContentLengthHandler.php
View File

@ -1,6 +1,6 @@
<?php
namespace WellRESTed\Routing\Hook;
namespace WellRESTed\Responder\Middleware;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
@ -13,7 +13,7 @@ use WellRESTed\MiddlewareInterface;
* - Response does not have a Tranfser-encoding: chunked header
* - Response body stream reports a size
*/
class ContentLengthHook implements MiddlewareInterface
class ContentLengthHandler implements MiddlewareInterface
{
public function dispatch(ServerRequestInterface $request, ResponseInterface $response, $next)
{

4
src/Routing/Hook/HeadHook.php → src/Responder/Middleware/HeadHandler.php
View File

@ -1,6 +1,6 @@
<?php
namespace WellRESTed\Routing\Hook;
namespace WellRESTed\Responder\Middleware;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
@ -10,7 +10,7 @@ use WellRESTed\MiddlewareInterface;
/**
* Removes the body of a response to a HEAD request.
*/
class HeadHook implements MiddlewareInterface
class HeadHandler implements MiddlewareInterface
{
public function dispatch(ServerRequestInterface $request, ResponseInterface $response, $next)
{

6
src/Routing/Responder.php → src/Responder/Responder.php
View File

@ -1,8 +1,9 @@
<?php
namespace WellRESTed\Routing;
namespace WellRESTed\Responder;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamInterface;
class Responder implements ResponderInterface
@ -12,9 +13,10 @@ class Responder implements ResponderInterface
/**
* Outputs a response.
*
* @param ServerRequestInterface $request
* @param ResponseInterface $response Response to output
*/
public function respond(ResponseInterface $response)
public function respond(ServerRequestInterface $request, ResponseInterface $response)
{
// Status Line
header($this->getStatusLine($response));

17
src/Responder/ResponderInterface.php Normal file
View File

@ -0,0 +1,17 @@
<?php
namespace WellRESTed\Responder;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
interface ResponderInterface
{
/**
* Outputs a response.
*
* @param ServerRequestInterface $request
* @param ResponseInterface $response Response to output
*/
public function respond(ServerRequestInterface $request, ResponseInterface $response);
}

15
src/Routing/ResponderInterface.php
View File

@ -1,15 +0,0 @@
<?php
namespace WellRESTed\Routing;
use Psr\Http\Message\ResponseInterface;
interface ResponderInterface
{
/**
* Outputs a response.
*
* @param ResponseInterface $response Response to output
*/
public function respond(ResponseInterface $response);
}

2
test/src/HeaderStack.php
View File

@ -1,6 +1,6 @@
<?php
namespace WellRESTed\Routing;
namespace WellRESTed\Responder;
class HeaderStack
{

18
test/tests/unit/Routing/Hook/ContentLengthHookTest.php → test/tests/unit/Responder/Middleware/ContentLengthHookTest.php
View File

@ -3,19 +3,19 @@
namespace WellRESTed\Test\Unit\Routing\Hook;
use Prophecy\Argument;
use WellRESTed\Routing\Hook\ContentLengthHook;
use WellRESTed\Responder\Middleware\ContentLengthHandler;
/**
* @covers WellRESTed\Routing\Hook\ContentLengthHook
* @covers WellRESTed\Responder\Middleware\ContentLengthHandler
* @group responder
*/
class ContentLengthHookTest extends \PHPUnit_Framework_TestCase
class ContentLengthHandlerTest extends \PHPUnit_Framework_TestCase
{
private $request;
private $response;
private $next;
private $body;
public function setUp()
{
parent::setUp();
@ -42,7 +42,7 @@ class ContentLengthHookTest extends \PHPUnit_Framework_TestCase
$this->response->hasHeader("Content-length")->willReturn(false);
$this->response->getHeaderLine("Transfer-encoding")->willReturn("");
$hook = new ContentLengthHook();
$hook = new ContentLengthHandler();
$response = $hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$this->assertEquals([1024], $response->getHeader("Content-length"));
@ -53,7 +53,7 @@ class ContentLengthHookTest extends \PHPUnit_Framework_TestCase
$this->response->hasHeader("Content-length")->willReturn(false);
$this->response->getHeaderLine("Transfer-encoding")->willReturn("");
$hook = new ContentLengthHook();
$hook = new ContentLengthHandler();
$response = $this->response->reveal();
$response = $hook->dispatch($this->request->reveal(), $response, $this->next);
@ -67,7 +67,7 @@ class ContentLengthHookTest extends \PHPUnit_Framework_TestCase
$this->response->hasHeader("Content-length")->willReturn(true);
$this->response->getHeaderLine("Transfer-encoding")->willReturn("");
$hook = new ContentLengthHook();
$hook = new ContentLengthHandler();
$hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$this->response->withHeader(Argument::cetera())->shouldNotHaveBeenCalled();
@ -78,7 +78,7 @@ class ContentLengthHookTest extends \PHPUnit_Framework_TestCase
$this->response->hasHeader("Content-length")->willReturn(false);
$this->response->getHeaderLine("Transfer-encoding")->willReturn("CHUNKED");
$hook = new ContentLengthHook();
$hook = new ContentLengthHandler();
$hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$this->response->withHeader(Argument::cetera())->shouldNotHaveBeenCalled();
@ -90,7 +90,7 @@ class ContentLengthHookTest extends \PHPUnit_Framework_TestCase
$this->response->getHeaderLine("Transfer-encoding")->willReturn("");
$this->body->getSize()->willReturn(null);
$hook = new ContentLengthHook();
$hook = new ContentLengthHandler();
$hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$this->response->withHeader(Argument::cetera())->shouldNotHaveBeenCalled();

27
test/tests/unit/Routing/Hook/HeadHookTest.php → test/tests/unit/Responder/Middleware/HeadHandlerTest.php
View File

@ -1,15 +1,16 @@
<?php
namespace WellRESTed\Test\Unit\Routing\Hook;
namespace WellRESTed\Test\Unit\Responder\Middleware;
use Prophecy\Argument;
use WellRESTed\Routing\Hook\HeadHook;
use WellRESTed\Responder\Middleware\HeadHandler;
/**
* @covers WellRESTed\Routing\Hook\HeadHook
* @uses WellRESTed\Message\NullStream
* @covers WellRESTed\Responder\Middleware\HeadHandler
* @uses WellRESTed\Message\NullStream
* @group responder
*/
class HeadHookTest extends \PHPUnit_Framework_TestCase
class HeadHandlerTest extends \PHPUnit_Framework_TestCase
{
private $request;
private $response;
@ -24,10 +25,12 @@ class HeadHookTest extends \PHPUnit_Framework_TestCase
$this->request = $this->prophesize('Psr\Http\Message\ServerRequestInterface');
$this->response = $this->prophesize('Psr\Http\Message\ResponseInterface');
$this->response->getBody()->willReturn($this->body->reveal());
$this->response->withBody(Argument::any())->will(function ($args) {
$this->getBody()->willReturn($args[0]);
return $this;
});
$this->response->withBody(Argument::any())->will(
function ($args) {
$this->getBody()->willReturn($args[0]);
return $this;
}
);
$this->next = function ($request, $response) {
return $response;
};
@ -36,7 +39,7 @@ class HeadHookTest extends \PHPUnit_Framework_TestCase
public function testReplacesBodyForHeadRequest()
{
$this->request->getMethod()->willReturn("HEAD");
$hook = new HeadHook();
$hook = new HeadHandler();
$response = $hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$this->assertSame(0, $response->getBody()->getSize());
}
@ -44,7 +47,7 @@ class HeadHookTest extends \PHPUnit_Framework_TestCase
public function testMultipleDispatchesHaveNoEffect()
{
$this->request->getMethod()->willReturn("HEAD");
$hook = new HeadHook();
$hook = new HeadHandler();
$response = $hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$hook->dispatch($this->request->reveal(), $response, $this->next);
$this->response->withBody(Argument::any())->shouldHaveBeenCalledTimes(1);
@ -53,7 +56,7 @@ class HeadHookTest extends \PHPUnit_Framework_TestCase
public function testDoesNotReplaceBodyForNonHeadRequests()
{
$this->request->getMethod()->willReturn("GET");
$hook = new HeadHook();
$hook = new HeadHandler();
$hook->dispatch($this->request->reveal(), $this->response->reveal(), $this->next);
$this->response->withBody(Argument::any())->shouldNotHaveBeenCalled();
}

41
test/tests/unit/Routing/ResponderTest.php → test/tests/unit/Responder/ResponderTest.php
View File

@ -1,18 +1,20 @@
<?php
namespace WellRESTed\Test\Unit\Routing;
namespace WellRESTed\Test\Unit\Responder;
use Prophecy\Argument;
use WellRESTed\Routing\HeaderStack;
use WellRESTed\Routing\Responder;
use WellRESTed\Responder\HeaderStack;
use WellRESTed\Responder\Responder;
require_once(__DIR__ . "/../../../src/HeaderStack.php");
require_once __DIR__ . "/../../../src/HeaderStack.php";
/**
* @covers WellRESTed\Routing\Responder
* @covers WellRESTed\Responder\Responder
* @group responder
*/
class ResponderTest extends \PHPUnit_Framework_TestCase
{
private $request;
private $response;
private $body;
@ -21,6 +23,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase
HeaderStack::reset();
$this->body = $this->prophesize('\Psr\Http\Message\StreamInterface');
$this->body->isReadable()->willReturn(false);
$this->request = $this->prophesize('\Psr\Http\Message\ServerRequestInterface');
$this->response = $this->prophesize('\Psr\Http\Message\ResponseInterface');
$this->response->getHeaders()->willReturn([]);
$this->response->getProtocolVersion()->willReturn("1.1");
@ -35,7 +38,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase
$this->response->getReasonPhrase()->willReturn("Ok");
$responder = new Responder();
$responder->respond($this->response->reveal());
$responder->respond($this->request->reveal(), $this->response->reveal());
$this->assertContains("HTTP/1.1 200 Ok", HeaderStack::getHeaders());
}
@ -45,7 +48,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase
$this->response->getReasonPhrase()->willReturn(null);
$responder = new Responder();
$responder->respond($this->response->reveal());
$responder->respond($this->request->reveal(), $this->response->reveal());
$this->assertContains("HTTP/1.1 999", HeaderStack::getHeaders());
}
@ -60,7 +63,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase
]);
$responder = new Responder();
$responder->respond($this->response->reveal());
$responder->respond($this->request->reveal(), $this->response->reveal());
$this->assertContains($header, HeaderStack::getHeaders());
}
@ -83,7 +86,7 @@ class ResponderTest extends \PHPUnit_Framework_TestCase
$responder = new Responder();
ob_start();
$responder->respond($this->response->reveal());
$responder->respond($this->request->reveal(), $this->response->reveal());
$captured = ob_get_contents();
ob_end_clean();
@ -99,21 +102,23 @@ class ResponderTest extends \PHPUnit_Framework_TestCase
$this->body->isReadable()->willReturn(true);
$this->body->rewind()->willReturn(true);
$this->body->eof()->willReturn(false);
$this->body->read(Argument::any())->will(function ($args) use ($content, &$position) {
$chunkSize = $args[0];
$chunk = substr($content, $position, $chunkSize);
$position += $chunkSize;
if ($position >= strlen($content)) {
$this->eof()->willReturn(true);
$this->body->read(Argument::any())->will(
function ($args) use ($content, &$position) {
$chunkSize = $args[0];
$chunk = substr($content, $position, $chunkSize);
$position += $chunkSize;
if ($position >= strlen($content)) {
$this->eof()->willReturn(true);
}
return $chunk;
}
return $chunk;
});
);
$responder = new Responder();
$responder->setChunkSize($chunkSize);
ob_start();
$responder->respond($this->response->reveal(), $chunkSize);
$responder->respond($this->request->reveal(), $this->response->reveal(), $chunkSize);
$captured = ob_get_contents();
ob_end_clean();