Permalink
Browse files

Merge branch 'hotfix/2682'

Close #2682
  • Loading branch information...
2 parents a0681e2 + 37a161e commit a3963a7b00715fecab3cddf7288788a0072b063c @weierophinney weierophinney committed Oct 5, 2012
@@ -28,7 +28,7 @@ class AdapterServiceFactory implements FactoryInterface
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
- $config = $serviceLocator->get('Configuration');
+ $config = $serviceLocator->get('Config');
return new Adapter($config['db']);
}
}
@@ -25,7 +25,7 @@ class TranslatorServiceFactory implements FactoryInterface
public function createService(ServiceLocatorInterface $serviceLocator)
{
// Configure the translator
- $config = $serviceLocator->get('Configuration');
+ $config = $serviceLocator->get('Config');
$trConfig = isset($config['translator']) ? $config['translator'] : array();
$translator = Translator::factory($trConfig);
return $translator;
@@ -37,7 +37,7 @@ class RouterFactory implements FactoryInterface
*/
public function createService(ServiceLocatorInterface $serviceLocator, $cName = null, $rName = null)
{
- $config = $serviceLocator->get('Configuration');
+ $config = $serviceLocator->get('Config');
if (
$rName === 'ConsoleRouter' || // force console router
@@ -56,7 +56,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
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');

0 comments on commit a3963a7

Please sign in to comment.