Incorporate feedback for InputFilterAbstractServiceFactory

- Move v2 checks into v2-specific methods of abstract factory. - Use provided `$services` argument when lazy-instantiating filter and validator plugin managers. - For abstract factory tests, vary methods tested based on service manager version.
zendframework · Feb 18, 2016 · ec011db · ec011db
1 parent 656001c
commit ec011db
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 40 deletions.
diff --git a/src/InputFilterAbstractServiceFactory.php b/src/InputFilterAbstractServiceFactory.php
@@ -13,7 +13,6 @@
 use Zend\Filter\FilterPluginManager;
 use Zend\ServiceManager\AbstractFactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\ServiceManager\ServiceManager;
 use Zend\Validator\ValidatorPluginManager;
 
 class InputFilterAbstractServiceFactory implements AbstractFactoryInterface
@@ -23,7 +22,6 @@ class InputFilterAbstractServiceFactory implements AbstractFactoryInterface
      */
     protected $factory;
 
-
     /**
      * @param ContainerInterface      $services
      * @param string                  $rName
@@ -32,14 +30,8 @@ class InputFilterAbstractServiceFactory implements AbstractFactoryInterface
      */
     public function __invoke(ContainerInterface $services, $rName, array  $options = null)
     {
-        // v2 - get parent service manager
-        if (! method_exists($services, 'configure')) {
-            $services = $services->getServiceLocator();
-        }
-
         $allConfig = $services->get('config');
         $config    = $allConfig['input_filter_specs'][$rName];
-
         $factory   = $this->getInputFilterFactory($services);
 
         return $factory->createInputFilter($config);
@@ -54,11 +46,6 @@ public function __invoke(ContainerInterface $services, $rName, array  $options =
      */
     public function canCreate(ContainerInterface $services, $rName)
     {
-        // v2 - get parent service manager
-        if (! method_exists($services, 'configure')) {
-            $services = $services->getServiceLocator();
-        }
-
         if (! $services->has('config')) {
             return false;
         }
@@ -83,7 +70,15 @@ public function canCreate(ContainerInterface $services, $rName)
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return $this->canCreate($serviceLocator, $requestedName);
+        // v2 => need to get parent service locator
+        $services = $serviceLocator->getServiceLocator();
+
+        // No parent locator => cannot create service.
+        if (! $services) {
+            return false;
+        }
+
+        return $this->canCreate($services, $requestedName);
     }
 
     /**
@@ -94,7 +89,15 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      */
     public function createServiceWithName(ServiceLocatorInterface $inputFilters, $cName, $rName)
     {
-        return $this($inputFilters, $rName);
+        // v2 => need to get parent service locator
+        $services = $inputFilters->getServiceLocator();
+
+        // No parent locator => cannot create service.
+        if (! $services) {
+            return false;
+        }
+
+        return $this($services, $rName);
     }
 
     /**
@@ -128,7 +131,7 @@ protected function getFilterPluginManager(ServiceLocatorInterface $services)
             return $services->get('FilterManager');
         }
 
-        return new FilterPluginManager(new ServiceManager());
+        return new FilterPluginManager($services);
     }
 
     /**
@@ -141,6 +144,6 @@ protected function getValidatorPluginManager(ServiceLocatorInterface $services)
             return $services->get('ValidatorManager');
         }
 
-        return new ValidatorPluginManager(new ServiceManager());
+        return new ValidatorPluginManager($services);
     }
 }
diff --git a/test/InputFilterAbstractServiceFactoryTest.php b/test/InputFilterAbstractServiceFactoryTest.php
@@ -24,13 +24,19 @@
  */
 class InputFilterAbstractServiceFactoryTest extends TestCase
 {
-    /** @var ServiceManager */
+    /**
+     * @var ServiceManager
+    */
     protected $services;
 
-    /** @var InputFilterPluginManager */
+    /**
+     * @var InputFilterPluginManager
+    */
     protected $filters;
 
-    /** @var InputFilterAbstractServiceFactory */
+    /**
+     * @var InputFilterAbstractServiceFactory
+     */
     protected $factory;
 
     public function setUp()
@@ -44,27 +50,48 @@ public function setUp()
 
     public function testCannotCreateServiceIfNoConfigServicePresent()
     {
-        $this->assertFalse($this->factory->canCreate($this->getCompatContainer(), 'filter'));
-        // v2
-        $this->assertFalse($this->factory->canCreateServiceWithName($this->getCompatContainer(), 'filter', 'filter'));
+        if (method_exists($this->services, 'configure')) {
+            // v3
+            $method = 'canCreate';
+            $args = [$this->getCompatContainer(), 'filter'];
+        } else {
+            // v2
+            $method = 'canCreateServiceWithName';
+            $args = [$this->getCompatContainer(), 'filter', 'filter'];
+        }
+        $this->assertFalse(call_user_func_array([$this->factory, $method], $args));
     }
 
     public function testCannotCreateServiceIfConfigServiceDoesNotHaveInputFiltersConfiguration()
     {
         $this->services->setService('config', []);
-        $this->assertFalse($this->factory->canCreate($this->getCompatContainer(), 'filter'));
-        // v2
-        $this->assertFalse($this->factory->canCreateServiceWithName($this->getCompatContainer(), 'filter', 'filter'));
+        if (method_exists($this->services, 'configure')) {
+            // v3
+            $method = 'canCreate';
+            $args = [$this->getCompatContainer(), 'filter'];
+        } else {
+            // v2
+            $method = 'canCreateServiceWithName';
+            $args = [$this->getCompatContainer(), 'filter', 'filter'];
+        }
+        $this->assertFalse(call_user_func_array([$this->factory, $method], $args));
     }
 
     public function testCannotCreateServiceIfConfigInputFiltersDoesNotContainMatchingServiceName()
     {
         $this->services->setService('config', [
             'input_filter_specs' => [],
         ]);
-        $this->assertFalse($this->factory->canCreate($this->getCompatContainer(), 'filter'));
-        // v2
-        $this->assertFalse($this->factory->canCreateServiceWithName($this->getCompatContainer(), 'filter', 'filter'));
+        if (method_exists($this->services, 'configure')) {
+            // v3
+            $method = 'canCreate';
+            $args = [$this->getCompatContainer(), 'filter'];
+        } else {
+            // v2
+            $method = 'canCreateServiceWithName';
+            $args = [$this->getCompatContainer(), 'filter', 'filter'];
+        }
+        $this->assertFalse(call_user_func_array([$this->factory, $method], $args));
     }
 
     public function testCanCreateServiceIfConfigInputFiltersContainsMatchingServiceName()
@@ -74,9 +101,16 @@ public function testCanCreateServiceIfConfigInputFiltersContainsMatchingServiceN
                 'filter' => [],
             ],
         ]);
