X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fcontent%2FTextContent.php;h=54a57a55e62e5e7af480715fbddf50839c42035a;hb=70e1b9c450f6e07adc890222bef2599f9150f4af;hp=0198a0de1172e4c48ddf3b61363dd3b849647ad9;hpb=a5b521730095f56aef4916f73e39213f1d9b1d16;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index 0198a0de11..54a57a55e6 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -73,7 +73,7 @@ class TextContent extends AbstractContent {
 	}
 
 	public function getTextForSummary( $maxlength = 250 ) {
-		$text = $this->getNativeData();
+		$text = $this->getText();
 
 		$truncatedtext = MediaWikiServices::getInstance()->getContentLanguage()->
 			truncateForDatabase( preg_replace( "/[\n\r]/", ' ', $text ), max( 0, $maxlength ) );
@@ -87,7 +87,7 @@ class TextContent extends AbstractContent {
 	 * @return int
 	 */
 	public function getSize() {
-		$text = $this->getNativeData();
+		$text = $this->getText();
 
 		return strlen( $text );
 	}
@@ -118,9 +118,22 @@ class TextContent extends AbstractContent {
 	/**
 	 * Returns the text represented by this Content object, as a string.
 	 *
-	 * @return string The raw text.
+	 * @deprecated since 1.33 use getText() instead.
+	 *
+	 * @return string The raw text. Subclasses may guarantee a specific syntax here.
 	 */
 	public function getNativeData() {
+		return $this->getText();
+	}
+
+	/**
+	 * Returns the text represented by this Content object, as a string.
+	 *
+	 * @since 1.33
+	 *
+	 * @return string The raw text.
+	 */
+	public function getText() {
 		return $this->mText;
 	}
 
@@ -130,7 +143,7 @@ class TextContent extends AbstractContent {
 	 * @return string The raw text.
 	 */
 	public function getTextForSearchIndex() {
-		return $this->getNativeData();
+		return $this->getText();
 	}
 
 	/**
@@ -142,10 +155,12 @@ class TextContent extends AbstractContent {
 	 * @return string|bool The raw text, or false if the conversion failed.
 	 */
 	public function getWikitextForTransclusion() {
+		/** @var WikitextContent $wikitext */
 		$wikitext = $this->convert( CONTENT_MODEL_WIKITEXT, 'lossy' );
+		'@phan-var WikitextContent $wikitext';
 
 		if ( $wikitext ) {
-			return $wikitext->getNativeData();
+			return $wikitext->getText();
 		} else {
 			return false;
 		}
@@ -181,7 +196,7 @@ class TextContent extends AbstractContent {
 	 * @return Content
 	 */
 	public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) {
-		$text = $this->getNativeData();
+		$text = $this->getText();
 		$pst = self::normalizeLineEndings( $text );
 
 		return ( $text === $pst ) ? $this : new static( $pst, $this->getModel() );
@@ -201,15 +216,16 @@ class TextContent extends AbstractContent {
 	 */
 	public function diff( Content $that, Language $lang = null ) {
 		$this->checkModelID( $that->getModel() );
-
+		/** @var self $that */
+		'@phan-var self $that';
 		// @todo could implement this in DifferenceEngine and just delegate here?
 
 		if ( !$lang ) {
 			$lang = MediaWikiServices::getInstance()->getContentLanguage();
 		}
 
-		$otext = $this->getNativeData();
-		$ntext = $that->getNativeData();
+		$otext = $this->getText();
+		$ntext = $that->getText();
 
 		# Note: Use native PHP diff, external engines don't give us abstract output
 		$ota = explode( "\n", $lang->segmentForDiff( $otext ) );
@@ -240,11 +256,12 @@ class TextContent extends AbstractContent {
 	protected function fillParserOutput( Title $title, $revId,
 		ParserOptions $options, $generateHtml, ParserOutput &$output
 	) {
-		global $wgParser, $wgTextModelsToParse;
+		global $wgTextModelsToParse;
 
 		if ( in_array( $this->getModel(), $wgTextModelsToParse ) ) {
 			// parse just to get links etc into the database, HTML is replaced below.
-			$output = $wgParser->parse( $this->getNativeData(), $title, $options, true, true, $revId );
+			$output = MediaWikiServices::getInstance()->getParser()
+				->parse( $this->getText(), $title, $options, true, true, $revId );
 		}
 
 		if ( $generateHtml ) {
@@ -291,7 +308,7 @@ class TextContent extends AbstractContent {
 	 * @return string An HTML representation of the content
 	 */
 	protected function getHighlightHtml() {
-		return htmlspecialchars( $this->getNativeData() );
+		return htmlspecialchars( $this->getText() );
 	}
 
 	/**
@@ -318,7 +335,7 @@ class TextContent extends AbstractContent {
 
 		if ( $toHandler instanceof TextContentHandler ) {
 			// NOTE: ignore content serialization format - it's just text anyway.
-			$text = $this->getNativeData();
+			$text = $this->getText();
 			$converted = $toHandler->unserializeContent( $text );
 		}