Skip to content
This repository

Replace 'Configuration' with 'Config' when retrieving configuration #2682

Closed
wants to merge 1 commit into from

2 participants

Andreas Möller Matthew Weier O'Phinney
Andreas Möller

No description provided.

Matthew Weier O'Phinney weierophinney closed this in a3963a7 October 05, 2012
Deleted user Unknown referenced this pull request from a commit October 05, 2012
Matthew Weier O'Phinney Merge branch 'hotfix/2682'
Close #2682
a465246
Deleted user Unknown referenced this pull request from a commit October 05, 2012
Matthew Weier O'Phinney Merge branch 'hotfix/2682' into develop
Forward port #2682
b1e542e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
2  library/Zend/Db/Adapter/AdapterServiceFactory.php
@@ -28,7 +28,7 @@ class AdapterServiceFactory implements FactoryInterface
28 28
      */
29 29
     public function createService(ServiceLocatorInterface $serviceLocator)
30 30
     {
31  
-        $config = $serviceLocator->get('Configuration');
  31
+        $config = $serviceLocator->get('Config');
32 32
         return new Adapter($config['db']);
33 33
     }
34 34
 }
2  library/Zend/I18n/Translator/TranslatorServiceFactory.php
@@ -25,7 +25,7 @@ class TranslatorServiceFactory implements FactoryInterface
25 25
     public function createService(ServiceLocatorInterface $serviceLocator)
26 26
     {
27 27
         // Configure the translator
28  
-        $config = $serviceLocator->get('Configuration');
  28
+        $config = $serviceLocator->get('Config');
29 29
         $trConfig = isset($config['translator']) ? $config['translator'] : array();
30 30
         $translator = Translator::factory($trConfig);
31 31
         return $translator;
2  library/Zend/Mvc/Service/RouterFactory.php
@@ -37,7 +37,7 @@ class RouterFactory implements FactoryInterface
37 37
      */
38 38
     public function createService(ServiceLocatorInterface $serviceLocator, $cName = null, $rName = null)
39 39
     {
40  
-        $config = $serviceLocator->get('Configuration');
  40
+        $config = $serviceLocator->get('Config');
41 41
 
42 42
         if (
43 43
             $rName === 'ConsoleRouter' ||                   // force console router
2  library/Zend/Navigation/Service/AbstractNavigationFactory.php
@@ -56,7 +56,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
56 56
     protected function getPages(ServiceLocatorInterface $serviceLocator)
57 57
     {
58 58
         if (null === $this->pages) {
59  
-            $configuration = $serviceLocator->get('Configuration');
  59
+            $configuration = $serviceLocator->get('Config');
60 60
 
61 61
             if (!isset($configuration['navigation'])) {
62 62
                 throw new Exception\InvalidArgumentException('Could not find navigation configuration key');
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.