Merge branch 'hotfix/45' into develop

Forward port #45

Author: weierophinney

CHANGELOG.md

@@ -44,6 +44,10 @@ All notable changes to this project will be documented in this file, in reverse
 - [#38](https://github.com/zendframework/zend-form/pull/38) removes the
   arbitrary restriction of only the "labelledby" and "describedby" aria
   attributes on form element view helpers; any aria attribute is now allowed.
+- [#45](https://github.com/zendframework/zend-form/pull/45) fixes the behavior
+  in `Zend\Form\Factory::create()` when pulling elements from the form element
+  manager; it now will pass specifications provided for the given element when
+  calling the manager's `get()` method.
 
 ## 2.7.0 - 2016-02-22
 

src/Factory.php

@@ -108,7 +108,12 @@ public function create($spec)
         $spec = $this->validateSpecification($spec, __METHOD__);
         $type = isset($spec['type']) ? $spec['type'] : Element::class;
 
-        $element = $this->getFormElementManager()->get($type);
+        $creationOptions = [];
+        if (isset($spec['options']) && is_array($spec['options'])) {
+            $creationOptions = $spec['options'];
+        }
+
+        $element = $this->getFormElementManager()->get($type, $creationOptions);
 
         if ($element instanceof FormInterface) {
             return $this->configureForm($element, $spec);

test/FactoryTest.php

@@ -10,10 +10,12 @@
 namespace ZendTest\Form;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use DateTime;
 use Zend\Filter;
 use Zend\Form;
-use Zend\Form\FormElementManager;
 use Zend\Form\Factory as FormFactory;
+use Zend\Form\FormElementManager;
+use Zend\Form\FormInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Hydrator\HydratorPluginManager;
 
@@ -755,4 +757,30 @@ public function testCanCreateFormWithNullElements()
         $this->assertFalse($form->has('baz'));
         $this->assertTrue($form->has('bat'));
     }
+
+    public function testOptionsArePassedAsCreationOptionsToFactories()
+    {
+        $formManager = $this->factory->getFormElementManager();
+        $formManager->setFactory('customCreatedForm', TestAsset\CustomCreatedFormFactory::class);
+
+        /* @var $form TestAsset\CustomCreatedForm */
+        $form = $this->factory->create([
+            'name'    => 'some_name',
+            'type'    => 'customCreatedForm',
+            'options' => [
+                'created'           => '2016-02-19',
+                'some_other_option' => 1234
+            ]
+        ]);
+
+        $this->assertInstanceOf(FormInterface::class, $form);
+        $this->assertInstanceOf(TestAsset\CustomCreatedForm::class, $form);
+        $this->assertSame('some_name', $form->getName());
+        $this->assertSame(1234, $form->getOption('some_other_option'));
+
+        /* @var $created DateTime */
+        $created = $form->getCreated();
+        $this->assertInstanceOf(DateTime::class, $created);
+        $this->assertSame('2016-02-19', $created->format('Y-m-d'));
+    }
 }

test/TestAsset/CustomCreatedForm.php

@@ -0,0 +1,30 @@
+<?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;
+
+use Zend\Form\Form;
+use DateTime;
+
+class CustomCreatedForm extends Form
+{
+    private $created;
+
+    public function __construct(DateTime $created, $name = null, $options = array())
+    {
+        parent::__construct($name, $options);
+        $this->created = $created;
+    }
+
+    public function getCreated()
+    {
+        return $this->created;
+    }
+}

test/TestAsset/CustomCreatedFormFactory.php

@@ -0,0 +1,52 @@
+<?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;
+
+use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use DateTime;
+
+class CustomCreatedFormFactory implements FactoryInterface
+{
+    private $creationOptions = [];
+
+    public function __invoke(ContainerInterface $container, $name, array $options = null)
+    {
+        $options = $options ?: [];
+        $creationString = 'now';
+
+        if (isset($options['created'])) {
+            $creationString = $options['created'];
+            unset($options['created']);
+        }
+
+        $created = new DateTime($creationString);
+
+        $name = null;
+        if (isset($options['name'])) {
+            $name = $options['name'];
+            unset($options['name']);
+        }
+
+        $form = new CustomCreatedForm($created, $name, $options);
+        return $form;
+    }
+
+    public function createService(ServiceLocatorInterface $container)
+    {
+        return $this($container, CustomCreatedForm::class, $this->creationOptions);
+    }
+
+    public function setCreationOptions(array $options)
+    {
+        $this->creationOptions = $options;
+    }
+}