From c92737c0a3977e6f0d53b1c0a41f6250dcb3029c Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 13:54:40 -0400
Subject: [PATCH] Renamed searchspecsreader service to
VuFind\SearchSpecsReader.
---
module/VuFind/config/module.config.php | 2 +-
module/VuFind/src/VuFind/Connection/Solr.php | 4 ++--
module/VuFind/src/VuFindTest/Unit/TestCase.php | 2 +-
.../tests/unit-tests/src/Config/SearchSpecsReaderTest.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 00a7b9ad90c..83fa798885b 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -319,7 +319,7 @@ $config = array(
'VuFind\CacheManager' => 'VuFind\Cache\Manager',
'VuFind\Mailer' => 'VuFind\Mailer',
'VuFind\RecordLoader' => 'VuFind\Record\Loader',
- 'searchspecsreader' => 'VuFind\Config\SearchSpecsReader',
+ 'VuFind\SearchSpecsReader' => 'VuFind\Config\SearchSpecsReader',
'sessionmanager' => 'Zend\Session\SessionManager',
'sms' => 'VuFind\Mailer\SMS',
'worldcatconnection' => 'VuFind\Connection\WorldCat',
diff --git a/module/VuFind/src/VuFind/Connection/Solr.php b/module/VuFind/src/VuFind/Connection/Solr.php
index c3b066faff2..9d2293ad303 100644
--- a/module/VuFind/src/VuFind/Connection/Solr.php
+++ b/module/VuFind/src/VuFind/Connection/Solr.php
@@ -227,8 +227,8 @@ class Solr implements ServiceLocatorAwareInterface, \Zend\Log\LoggerAwareInterfa
{
// Only load specs once:
if ($this->searchSpecs === false) {
- $this->searchSpecs = $this->getServiceLocator()->get('SearchSpecsReader')
- ->get($this->searchSpecsFile);
+ $this->searchSpecs = $this->getServiceLocator()
+ ->get('VuFind\SearchSpecsReader')->get($this->searchSpecsFile);
}
// Special case -- null $handler means we want all search specs.
diff --git a/module/VuFind/src/VuFindTest/Unit/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
index d843d06d26e..066a0a5e0ab 100644
--- a/module/VuFind/src/VuFindTest/Unit/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -128,7 +128,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
'VuFind\RecordDriverPluginManager', $recordDriverFactory
);
$this->serviceManager->setService(
- 'SearchSpecsReader', new \VuFind\Config\SearchSpecsReader()
+ 'VuFind\SearchSpecsReader', new \VuFind\Config\SearchSpecsReader()
);
$this->serviceManager->setService(
'VuFind\Logger', new \VuFind\Log\Logger()
diff --git a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
index 2c92d80a68c..0f8a6f67638 100644
--- a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
@@ -49,7 +49,7 @@ class SearchSpecsReaderTest extends \VuFindTest\Unit\TestCase
{
// The searchspecs.yaml file should define author dismax fields (among many
// other things).
- $reader = $this->getServiceManager()->get('SearchSpecsReader');
+ $reader = $this->getServiceManager()->get('VuFind\SearchSpecsReader');
$specs = $reader->get('searchspecs.yaml');
$this->assertTrue(
isset($specs['Author']['DismaxFields'])
--
GitLab