more changes

tests/phpunit/ExtensionTest.php

@@ -25,11 +25,6 @@
  * @group bovender
  * @group Database
  */
-
-use MediaWiki\Title\Title;
-use MediaWiki\Page\WikiPageFactory;
-use MediaWiki\MediaWikiServices;
-
 class ExtensionTest extends LinkTitles\TestCase {
 
 	/**
@@ -41,9 +36,7 @@ class ExtensionTest extends LinkTitles\TestCase {
 			'wgLinkTitlesParseOnRender' => !$parseOnEdit
 		] );
 		$pageId = $this->insertPage( 'test page', $input )['id'];
-		$title = Title::newFromID( $pageId );
-		$wpf = MediaWikiServices::getInstance()->getWikiPageFactory();
-		$page = $wpf->newFromTitle( $title );
+		$page = WikiPage::newFromId( $pageId );
 		$this->assertSame( $expectedOutput, self::getPageText( $page ) );
 	}
 
@@ -78,10 +71,9 @@ class ExtensionTest extends LinkTitles\TestCase {
 		] );
 		$title = $this->insertPage( 'test page', $input )['title'];
 		$page = new WikiPage( $title );
-		$userFactory = MediaWikiServices::getInstance()->getUserFactory();
-		$user = $userFactory->newAnonymous();
+		$user = MediaWiki\User\UserFactory::newAnonymous();
 		$output = $page->getParserOutput( new ParserOptions( $user ), null, true );
-		$lines = explode( "\n", $output->getRawText() );
+		$lines = explode( "\n", $output->getText() );
 		$this->assertRegexp( $expectedOutput, $lines[0] );
 	}
 

tests/phpunit/LinkerTest.php

@@ -35,9 +35,6 @@
  * @group bovender
  * @group Database
  */
-
-use MediaWiki\MediaWikiServices;
-
 class LinkTitlesLinkerTest extends LinkTitles\TestCase {
 	protected $title;
 
@@ -320,11 +317,10 @@ class LinkTitlesLinkerTest extends LinkTitles\TestCase {
 
 		// Reset namespace caches.
 		// See https://stackoverflow.com/q/45974979/270712
-		$namespaceInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
-		$namespaceInfo->getCanonicalNamespaces( true );
+		\MWNamespace::getCanonicalNamespaces(true);
 		$wgContLang = \MediaWiki\MediaWikiServices::getInstance()->getContentLanguage();
 		$wgContLang->resetNamespaces();
-		$this->assertTrue( $namespaceInfo->exists( $ns ), "The namespace with id $ns should exist!" );
+		$this->assertTrue( MWNamespace::exists( $ns ), "The namespace with id $ns should exist!" );
 
 		$this->insertPage( "in custom namespace", 'This is a page in a custom namespace', $ns );
 		LinkTitles\Targets::invalidate();