Replaces usages of deprecated Revision::newFromId and User::newFromId (#10)

R4356th · Kenny2github · web-flow · commit 43ed2a8eae89 · 2021-05-25T21:25:22.000+08:00
* Replace deprecated use of Revision::newFromId

* Replace usages of deprecated User::newFromId

* Remove extraneous "use User;"

Co-authored-by: Kenny2github &lt;kenny2minecraft@gmail.com&gt;

* Remove extraneous "use User;"

Co-authored-by: Kenny2github &lt;kenny2minecraft@gmail.com&gt;

Co-authored-by: Kenny2github &lt;kenny2minecraft@gmail.com&gt;
diff --git a/includes/HandleReportsPager.php b/includes/HandleReportsPager.php
@@ -4,7 +4,7 @@
 use ReverseChronologicalPager;
 use Html;
 use SpecialPage;
-use User;
+use MediaWiki\MediaWikiServices;
 
 class HandleReportsPager extends ReverseChronologicalPager {
 	private $conds;
@@ -47,7 +47,7 @@ function formatRow($row) {
 			],
 			$row->report_reason
 		));
-		$user = User::newFromId($row->report_user);
+		$user = MediaWikiServices::getInstance()->getUserFactory()->newFromId($row->report_user);
 		$out .= Html::rawElement('td', [], Html::element(
 			'a',
 			[
diff --git a/includes/SpecialHandleReports.php b/includes/SpecialHandleReports.php
@@ -3,7 +3,7 @@
 
 use SpecialPage;
 use Html;
-use User;
+use MediaWiki\MediaWikiServices;
 
 class SpecialHandleReports extends SpecialPage {
 
@@ -83,6 +83,9 @@ public function reportList( bool $handled, $out ) {
 	}
 
 	public function showReport( $par, $out, $user ) {
+		
+		$userfactory = MediaWikiServices::getInstance()->getUserFactory();
+
 		if ($this->getRequest()->wasPosted()) {
 			return $this->onPost( $par, $out, $user );
 		}
@@ -124,7 +127,7 @@ public function showReport( $par, $out, $user ) {
 				[ 'readonly' => '', 'class' => 'mw-report-handling-textarea' ],
 				$query->report_reason
 			));
-			$user = User::newFromId($query->report_user);
+			$user = $userfactory->newFromId($query->report_user);
 			$out->addHTML(Html::closeElement('fieldset'));
 
 			// Report information display
@@ -217,7 +220,7 @@ public function showReport( $par, $out, $user ) {
 			// Handler
 			$out->addHTML(Html::openElement('td'));
 			if ($query->report_handled) {
-				$handledby = User::newFromId($query->report_handled_by);
+				$handledby = $userfactory->newFromId($query->report_handled_by);
 				$out->addHTML(Html::element(
 					'a',
 					[
diff --git a/includes/SpecialReport.php b/includes/SpecialReport.php
@@ -3,7 +3,7 @@
 
 use SpecialPage;
 use Html;
-use Revision;
+use MediaWiki\MediaWikiServices;
 
 class SpecialReport extends SpecialPage {
 
@@ -33,7 +33,7 @@ public function execute( $par ) {
 			$this->showError( 'report-error-invalid-revid', $par );
 			return;
 		}
-		$rev = Revision::newFromId( (int)$par );
+		$rev = MediaWikiServices::getInstance()->getRevisionLookup()->getRevisionById( (int)$par );
 		if (!$rev) {
 			$this->showError( 'report-error-invalid-revid', $par );
 			return;
