Skip to content

fix(config): add null coalescing fallback in getValueBool before strtolower #60654

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
skjnldsv wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −11
Open

fix(config): add null coalescing fallback in getValueBool before strtolower #60654

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3548,11 +3548,6 @@
<code><![CDATA[$CONFIG]]></code>
</UndefinedVariable>
</file>
<file src="lib/private/Config/UserConfig.php">
<RedundantCast>
<code><![CDATA[(string)$this->getTypedValue($userId, $app, $key, $default ? 'true' : 'false', $lazy, ValueType::BOOL)]]></code>
</RedundantCast>
</file>
<file src="lib/private/Console/Application.php">
<NoInterfaceProperties>
<code><![CDATA[$this->request->server]]></code>
Expand Down
10 changes: 9 additions & 1 deletion lib/private/AppConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,15 @@ public function getValueFloat(string $app, string $key, float $default = 0, bool
*/
#[\Override]
public function getValueBool(string $app, string $key, bool $default = false, bool $lazy = false): bool {
$b = strtolower($this->getTypedValue($app, $key, $default ? 'true' : 'false', $lazy, self::VALUE_BOOL));
// The explicit (string) cast and ?? null guard defend against a PHP OPcache bug where
// values passed by reference across function boundaries can have their type corrupted
// (e.g. bool returned as int, or null). Affects PHP 8.x with OPcache enabled; fixed
// upstream in https://github.com/php/php-src/pull/21973. Keep until minimum PHP version
// is bumped. Psalm sees the declared return type (string) and flags these as redundant.
/** @psalm-suppress RedundantCondition, TypeDoesNotContainNull */
$value = $this->getTypedValue($app, $key, $default ? 'true' : 'false', $lazy, self::VALUE_BOOL) ?? ($default ? 'true' : 'false');
/** @psalm-suppress RedundantCast */
$b = strtolower((string)$value);
return in_array($b, ['1', 'true', 'yes', 'on']);
}

Expand Down
14 changes: 9 additions & 5 deletions lib/private/Config/UserConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,11 +705,15 @@ public function getValueBool(
bool $default = false,
bool $lazy = false,
): bool {
// The explicit (string) cast guards against a PHP OPcache bug where values passed
// by reference across function boundaries can have their type corrupted (e.g. bool
// returned as int). Affects PHP 8.x with OPcache enabled; fixed upstream in
// https://github.com/php/php-src/pull/21973. Keep until minimum PHP version is bumped.
$b = strtolower((string)$this->getTypedValue($userId, $app, $key, $default ? 'true' : 'false', $lazy, ValueType::BOOL));
// The explicit (string) cast and ?? null guard defend against a PHP OPcache bug where
// values passed by reference across function boundaries can have their type corrupted
// (e.g. bool returned as int, or null). Affects PHP 8.x with OPcache enabled; fixed
// upstream in https://github.com/php/php-src/pull/21973. Keep until minimum PHP version
// is bumped. Psalm sees the declared return type (string) and flags these as redundant.
/** @psalm-suppress RedundantCondition, TypeDoesNotContainNull */
$value = $this->getTypedValue($userId, $app, $key, $default ? 'true' : 'false', $lazy, ValueType::BOOL) ?? ($default ? 'true' : 'false');
/** @psalm-suppress RedundantCast */
$b = strtolower((string)$value);
return in_array($b, ['1', 'true', 'yes', 'on']);
}

Expand Down
Loading