Feedbacks

hinikato · Apr 26, 2013 · ee439e3 · ee439e3
1 parent f8f2892
commit ee439e3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
@@ -35,7 +35,7 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
     public function init()
     {
     }
-    
+
     /**
      * Countable: number of inputs in this input filter
      *

diff --git a/library/Zend/InputFilter/InputFilterPluginManager.php b/library/Zend/InputFilter/InputFilterPluginManager.php
@@ -12,6 +12,7 @@
 use Zend\InputFilter\Exception;
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\Stdlib\InitializableInterface;
 
 /**
@@ -36,7 +37,7 @@ public function __construct(ConfigInterface $configuration = null)
      */
     public function populateFactory($element)
     {
-        if ($element instanceof InputFilter) {
+        if ($element instanceof InputFilter && $this->serviceLocator instanceof ServiceLocatorInterface) {
             $factory = $element->getFactory();
             $factory->getDefaultFilterChain()->setPluginManager($this->serviceLocator->get('FilterManager'));
             $factory->getDefaultValidatorChain()->setPluginManager($this->serviceLocator->get('ValidatorManager'));
@@ -48,12 +49,12 @@ public function populateFactory($element)
      */
     public function validatePlugin($plugin)
     {
-        // Hook to perform various initialization, when the element is not created through the factory
-        if ($plugin instanceof InitializableInterface) {
-            $plugin->init();
-        }
-
         if ($plugin instanceof InputFilterInterface) {
+            // Hook to perform various initialization, when the element is not created through the factory
+            if ($plugin instanceof InitializableInterface) {
+                $plugin->init();
+            }
+
             // we're okay
             return;
         }

diff --git a/tests/ZendTest/InputFilter/InputFilterManagerTest.php b/tests/ZendTest/InputFilter/InputFilterManagerTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Form
  */
 
 namespace ZendTest\InputFilter;
@@ -14,8 +13,7 @@
 use Zend\InputFilter\InputFilterPluginManager;
 
 /**
- * @category   Zend
- * @group      Zend_Stdlib
+ * @group Zend_Stdlib
  */
 class InputFilterManagerTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/ZendTest/Stdlib/Hydrator/HydratorManagerTest.php b/tests/ZendTest/Stdlib/Hydrator/HydratorManagerTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Form
  */
 
 namespace ZendTest\Stdlib\Hydrator;
@@ -14,8 +13,7 @@
 use Zend\Stdlib\Hydrator\HydratorPluginManager;
 
 /**
- * @category   Zend
- * @group      Zend_Stdlib
+ * @group Zend_Stdlib
  */
 class HydratorManagerTest extends \PHPUnit_Framework_TestCase
 {
-Original file line number
+Diff line change
@@ Expand Up @@
         public function init()
         {
         }
         /**
          * Countable: number of inputs in this input filter
          *
@@ Expand Down @@