Skip to content

Commit 6309064

Browse files
ACPT-1599: Reverting, DeploymentConfig resets & reloads every time new key that wasn't previously set
Reverting ACP2E-2198 so that we prevent DeploymentConfig reseting & reloading every time a new key is loaded that wasn't previously set
1 parent ba41752 commit 6309064

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

lib/internal/Magento/Framework/App/DeploymentConfig.php

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ class DeploymentConfig
6161
*/
6262
private $readerLoad = [];
6363

64-
/**
65-
* @var array
66-
*/
67-
private $noConfigData = [];
68-
6964
/**
7065
* Constructor
7166
*
@@ -99,17 +94,9 @@ public function get($key = null, $defaultValue = null)
9994
}
10095
$result = $this->getByKey($key);
10196
if ($result === null) {
102-
if (empty($this->flatData)
103-
|| !isset($this->flatData[$key]) && !isset($this->noConfigData[$key])
104-
|| count($this->getAllEnvOverrides())
105-
) {
106-
$this->resetData();
97+
if (empty($this->flatData) || count($this->getAllEnvOverrides())) {
10798
$this->reloadData();
10899
}
109-
110-
if (!isset($this->flatData[$key])) {
111-
$this->noConfigData[$key] = $key;
112-
}
113100
$result = $this->getByKey($key);
114101
}
115102
return $result ?? $defaultValue;

0 commit comments

Comments
 (0)