Skip to content

Fix DeploymentConfig::getAllEnvOverrides memoization when no MAGENTO_… #40589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hryvinskyi wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
+4 −3
Open

Fix DeploymentConfig::getAllEnvOverrides memoization when no MAGENTO_… #40589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/internal/Magento/Framework/App/DeploymentConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ class DeploymentConfig
private $overrideData;

/**
* @var array
* @var array|null
*/
private $envOverrides = [];
private ?array $envOverrides = null;

/**
* @var array
Expand Down Expand Up @@ -215,7 +215,8 @@ private function reloadData(): void
*/
private function getAllEnvOverrides(): array
{
if (empty($this->envOverrides)) {
if ($this->envOverrides === null) {
$this->envOverrides = [];
// allow reading values from env variables by convention
// MAGENTO_DC_{path}, like db/connection/default/host =>
// can be overwritten by MAGENTO_DC_DB__CONNECTION__DEFAULT__HOST
Expand Down