X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcheckComposerLockUpToDate.php;h=69f16f50250041bb2db2237c96d3c6a91cdcb68e;hb=d2fcfb143d61a301c45ae1e0767090f7ed905465;hp=9ec61dc04f5a8a81ffca802e7163918f7fb19a33;hpb=9a3a412f86ba2568bdf85f9c5def51bdb422032d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/checkComposerLockUpToDate.php b/maintenance/checkComposerLockUpToDate.php
index 9ec61dc04f..69f16f5025 100644
--- a/maintenance/checkComposerLockUpToDate.php
+++ b/maintenance/checkComposerLockUpToDate.php
@@ -24,9 +24,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"?'
 				);
 			}
 		}
@@ -34,11 +33,7 @@ class CheckComposerLockUpToDate extends Maintenance {
 		$lock = new ComposerLock( $lockLocation );
 		$json = new ComposerJson( $jsonLocation );
 
-		if ( $lock->getHash() === $json->getHash() ) {
-			$this->output( "Your composer.lock file is up to date with current dependencies!\n" );
-			return;
-		}
-		// Out of date, lets figure out which dependencies are old
+		// Check all the dependencies to see if any are old
 		$found = false;
 		$installed = $lock->getInstalledDependencies();
 		foreach ( $json->getRequiredDependencies() as $name => $version ) {
@@ -55,20 +50,16 @@ 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 {
-			// The hash is the entire composer.json file,
-			// so it can be updated without any of the dependencies changing
 			// We couldn't find any out-of-date dependencies, so assume everything is ok!
 			$this->output( "Your composer.lock file is up to date with current dependencies!\n" );
 		}
-
 	}
 }
 
-$maintClass = 'CheckComposerLockUpToDate';
+$maintClass = CheckComposerLockUpToDate::class;
 require_once RUN_MAINTENANCE_IF_MAIN;