Merge pull request #68 from Blinden/patch_inputFilter_naming

Patch for integer indexed nested InputFilters defined in input_filter_specs

Author: weierophinney

src/Factory.php

@@ -331,6 +331,23 @@ public function createInputFilter($inputFilterSpecification)
             ) {
                 $input = $value;
             } else {
+
+                // Patch to enable nested, integer indexed input_filter_specs
+                // Check type and name are in spec
+                if (isset($value['type']) && is_string($value['type'])
+                    && isset($value['name']) && is_string($value['name'])) {
+                    // Make sure type is an InputFilter
+                    $checkType = $this->getInputFilterManager()->get($value['type']);
+                    if ($checkType instanceof InputFilter) {
+                        // Only apply when key is an integer
+                        if (is_integer($key)) {
+                            $key = $value['name'];
+                        }
+                        // Remove name from spec. InputFilter doesn't have an name property!
+                        unset($value['name']);
+                    }
+                }
+
                 $input = $this->createInput($value);
             }
 

test/FactoryTest.php

@@ -934,6 +934,75 @@ public function testInputFromPluginManagerMayBeFurtherConfiguredWithSpec()
         $this->assertSame('bar', $input->getName());
     }
 
+    public function testCreateInputFilterConfiguredNameWhenSpecIsIntegerIndexed()
+    {
+        $factory = $this->createDefaultFactory();
+        $inputFilter = $factory->createInputFilter([
+            1 => [
+                'type' => InputFilter::class,
+                'name' => 'foo',
+            ],
+        ]);
+
+        $this->assertTrue($inputFilter->has('foo'));
+    }
+
+    public function testCreateInputFilterUsesAssociatedNameMappingOverConfiguredName()
+    {
+        $factory = $this->createDefaultFactory();
+        $inputFilter = $factory->createInputFilter([
+            'foo' => [
+                'type' => InputFilter::class,
+                'name' => 'bar',
+            ],
+        ]);
+
+        $this->assertTrue($inputFilter->has('foo'));
+        $this->assertFalse($inputFilter->has('bar'));
+    }
+
+    public function testCreateInputFilterUsesConfiguredNameForNestedInputFilters()
+    {
+        $factory = $this->createDefaultFactory();
+        $inputFilter = $factory->createInputFilter([
+            0 => [
+                'type' => InputFilter::class,
+                'name' => 'bar',
+                '0' => [
+                    'name' => 'bat',
+                ],
+                '1' => [
+                    'name' => 'baz',
+                ],
+            ],
+            1 => [
+                'type' => CollectionInputFilter::class,
+                'name' => 'foo',
+                'input_filter' => [
+                    '0' => [
+                        'name' => 'bat',
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertInstanceOf(InputFilter::class, $inputFilter);
+        $this->assertEquals(2, count($inputFilter));
+
+        $nestedInputFilter = $inputFilter->get('bar');
+        $this->assertInstanceOf(InputFilter::class, $nestedInputFilter);
+        $this->assertEquals(2, count($nestedInputFilter));
+        $this->assertTrue($nestedInputFilter->has('bat'));
+        $this->assertTrue($nestedInputFilter->has('baz'));
+
+        $collection = $inputFilter->get('foo');
+        $this->assertInstanceOf(CollectionInputFilter::class, $collection);
+        $collectionInputFilter = $collection->getInputFilter();
+        $this->assertInstanceOf(InputFilter::class, $collectionInputFilter);
+        $this->assertEquals(1, count($collectionInputFilter));
+        $this->assertTrue($collectionInputFilter->has('bat'));
+    }
+
     /**
      * @return Factory
      */

test/InputFilterAbstractServiceFactoryTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Zend Framework (http://framework.zend.com/)
  *
@@ -26,7 +27,7 @@ class InputFilterAbstractServiceFactoryTest extends TestCase
 {
     /**
      * @var ServiceManager
-    */
+     */
     protected $services;
 
     /**