Merge branch 'hotfix/configuration-rename' of https://github.com/Evan…

…DotPro/zf2
zendframework · Jul 20, 2012 · 377b920 · 377b920
8 parents e3b1be1 + 19f0ef6 + 33bf9c0 + 3729984 + a5ce396 + 698dbe0 + 0efca0b + d1534ec
commit 377b920
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/test/Helper/Navigation/AbstractTest.php b/test/Helper/Navigation/AbstractTest.php
@@ -16,7 +16,7 @@
 use Zend\Acl\Resource\GenericResource;
 use Zend\Config\Factory as ConfigFactory;
 use Zend\Mvc\Router\RouteMatch;
-use Zend\Mvc\Service\ServiceManagerConfiguration;
+use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\ServiceManager\ServiceManager;
 use Zend\I18n\Translator\Translator;
 use Zend\View\Renderer\PhpRenderer;
@@ -114,7 +114,7 @@ protected function setUp()
                 'extra_config'         => array(
                     'service_manager' => array(
                         'factories' => array(
-                            'Configuration' => function() use ($config) {
+                            'Config' => function() use ($config) {
                                 return array(
                                     'navigation' => array(
                                         'default' => $config->get('nav_test1'),
@@ -127,8 +127,8 @@ protected function setUp()
             ),
         );
 
-        $sm = $this->serviceManager = new ServiceManager(new ServiceManagerConfiguration);
-        $sm->setService('ApplicationConfiguration', $smConfig);
+        $sm = $this->serviceManager = new ServiceManager(new ServiceManagerConfig);
+        $sm->setService('ApplicationConfig', $smConfig);
         $sm->get('ModuleManager')->loadModules();
         $sm->get('Application')->bootstrap();
         $sm->setFactory('Navigation', 'Zend\Navigation\Service\DefaultNavigationFactory');