WikilogUtils: Replace WikiPage::getText() with getContent() #21

refeed · 2017-12-23T14:45:13Z

Replace WikiPage::getText() with
WikiPage::getContent()->getNativeData() in
WikilogUtils.php, since WikiPage::getText() had been removed
from WikiPage.

Bug: T179532

FlorianSW · 2017-12-23T15:41:08Z

WikilogUtils.php

@@ -210,7 +210,7 @@ public static function parsedArticle( Title $title, $feed = false ) {
 		$parser->startExternalParse( $title, $parserOpt, Parser::OT_HTML );

 		# Parse article.
-		$arttext = $article->getText();
+		$arttext = $article->getContent()->getNativeData();


Please check, if the returned Content object is a TextContent (instanceof TextContent), as this is currently the implementation, which will return text for getNativeData(). Any other implementation will vary depending on the content model of the page.

Here in this case, I think it's best to just check if the content model is TextContent, and if not return default values (null or empty things).

FlorianSW · 2017-12-23T15:41:14Z

WikilogUtils.php

@@ -328,7 +328,7 @@ public static function categoryList( $list ) {
 		foreach ( $list as $cat ) {
 			$title = Title::makeTitle( NS_CATEGORY, $cat );
 			$categoryUrl = $title->getPrefixedText();
-			$categoryTxt = $title->getText();
+			$categoryTxt = $title->getContent()->getNativeData();


same as above.

Sorry my bad, I think $title here is not related with WikiPage

FlorianSW · 2017-12-23T15:41:20Z

WikilogUtils.php

@@ -365,7 +365,7 @@ public static function tagList( $list ) {
 	public static function splitSummaryContent( $parserOutput ) {
 		global $wgUseTidy;

-		$content = Sanitizer::removeHTMLcomments( $parserOutput->getText() );
+		$content = Sanitizer::removeHTMLcomments( $parserOutput->getContent()->getNativeData() );


same as above.

I think $title here is not related with WikiPage

FlorianSW · 2017-12-23T16:08:01Z

WikilogUtils.php

@@ -210,7 +210,8 @@ public static function parsedArticle( Title $title, $feed = false ) {
 		$parser->startExternalParse( $title, $parserOpt, Parser::OT_HTML );

 		# Parse article.
-		$arttext = $article->getText();
+		$articleContent = $article->getContent();
+		$arttext = $articleContent instanceof TextContent ? $articleContent->getNativeData() : false;


Is false really a good default value? What do you think about checking, if the content is a TextContent, and if not, returning with an empty string as the text, as it would be pointless to proceed in the codepath with an empty string I think.

return array( $article, '');

Replace `WikiPage::getText()` with `WikiPage::getContent()->getNativeData()` in `WikilogUtils.php`, since `WikiPage::getText()` had been removed from `WikiPage`. Bug: T179532

refeed · 2017-12-23T16:46:03Z

WikilogUtils.php

-		$arttext = $article->getText();
+		$articleContent = $article->getContent();
+		if ( !($articleContent instanceof TextContent) ){
+			# Restore default behavior.


From line 230, I think we need to restore the default behavior (I think it's related to the parser).

/** * Enable special wikilog feed parsing. * * This function changes the parser behavior in order to output * * The proper way to use this function is: * @code * $saveFeedParse = WikilogParser::enableFeedParsing(); * # ...code that uses $wgParser in order to parse articles... * WikilogParser::enableFeedParsing( $saveFeedParse ); * @endcode * * @note Using this function changes the behavior of Parser. When enabled, * parsed content should be cached under a different key. */ public static function enableFeedParsing( $enable = true ) { $prev = self::$feedParsing; self::$feedParsing = $enable; return $prev; }

FlorianSW suggested changes Dec 23, 2017

View reviewed changes

refeed force-pushed the fix_deprecated_gettext_method branch from 01f407b to 11b442b Compare December 23, 2017 16:04

FlorianSW suggested changes Dec 23, 2017

View reviewed changes

WikilogUtils: Replace WikiPage::getText() with getContent()

97d1e06

Replace `WikiPage::getText()` with `WikiPage::getContent()->getNativeData()` in `WikilogUtils.php`, since `WikiPage::getText()` had been removed from `WikiPage`. Bug: T179532

refeed force-pushed the fix_deprecated_gettext_method branch from 11b442b to 97d1e06 Compare December 23, 2017 16:43

refeed commented Dec 23, 2017

View reviewed changes

FlorianSW approved these changes Dec 23, 2017

View reviewed changes

vitalif merged commit 8f2df05 into mediawiki4intranet:master Dec 27, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WikilogUtils: Replace WikiPage::getText() with getContent() #21

WikilogUtils: Replace WikiPage::getText() with getContent() #21

refeed commented Dec 23, 2017

FlorianSW Dec 23, 2017

refeed Dec 23, 2017

FlorianSW Dec 23, 2017

refeed Dec 23, 2017

FlorianSW Dec 23, 2017

refeed Dec 23, 2017

FlorianSW Dec 23, 2017

refeed Dec 23, 2017

refeed Dec 23, 2017 •

edited

WikilogUtils: Replace WikiPage::getText() with getContent() #21

WikilogUtils: Replace WikiPage::getText() with getContent() #21

Conversation

refeed commented Dec 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

refeed Dec 23, 2017 • edited

Choose a reason for hiding this comment

refeed Dec 23, 2017 •

edited