mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25347 from nextcloud/backport/25335/stable20 

[stable20] Fix/app fetcher php compat comparison
This commit is contained in:
Roeland Jago Douma 2021-01-27 21:01:11 +01:00 committed by GitHub
parent b527ffc4c9 9010937535
commit 5caf554d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/App/AppStore/Fetcher/AppFetcher.php
View File

@ -113,12 +113,12 @@ class AppFetcher extends Fetcher {
$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']); $phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
$minPhpVersion = $phpVersion->getMinimumVersion(); $minPhpVersion = $phpVersion->getMinimumVersion();
$maxPhpVersion = $phpVersion->getMaximumVersion(); $maxPhpVersion = $phpVersion->getMaximumVersion();
$minPhpFulfilled = $minPhpVersion === '' || version_compare( $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
PHP_VERSION, PHP_VERSION,
$minPhpVersion, $minPhpVersion,
'>=' '>='
); );
$maxPhpFulfilled = $maxPhpVersion === '' || version_compare( $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
PHP_VERSION, PHP_VERSION,
$maxPhpVersion, $maxPhpVersion,
'<=' '<='

25
lib/private/App/CompareVersion.php
View File

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at> * @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
* *
@ -24,12 +27,13 @@
namespace OC\App; namespace OC\App;
use InvalidArgumentException; use InvalidArgumentException;
use function explode;
class CompareVersion { class CompareVersion {
public const REGEX_MAJOR = '/^\d+$/'; private const REGEX_MAJOR = '/^\d+$/';
public const REGEX_MAJOR_MINOR = '/^\d+.\d+$/'; private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
public const REGEX_MAJOR_MINOR_PATCH = '/^\d+.\d+.\d+$/'; private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
public const REGEX_SERVER = '/^\d+.\d+.\d+(.\d+)?$/'; private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
/** /**
* Checks if the given server version fulfills the given (app) version requirements. * Checks if the given server version fulfills the given (app) version requirements.
@ -45,18 +49,19 @@ class CompareVersion {
*/ */
public function isCompatible(string $actual, string $required, public function isCompatible(string $actual, string $required,
string $comparator = '>='): bool { string $comparator = '>='): bool {
if (!preg_match(self::REGEX_SERVER, $actual)) { if (!preg_match(self::REGEX_ACTUAL, $actual, $matches)) {
throw new InvalidArgumentException('server version is invalid'); throw new InvalidArgumentException("version specification $actual is invalid");
} }
$cleanActual = $matches[0];
if (preg_match(self::REGEX_MAJOR, $required) === 1) { if (preg_match(self::REGEX_MAJOR, $required) === 1) {
return $this->compareMajor($actual, $required, $comparator); return $this->compareMajor($cleanActual, $required, $comparator);
} elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) { } elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
return $this->compareMajorMinor($actual, $required, $comparator); return $this->compareMajorMinor($cleanActual, $required, $comparator);
} elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) { } elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
return $this->compareMajorMinorPatch($actual, $required, $comparator); return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
} else { } else {
throw new InvalidArgumentException('required version is invalid'); throw new InvalidArgumentException("required version $required is invalid");
} }
} }

8
tests/lib/App/CompareVersionTest.php
View File

@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at> * @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
* *
@ -49,11 +51,17 @@ class CompareVersionTest extends TestCase {
['13.0.0', '13', '>=', true], ['13.0.0', '13', '>=', true],
['13.0.1', '13', '>=', true], ['13.0.1', '13', '>=', true],
['13.0.1', '13', '<=', true], ['13.0.1', '13', '<=', true],
['13.0.1.9', '13', '<=', true],
['13.0.1-beta.1', '13', '<=', true],
['7.4.14', '7.4', '<=', true],
['7.4.14-ubuntu', '7.4', '<=', true],
['7.4.14-ubuntu', '7.4.15', '<=', true],
// Incompatible major versions // Incompatible major versions
['13.0.0.3', '13.0.0', '<', false], ['13.0.0.3', '13.0.0', '<', false],
['12.0.0', '13.0.0', '>=', false], ['12.0.0', '13.0.0', '>=', false],
['12.0.0', '13.0', '>=', false], ['12.0.0', '13.0', '>=', false],
['12.0.0', '13', '>=', false], ['12.0.0', '13', '>=', false],
['7.4.15-ubuntu', '7.4.15', '>=', true],
// Incompatible minor and patch versions // Incompatible minor and patch versions
['13.0.0', '13.0.1', '>=', false], ['13.0.0', '13.0.1', '>=', false],
['13.0.0', '13.1', '>=', false], ['13.0.0', '13.1', '>=', false],