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

Forward port #137

Author: weierophinney

CHANGELOG.md

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

src/InputFilterPluginManagerFactory.php

@@ -8,6 +8,7 @@
 namespace Zend\InputFilter;
 
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Config;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
@@ -27,7 +28,30 @@ class InputFilterPluginManagerFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $name, array $options = null)
     {
-        return new InputFilterPluginManager($container, $options ?: []);
+        $pluginManager = new InputFilterPluginManager($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 input_filters configuration, nothing more to do
+        if (! isset($config['input_filters']) || ! is_array($config['input_filters'])) {
+            return $pluginManager;
+        }
+
+        // Wire service configuration for input_filters
+        (new Config($config['input_filters']))->configureServiceManager($pluginManager);
+
+        return $pluginManager;
     }
 
     /**

test/InputFilterPluginManagerFactoryTest.php

@@ -81,4 +81,99 @@ public function testFactoryConfiguresPluginManagerUnderServiceManagerV2($pluginT
         $filters = $factory->createService($container->reveal());
         $this->assertSame($plugin, $filters->get('test'));
     }
+
+    public function testConfiguresInputFilterServicesWhenFound()
+    {
+        $inputFilter = $this->prophesize(InputFilterInterface::class)->reveal();
+        $config = [
+            'input_filters' => [
+                'aliases' => [
+                    'test' => 'test-too',
+                ],
+                'factories' => [
+                    'test-too' => function ($container) use ($inputFilter) {
+                        return $inputFilter;
+                    },
+                ],
+            ],
+        ];
+
+        $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 InputFilterPluginManagerFactory();
+        $inputFilters = $factory($container->reveal(), 'InputFilterManager');
+
+        $this->assertInstanceOf(InputFilterPluginManager::class, $inputFilters);
+        $this->assertTrue($inputFilters->has('test'));
+        $this->assertSame($inputFilter, $inputFilters->get('test'));
+        $this->assertTrue($inputFilters->has('test-too'));
+        $this->assertSame($inputFilter, $inputFilters->get('test-too'));
+    }
+
+    public function testDoesNotConfigureInputFilterServicesWhenServiceListenerPresent()
+    {
+        $inputFilter = $this->prophesize(InputFilterInterface::class)->reveal();
+        $config = [
+            'input_filters' => [
+                'aliases' => [
+                    'test' => 'test-too',
+                ],
+                'factories' => [
+                    'test-too' => function ($container) use ($inputFilter) {
+                        return $inputFilter;
+                    },
+                ],
+            ],
+        ];
+
+        $container = $this->prophesize(ServiceLocatorInterface::class);
+        $container->willImplement(ContainerInterface::class);
+
+        $container->has('ServiceListener')->willReturn(true);
+        $container->has('config')->shouldNotBeCalled();
+        $container->get('config')->shouldNotBeCalled();
+
+        $factory = new InputFilterPluginManagerFactory();
+        $inputFilters = $factory($container->reveal(), 'InputFilterManager');
+
+        $this->assertInstanceOf(InputFilterPluginManager::class, $inputFilters);
+        $this->assertFalse($inputFilters->has('test'));
+        $this->assertFalse($inputFilters->has('test-too'));
+    }
+
+    public function testDoesNotConfigureInputFilterServicesWhenConfigServiceNotPresent()
+    {
+        $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 InputFilterPluginManagerFactory();
+        $inputFilters = $factory($container->reveal(), 'InputFilterManager');
+
+        $this->assertInstanceOf(InputFilterPluginManager::class, $inputFilters);
+    }
+
+    public function testDoesNotConfigureInputFilterServicesWhenConfigServiceDoesNotContainInputFiltersConfig()
+    {
+        $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 InputFilterPluginManagerFactory();
+        $inputFilters = $factory($container->reveal(), 'InputFilterManager');
+
+        $this->assertInstanceOf(InputFilterPluginManager::class, $inputFilters);
+        $this->assertFalse($inputFilters->has('foo'));
+    }
 }