Merge branch 'hotfix/60' into develop

Forward port #60
zendframework · Apr 28, 2016 · e08ccdf · e08ccdf
2 parents 0535edb + a4d486b
commit e08ccdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#60](https://github.com/zendframework/zend-form/pull/60) adds an alias from
+  `Zend\Form\FormElementManager` to `FormElementManager` in the `ConfigProvider`.
 
 ### Deprecated
 

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -38,6 +38,7 @@ public function getDependencyConfig()
             'aliases' => [
                 'Zend\Form\Annotation\FormAnnotationBuilder' => 'FormAnnotationBuilder',
                 Annotation\AnnotationBuilder::class => 'FormAnnotationBuilder',
+                FormElementManager::class => 'FormElementManager',
             ],
             'factories' => [
                 'FormAnnotationBuilder' => Annotation\AnnotationBuilderFactory::class,