Merge branch 'hotfix/59' into develop

Forward port #59
zendframework · Jan 18, 2016 · ade4470 · ade4470
2 parents 794d538 + bf3e1d4
commit ade4470
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,9 @@ Sixth release candidate.
 - [#52](https://github.com/zendframework/zend-expressive-skeleton/pull/52)
   fixes the switch statement in the `HomePageAction` class to ensure the
   template name and documentation link are accurately found.
+- [#59](https://github.com/zendframework/zend-expressive-skeleton/pull/59)
+  updates the `config/container.php` implementation for zend-servicemanager such
+  that it can work with either v2 or v3 of that library.
 
 ## 1.0.0rc5 - 2015-12-22
 

diff --git a/src/ExpressiveInstaller/Resources/config/container-zend-servicemanager.php b/src/ExpressiveInstaller/Resources/config/container-zend-servicemanager.php
@@ -7,7 +7,8 @@
 $config = require __DIR__ . '/config.php';
 
 // Build container
-$container = new ServiceManager(new Config($config['dependencies']));
+$container = new ServiceManager();
+(new Config($config['dependencies']))->configureServiceManager($container);
 
 // Inject config
 $container->setService('config', $config);