Merge branch 'hotfix/77' into develop

Forward port #77

Author: weierophinney

CHANGELOG.md

@@ -38,7 +38,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#77](https://github.com/zendframework/zend-form/pull/77) updates
+  `Zend\Form\View\HelperConfig` to improve performance when running under
+  zend-servicemanager v3.
 
 ## 2.8.3 - 2016-05-03
 

src/View/HelperConfig.php

@@ -33,10 +33,14 @@ public function configureServiceManager(ServiceManager $serviceManager)
     {
         $config = $this->toArray();
 
+        if (method_exists($serviceManager, 'configure')) {
+            $serviceManager->configure($config);
+            return $serviceManager;
+        }
+
         foreach ($config['factories'] as $service => $factory) {
             $serviceManager->setFactory($service, $factory);
         }
-
         foreach ($config['aliases'] as $alias => $target) {
             $serviceManager->setAlias($alias, $target);
         }