From 57d5326628e23c965110c8ec62ee0ebf36b1f29a Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 13:28:31 -0400
Subject: [PATCH] Renamed authmanager service to VuFind\AuthManager.
---
module/VuFind/config/module.config.php | 2 +-
module/VuFind/src/VuFind/Bootstrap.php | 2 +-
module/VuFind/src/VuFind/Controller/AbstractBase.php | 2 +-
module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index a8102845ed5..aad0f174aca 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -314,7 +314,7 @@ $config = array(
},
),
'invokables' => array(
- 'authmanager' => 'VuFind\Auth\Manager',
+ 'VuFind\AuthManager' => 'VuFind\Auth\Manager',
'cart' => 'VuFind\Cart',
'cachemanager' => 'VuFind\Cache\Manager',
'mailer' => 'VuFind\Mailer',
diff --git a/module/VuFind/src/VuFind/Bootstrap.php b/module/VuFind/src/VuFind/Bootstrap.php
index 6ced5fdcee5..30af544ad12 100644
--- a/module/VuFind/src/VuFind/Bootstrap.php
+++ b/module/VuFind/src/VuFind/Bootstrap.php
@@ -152,7 +152,7 @@ class Bootstrap
register_shutdown_function(array($sessionManager, 'writeClose'));
// Make sure account credentials haven't expired:
- $serviceManager->get('AuthManager')->checkForExpiredCredentials();
+ $serviceManager->get('VuFind\AuthManager')->checkForExpiredCredentials();
}
/**
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index c90bf5e9c46..1635dec15a2 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -82,7 +82,7 @@ class AbstractBase extends AbstractActionController
*/
protected function getAuthManager()
{
- return $this->getServiceLocator()->get('AuthManager');
+ return $this->getServiceLocator()->get('VuFind\AuthManager');
}
/**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
index b074db25520..048fdbc80c4 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
@@ -89,7 +89,7 @@ class Auth extends AbstractServiceLocator
*/
public function getManager()
{
- return $this->getServiceLocator()->get('AuthManager');
+ return $this->getServiceLocator()->get('VuFind\AuthManager');
}
/**
--
GitLab