X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fparse.php;h=43bbca1177864055e44958be09a4ff4f95b85d55;hb=e65f8ac5110804067366f9f239c13f4f29b66c3d;hp=cf2fe541f22f2042a5f3cea159df907ffa835f00;hpb=695d7c28fe7036e9988ce92908185ebc41238296;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/parse.php b/maintenance/parse.php
index cf2fe541f2..43bbca1177 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\MediaWikiServices;
+
 /**
  * Parse some wikitext.
  *
@@ -68,7 +71,7 @@ class CLIParser extends Maintenance {
 			false,
 			true
 		);
-		$this->addOption( 'tidy', 'Tidy the output' );
+		$this->addOption( 'no-tidy', 'Don\'t tidy the output (deprecated)' );
 		$this->addArg( 'file', 'File containing wikitext (Default: stdin)', false );
 	}
 
@@ -82,7 +85,7 @@ class CLIParser extends Maintenance {
 	 * @return string HTML Rendering
 	 */
 	public function render( $wikitext ) {
-		return $this->parse( $wikitext )->getText();
+		return $this->parse( $wikitext )->getText( [ 'wrapperDivClass' => '' ] );
 	}
 
 	/**
@@ -103,9 +106,7 @@ class CLIParser extends Maintenance {
 	}
 
 	protected function initParser() {
-		global $wgParserConf;
-		$parserClass = $wgParserConf['class'];
-		$this->parser = new $parserClass();
+		$this->parser = MediaWikiServices::getInstance()->getParserFactory()->create();
 	}
 
 	/**
@@ -116,9 +117,7 @@ class CLIParser extends Maintenance {
 	 * @return Title
 	 */
 	protected function getTitle() {
-		$title = $this->getOption( 'title' )
-			? $this->getOption( 'title' )
-			: 'CLIParser';
+		$title = $this->getOption( 'title' ) ?: 'CLIParser';
 
 		return Title::newFromText( $title );
 	}
@@ -128,9 +127,10 @@ class CLIParser extends Maintenance {
 	 * @return ParserOutput
 	 */
 	protected function parse( $wikitext ) {
-		$options = new ParserOptions;
-		if ( $this->getOption( 'tidy' ) ) {
-			$options->setTidy( true );
+		$options = ParserOptions::newCanonical();
+		$options->setOption( 'enableLimitReport', false );
+		if ( $this->getOption( 'no-tidy' ) ) {
+			$options->setTidy( false );
 		}
 		return $this->parser->parse(
 			$wikitext,