Merge branch 'hotfix/161'

Close #161
zendframework · May 1, 2017 · bfb9469 · bfb9469
2 parents 72c3756 + b3c5b0a
commit bfb9469
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#161](https://github.com/zendframework/zend-form/pull/161) adds an import
+  statement to the `ElementFactory`, fixing an error whereby checks for
+  `Traversable` creation options would lead to a service creation exception;
+  these now correctly identify traversable options and convert them to an array.
 
 ## 2.10.1 - 2017-04-26
 

diff --git a/src/ElementFactory.php b/src/ElementFactory.php
@@ -9,6 +9,7 @@
 
 namespace Zend\Form;
 
+use Traversable;
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 use Zend\ServiceManager\FactoryInterface;