Skip to content
Snippets Groups Projects
Commit b2d0ec4a authored by Demian Katz's avatar Demian Katz Committed by Robert Lange
Browse files

Renamed property to eliminate "zend" from code.

- Preparing for Laminas migration.
parent d4e67991
No related merge requests found
...@@ -79,11 +79,12 @@ class TabManager ...@@ -79,11 +79,12 @@ class TabManager
protected $pluginManager; protected $pluginManager;
/** /**
* Overall framework configuration * Overall framework configuration (used for fetching configurations "the old
* way" -- can eventually be deprecated).
* *
* @var array * @var array
*/ */
protected $zendConfig; protected $legacyConfig;
/** /**
* Current active context (defaults to 'record') * Current active context (defaults to 'record')
...@@ -95,16 +96,17 @@ class TabManager ...@@ -95,16 +96,17 @@ class TabManager
/** /**
* Constructor * Constructor
* *
* @param PluginManager $pm RecordTab plugin manager * @param PluginManager $pm RecordTab plugin manager
* @param ConfigManager $cm Configuration plugin manager * @param ConfigManager $cm Configuration plugin manager
* @param array $zendConfig Zend Framework configuration * @param array $legacyConfig Overall framework configuration (only
* used for legacy config loading; optional)
*/ */
public function __construct(PluginManager $pm, ConfigManager $cm, public function __construct(PluginManager $pm, ConfigManager $cm,
$zendConfig = [] $legacyConfig = []
) { ) {
$this->pluginManager = $pm; $this->pluginManager = $pm;
$this->configManager = $cm; $this->configManager = $cm;
$this->zendConfig = $zendConfig; $this->legacyConfig = $legacyConfig;
// Initialize default context. // Initialize default context.
$this->initializeCurrentContext(); $this->initializeCurrentContext();
...@@ -137,7 +139,7 @@ class TabManager ...@@ -137,7 +139,7 @@ class TabManager
if (!isset($this->config[$this->context])) { if (!isset($this->config[$this->context])) {
$key = $this->contextSettings[$this->context]['legacyConfigSection'] $key = $this->contextSettings[$this->context]['legacyConfigSection']
?? 'recorddriver_tabs'; ?? 'recorddriver_tabs';
$legacyConfig = $this->zendConfig['vufind'][$key] ?? []; $legacyConfig = $this->legacyConfig['vufind'][$key] ?? [];
$iniConfig = $this->configManager->get( $iniConfig = $this->configManager->get(
$this->contextSettings[$this->context]['configFile'] $this->contextSettings[$this->context]['configFile']
)->toArray(); )->toArray();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment