X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcheckComposerLockUpToDate.php;h=96c7fb328bc3b8528cd5db1162364fe949cba12e;hb=86a727b908e7c729d0ccfc67ff6c2cf27ff28928;hp=b504bded778f90ec72419e93846226b97900b56f;hpb=2fdcd7bfdd95a3b1515b9a94289d67eb60add484;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/checkComposerLockUpToDate.php b/maintenance/checkComposerLockUpToDate.php
index b504bded77..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
  *
@@ -24,9 +26,8 @@ class CheckComposerLockUpToDate extends Maintenance {
 			// Maybe they're using mediawiki/vendor?
 			$lockLocation = "$IP/vendor/composer.lock";
 			if ( !file_exists( $lockLocation ) ) {
-				$this->error(
-					'Could not find composer.lock file. Have you run "composer install"?',
-					1
+				$this->fatalError(
+					'Could not find composer.lock file. Have you run "composer install --no-dev"?'
 				);
 			}
 		}
@@ -39,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"
 					);
@@ -51,10 +52,9 @@ class CheckComposerLockUpToDate extends Maintenance {
 			}
 		}
 		if ( $found ) {
-			$this->error(
+			$this->fatalError(
 				'Error: your composer.lock file is not up to date. ' .
-					'Run "composer update" to install newer dependencies',
-				1
+					'Run "composer update --no-dev" to install newer dependencies'
 			);
 		} else {
 			// We couldn't find any out-of-date dependencies, so assume everything is ok!
@@ -63,5 +63,5 @@ class CheckComposerLockUpToDate extends Maintenance {
 	}
 }
 
-$maintClass = 'CheckComposerLockUpToDate';
+$maintClass = CheckComposerLockUpToDate::class;
 require_once RUN_MAINTENANCE_IF_MAIN;