From e7a476f7c8a274c9f8afde098aac66fb33d45a88 Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Thu, 13 Feb 2020 16:48:59 -0500 Subject: [PATCH] Use proper SemVer comparison in CheckComposerLockUpToDate We were using exact string matching previously. We already have a SemVer dependency in ExtensionRegistry.php, so we might as well do things right. Change-Id: I8895843a5b1116fca42e0c7179a2907fe84a74d1 (cherry picked from commit 3b0b9aa8ad35b9a567619186ac2174240db58726) --- maintenance/checkComposerLockUpToDate.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintenance/checkComposerLockUpToDate.php b/maintenance/checkComposerLockUpToDate.php index 69f16f5025..96c7fb328b 100644 --- a/maintenance/checkComposerLockUpToDate.php +++ b/maintenance/checkComposerLockUpToDate.php @@ -2,6 +2,8 @@ require_once __DIR__ . '/Maintenance.php'; +use Composer\Semver\Semver; + /** * Checks whether your composer-installed dependencies are up to date * @@ -38,7 +40,7 @@ class CheckComposerLockUpToDate extends Maintenance { $installed = $lock->getInstalledDependencies(); foreach ( $json->getRequiredDependencies() as $name => $version ) { if ( isset( $installed[$name] ) ) { - if ( $installed[$name]['version'] !== $version ) { + if ( !SemVer::satisfies( $installed[$name]['version'], $version ) ) { $this->output( "$name: {$installed[$name]['version']} installed, $version required.\n" ); -- 2.20.1