Add various plugin manager

library/Zend/InputFilter/BaseInputFilter.php

@@ -12,19 +12,30 @@
 use ArrayAccess;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\InitializableInterface;
 
 /**
  * @todo       How should we deal with required input when data is missing?
  *             should a message be returned? if so, what message?
  */
-class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInterface
+class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInterface, InitializableInterface
 {
     protected $data;
     protected $inputs = array();
     protected $invalidInputs;
     protected $validationGroup;
     protected $validInputs;
 
+    /**
+     * This function is automatically called when creating element with factory. It
+     * allows to perform various operations (add elements...)
+     *
+     * @return void
+     */
+    public function init()
+    {
+    }
+
     /**
      * Countable: number of inputs in this input filter
      *
@@ -469,6 +480,7 @@ public function getMessages()
         foreach ($this->getInvalidInput() as $name => $input) {
             $messages[$name] = $input->getMessages();
         }
+
         return $messages;
     }
 

library/Zend/InputFilter/Factory.php

@@ -20,6 +20,12 @@ class Factory
     protected $defaultFilterChain;
     protected $defaultValidatorChain;
 
+    public function __construct()
+    {
+        $this->defaultFilterChain    = new FilterChain();
+        $this->defaultValidatorChain = new ValidatorChain();
+    }
+
     /**
      * Set default filter chain to use
      *

library/Zend/InputFilter/InputFilterPluginManager.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
+namespace Zend\InputFilter;
+
+use Zend\InputFilter\Exception;
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Stdlib\InitializableInterface;
+
+/**
+ * Plugin manager implementation for input filters.
+ */
+class InputFilterPluginManager extends AbstractPluginManager
+{
+    /**
+     * @param ConfigInterface $configuration
+     */
+    public function __construct(ConfigInterface $configuration = null)
+    {
+        parent::__construct($configuration);
+
+        $this->addInitializer(array($this, 'populateFactory'));
+    }
+
+    /**
+     * Populate the factory with filter chain and validator chain
+     *
+     * @param $element
+     */
+    public function populateFactory($element)
+    {
+        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'));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validatePlugin($plugin)
+    {
+        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;
+        }
+
+        throw new Exception\RuntimeException(sprintf(
+            'Plugin of type %s is invalid; must implement Zend\InputFilter\InputFilterInterface',
+            (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+        ));
+    }
+}

library/Zend/InputFilter/composer.json

@@ -18,6 +18,9 @@
         "zendframework/zend-validator": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },
+    "suggest": {
+        "zendframework/zend-servicemanager": "To support plugin manager support"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.1-dev",

library/Zend/ModuleManager/Feature/HydratorProviderInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface HydratorProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getHydratorConfig();
+}

library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface InputFilterProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getInputFilterConfig();
+}

library/Zend/Mvc/Service/HydratorManagerFactory.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class HydratorManagerFactory extends AbstractPluginManagerFactory
+{
+    const PLUGIN_MANAGER_CLASS = 'Zend\Stdlib\Hydrator\HydratorPluginManager';
+}

library/Zend/Mvc/Service/InputFilterManagerFactory.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class InputFilterManagerFactory extends AbstractPluginManagerFactory
+{
+    const PLUGIN_MANAGER_CLASS = 'Zend\InputFilter\InputFilterPluginManager';
+}

library/Zend/Mvc/Service/ModuleManagerFactory.php

@@ -91,6 +91,24 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             'Zend\ModuleManager\Feature\RouteProviderInterface',
             'getRouteConfig'
         );
+        $serviceListener->addServiceManager(
+            'SerializerAdapterManager',
+            'serializers',
+            'Zend\ModuleManager\Feature\SerializerProviderInterface',
+            'getSerializerConfig'
+        );
+        $serviceListener->addServiceManager(
+            'HydratorManager',
+            'hydrators',
+            'Zend\ModuleManager\Feature\HydratorProviderInterface',
+            'getHydratorConfig'
+        );
+        $serviceListener->addServiceManager(
+            'InputFilterManager',
+            'input_filters',
+            'Zend\ModuleManager\Feature\InputFilterProviderInterface',
+            'getInputFilterConfig'
+        );
 
         $events = $serviceLocator->get('EventManager');
         $events->attach($defaultListeners);

