From 0adb789e736bc62f89e94ac95c10321b08b09b00 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 31 Jan 2017 12:04:21 -0500
Subject: [PATCH] Access MVC services directly, instead of through ViewManager.
- More forward-compatible; preparing for ZF3.
---
module/VuFind/src/VuFind/Bootstrapper.php | 4 ++--
module/VuFind/src/VuFind/Controller/AbstractBase.php | 2 +-
module/VuFindApi/src/VuFindApi/Controller/Factory.php | 3 +--
module/VuFindTheme/src/VuFindTheme/Initializer.php | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/module/VuFind/src/VuFind/Bootstrapper.php b/module/VuFind/src/VuFind/Bootstrapper.php
index 5d521d2399f..23f49552046 100644
--- a/module/VuFind/src/VuFind/Bootstrapper.php
+++ b/module/VuFind/src/VuFind/Bootstrapper.php
@@ -201,8 +201,8 @@ class Bootstrapper
{
$callback = function ($event) {
$serviceManager = $event->getApplication()->getServiceManager();
- $renderer = $serviceManager->get('viewmanager')->getRenderer();
- $headTitle = $renderer->plugin('headtitle');
+ $helperManager = $serviceManager->get('ViewHelperManager');
+ $headTitle = $helperManager->get('headtitle');
$headTitle->setDefaultAttachOrder(
\Zend\View\Helper\Placeholder\Container\AbstractContainer::SET
);
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index 982097b9957..6537d2c4609 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -252,7 +252,7 @@ class AbstractBase extends AbstractActionController
*/
protected function getViewRenderer()
{
- return $this->getServiceLocator()->get('viewmanager')->getRenderer();
+ return $this->getServiceLocator()->get('ViewRenderer');
}
/**
diff --git a/module/VuFindApi/src/VuFindApi/Controller/Factory.php b/module/VuFindApi/src/VuFindApi/Controller/Factory.php
index c7fec320ccb..0f978984638 100644
--- a/module/VuFindApi/src/VuFindApi/Controller/Factory.php
+++ b/module/VuFindApi/src/VuFindApi/Controller/Factory.php
@@ -68,8 +68,7 @@ class Factory
{
$recordFields = $sm->getServiceLocator()
->get('VuFind\YamlReader')->get('SearchApiRecordFields.yaml');
- $helperManager = $sm->getServiceLocator()->get('viewmanager')
- ->getHelperManager();
+ $helperManager = $sm->getServiceLocator()->get('ViewHelperManager');
$rf = new RecordFormatter($recordFields, $helperManager);
$controller = new SearchApiController($rf, new FacetFormatter());
return $controller;
diff --git a/module/VuFindTheme/src/VuFindTheme/Initializer.php b/module/VuFindTheme/src/VuFindTheme/Initializer.php
index 563625e4747..c6d3c025cf0 100644
--- a/module/VuFindTheme/src/VuFindTheme/Initializer.php
+++ b/module/VuFindTheme/src/VuFindTheme/Initializer.php
@@ -310,7 +310,7 @@ class Initializer
protected function setUpThemeViewHelpers($helpers)
{
// Grab the helper loader from the view manager:
- $loader = $this->serviceManager->get('viewmanager')->getHelperManager();
+ $loader = $this->serviceManager->get('ViewHelperManager');
// Register all the helpers:
$config = new \Zend\ServiceManager\Config($helpers);
@@ -376,7 +376,7 @@ class Initializer
}
// Inject the path stack generated above into the view resolver:
- $resolver = $this->serviceManager->get('viewmanager')->getResolver();
+ $resolver = $this->serviceManager->get('ViewResolver');
if (!is_a($resolver, 'Zend\View\Resolver\AggregateResolver')) {
throw new \Exception('Unexpected resolver: ' . get_class($resolver));
}
--
GitLab