Fix runOutputPipeline args and revert WikiPage namespace (not in REL1_43)

Author: JeroenDeDauw

src/EntryPoints/MediaWikiHooks.php

@@ -6,12 +6,12 @@
 
 use MediaWiki\Content\ContentHandler;
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Page\WikiPage;
 use MediaWiki\Parser\Parser;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 use ProfessionalWiki\ExternalContent\EmbedExtensionFactory;
 use SearchEngine;
+use WikiPage;
 
 final class MediaWikiHooks {
 

tests/Integration/EmbedFunctionIntegrationTest.php

@@ -54,12 +54,13 @@ public function testUsageIsTracked(): void {
 		$this->extensionFactory->setFileFetcher( new InMemoryFileFetcher( [] ) );
 
 		$parser = MediaWikiServices::getInstance()->getParser();
+		$parserOptions = new ParserOptions( User::newSystemUser( 'TestUser' ) );
 
 		$parser->parse(
 			'{{#embed:https://example.com/KITTENS.md}}',
 			Title::newFromText( 'EmbedFunctionIntegrationTest' ),
-			new ParserOptions( User::newSystemUser( 'TestUser' ) )
-		)->runOutputPipeline( null, [] )->getRawText();
+			$parserOptions
+		)->runOutputPipeline( $parserOptions, [] )->getRawText();
 
 		// Since the category name depends on the wiki language, we need to skip this test when it is not English.
 		if ( MediaWikiServices::getInstance()->getContentLanguage()->getCode() === 'en' ) {

tests/Integration/EmbedFunctionSystemTest.php

@@ -8,9 +8,9 @@
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Content\Content;
 use MediaWiki\Content\ContentHandler;
-use MediaWiki\Page\WikiPage;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use WikiPage;
 
 /**
  * @group Database

tests/TestEnvironment.php

@@ -24,12 +24,13 @@ public function wikiUrl( string $pageName ): ?string {
 	}
 
 	public function parse( string $textToParse, ?Title $contextPage = null ): string {
+		$parserOptions = new ParserOptions( User::newSystemUser( 'TestUser' ) );
 		return MediaWikiServices::getInstance()->getParser()
 			->parse(
 				$textToParse,
 				$contextPage ?? Title::newFromText( 'ContextPage' ),
-				new ParserOptions( User::newSystemUser( 'TestUser' ) )
-			)->runOutputPipeline( null, [] )->getRawText();
+				$parserOptions
+			)->runOutputPipeline( $parserOptions, [] )->getRawText();
 	}
 
 }