Merge pull request #24698 from nextcloud/backport/24416/stable20

[stable20] Check php compatibility of app store app releases
nextcloud · Dec 15, 2020 · f0c2807 · f0c2807
2 parents 2304f1e + 0ae5c8d
commit f0c2807
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -101,14 +101,32 @@ protected function fetch($ETag, $content, $allowUnstable = false) {
 					// Exclude all versions not compatible with the current version
 					try {
 						$versionParser = new VersionParser();
-						$version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
+						$serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
 						$ncVersion = $this->getVersion();
-						$min = $version->getMinimumVersion();
-						$max = $version->getMaximumVersion();
-						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $min, '>=');
-						$maxFulfilled = $max !== '' &&
-							$this->compareVersion->isCompatible($ncVersion, $max, '<=');
-						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled)) {
+						$minServerVersion = $serverVersion->getMinimumVersion();
+						$maxServerVersion = $serverVersion->getMaximumVersion();
+						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
+						$maxFulfilled = $maxServerVersion !== '' &&
+							$this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
+						$isPhpCompatible = true;
+						if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
+							$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
+							$minPhpVersion = $phpVersion->getMinimumVersion();
+							$maxPhpVersion = $phpVersion->getMaximumVersion();
+							$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
+									PHP_VERSION,
+									$minPhpVersion,
+									'>='
+								);
+							$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
+									PHP_VERSION,
+									$maxPhpVersion,
+									'<='
+								);
+
+							$isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
+						}
+						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
 							$releases[] = $release;
 						}
 					} catch (\InvalidArgumentException $e) {