From 98c6d39572479f20d6c98df0f8fc00a805a6e2c4 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 1 May 2017 20:24:30 +0200 Subject: [PATCH] Removing test that specifies that allowing anything as the return type of a middleware is OK This is likely going to land into a separate dispatch listener instead --- test/MiddlewareListenerTest.php | 71 --------------------------------- 1 file changed, 71 deletions(-) diff --git a/test/MiddlewareListenerTest.php b/test/MiddlewareListenerTest.php index af77a52e2..dc643f8e7 100644 --- a/test/MiddlewareListenerTest.php +++ b/test/MiddlewareListenerTest.php @@ -10,7 +10,6 @@ namespace ZendTest\Mvc; use Interop\Container\ContainerInterface; -use Interop\Http\ServerMiddleware\DelegateInterface; use Interop\Http\ServerMiddleware\MiddlewareInterface; use PHPUnit\Framework\TestCase; use Psr\Http\Message\ResponseInterface; @@ -398,76 +397,6 @@ public function testValidMiddlewareDispatchCancelsPreviousDispatchFailures() self::assertEmpty($event->getError(), 'Previously set MVC errors are canceled by a successful dispatch'); } - /** - * @dataProvider possibleMiddlewareNonPsr7ResponseReturnValues - * - * @param mixed $middlewareResult - */ - public function testMiddlewareDispatchWillRetrieveAnyCallableReturnValue($middlewareResult) - { - $middlewareName = uniqid('middleware', true); - $routeMatch = new RouteMatch(['middleware' => $middlewareName]); - /* @var $application Application|\PHPUnit_Framework_MockObject_MockObject */ - $application = $this->createMock(Application::class); - $eventManager = new EventManager(); - $middleware = $this->getMockBuilder(\stdClass::class)->setMethods(['__invoke'])->getMock(); - $serviceManager = new ServiceManager([ - 'factories' => [ - 'EventManager' => function () { - return new EventManager(); - }, - ], - 'services' => [ - $middlewareName => $middleware, - ], - ]); - - $application->expects(self::any())->method('getRequest')->willReturn(new Request()); - $application->expects(self::any())->method('getEventManager')->willReturn($eventManager); - $application->expects(self::any())->method('getServiceManager')->willReturn($serviceManager); - $application->expects(self::any())->method('getResponse')->willReturn(new Response()); - $middleware->expects(self::once())->method('__invoke')->willReturn($middlewareResult); - - $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, function ($e) { - self::fail('No dispatch error should have been raised'); - }); - - $event = new MvcEvent(); - - $event->setRequest(new Request()); - $event->setApplication($application); - $event->setError(Application::ERROR_CONTROLLER_CANNOT_DISPATCH); - $event->setRouteMatch($routeMatch); - - $listener = new MiddlewareListener(); - $result = $listener->onDispatch($event); - - self::assertSame($middlewareResult, $result); - self::assertSame($middlewareResult, $event->getResult()); - self::assertEmpty($event->getError(), 'No errors raised when the return type is unknown'); - } - - /** - * @return mixed[][] - */ - public function possibleMiddlewareNonPsr7ResponseReturnValues() - { - return [ - [123], - [true], - [false], - [[]], - [new \stdClass()], - [$this], - [$this->createMock(ModelInterface::class)], - [$this->createMock(Response::class)], - [['view model data' => 'as an array']], - [['foo' => new \stdClass()]], - ['a response string'], - ]; - } - - public function testValidMiddlewareFiresDispatchableInterfaceEventListeners() { $middlewareName = uniqid('middleware', true);