Merge branch 'hotfix/555-config-provider-tests' into release-3.0.0

Close #555

Author: weierophinney

CHANGELOG.md

@@ -26,6 +26,10 @@ All notable changes to this project will be documented in this file, in reverse
   missing import statement for the PSR-7 `StreamInterface` to the
   `StreamFactoryFactory`.
 
+- [#555](https://github.com/zendframework/zend-expressive/pull/555) adds tests
+  to better ensure that the entries in the `ConfigProvider` resolve to valid
+  factories, aliases, etc.
+
 ## 3.0.0alpha7 - 2018-02-14
 
 ### Added

test/ConfigProviderTest.php

@@ -18,10 +18,14 @@
 use Zend\Expressive\Middleware;
 use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\MiddlewareFactory;
+use Zend\Expressive\Router\ConfigProvider as RouterConfigProvider;
+use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
 use Zend\Expressive\ServerRequestFactory;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
+use Zend\ServiceManager\Config;
+use Zend\ServiceManager\ServiceManager;
 use Zend\Stratigility\Middleware\ErrorHandler;
 
 use const Zend\Expressive\DEFAULT_DELEGATE;
@@ -40,6 +44,9 @@
 
 class ConfigProviderTest extends TestCase
 {
+    /** @var ConfigProvider */
+    private $provider;
+
     public function setUp()
     {
         $this->provider = new ConfigProvider();
@@ -88,4 +95,54 @@ public function testInvocationReturnsArrayWithDependencies()
         $this->assertArrayHasKey('aliases', $config['dependencies']);
         $this->assertArrayHasKey('factories', $config['dependencies']);
     }
+
+    public function testServicesDefinedInConfigProvider()
+    {
+        $config = ($this->provider)();
+
+        $json = json_decode(
+            file_get_contents(__DIR__ . '/../composer.lock'),
+            true
+        );
+        foreach ($json['packages'] as $package) {
+            if (isset($package['extra']['zf']['config-provider'])) {
+                $configProvider = new $package['extra']['zf']['config-provider']();
+                $config = array_merge_recursive($config, $configProvider());
+            }
+        }
+
+        $routerInterface = $this->prophesize(RouterInterface::class)->reveal();
+        $config['dependencies']['services'][RouterInterface::class] = $routerInterface;
+        $container = $this->getContainer($config['dependencies']);
+
+        $dependencies = $this->provider->getDependencies();
+        foreach ($dependencies['factories'] as $name => $factory) {
+            $this->assertTrue($container->has($name), sprintf('Container does not contain service %s', $name));
+            $this->assertInternalType(
+                'object',
+                $container->get($name),
+                sprintf('Cannot get service %s from container using factory %s', $name, $factory)
+            );
+        }
+
+        foreach ($dependencies['aliases'] as $alias => $dependency) {
+            $this->assertTrue(
+                $container->has($alias),
+                sprintf('Container does not contain service with alias %s', $alias)
+            );
+            $this->assertInternalType(
+                'object',
+                $container->get($alias),
+                sprintf('Cannot get service %s using alias %s', $dependency, $alias)
+            );
+        }
+    }
+
+    private function getContainer(array $dependencies) : ServiceManager
+    {
+        $container = new ServiceManager();
+        (new Config($dependencies))->configureServiceManager($container);
+
+        return $container;
+    }
 }