Merge pull request #35005 from nextcloud/backport/34937/stable24

[stable24] Avoid a crash when a PHP extension has no version
nextcloud · Nov 7, 2022 · 29e31f4 · 29e31f4
2 parents 3e97bee + 9d377a1
commit 29e31f4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php
@@ -48,7 +48,11 @@ protected function initialize() {
 			$ext = new \ReflectionExtension($name);
 			try {
 				$prettyVersion = $ext->getVersion();
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
+				/** @psalm-suppress TypeDoesNotContainNull
+				 * @psalm-suppress RedundantCondition
+				 * TODO Remove these annotations once psalm fixes the method signature ( https://github.com/vimeo/psalm/pull/8655 )
+				 */
+				$prettyVersion = $this->normalizeVersion($prettyVersion ?? '0');
 			} catch (\UnexpectedValueException $e) {
 				$prettyVersion = '0';
 				$prettyVersion = $this->normalizeVersion($prettyVersion);
@@ -109,6 +113,9 @@ protected function initialize() {
 					continue 2;
 			}
 
+			if ($prettyVersion === null) {
+				continue;
+			}
 			try {
 				$prettyVersion = $this->normalizeVersion($prettyVersion);
 			} catch (\UnexpectedValueException $e) {