From fb1c4edc64b1feffd6688a77af1240b90ceaaecc Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 13:41:20 -0400
Subject: [PATCH] Renamed ilsconnection service to VuFind\ILSConnection.
---
module/VuFind/config/module.config.php | 4 ++--
module/VuFind/src/VuFind/Auth/Manager.php | 2 +-
module/VuFind/src/VuFind/Controller/AbstractBase.php | 2 +-
module/VuFind/src/VuFind/RecordDriver/SolrMarc.php | 3 ++-
module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php | 2 +-
.../src/VuFindConsole/Controller/AbstractBase.php | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 5333d7a722b..b2c4de85010 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -78,7 +78,7 @@ $config = array(
'factories' => array(
'ils' => function ($sm) {
return new \VuFind\Auth\ILS(
- $sm->getServiceLocator()->get('ILSConnection')
+ $sm->getServiceLocator()->get('VuFind\ILSConnection')
);
},
),
@@ -282,7 +282,7 @@ $config = array(
'VuFind\DbAdapter' => function ($sm) {
return \VuFind\Db\AdapterFactory::getAdapter();
},
- 'ilsconnection' => function ($sm) {
+ 'VuFind\ILSConnection' => function ($sm) {
$catalog = new \VuFind\ILS\Connection();
return $catalog
->setConfig(\VuFind\Config\Reader::getConfig()->Catalog)
diff --git a/module/VuFind/src/VuFind/Auth/Manager.php b/module/VuFind/src/VuFind/Auth/Manager.php
index 18eab5c6d61..19c02cda52d 100644
--- a/module/VuFind/src/VuFind/Auth/Manager.php
+++ b/module/VuFind/src/VuFind/Auth/Manager.php
@@ -71,7 +71,7 @@ class Manager implements ServiceLocatorAwareInterface
*/
protected function getILS()
{
- return $this->getServiceLocator()->get('ILSConnection');
+ return $this->getServiceLocator()->get('VuFind\ILSConnection');
}
/**
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index 1635dec15a2..7e7ac7bfe78 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -196,7 +196,7 @@ class AbstractBase extends AbstractActionController
*/
public function getILS()
{
- return $this->getServiceLocator()->get('ILSConnection');
+ return $this->getServiceLocator()->get('VuFind\ILSConnection');
}
/**
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
index b4576728fd0..6018ee1dc12 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
@@ -796,7 +796,8 @@ class SolrMarc extends SolrDefault
*/
protected function getILS()
{
- return $this->getServiceLocator()->getServiceLocator()->get('ILSConnection');
+ return $this->getServiceLocator()->getServiceLocator()
+ ->get('VuFind\ILSConnection');
}
/**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php
index ed99d11de65..c337b61568d 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Ils.php
@@ -46,6 +46,6 @@ class Ils extends AbstractServiceLocator
*/
public function __invoke()
{
- return $this->getServiceLocator()->get('ILSConnection');
+ return $this->getServiceLocator()->get('VuFind\ILSConnection');
}
}
\ No newline at end of file
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
index 324448d0ac3..a59fe076308 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
@@ -107,7 +107,7 @@ class AbstractBase extends AbstractActionController
*/
public function getILS()
{
- return $this->getServiceLocator()->get('ILSConnection');
+ return $this->getServiceLocator()->get('VuFind\ILSConnection');
}
/**
--
GitLab