-
Notifications
You must be signed in to change notification settings - Fork 89
Fix: allow middleware dispatch to behave like controller dispatch #236
Changes from all commits
c27997f
5a914bd
ecab36d
cb4d7ee
0af1831
606ce94
1ab5b13
71066ad
a6d23ff
3c3136a
a46ae7e
a37be06
0ce89d1
533a489
e78b531
2d2f887
396a650
50ec228
16a77c3
e4824a3
7d33ff7
6170700
98c6d39
8442764
29d8e5b
145e300
4628c44
b7f52a9
a122791
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
*/ | ||
|
||
namespace Zend\Mvc\Controller; | ||
|
||
use Psr\Http\Message\ResponseInterface; | ||
use Psr\Http\Message\ServerRequestInterface; | ||
use Zend\EventManager\EventManagerInterface; | ||
use Zend\Http\Request; | ||
use Zend\Mvc\Exception\ReachedFinalHandlerException; | ||
use Zend\Mvc\Exception\RuntimeException; | ||
use Zend\Mvc\MvcEvent; | ||
use Zend\Psr7Bridge\Psr7ServerRequest; | ||
use Zend\Router\RouteMatch; | ||
use Zend\Stratigility\Delegate\CallableDelegateDecorator; | ||
use Zend\Stratigility\MiddlewarePipe; | ||
|
||
/** | ||
* @internal don't use this in your codebase, or else @ocramius will hunt you down. This is just an internal | ||
* @internal hack to make middleware trigger 'dispatch' events attached to the DispatchableInterface identifier. | ||
* | ||
* Specifically, it will receive a @see MiddlewarePipe, a @see ResponseInterface prototype, and then dispatch | ||
* the pipe whilst still behaving like a normal controller. That is needed for any events attached to | ||
* the @see \Zend\Stdlib\DispatchableInterface identifier to reach their listeners on any attached | ||
* @see \Zend\EventManager\SharedEventManagerInterface | ||
*/ | ||
final class MiddlewareController extends AbstractController | ||
{ | ||
/** | ||
* @var MiddlewarePipe | ||
*/ | ||
private $pipe; | ||
|
||
/** | ||
* @var ResponseInterface | ||
*/ | ||
private $responsePrototype; | ||
|
||
public function __construct( | ||
MiddlewarePipe $pipe, | ||
ResponseInterface $responsePrototype, | ||
EventManagerInterface $eventManager, | ||
MvcEvent $event | ||
) { | ||
$this->eventIdentifier = __CLASS__; | ||
$this->pipe = $pipe; | ||
$this->responsePrototype = $responsePrototype; | ||
|
||
$this->setEventManager($eventManager); | ||
$this->setEvent($event); | ||
} | ||
|
||
/** | ||
* {@inheritDoc} | ||
* | ||
* @throws RuntimeException | ||
*/ | ||
public function onDispatch(MvcEvent $e) | ||
{ | ||
$routeMatch = $e->getRouteMatch(); | ||
$psr7Request = $this->populateRequestParametersFromRoute( | ||
$this->loadRequest()->withAttribute(RouteMatch::class, $routeMatch), | ||
$routeMatch | ||
); | ||
|
||
$result = $this->pipe->process($psr7Request, new CallableDelegateDecorator( | ||
function () { | ||
throw ReachedFinalHandlerException::create(); | ||
}, | ||
$this->responsePrototype | ||
)); | ||
|
||
$e->setResult($result); | ||
|
||
return $result; | ||
} | ||
|
||
/** | ||
* @return \Zend\Diactoros\ServerRequest | ||
* | ||
* @throws RuntimeException | ||
*/ | ||
private function loadRequest() | ||
{ | ||
$request = $this->request; | ||
|
||
if (! $request instanceof Request) { | ||
throw new RuntimeException(sprintf( | ||
'Expected request to be a %s, %s given', | ||
Request::class, | ||
get_class($request) | ||
)); | ||
} | ||
|
||
return Psr7ServerRequest::fromZend($request); | ||
} | ||
|
||
/** | ||
* @param ServerRequestInterface $request | ||
* @param RouteMatch|null $routeMatch | ||
* | ||
* @return ServerRequestInterface | ||
*/ | ||
private function populateRequestParametersFromRoute(ServerRequestInterface $request, RouteMatch $routeMatch = null) | ||
{ | ||
if (! $routeMatch) { | ||
return $request; | ||
} | ||
|
||
foreach ($routeMatch->getParams() as $key => $value) { | ||
$request = $request->withAttribute($key, $value); | ||
} | ||
|
||
return $request; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ | |
use Zend\EventManager\EventManagerInterface; | ||
use Zend\Mvc\Exception\InvalidMiddlewareException; | ||
use Zend\Mvc\Exception\ReachedFinalHandlerException; | ||
use Zend\Psr7Bridge\Psr7ServerRequest as Psr7Request; | ||
use Zend\Mvc\Controller\MiddlewareController; | ||
use Zend\Psr7Bridge\Psr7Response; | ||
use Zend\Router\RouteMatch; | ||
use Zend\Stratigility\Delegate\CallableDelegateDecorator; | ||
|
@@ -45,6 +45,10 @@ public function attach(EventManagerInterface $events, $priority = 1) | |
*/ | ||
public function onDispatch(MvcEvent $event) | ||
{ | ||
if (null !== $event->getResult()) { | ||
return; | ||
} | ||
|
||
$routeMatch = $event->getRouteMatch(); | ||
$middleware = $routeMatch->getParam('middleware', false); | ||
if (false === $middleware) { | ||
|
@@ -78,16 +82,12 @@ public function onDispatch(MvcEvent $event) | |
|
||
$caughtException = null; | ||
try { | ||
$psr7Request = Psr7Request::fromZend($request)->withAttribute(RouteMatch::class, $routeMatch); | ||
foreach ($routeMatch->getParams() as $key => $value) { | ||
$psr7Request = $psr7Request->withAttribute($key, $value); | ||
} | ||
$return = $pipe->process($psr7Request, new CallableDelegateDecorator( | ||
function (PsrServerRequestInterface $request, PsrResponseInterface $response) { | ||
throw ReachedFinalHandlerException::create(); | ||
}, | ||
$psr7ResponsePrototype | ||
)); | ||
$return = (new MiddlewareController( | ||
$pipe, | ||
$psr7ResponsePrototype, | ||
$application->getServiceManager()->get('EventManager'), | ||
$event | ||
))->dispatch($request, $response); | ||
} catch (\Throwable $ex) { | ||
$caughtException = $ex; | ||
} catch (\Exception $ex) { // @TODO clean up once PHP 7 requirement is enforced | ||
|
@@ -107,6 +107,8 @@ function (PsrServerRequestInterface $request, PsrResponseInterface $response) { | |
} | ||
} | ||
|
||
$event->setError(''); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note: this still means that the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd argue both the if (null !== $e->getResult()) {
return;
} Do you want to incorporate that change in this PR? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @weierophinney done for both listeners |
||
|
||
if (! $return instanceof PsrResponseInterface) { | ||
$event->setResult($return); | ||
return $return; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
*/ | ||
|
||
namespace ZendTest\Mvc\Controller; | ||
|
||
use PHPUnit\Framework\TestCase; | ||
use Psr\Http\Message\ResponseInterface; | ||
use Zend\EventManager\EventManager; | ||
use Zend\EventManager\EventManagerInterface; | ||
use Zend\Http\Request; | ||
use Zend\Http\Response; | ||
use Zend\Mvc\Controller\AbstractController; | ||
use Zend\Mvc\Controller\MiddlewareController; | ||
use Zend\Mvc\Exception\RuntimeException; | ||
use Zend\Mvc\MvcEvent; | ||
use Zend\Stdlib\DispatchableInterface; | ||
use Zend\Stdlib\RequestInterface; | ||
use Zend\Stratigility\MiddlewarePipe; | ||
|
||
/** | ||
* @covers \Zend\Mvc\Controller\MiddlewareController | ||
*/ | ||
class MiddlewareControllerTest extends TestCase | ||
{ | ||
/** | ||
* @var MiddlewarePipe|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $pipe; | ||
|
||
/** | ||
* @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $responsePrototype; | ||
|
||
/** | ||
* @var EventManagerInterface | ||
*/ | ||
private $eventManager; | ||
|
||
/** | ||
* @var AbstractController|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $controller; | ||
|
||
/** | ||
* @var MvcEvent | ||
*/ | ||
private $event; | ||
|
||
/** | ||
* {@inheritDoc} | ||
*/ | ||
protected function setUp() | ||
{ | ||
$this->pipe = $this->createMock(MiddlewarePipe::class); | ||
$this->responsePrototype = $this->createMock(ResponseInterface::class); | ||
$this->eventManager = $this->createMock(EventManagerInterface::class); | ||
$this->event = new MvcEvent(); | ||
$this->eventManager = new EventManager(); | ||
|
||
$this->controller = new MiddlewareController( | ||
$this->pipe, | ||
$this->responsePrototype, | ||
$this->eventManager, | ||
$this->event | ||
); | ||
} | ||
|
||
public function testWillAssignCorrectEventManagerIdentifiers() | ||
{ | ||
$identifiers = $this->eventManager->getIdentifiers(); | ||
|
||
self::assertContains(MiddlewareController::class, $identifiers); | ||
self::assertContains(AbstractController::class, $identifiers); | ||
self::assertContains(DispatchableInterface::class, $identifiers); | ||
} | ||
|
||
public function testWillDispatchARequestAndResponseWithAGivenPipe() | ||
{ | ||
$request = new Request(); | ||
$response = new Response(); | ||
$result = $this->createMock(ResponseInterface::class); | ||
/* @var $dispatchListener callable|\PHPUnit_Framework_MockObject_MockObject */ | ||
$dispatchListener = $this->getMockBuilder(\stdClass::class)->setMethods(['__invoke'])->getMock(); | ||
|
||
$this->eventManager->attach(MvcEvent::EVENT_DISPATCH, $dispatchListener, 100); | ||
$this->eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, function () { | ||
self::fail('No dispatch error expected'); | ||
}, 100); | ||
|
||
$dispatchListener | ||
->expects(self::once()) | ||
->method('__invoke') | ||
->with(self::callback(function (MvcEvent $event) use ($request, $response) { | ||
self::assertSame($this->event, $event); | ||
self::assertSame(MvcEvent::EVENT_DISPATCH, $event->getName()); | ||
self::assertSame($this->controller, $event->getTarget()); | ||
self::assertSame($request, $event->getRequest()); | ||
self::assertSame($response, $event->getResponse()); | ||
|
||
return true; | ||
})); | ||
|
||
$this->pipe->expects(self::once())->method('process')->willReturn($result); | ||
|
||
$controllerResult = $this->controller->dispatch($request, $response); | ||
|
||
self::assertSame($result, $controllerResult); | ||
self::assertSame($result, $this->event->getResult()); | ||
} | ||
|
||
public function testWillRefuseDispatchingInvalidRequestTypes() | ||
{ | ||
/* @var $request RequestInterface */ | ||
$request = $this->createMock(RequestInterface::class); | ||
$response = new Response(); | ||
/* @var $dispatchListener callable|\PHPUnit_Framework_MockObject_MockObject */ | ||
$dispatchListener = $this->getMockBuilder(\stdClass::class)->setMethods(['__invoke'])->getMock(); | ||
|
||
$this->eventManager->attach(MvcEvent::EVENT_DISPATCH, $dispatchListener, 100); | ||
|
||
$dispatchListener | ||
->expects(self::once()) | ||
->method('__invoke') | ||
->with(self::callback(function (MvcEvent $event) use ($request, $response) { | ||
self::assertSame($this->event, $event); | ||
self::assertSame(MvcEvent::EVENT_DISPATCH, $event->getName()); | ||
self::assertSame($this->controller, $event->getTarget()); | ||
self::assertSame($request, $event->getRequest()); | ||
self::assertSame($response, $event->getResponse()); | ||
|
||
return true; | ||
})); | ||
|
||
$this->pipe->expects(self::never())->method('process'); | ||
|
||
$this->expectException(RuntimeException::class); | ||
|
||
$this->controller->dispatch($request, $response); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not particularly proud of this, but PSR-7's immutability makes it quite acceptable to pass in a request as a prototype. Still, this class is designed as "fire once" and "internal" specifically due to this weirdness.