Merge pull request #2 from Wikia/PLATFORM_6983-fixes

PLATFORM-6983 | Fix PvXcode to work on MW 1.37

Author: slayful

specials/SpecialPvXConvert.php

@@ -22,30 +22,27 @@ class SpecialPvXConvert extends SpecialPage {
 	 */
 	public function __construct() {
 		parent::__construct( 'PvXConvert' );
-
-		$this->wgRequest = $this->getRequest();
-		$this->wgUser = $this->getUser();
-		$this->output = $this->getOutput();
-
-		$this->DB = wfGetDB( DB_PRIMARY );
 	}
 
 	/**
 	 * Main Execute for the Special Page
 	 *
 	 * @param $par - Not used, but expected to be there by mediawiki.
 	 * @return void - echos to page.
+	 * @throws MWException
 	 */
 	public function execute( $par = null ) {
-		$name = $this->wgRequest->getText( 'wpName' );
-		$build = $this->wgRequest->getText( 'wpBuild' );
+		$request = $this->getRequest();
+		$output = $this->getOutput();
+		$name = $request->getText( 'wpName' );
+		$build = $request->getText( 'wpBuild' );
 
 		if ( $build ) {
 			$rout = $this->formatBuild( $build, $name );
-			$this->output->addWikiText( "== Preview ==" );
-			$this->output->addWikiText( $rout );
-			$this->output->addHtml( "<br>" );
-			$this->output->addWikiText( "== PvXcode ==" );
+			$output->addWikiTextAsContent( "== Preview ==" );
+			$output->addWikiTextAsContent( $rout );
+			$output->addHtml( "<br>" );
+			$output->addWikiTextAsContent( "== PvXcode ==" );
 			$out = "<p><textarea cols='80' rows='10' wrap='virtual'>" . $rout . "</textarea></p>";
 		} else {
 			$out = '<p>
@@ -56,8 +53,8 @@ public function execute( $par = null ) {
 					&nbsp;&nbsp;|&nbsp;Wilderness&nbsp;Survival&nbsp;|&nbsp;12&nbsp;+&nbsp;1&nbsp;+&nbsp;3<br>
 					&nbsp;&nbsp;|&nbsp;Expertise&nbsp;|&nbsp;12&nbsp;+&nbsp;1<br>
 					}}<br>
-					{{skill bar|Echo|Dust Trap|Barbed Trap|Flame Trap|Trappers Speed|
-					Troll Unguent|Whirling Defense|Resurrection Signet}}</code>
+					{{skill bar|Echo|Dust Trap|Barbed Trap|Flame Trap|Trappers Speed|Troll
+					Unguent|Whirling Defense|Resurrection Signet}}</code>
 					<p>Enter old style GuildWiki &quot;Attributes and Skills&quot; template:</p>
 					<form action="' . $_SERVER["PHP_SELF"] . '" method="get">
 					<input name="title" type="hidden" value="Special:PvXconvert" />
@@ -69,7 +66,7 @@ public function execute( $par = null ) {
 		}
 		$this->setHeaders();
 
-		$this->output->addHtml( $out );
+		$output->addHtml( $out );
 	}
 
 	/**

specials/SpecialPvXDecode.php

@@ -21,14 +21,7 @@ class SpecialPvXDecode extends SpecialPage {
 	 * @return    void
 	 */
 	public function __construct() {
-		global $wgRequest, $wgUser;
-
 		parent::__construct( 'PvXDecode' );
-
-		$this->wgRequest = $wgRequest;
-		$this->wgUser = $wgUser;
-		$this->output = $this->getOutput();
-
 		$this->DB = wfGetDB( DB_PRIMARY );
 
 		require_once( GWBBCODE_ROOT . '/gwbbcode.inc.php' );
@@ -38,22 +31,25 @@ public function __construct() {
 	 * Main Execute for the Specil Page
 	 * @param $par - Not used, but expected to be there by mediawiki.
 	 * @return void - echos to page.
+	 * @throws MWException
 	 */
 	public function execute( $par = null ) {
-		$name = $this->wgRequest->getText( 'wpName' );
-		$build = $this->wgRequest->getText( 'wpBuild' );
+		$request = $this->getRequest();
+		$output = $this->getOutput();
+		$name = $request->getText( 'wpName' );
+		$build = $request->getText( 'wpBuild' );
 
 		if ( $build ) {
-			if ( strlen( $name ) > 1 ) {
+			if ( strlen( $name ) >= 1 ) {
 				$rout = template_to_gwbbcode( $name . ";" . $build );
 			} else {
 				$rout = template_to_gwbbcode( $build );
 			}
 
-			$this->output->addWikiText( "== Preview ==" );
-			$this->output->addWikiText( "<pvxbig>" . $rout . "</pvxbig>" );
-			$this->output->addHtml( "<br>" );
-			$this->output->addWikiText( "== PvXcode ==" );
+			$output->addWikiTextAsContent( "== Preview ==" );
+			$output->addWikiTextAsContent( "<pvxbig>" . $rout . "</pvxbig>" );
+			$output->addHtml( "<br>" );
+			$output->addWikiTextAsContent( "== PvXcode ==" );
 			$out =
 				"<p><textarea cols='80' rows='10' wrap='virtual'>\n<pvxbig>\n" . $rout . "\n</pvxbig>\n</textarea></p>";
 
@@ -76,15 +72,15 @@ public function execute( $par = null ) {
 		}
 		$this->setHeaders();
 
-		$this->output->addHtml( $out );
+		$output->addHTML( $out );
 	}
 
 	/**
 	 * Return the group name for this special page.
 	 *
 	 * @return string
 	 */
-	protected function getGroupName() {
+	protected function getGroupName(): string {
 		// Change to display in a different category on Special:SpecialPages.
 		return 'pvx';
 	}