library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php

@@ -9,30 +9,7 @@
 
 namespace Zend\Mvc\Service;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
-
 class SerializerAdapterPluginManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\Serializer\AdapterPluginManager';
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        /** @var $serviceListener \Zend\ModuleManager\Listener\ServiceListener */
-        $serviceListener = $serviceLocator->get('ServiceListener');
-
-        // This will allow to register new serializers easily, either by implementing the SerializerProviderInterface
-        // in your Module.php file, or by adding the "serializers" key in your module.config.php file
-        $serviceListener->addServiceManager(
-            $serviceLocator,
-            'serializers',
-            'Zend\ModuleManager\Feature\SerializerProviderInterface',
-            'getSerializerConfig'
-        );
-
-        return parent::createService($serviceLocator);
-    }
 }

library/Zend/Mvc/Service/ServiceListenerFactory.php

@@ -53,11 +53,14 @@ class ServiceListenerFactory implements FactoryInterface
             'FilterManager'                  => 'Zend\Mvc\Service\FilterManagerFactory',
             'FormElementManager'             => 'Zend\Mvc\Service\FormElementManagerFactory',
             'HttpRouter'                     => 'Zend\Mvc\Service\RouterFactory',
+            'HydratorManager'                => 'Zend\Mvc\Service\HydratorManagerFactory',
+            'InputFilterManager'             => 'Zend\Mvc\Service\InputFilterManagerFactory',
             'PaginatorPluginManager'         => 'Zend\Mvc\Service\PaginatorPluginManagerFactory',
             'Request'                        => 'Zend\Mvc\Service\RequestFactory',
             'Response'                       => 'Zend\Mvc\Service\ResponseFactory',
             'Router'                         => 'Zend\Mvc\Service\RouterFactory',
             'RoutePluginManager'             => 'Zend\Mvc\Service\RoutePluginManagerFactory',
+            'SerializerAdapterManager'       => 'Zend\Mvc\Service\SerializerAdapterPluginManagerFactory',
             'ValidatorManager'               => 'Zend\Mvc\Service\ValidatorManagerFactory',
             'ViewHelperManager'              => 'Zend\Mvc\Service\ViewHelperManagerFactory',
             'ViewFeedRenderer'               => 'Zend\Mvc\Service\ViewFeedRendererFactory',

library/Zend/Serializer/composer.json

@@ -18,6 +18,9 @@
         "zendframework/zend-json": "self.version",
         "zendframework/zend-math": "self.version"
     },
+    "suggest": {
+        "zendframework/zend-servicemanager": "To support plugin manager support"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.1-dev",

library/Zend/Stdlib/Hydrator/HydratorPluginManager.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\Stdlib\Exception;
+
+/**
+ * Plugin manager implementation for hydrators.
+ *
+ * Enforces that adapters retrieved are instances of HydratorInterface
+ */
+class HydratorPluginManager extends AbstractPluginManager
+{
+    /**
+     * Whether or not to share by default
+     *
+     * @var bool
+     */
+    protected $shareByDefault = false;
+
+    /**
+     * Default set of adapters
+     *
+     * @var array
+     */
+    protected $invokableClasses = array(
+        'arrayserializable' => 'Zend\Stdlib\Hydrator\ArraySerializable',
+        'classmethods'      => 'Zend\Stdlib\Hydrator\ClassMethods',
+        'objectproperty'    => 'Zend\Stdlib\Hydrator\ObjectProperty',
+        'reflection'        => 'Zend\Stdlib\Hydrator\Reflection'
+    );
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validatePlugin($plugin)
+    {
+        if ($plugin instanceof HydratorInterface) {
+            // we're okay
+            return;
+        }
+
+        throw new Exception\RuntimeException(sprintf(
+            'Plugin of type %s is invalid; must implement Zend\Stdlib\Hydrator\HydratorInterface',
+            (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+        ));
+    }
+}

library/Zend/Stdlib/composer.json

@@ -13,7 +13,8 @@
     },
     "target-dir": "Zend/Stdlib",
     "suggest": {
-        "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler"
+        "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler",
+        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
     },
     "require": {
         "php": ">=5.3.3"