Allow to test zend-expressive v2

Author: snapshotpl

composer.json

@@ -22,8 +22,8 @@
         "phpunit/phpunit": "^5.7.19",
         "mikey179/vfsStream": "^1.6",
         "slim/slim": "^3.0",
-        "zendframework/zend-expressive": "^1.0",
-        "zendframework/zend-expressive-fastroute": "^1.0",
+        "zendframework/zend-expressive": "^1.0 || ^2.0",
+        "zendframework/zend-expressive-fastroute": "^1.0 || ^2.0",
         "zendframework/zend-servicemanager": "^3.0"
     },
     "autoload": {

test/ZendExpressiveTest.php

@@ -4,24 +4,15 @@
 
 use Interop\Container\ContainerInterface;
 use PhpMiddleware\PhpDebugBar\ConfigProvider;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response\EmitterInterface;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Expressive\Container\ApplicationFactory;
 use Zend\ServiceManager\ServiceManager;
-use Zend\Stratigility\Http\ResponseInterface;
 
 final class ZendExpressiveTest extends AbstractMiddlewareRunnerTest
 {
-    private $testEmitter;
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->testEmitter = new TestEmitter();
-    }
-
     final public function testContainsConfigCollectorOutput()
     {
         $response = $this->dispatchApplication([
@@ -58,7 +49,7 @@ protected function dispatchApplication(array $server, array $pipe = [])
 
         $app->run($serverRequest);
 
-        return $this->testEmitter->getResponse();
+        return $container->get(EmitterInterface::class)->getResponse();
     }
 
     /**
@@ -71,7 +62,7 @@ private function createContainer()
 
         $serviceManagerConfig = $config['dependencies'];
         $serviceManagerConfig['services']['config'] = $config;
-        $serviceManagerConfig['services'][EmitterInterface::class] = $this->testEmitter;
+        $serviceManagerConfig['services'][EmitterInterface::class] = new TestEmitter();
 
         return new ServiceManager($serviceManagerConfig);
     }