X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fminify.php;h=16e4d1c9727ca5c18d98da013cfa8e50bbf7e669;hb=052c6c9aedfce9b5470f5709da14268bc7c8bc38;hp=efecaad0d014341c61d3a106d31a12a7d614e1ce;hpb=c7d3ebf125750a1e4b1601681801e0d761016788;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/minify.php b/maintenance/minify.php
index efecaad0d0..16e4d1c972 100644
--- a/maintenance/minify.php
+++ b/maintenance/minify.php
@@ -40,15 +40,10 @@ class MinifyScript extends Maintenance {
 			"Directory for output. If this is not specified, and neither is --outfile, then the\n" .
 			"output files will be sent to the same directories as the input files.",
 			false, true );
-		$this->addOption( 'js-statements-on-own-line',
-			"Boolean value for putting statements on their own line when minifying JavaScript.",
-			false, true );
-		$this->addOption( 'js-max-line-length',
-			"Maximum line length for JavaScript minification.",
-			false, true );
-		$this->mDescription = "Minify a file or set of files.\n\n" .
+		$this->addDescription( "Minify a file or set of files.\n\n" .
 			"If --outfile is not specified, then the output file names will have a .min extension\n" .
-			"added, e.g. jquery.js -> jquery.min.js.";
+			"added, e.g. jquery.js -> jquery.min.js."
+		);
 	}
 
 	public function execute() {
@@ -108,8 +103,6 @@ class MinifyScript extends Maintenance {
 	}
 
 	public function minify( $inPath, $outPath ) {
-		global $wgResourceLoaderMinifierStatementsOnOwnLine, $wgResourceLoaderMinifierMaxLineLength;
-
 		$extension = $this->getExtension( $inPath );
 		$this->output( basename( $inPath ) . ' -> ' . basename( $outPath ) . '...' );
 
@@ -126,10 +119,7 @@ class MinifyScript extends Maintenance {
 
 		switch ( $extension ) {
 			case 'js':
-				$outText = JavaScriptMinifier::minify( $inText,
-					$this->getOption( 'js-statements-on-own-line', $wgResourceLoaderMinifierStatementsOnOwnLine ),
-					$this->getOption( 'js-max-line-length', $wgResourceLoaderMinifierMaxLineLength )
-				);
+				$outText = JavaScriptMinifier::minify( $inText );
 				break;
 			case 'css':
 				$outText = CSSMin::minify( $inText );