-        $this->assertTrue($this->factory->canCreate($this->getCompatContainer(), 'filter'));
-        // v2
-        $this->assertTrue($this->factory->canCreateServiceWithName($this->getCompatContainer(), 'filter', 'filter'));
+        if (method_exists($this->services, 'configure')) {
+            // v3
+            $method = 'canCreate';
+            $args = [$this->getCompatContainer(), 'filter'];
+        } else {
+            // v2
+            $method = 'canCreateServiceWithName';
+            $args = [$this->getCompatContainer(), 'filter', 'filter'];
+        }
+        $this->assertTrue(call_user_func_array([$this->factory, $method], $args));
     }
 
     public function testCreatesInputFilterInstance()
@@ -86,11 +120,17 @@ public function testCreatesInputFilterInstance()
                 'filter' => [],
             ],
         ]);
-        $filter = $this->factory->__invoke($this->getCompatContainer(), 'filter');
+        if (method_exists($this->services, 'configure')) {
+            // v3
+            $method = '__invoke';
+            $args = [$this->getCompatContainer(), 'filter'];
+        } else {
+            // v2
+            $method = 'createServiceWithName';
+            $args = [$this->getCompatContainer(), 'filter', 'filter'];
+        }
+        $filter = call_user_func_array([$this->factory, $method], $args);
         $this->assertInstanceOf(InputFilterInterface::class, $filter);
-        // v2
-        $v2filter = $this->factory->createServiceWithName($this->getCompatContainer(), 'filter', 'filter');
-        $this->assertEquals($filter, $v2filter);
     }
 
     /**
@@ -128,11 +168,17 @@ public function testUsesConfiguredValidationAndFilterManagerServicesWhenCreating
         ]);
 
 
-        $inputFilter = $this->factory->__invoke($this->getCompatContainer(), 'filter');
+        if (method_exists($this->services, 'configure')) {
+            // v3
+            $method = '__invoke';
+            $args = [$this->getCompatContainer(), 'filter'];
+        } else {
+            // v2
+            $method = 'createServiceWithName';
+            $args = [$this->getCompatContainer(), 'filter', 'filter'];
+        }
+        $inputFilter = call_user_func_array([$this->factory, $method], $args);
         $this->assertTrue($inputFilter->has('input'));
-        // v2
-        $v2InputFilter = $this->factory->createServiceWithName($this->getCompatContainer(), 'filter', 'filter');
-        $this->assertEquals($inputFilter, $v2InputFilter);
 
         $input = $inputFilter->get('input');