Merge branch 'hotfix/zendframework/zendframework#6505-fix-null-pointe…

…r-in-inputfilter-factory' into develop Forward port zendframework/zendframework#6505
zendframework · Aug 6, 2014 · 7431896 · 7431896
5 parents 14ea016 + 0f3cda8 + 3b2126c + 51c8f86 + 18c51d2
commit 7431896
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Factory.php b/src/Factory.php
@@ -39,12 +39,12 @@ class Factory
      */
     public function __construct(InputFilterPluginManager $inputFilterManager = null)
     {
+        $this->defaultFilterChain    = new FilterChain();
+        $this->defaultValidatorChain = new ValidatorChain();
+
         if ($inputFilterManager) {
             $this->setInputFilterManager($inputFilterManager);
         }
-
-        $this->defaultFilterChain    = new FilterChain();
-        $this->defaultValidatorChain = new ValidatorChain();
     }
 
     /**

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -570,6 +570,13 @@ public function testSetInputFilterManagerWithoutServiceManager()
         $this->assertSame($inputFilterManager, $factory->getInputFilterManager());
     }
 
+    public function testSetInputFilterManagerOnConstruct()
+    {
+        $inputFilterManager = new InputFilterPluginManager();
+        $factory = new Factory($inputFilterManager);
+        $this->assertSame($inputFilterManager, $factory->getInputFilterManager());
+    }
+
     /**
      * @group 5691
      *