Form abstract factory

library/Zend/Form/Factory.php

@@ -468,6 +468,11 @@ protected function prepareAndInjectHydrator($hydratorOrName, FieldsetInterface $
      */
     protected function prepareAndInjectInputFilter($spec, FormInterface $form, $method)
     {
+        if ($spec instanceof InputFilterInterface) {
+            $form->setInputFilter($spec);
+            return;
+        }
+
         if (is_string($spec)) {
             if (!class_exists($spec)) {
                 throw new Exception\DomainException(sprintf(
@@ -490,6 +495,9 @@ protected function prepareAndInjectInputFilter($spec, FormInterface $form, $meth
 
         $factory = $this->getInputFilterFactory();
         $filter  = $factory->createInputFilter($spec);
+        if (method_exists($filter, 'setFactory')) {
+            $filter->setFactory($factory);
+        }
         $form->setInputFilter($filter);
     }
 
@@ -528,10 +536,17 @@ protected function prepareAndInjectValidationGroup($spec, FormInterface $form, $
      */
     protected function getHydratorFromName($hydratorName)
     {
-        $serviceLocator = $this->getFormElementManager()->getServiceLocator();
+        $services = $this->getFormElementManager()->getServiceLocator();
+
+        if ($services && $services->has('HydratorManager')) {
+            $hydrators = $services->get('HydratorManager');
+            if ($hydrators->has($hydratorName)) {
+                return $hydrators->get($hydratorName);
+            }
+        }
 
-        if ($serviceLocator && $serviceLocator->has($hydratorName)) {
-            return $serviceLocator->get($hydratorName);
+        if ($services && $services->has($hydratorName)) {
+            return $services->get($hydratorName);
         }
 
         if (!class_exists($hydratorName)) {

library/Zend/Form/FormAbstractFactory.php

@@ -0,0 +1,154 @@
+<?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\Form;
+
+use Zend\InputFilter\InputFilterInterface;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class FormAbstractFactory implements AbstractFactoryInterface
+{
+    /**
+     * @var string Top-level configuration key indicating forms configuration
+     */
+    protected $configKey     = 'form_manager';
+
+    /**
+     * @var Factory Form factory used to create forms
+     */
+    protected $factory;
+
+    /**
+     * @var string Service prefix necessary for abstract factory to trigger
+     */
+    protected $servicePrefix = 'Form\\';
+
+    /**
+     * Can we create the requested service?
+     *
+     * @param  ServiceLocatorInterface $services
+     * @param  string $name Service name (as resolved by ServiceManager)
+     * @param  string $rName Name by which service was requested
+     * @return bool
+     */
+    public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $rName)
+    {
+        if (!$services->has('Config')) {
+            return false;
+        }
+
+        $prefixLength = strlen($this->servicePrefix);
+        if (strlen($rName) < $prefixLength
+            || substr($rName, 0, $prefixLength) !== $this->servicePrefix
+        ) {
+            return false;
+        }
+
+        $config = $services->get('Config');
+        if (!isset($config[$this->configKey])
+            || !is_array($config[$this->configKey])
+            || empty($config[$this->configKey])
+        ) {
+            return false;
+        }
+
+        $config = $config[$this->configKey];
+
+        $serviceName = substr($rName, $prefixLength);
+        if (!isset($config[$serviceName])
+            || !is_array($config[$serviceName])
+            || empty($config[$serviceName])
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create a form
+     *
+     * @param  ServiceLocatorInterface $services
+     * @param  string $name Service name (as resolved by ServiceManager)
+     * @param  string $rName Name by which service was requested
+     * @return Form
+     */
+    public function createServiceWithName(ServiceLocatorInterface $services, $name, $rName)
+    {
+        $serviceName = substr($rName, strlen($this->servicePrefix));
+        $config = $services->get('Config');
+
+        $config = $config[$this->configKey][$serviceName];
+
+        $factory = $this->getFormFactory($services);
+        $this->marshalInputFilter($config, $services, $factory);
+
+        return $factory->createForm($config);
+    }
+
+    /**
+     * Retrieve the form factory, creating it if necessary
+     *
+     * @param  ServiceLocatorInterface $services
+     * @return Factory
+     */
+    protected function getFormFactory(ServiceLocatorInterface $services)
+    {
+        if ($this->factory instanceof Factory) {
+            return $this->factory;
+        }
+
+        $elements = null;
+        if ($services->has('FormElementManager')) {
+            $elements = $services->get('FormElementManager');
+        }
+
+        $this->factory = new Factory($elements);
+        return $this->factory;
+    }
+
+    /**
+     * Marshal the input filter into the configuration
+     *
+     * If an input filter is specified:
+     * - if the InputFilterManager is present, checks if it's there; if so,
+     *   retrieves it and resets the specification to the instance.
+     * - otherwise, pulls the input filter factory from the form factory, and
+     *   attaches the FilterManager and ValidatorManager to it.
+     *
+     * @param array $config
+     * @param ServiceLocatorInterface $services
+     * @param Factory $formFactory
+     */
+    protected function marshalInputFilter(array &$config, ServiceLocatorInterface $services, Factory $formFactory)
+    {
+        if (!isset($config['input_filter'])) {
+            return;
+        }
+
+        if ($config['input_filter'] instanceof InputFilterInterface) {
+            return;
+        }
+
+        if (is_string($config['input_filter'])
+            && $services->has('InputFilterManager')
+        ) {
+            $inputFilters = $services->get('InputFilterManager');
+            if ($inputFilters->has($config['input_filter'])) {
+                $config['input_filter'] = $inputFilters->get($config['input_filter']);
+                return;
+            }
+        }
+
+        $inputFilterFactory = $formFactory->getInputFilterFactory();
+        $inputFilterFactory->getDefaultFilterChain()->setPluginManager($services->get('FilterManager'));
+        $inputFilterFactory->getDefaultValidatorChain()->setPluginManager($services->get('ValidatorManager'));
+    }
+}

library/Zend/Mvc/Service/ServiceListenerFactory.php

@@ -83,6 +83,9 @@ class ServiceListenerFactory implements FactoryInterface
             'Zend\View\Resolver\AggregateResolver'   => 'ViewResolver',
             'Zend\View\Resolver\ResolverInterface'   => 'ViewResolver',
         ),
+        'abstract_factories' => array(
+            'Zend\Form\FormAbstractFactory',
+        ),
     );
 
     /**

tests/ZendTest/Form/FactoryTest.php

@@ -17,6 +17,7 @@
 use Zend\Form\Factory as FormFactory;
 use Zend\InputFilter;
 use Zend\ServiceManager\ServiceManager;
+use Zend\Stdlib\Hydrator\HydratorPluginManager;
 
 /**
  * @category   Zend
@@ -314,6 +315,18 @@ public function testCanCreateFormsWithInputFilterSpecifications()
         }
     }
 
+    public function testCanCreateFormsWithInputFilterInstances()
+    {
+        $filter = new TestAsset\InputFilter();
+        $form = $this->factory->createForm(array(
+            'name'         => 'foo',
+            'input_filter' => $filter,
+        ));
+        $this->assertInstanceOf('Zend\Form\FormInterface', $form);
+        $test = $form->getInputFilter();
+        $this->assertSame($filter, $test);
+    }
+
     public function testCanCreateFormsAndSpecifyHydrator()
     {
         $form = $this->factory->createForm(array(
@@ -325,6 +338,22 @@ public function testCanCreateFormsAndSpecifyHydrator()
         $this->assertInstanceOf('Zend\Stdlib\Hydrator\ObjectProperty', $hydrator);
     }
 
+    public function testCanCreateFormsAndSpecifyHydratorManagedByHydratorManager()
+    {
+        $hydrators = new HydratorPluginManager();
+        $services = $this->factory->getFormElementManager()->getServiceLocator();
+        $hydrators->setServiceLocator($services);
+        $services->setService('HydratorManager', new HydratorPluginManager());
+
+        $form = $this->factory->createForm(array(
+            'name'     => 'foo',
+            'hydrator' => 'ObjectProperty',
+        ));
+        $this->assertInstanceOf('Zend\Form\FormInterface', $form);
+        $hydrator = $form->getHydrator();
+        $this->assertInstanceOf('Zend\Stdlib\Hydrator\ObjectProperty', $hydrator);
+    }
+
     public function testCanCreateHydratorFromArray()
     {
         $form = $this->factory->createForm(array(