Merge branch 'hotfix/232'

Close #232

Author: michalbundyra

CHANGELOG.md

@@ -22,7 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#232](https://github.com/zendframework/zend-form/pull/232) fixes validating `$creationOption`
+  of `Zend\Form\ElementFactory`. Allowed values are: array, Traversable or null.
+  If invalid value provided exception will be thrown.
 
 ## 2.14.1 - 2019-02-26
 

src/ElementFactory.php

@@ -38,6 +38,18 @@ public function __construct($creationOptions = null)
             return;
         }
 
+        if ($creationOptions instanceof Traversable) {
+            $creationOptions = iterator_to_array($creationOptions);
+        }
+
+        if (! is_array($creationOptions)) {
+            throw new InvalidServiceException(sprintf(
+                '%s cannot use non-array, non-traversable, non-null creation options; received %s',
+                __CLASS__,
+                is_object($creationOptions) ? get_class($creationOptions) : gettype($creationOptions)
+            ));
+        }
+
         $this->setCreationOptions($creationOptions);
     }
 
@@ -118,18 +130,6 @@ public function createService(ServiceLocatorInterface $serviceLocator, $canonica
      */
     public function setCreationOptions(array $creationOptions)
     {
-        if ($creationOptions instanceof Traversable) {
-            $creationOptions = iterator_to_array($creationOptions);
-        }
-
-        if (! is_array($creationOptions)) {
-            throw new InvalidServiceException(sprintf(
-                '%s cannot use non-array, non-traversable creation options; received %s',
-                __CLASS__,
-                (is_object($creationOptions) ? get_class($creationOptions) : gettype($creationOptions))
-            ));
-        }
-
         $this->creationOptions = $creationOptions;
     }
 }

test/ElementFactoryTest.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-form for the canonical source repository
+ * @copyright Copyright (c) 2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-form/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Form;
+
+use ArrayObject;
+use Interop\Container\ContainerInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Form\ElementFactory;
+use Zend\ServiceManager\Exception\InvalidServiceException;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use ZendTest\Form\TestAsset\ArgumentRecorder;
+
+class ElementFactoryTest extends TestCase
+{
+    public function validCreationOptions()
+    {
+        yield 'ArrayObject' => [new ArrayObject(['key' => 'value']), ['key' => 'value']];
+        yield 'array' => [['key' => 'value'], ['key' => 'value']];
+        yield 'empty-array' => [[], []];
+        yield 'null' => [null, []];
+    }
+
+    /**
+     * @dataProvider validCreationOptions
+     *
+     * @param mixed $creationOptions
+     * @param array $expectedValue
+     */
+    public function testValidCreationOptions($creationOptions, array $expectedValue)
+    {
+        $container = $this->prophesize(ServiceLocatorInterface::class)
+            ->willImplement(ContainerInterface::class)
+            ->reveal();
+
+        $factory = new ElementFactory($creationOptions);
+        $result = $factory->createService($container, ArgumentRecorder::class);
+        $this->assertInstanceOf(ArgumentRecorder::class, $result);
+        $this->assertSame(['argumentrecorder', $expectedValue], $result->args);
+    }
+
+    public function invalidCreationOptions()
+    {
+        yield 'object' => [(object) ['key' => 'val']];
+        yield 'int' => [PHP_INT_MAX];
+        yield 'string' => [uniqid('', true)];
+    }
+
+    /**
+     * @dataProvider invalidCreationOptions
+     *
+     * @param $creationOptions
+     */
+    public function testInvalidCreationOptionsException($creationOptions)
+    {
+        $this->expectException(InvalidServiceException::class);
+        $this->expectExceptionMessage('cannot use non-array, non-traversable, non-null creation options;');
+        new ElementFactory($creationOptions);
+    }
+}

test/TestAsset/ArgumentRecorder.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-form for the canonical source repository
+ * @copyright Copyright (c) 2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-form/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Form\TestAsset;
+
+class ArgumentRecorder
+{
+    public $args;
+
+    public function __construct(...$args)
+    {
+        $this->args = $args;
+    }
+}