Compare commits

..

No commits in common. "3dde66f2e367a35a777417c939133575bac03f6d" and "250e5a0c1ea9f0a6fa7eec4ab4eeb69fe84c546c" have entirely different histories.

2 changed files with 3 additions and 15 deletions

View file

@ -1,3 +0,0 @@
#!/usr/bin/env bash
awk '/^ public [^f][^u][^n]/ { sub(/\$/, "", $3); print $3 }' php/src/Data/ConfigurationManager.php | sort

View file

@ -978,19 +978,10 @@ class ConfigurationManager
}
$this->setMultiple(function(ConfigurationManager $confManager) use ($input) {
foreach ($input as $variable) {
if (!is_string($variable) || !str_contains($variable, '=')) {
error_log("Invalid input: '$variable' is not a string or does not contain an equal sign ('=')");
continue;
}
$keyWithValue = $confManager->replaceEnvPlaceholders($variable);
// Pad the result with nulls so psalm is happy (and we don't risk to run into warnings in case
// the check for an equal sign from above gets changed).
[$key, $value] = explode('=', $keyWithValue, 2) + [null, null];
if ($value === null) {
error_log("Invalid input: '$keyWithValue' has no value after the equal sign");
} else if (!property_exists($confManager, $key)) {
error_log("Error: '$key' is not a valid configuration key (in '$keyWithValue')");
} else {
[$key, $value] = explode('=', $keyWithValue, 2);
// Set if there's an attribute corresponding to the key.
if (isset($key, $confManager->$key)) {
$confManager->$key = $value;
}
}