From b2d0ec4a3644fd0756dea169362059efe74dba96 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 3 Feb 2020 16:46:26 -0500
Subject: [PATCH] Renamed property to eliminate "zend" from code. - Preparing
for Laminas migration.
---
.../VuFind/src/VuFind/RecordTab/TabManager.php | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/module/VuFind/src/VuFind/RecordTab/TabManager.php b/module/VuFind/src/VuFind/RecordTab/TabManager.php
index 760af483bd1..b0183502d05 100644
--- a/module/VuFind/src/VuFind/RecordTab/TabManager.php
+++ b/module/VuFind/src/VuFind/RecordTab/TabManager.php
@@ -79,11 +79,12 @@ class TabManager
protected $pluginManager;
/**
- * Overall framework configuration
+ * Overall framework configuration (used for fetching configurations "the old
+ * way" -- can eventually be deprecated).
*
* @var array
*/
- protected $zendConfig;
+ protected $legacyConfig;
/**
* Current active context (defaults to 'record')
@@ -95,16 +96,17 @@ class TabManager
/**
* Constructor
*
- * @param PluginManager $pm RecordTab plugin manager
- * @param ConfigManager $cm Configuration plugin manager
- * @param array $zendConfig Zend Framework configuration
+ * @param PluginManager $pm RecordTab plugin manager
+ * @param ConfigManager $cm Configuration plugin manager
+ * @param array $legacyConfig Overall framework configuration (only
+ * used for legacy config loading; optional)
*/
public function __construct(PluginManager $pm, ConfigManager $cm,
- $zendConfig = []
+ $legacyConfig = []
) {
$this->pluginManager = $pm;
$this->configManager = $cm;
- $this->zendConfig = $zendConfig;
+ $this->legacyConfig = $legacyConfig;
// Initialize default context.
$this->initializeCurrentContext();
@@ -137,7 +139,7 @@ class TabManager
if (!isset($this->config[$this->context])) {
$key = $this->contextSettings[$this->context]['legacyConfigSection']
?? 'recorddriver_tabs';
- $legacyConfig = $this->zendConfig['vufind'][$key] ?? [];
+ $legacyConfig = $this->legacyConfig['vufind'][$key] ?? [];
$iniConfig = $this->configManager->get(
$this->contextSettings[$this->context]['configFile']
)->toArray();
--
GitLab