Merge branch 'hotfix/24' into develop

Forward port #24

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,11 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#24](https://github.com/zendframework/zend-form/pull/24) ensures that when
+  `Zend\Form\Form::getInputFilter()` when lazy-creates an `InputFilter`
+  instance, it is populated with the `InputFilterFactory` present in its own
+  `FormFactory`. This ensures that any custom inputs, input filters, validators,
+  or filters are available to the new instance.
 
 ## 2.7.0 - 2016-02-22
 

src/Form.php

@@ -679,6 +679,7 @@ public function getInputFilter()
                 $name = $this->baseFieldset->getName();
                 if (!$this->filter instanceof InputFilterInterface || !$this->filter->has($name)) {
                     $filter = new InputFilter();
+                    $filter->setFactory($this->getFormFactory()->getInputFilterFactory());
                     $filter->add($this->object->getInputFilter(), $name);
                     $this->filter = $filter;
                 }
@@ -687,6 +688,7 @@ public function getInputFilter()
 
         if (!isset($this->filter)) {
             $this->filter = new InputFilter();
+            $this->filter->setFactory($this->getFormFactory()->getInputFilterFactory());
         }
 
         if (!$this->hasAddedInputFilterDefaults

test/FormTest.php

@@ -2135,4 +2135,27 @@ public function testSetValidationGroupOnFormWithNestedCollectionsPopulatesOnlyFi
 
         $this->assertEquals($data, $this->form->getData());
     }
+
+    /**
+     * Test for https://github.com/zendframework/zend-form/pull/24#issue-119023527
+     */
+    public function testGetInputFilterInjectsFormInputFilterFactoryInstanceObjectIsNull()
+    {
+        $inputFilterFactory = $this->form->getFormFactory()->getInputFilterFactory();
+        $inputFilter = $this->form->getInputFilter();
+        $this->assertSame($inputFilterFactory, $inputFilter->getFactory());
+    }
+
+    /**
+     * Test for https://github.com/zendframework/zend-form/pull/24#issuecomment-159905491
+     */
+    public function testGetInputFilterInjectsFormInputFilterFactoryInstanceWhenObjectIsInputFilterAware()
+    {
+        $this->form->setBaseFieldset(new Fieldset());
+        $this->form->setHydrator(new Hydrator\ClassMethods());
+        $this->form->bind(new TestAsset\Entity\Cat());
+        $inputFilterFactory = $this->form->getFormFactory()->getInputFilterFactory();
+        $inputFilter = $this->form->getInputFilter();
+        $this->assertSame($inputFilterFactory, $inputFilter->getFactory());
+    }
 }

test/TestAsset/Entity/Cat.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Form\TestAsset\Entity;
+
+use Zend\InputFilter\InputFilter;
+use Zend\InputFilter\InputFilterInterface;
+use Zend\InputFilter\InputFilterAwareInterface;
+
+class Cat implements InputFilterAwareInterface
+{
+    /**
+     * @var string
+     */
+    protected $name = null;
+
+    /**
+     * @var InputFilterInterface
+     */
+    protected $inputFilter = null;
+
+    /**
+     * @param string $name
+     * @return Cat
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set input filter
+     *
+     * @param  InputFilterInterface $inputFilter
+     * @return Cat
+     */
+    public function setInputFilter(InputFilterInterface $inputFilter)
+    {
+        $this->inputFilter = $inputFilter;
+        return $this;
+    }
+
+    /**
+     * Retrieve input filter
+     *
+     * @return InputFilterInterface
+     */
+    public function getInputFilter()
+    {
+        if (null === $this->inputFilter) {
+            $this->inputFilter = new InputFilter();
+        }
+        return $this->inputFilter;
+    }
+}