From 397c80aab50640294d932d0a66f2b75f57d499bd Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 26 Feb 2021 08:11:46 -0500
Subject: [PATCH] Use correct class names as service names (instead of
aliases/strings) (#1860)
---
.../VuFind/src/VuFind/AjaxHandler/GetSideFacetsFactory.php | 2 +-
.../VuFind/src/VuFind/Controller/ExternalAuthController.php | 2 +-
module/VuFind/src/VuFind/Controller/OverdriveController.php | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetSideFacetsFactory.php b/module/VuFind/src/VuFind/AjaxHandler/GetSideFacetsFactory.php
index 068128a3e15..e6d22f9281b 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetSideFacetsFactory.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetSideFacetsFactory.php
@@ -69,7 +69,7 @@ class GetSideFacetsFactory
$result = new $requestedName(
$container->get(\VuFind\Session\Settings::class),
$container->get(\VuFind\Recommend\PluginManager::class),
- $container->get(\VuFind\SearchRunner::class),
+ $container->get(\VuFind\Search\SearchRunner::class),
$container->get(\VuFind\Search\Solr\HierarchicalFacetHelper::class),
$container->get(\VuFind\Config\PluginManager::class)->get('facets'),
$container->get('ViewRenderer')
diff --git a/module/VuFind/src/VuFind/Controller/ExternalAuthController.php b/module/VuFind/src/VuFind/Controller/ExternalAuthController.php
index 3052ad9018f..56cec134378 100644
--- a/module/VuFind/src/VuFind/Controller/ExternalAuthController.php
+++ b/module/VuFind/src/VuFind/Controller/ExternalAuthController.php
@@ -72,7 +72,7 @@ class ExternalAuthController extends AbstractBase implements LoggerAwareInterfac
if ($authService->isGranted($this->ezproxyRequiredPermission)) {
// Access granted, redirect to EZproxy
if (empty($config->EZproxy->disable_ticket_auth_logging)) {
- $logger = $this->serviceLocator->get(\VuFind\Logger::class);
+ $logger = $this->serviceLocator->get(\VuFind\Log\Logger::class);
$logger->log(
\Laminas\Log\Logger::INFO,
"EZproxy login to '" . $config->EZproxy->host
diff --git a/module/VuFind/src/VuFind/Controller/OverdriveController.php b/module/VuFind/src/VuFind/Controller/OverdriveController.php
index 0a15eeca4a2..4ca880072da 100644
--- a/module/VuFind/src/VuFind/Controller/OverdriveController.php
+++ b/module/VuFind/src/VuFind/Controller/OverdriveController.php
@@ -45,8 +45,9 @@ class OverdriveController extends AbstractBase implements LoggerAwareInterface
*/
public function __construct(ServiceLocatorInterface $sm)
{
- $this->setLogger($sm->get('VuFind\Logger'));
- $this->connector = $sm->get('VuFind\DigitalContent\OverdriveConnector');
+ $this->setLogger($sm->get(\VuFind\Log\Logger::class));
+ $this->connector
+ = $sm->get(\VuFind\DigitalContent\OverdriveConnector::class);
parent::__construct($sm);
$this->debug("ODRC constructed");
}
--
GitLab