upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #60654 from nextcloud/fix/null-safe-strtolower-getvaluebool

Browse source 
fix(config): add null coalescing fallback in getValueBool before strtolower
This commit is contained in:
John Molakvoæ 2026-05-26 09:32:44 +02:00 committed by GitHub
commit 2fb2f31abd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/psalm-baseline.xml
View file

@ -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>

10
lib/private/AppConfig.php
View file

@ -437,7 +437,15 @@ class AppConfig implements IAppConfig {
*/
#[\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']);
}

14
lib/private/Config/UserConfig.php
View file

@ -705,11 +705,15 @@ class UserConfig implements IUserConfig {
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']);
}