Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 9dad06b

Browse files
committed
Convert the Reponse interfaces to "Virtual" classes
Their FQCNs do not resolve to actual classes/interfaces. As discussed with and requested by @weierophinney
1 parent f86b8d0 commit 9dad06b

File tree

7 files changed

+6
-39
lines changed

7 files changed

+6
-39
lines changed

src/Container/NotFoundMiddlewareFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
use Psr\Container\ContainerInterface;
1313
use Zend\Expressive\Middleware\NotFoundMiddleware;
14-
use Zend\Expressive\Response\NotFoundResponseInterface;
14+
use Zend\Expressive\NotFoundResponseInterface;
1515
use Zend\Expressive\Template\TemplateRendererInterface;
1616

1717
class NotFoundMiddlewareFactory

src/Container/RouteMiddlewareFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
namespace Zend\Expressive\Container;
1111

1212
use Psr\Container\ContainerInterface;
13-
use Zend\Expressive\Response\RouterResponseInterface;
1413
use Zend\Expressive\Router\PathBasedRoutingMiddleware;
1514
use Zend\Expressive\Router\RouterInterface;
15+
use Zend\Expressive\RouterResponseInterface;
1616

1717
class RouteMiddlewareFactory
1818
{

src/Response/NotFoundResponseInterface.php

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Response/RouterResponseInterface.php

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/ConfigProviderTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@
1010
namespace ZendTest\Expressive;
1111

1212
use PHPUnit\Framework\TestCase;
13-
use Psr\Http\Message\ResponseInterface;
1413
use Zend\Expressive\Application;
1514
use Zend\Expressive\ApplicationPipeline;
1615
use Zend\Expressive\ConfigProvider;
1716
use Zend\Expressive\Delegate\DefaultDelegate;
1817
use Zend\Expressive\Middleware;
1918
use Zend\Expressive\MiddlewareContainer;
2019
use Zend\Expressive\MiddlewareFactory;
21-
use Zend\Expressive\Response\NotFoundResponseInterface;
22-
use Zend\Expressive\Response\RouterResponseInterface;
20+
use Zend\Expressive\NotFoundResponseInterface;
2321
use Zend\Expressive\Router\DispatchMiddleware;
2422
use Zend\Expressive\Router\PathBasedRoutingMiddleware;
23+
use Zend\Expressive\RouterResponseInterface;
2524
use Zend\Expressive\ServerRequestErrorResponseGenerator;
2625
use Zend\Expressive\ServerRequestFactory;
2726
use Zend\HttpHandlerRunner\Emitter\EmitterInterface;

test/Container/NotFoundMiddlewareFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Psr\Http\Message\ResponseInterface;
1616
use Zend\Expressive\Container\NotFoundMiddlewareFactory;
1717
use Zend\Expressive\Middleware\NotFoundMiddleware;
18-
use Zend\Expressive\Response\NotFoundResponseInterface;
18+
use Zend\Expressive\NotFoundResponseInterface;
1919
use Zend\Expressive\Template\TemplateRendererInterface;
2020

2121
class NotFoundMiddlewareFactoryTest extends TestCase

test/Container/RouteMiddlewareFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
use Psr\Container\ContainerInterface;
1414
use Psr\Http\Message\ResponseInterface;
1515
use Zend\Expressive\Container\RouteMiddlewareFactory;
16-
use Zend\Expressive\Response\RouterResponseInterface;
1716
use Zend\Expressive\Router\PathBasedRoutingMiddleware;
1817
use Zend\Expressive\Router\RouterInterface;
18+
use Zend\Expressive\RouterResponseInterface;
1919

2020
class RouteMiddlewareFactoryTest extends TestCase
2121
{

0 commit comments

Comments
 (0)