Merge branch 'hotfix/hydrators-service-config' into develop

Forward port #59

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#59](https://github.com/zendframework/zend-hydrator/pull/59) fixes how the
+  `HydratorPluginManagerFactory` factory initializes the plugin manager
+  instance, ensuring it is injecting the relevant configuration from the
+  `config` service and thus seeding it with configured hydrator services. This
+  means that the `hydrators` configuration will now be honored in non-zend-mvc
+  contexts.
 
 ## 2.2.1 - 2016-04-18
 

src/HydratorPluginManagerFactory.php

@@ -8,6 +8,7 @@
 namespace Zend\Hydrator;
 
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Config;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
@@ -27,7 +28,30 @@ class HydratorPluginManagerFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $name, array $options = null)
     {
-        return new HydratorPluginManager($container, $options ?: []);
+        $pluginManager = new HydratorPluginManager($container, $options ?: []);
+
+        // If this is in a zend-mvc application, the ServiceListener will inject
+        // merged configuration during bootstrap.
+        if ($container->has('ServiceListener')) {
+            return $pluginManager;
+        }
+
+        // If we do not have a config service, nothing more to do
+        if (! $container->has('config')) {
+            return $pluginManager;
+        }
+
+        $config = $container->get('config');
+
+        // If we do not have hydrators configuration, nothing more to do
+        if (! isset($config['hydrators']) || ! is_array($config['hydrators'])) {
+            return $pluginManager;
+        }
+
+        // Wire service configuration for hydrators
+        (new Config($config['hydrators']))->configureServiceManager($pluginManager);
+
+        return $pluginManager;
     }
 
     /**

test/HydratorPluginManagerFactoryTest.php

@@ -12,6 +12,7 @@
 use Zend\Hydrator\HydratorInterface;
 use Zend\Hydrator\HydratorPluginManager;
 use Zend\Hydrator\HydratorPluginManagerFactory;
+use Zend\Hydrator\Reflection;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 class HydratorPluginManagerFactoryTest extends TestCase
@@ -70,4 +71,99 @@ public function testFactoryConfiguresPluginManagerUnderServiceManagerV2()
         $hydrators = $factory->createService($container->reveal());
         $this->assertSame($hydrator, $hydrators->get('test'));
     }
+
+    public function testConfiguresHydratorServicesWhenFound()
+    {
+        $hydrator = $this->prophesize(HydratorInterface::class)->reveal();
+        $config = [
+            'hydrators' => [
+                'aliases' => [
+                    'test' => Reflection::class,
+                ],
+                'factories' => [
+                    'test-too' => function ($container) use ($hydrator) {
+                        return $hydrator;
+                    },
+                ],
+            ],
+        ];
+
+        $container = $this->prophesize(ServiceLocatorInterface::class);
+        $container->willImplement(ContainerInterface::class);
+
+        $container->has('ServiceListener')->willReturn(false);
+        $container->has('config')->willReturn(true);
+        $container->get('config')->willReturn($config);
+
+        $factory = new HydratorPluginManagerFactory();
+        $hydrators = $factory($container->reveal(), 'HydratorManager');
+
+        $this->assertInstanceOf(HydratorPluginManager::class, $hydrators);
+        $this->assertTrue($hydrators->has('test'));
+        $this->assertInstanceOf(Reflection::class, $hydrators->get('test'));
+        $this->assertTrue($hydrators->has('test-too'));
+        $this->assertSame($hydrator, $hydrators->get('test-too'));
+    }
+
+    public function testDoesNotConfigureHydratorServicesWhenServiceListenerPresent()
+    {
+        $hydrator = $this->prophesize(HydratorInterface::class)->reveal();
+        $config = [
+            'hydrators' => [
+                'aliases' => [
+                    'test' => Reflection::class,
+                ],
+                'factories' => [
+                    'test-too' => function ($container) use ($hydrator) {
+                        return $hydrator;
+                    },
+                ],
+            ],
+        ];
+
+        $container = $this->prophesize(ServiceLocatorInterface::class);
+        $container->willImplement(ContainerInterface::class);
+
+        $container->has('ServiceListener')->willReturn(true);
+        $container->has('config')->shouldNotBeCalled();
+        $container->get('config')->shouldNotBeCalled();
+
+        $factory = new HydratorPluginManagerFactory();
+        $hydrators = $factory($container->reveal(), 'HydratorManager');
+
+        $this->assertInstanceOf(HydratorPluginManager::class, $hydrators);
+        $this->assertFalse($hydrators->has('test'));
+        $this->assertFalse($hydrators->has('test-too'));
+    }
+
+    public function testDoesNotConfigureHydratorServicesWhenConfigServiceNotPresent()
+    {
+        $container = $this->prophesize(ServiceLocatorInterface::class);
+        $container->willImplement(ContainerInterface::class);
+
+        $container->has('ServiceListener')->willReturn(false);
+        $container->has('config')->willReturn(false);
+        $container->get('config')->shouldNotBeCalled();
+
+        $factory = new HydratorPluginManagerFactory();
+        $hydrators = $factory($container->reveal(), 'HydratorManager');
+
+        $this->assertInstanceOf(HydratorPluginManager::class, $hydrators);
+    }
+
+    public function testDoesNotConfigureHydratorServicesWhenConfigServiceDoesNotContainHydratorsConfig()
+    {
+        $container = $this->prophesize(ServiceLocatorInterface::class);
+        $container->willImplement(ContainerInterface::class);
+
+        $container->has('ServiceListener')->willReturn(false);
+        $container->has('config')->willReturn(true);
+        $container->get('config')->willReturn(['foo' => 'bar']);
+
+        $factory = new HydratorPluginManagerFactory();
+        $hydrators = $factory($container->reveal(), 'HydratorManager');
+
+        $this->assertInstanceOf(HydratorPluginManager::class, $hydrators);
+        $this->assertFalse($hydrators->has('foo'));
+    }
 }