Skip to content
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

fix(config): Add missing handling for envCache in getKeys() #46140

Merged
merged 4 commits into from
Sep 16, 2024
Merged

fix(config): Add missing handling for envCache in getKeys() #46140

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62192ca
fix(config): Add missing handling for envCache in getKeys()
joshtrichards Jun 26, 2024
2ffff51
fix(config): add envCache tests for getKeys()
joshtrichards Jun 26, 2024
34a9e48
fix: switch from explode to substr (faster)
joshtrichards Jun 27, 2024
13088b7
Merge branch 'master' into fix-nc-env-inclusion
icewind1991 Sep 16, 2024
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
18 changes: 13 additions & 5 deletions lib/private/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function __construct($configDir, $fileName = 'config.php') {
* @return array an array of key names
*/
public function getKeys() {
return array_keys($this->cache);
return array_merge(array_keys($this->cache), array_keys($this->envCache));
}

/**
Expand All @@ -64,9 +64,8 @@ public function getKeys() {
* @return mixed the value or $default
*/
public function getValue($key, $default = null) {
$envKey = self::ENV_PREFIX . $key;
if (isset($this->envCache[$envKey])) {
return $this->envCache[$envKey];
if (isset($this->envCache[$key])) {
return $this->envCache[$key];
}

if (isset($this->cache[$key])) {
Expand Down Expand Up @@ -226,7 +225,16 @@ private function readData() {
}
}

$this->envCache = getenv();
// grab any "NC_" environment variables
$envRaw = getenv();
// only save environment variables prefixed with "NC_" in the cache
$envPrefixLen = strlen(self::ENV_PREFIX);
foreach ($envRaw as $rawEnvKey => $rawEnvValue) {
if (str_starts_with($rawEnvKey, self::ENV_PREFIX)) {
$realKey = substr($rawEnvKey, $envPrefixLen);
$this->envCache[$realKey] = $rawEnvValue;
}
}
}

/**
Expand Down
7 changes: 7 additions & 0 deletions tests/lib/ConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ public function testGetKeys() {
$this->assertSame($expectedConfig, $this->getConfig()->getKeys());
}

public function testGetKeysReturnsEnvironmentKeysIfSet() {
$expectedConfig = ['foo', 'beers', 'alcohol_free', 'taste'];
putenv('NC_taste=great');
$this->assertSame($expectedConfig, $this->getConfig()->getKeys());
putenv('NC_taste');
}

public function testGetValue() {
$config = $this->getConfig();
$this->assertSame('bar', $config->getValue('foo'));
Expand Down
Loading