Merge branch 'functionality/WriterPluginManager' of github.com:jdolie…

…slager/zf2 into functionality/WriterPluginManager
zendframework · Oct 9, 2012 · 5023ed3 · 5023ed3
commit 5023ed3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "homepage": "https://github.com/zendframework/zend-navigation",
     "autoload": {
         "psr-4": {
-            "Zend\\Navigation": "src/"
+            "Zend\\Navigation\\": "src/"
         }
     },
     "require": {

diff --git a/src/Service/AbstractNavigationFactory.php b/src/Service/AbstractNavigationFactory.php
@@ -56,7 +56,7 @@ abstract protected function getName();
     protected function getPages(ServiceLocatorInterface $serviceLocator)
     {
         if (null === $this->pages) {
-            $configuration = $serviceLocator->get('Configuration');
+            $configuration = $serviceLocator->get('Config');
 
             if (!isset($configuration['navigation'])) {
                 throw new Exception\InvalidArgumentException('Could not find navigation configuration key');