Merge pull request #40 from TomHAnderson/hotfix/customHydrator

Allow abstract factory for custom hydrator

composer.json

@@ -21,7 +21,7 @@
   "require": {
     "php": "^5.6 || ^7.0",
     "doctrine/common": "^2.6.1",
-    "zendframework/zend-servicemanager": "^2.7.6 || ^3.1",
+    "zendframework/zend-servicemanager": "^3.3.2",
     "zendframework/zend-hydrator": "^1.1 || ^2.2.1",
     "zendframework/zend-modulemanager": "^2.7.2",
     "api-skeletons/zf-doctrine-module-zend-hydrator": "^1.0",

src/Service/DoctrineHydratorFactory.php

@@ -142,7 +142,12 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         }
 
         if ($useCustomHydrator) {
-            $extractService = $container->get($config['hydrator']);
+            try {
+                $extractService = $container->build($config['hydrator'], $config);
+            } catch (ServiceNotFoundException $e) {
+                $extractService = $container->get($config['hydrator']);
+            }
+
             $hydrateService = $extractService;
         }
 

test/src/Hydrator/CustomBuildHydratorFactory.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PhproTest\DoctrineHydrationModule\Hydrator;
+
+use Interop\Container\ContainerInterface;
+use Phpro\DoctrineHydrationModule\Hydrator\DoctrineHydrator;
+use Zend\Hydrator\ArraySerializable;
+
+final class CustomBuildHydratorFactory
+{
+    public function __invoke(
+        ContainerInterface $container,
+        $requestedName,
+        array $options = null
+    ) {
+        return new ArraySerializable();
+    }
+}

test/src/Tests/Service/DoctrineHydratorFactoryTest.php

@@ -2,6 +2,7 @@
 
 namespace PhproTest\DoctrineHydrationModule\Tests\Service;
 
+use PhproTest\DoctrineHydrationModule\Hydrator\CustomBuildHydratorFactory;
 use Phpro\DoctrineHydrationModule\Service\DoctrineHydratorFactory;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Hydrator\HydratorPluginManager;
@@ -190,6 +191,25 @@ public function it_should_be_possible_to_configure_a_custom_hydrator()
         $this->assertInstanceOf('Zend\Hydrator\ArraySerializable', $hydrator->getExtractService());
     }
 
+    /**
+     * @test
+     */
+    public function it_should_be_possible_to_configure_a_custom_hydrator_as_factory()
+    {
+        $this->serviceConfig['doctrine-hydrator']['custom-hydrator']['hydrator'] = 'custom.build.hydrator';
+        $this->serviceManager->setService('config', $this->serviceConfig);
+
+        $this->serviceManager->setFactory(
+            'custom.build.hydrator',
+            new CustomBuildHydratorFactory()
+        );
+
+        $hydrator = $this->createOrmHydrator();
+
+        $this->assertInstanceOf('Zend\Hydrator\ArraySerializable', $hydrator->getHydrateService());
+        $this->assertInstanceOf('Zend\Hydrator\ArraySerializable', $hydrator->getExtractService());
+    }
+
     /**
      * @test
      */