Merge pull request #60333 from nextcloud/backport/59646/stable33

[stable33] fix(UserConfig): cast getTypedValue() result to string in getValueBool()

Author: nickvergessen

build/psalm-baseline.xml

@@ -3460,6 +3460,11 @@
       <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>

lib/private/Config/UserConfig.php

@@ -685,7 +685,11 @@ public function getValueBool(
 		bool $default = false,
 		bool $lazy = false,
 	): bool {
-		$b = strtolower($this->getTypedValue($userId, $app, $key, $default ? 'true' : 'false', $lazy, ValueType::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));
 		return in_array($b, ['1', 'true', 'yes', 'on']);
 	}