Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "tests: Replace deprecated WikiPage::factory"

Browse source
This commit is contained in:
jenkins-bot 2022-09-09 16:25:08 +00:00 committed by Gerrit Code Review
commit aafa2e0b04
22 changed files with 103 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/parser/ParserTestRunner.php
View file

@ -2604,7 +2604,9 @@ class ParserTestRunner {
$newContent = ContentHandler::makeContent( $text, $title );
$page = WikiPage::factory( $title );
$services = MediaWikiServices::getInstance();
$page = $services->getWikiPageFactory()->newFromTitle( $title );
$page->loadPageData( WikiPage::READ_LATEST );
if ( $page->exists() ) {
@ -2619,8 +2621,6 @@ class ParserTestRunner {
);
}
$services = MediaWikiServices::getInstance();
// Optionally use mock parser, to make debugging of actual parser tests simpler.
// But initialise the MessageCache clone first, don't let MessageCache
// get a reference to the mock object.

6
tests/phpunit/MediaWikiIntegrationTestCase.php
View file

@ -280,7 +280,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
$title = ( $title === null ) ? 'UTPage' : $title;
$title = is_string( $title ) ? Title::newFromText( $title ) : $title;
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
if ( !$page->exists() ) {
$user = static::getTestSysop()->getUser();
@ -1548,7 +1548,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
}
$comment = __METHOD__ . ': Sample page for unit test.';
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$page->doUserEditContent( ContentHandler::makeContent( $text, $title ), $user, $comment );
return [
@ -1599,7 +1599,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
$user = static::getTestSysop()->getUser();
// Make 1 page with 1 revision
$page = WikiPage::factory( Title::newFromText( 'UTPage' ) );
$page = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromTitle( Title::newFromText( 'UTPage' ) );
if ( $page->getId() == 0 ) {
$page->doUserEditContent(
new WikitextContent( 'UTContent' ),

5
tests/phpunit/includes/EditPageConstraintsTest.php
View file

@ -72,7 +72,8 @@ class EditPageConstraintsTest extends MediaWikiLangTestCase {
}
$this->assertNotNull( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
if ( $user == null ) {
$user = $this->getTestUser()->getUser();
@ -146,7 +147,7 @@ class EditPageConstraintsTest extends MediaWikiLangTestCase {
"Expected result code mismatch. $message"
);
return WikiPage::factory( $title );
return $wikiPageFactory->newFromTitle( $title );
}
/** AccidentalRecreationConstraint integration */

5
tests/phpunit/includes/EditPageTest.php
View file

@ -138,7 +138,8 @@ class EditPageTest extends MediaWikiLangTestCase {
$user = $this->getTestUser()->getUser();
}
$page = WikiPage::factory( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
if ( $baseText !== null ) {
$content = ContentHandler::makeContent( $baseText, $title );
@ -195,7 +196,7 @@ class EditPageTest extends MediaWikiLangTestCase {
"Expected result code mismatch. $message" );
}
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
if ( $expectedText !== null ) {
// check resulting page text

2
tests/phpunit/includes/LinkerTest.php
View file

@ -520,7 +520,7 @@ class LinkerTest extends MediaWikiLangTestCase {
$this->assertSame( 0, Title::newFromText( $title )->getArticleID() );
$pageData = $this->insertPage( $title );
$page = WikiPage::factory( $pageData['title'] );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $pageData['title'] );
$summary = CommentStoreComment::newUnsavedComment( 'Some comment!' );
$page->newPageUpdater( $user )

2
tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
View file

@ -68,7 +68,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase {
private function getPage( $title ) {
$title = ( $title instanceof Title ) ? $title : $this->getTitle( $title );
return WikiPage::factory( $title );
return $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
}
/**

62
tests/phpunit/includes/Storage/PageUpdaterTest.php
View file

@ -86,9 +86,10 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
*/
public function testCreatePage() {
$user = $this->getTestUser()->getUser();
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$oldStats = $this->db->selectRow( 'site_stats', '*', '1=1' );
@ -157,7 +158,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$this->assertNotNull( $page->getRevisionRecord(), 'WikiPage::getRevisionRecord()' );
// re-load
$page2 = WikiPage::factory( $title );
$page2 = $wikiPageFactory->newFromTitle( $title );
$this->assertTrue( $page2->exists(), 'WikiPage::exists()' );
$this->assertSame( $rev->getId(), $page2->getLatest(), 'WikiPage::getLatest()' );
$this->assertNotNull( $page2->getRevisionRecord(), 'WikiPage::getRevisionRecord()' );
@ -195,8 +196,9 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ );
$this->insertPage( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
$parentId = $page->getLatest();
$updater = $page->newPageUpdater( $user );
@ -257,7 +259,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$this->assertNotNull( $page->getRevisionRecord(), 'WikiPage::getRevisionRecord()' );
// re-load
$page2 = WikiPage::factory( $title );
$page2 = $wikiPageFactory->newFromTitle( $title );
$this->assertTrue( $page2->exists(), 'WikiPage::exists()' );
$this->assertSame( $rev->getId(), $page2->getLatest(), 'WikiPage::getLatest()' );
$this->assertNotNull( $page2->getRevisionRecord(), 'WikiPage::getRevisionRecord()' );
@ -308,7 +310,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$this->insertPage( $title );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$parentId = $page->getLatest();
$updater = $page->newPageUpdater( $user );
$updater->setForceEmptyRevision( true );
@ -331,7 +333,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$this->insertPage( $title );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$updater->setForceEmptyRevision( true );
// Setting setForceEmptyRevision causes saveRevision() to fail if the content is changed.
@ -448,7 +450,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
];
// start editing non-existing page
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
foreach ( $slots as $slot => $content ) {
$updater->setContent( $slot, $content );
@ -504,7 +506,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ );
// start editing non-existing page
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user )
->setContent( SlotRecord::MAIN, new TextContent( 'Lorem Ipsum' ) );
@ -540,14 +542,15 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
// start editing non-existing page
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$updater->grabParentRevision();
// create page concurrently
$concurrentPage = WikiPage::factory( $title );
$concurrentPage = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$this->createRevision( $concurrentPage, __METHOD__ . '-one' );
// try creating the page - should trigger CAS failure.
@ -561,12 +564,12 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$this->assertStatusError( 'edit-already-exists', $status, 'edit-conflict' );
// start editing existing page
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$updater->grabParentRevision();
// update page concurrently
$concurrentPage = WikiPage::factory( $title );
$concurrentPage = $wikiPageFactory->newFromTitle( $title );
$this->createRevision( $concurrentPage, __METHOD__ . '-two' );
// try creating the page - should trigger CAS failure.
@ -589,7 +592,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ );
// start editing non-existing page
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
// update with EDIT_UPDATE flag should fail
@ -626,7 +629,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ );
// start editing non-existing page
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
// plain text content should fail in aux slot (the main slot doesn't care)
$updater = $page->newPageUpdater( $user )
@ -662,7 +665,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$summary = CommentStoreComment::newUnsavedComment( 'Lorem ipsum ' . $patrolled );
$rev = $page->newPageUpdater( $user )
->setContent( SlotRecord::MAIN, new TextContent( 'Lorem ipsum ' . $patrolled ) )
@ -681,9 +684,10 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ );
$summary = CommentStoreComment::newUnsavedComment( 'testing...' );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
// Create page
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
$updater = $page->newPageUpdater( $user )
->setContent( 'main', new TextContent( 'Content 1' ) );
$updater->saveRevision( $summary, EDIT_NEW );
@ -691,7 +695,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
// Create a clone of $title and $page.
$title = Title::makeTitle( $title->getNamespace(), $title->getDBkey() );
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
// start editing existing page using bad page ID
$updater = $page->newPageUpdater( $user );
@ -716,7 +720,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$summary = CommentStoreComment::newUnsavedComment( 'one' );
@ -833,7 +837,8 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
$updater = $page->newPageUpdater( $user )
->setUseAutomaticEditSummaries( true )
@ -861,7 +866,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
// check that we can also disable edit-summaries
$title2 = $this->getDummyTitle( __METHOD__ . '/2' );
$page2 = WikiPage::factory( $title2 );
$page2 = $wikiPageFactory->newFromTitle( $title2 );
$updater = $page2->newPageUpdater( $user )
->setUseAutomaticEditSummaries( false )
@ -899,7 +904,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ . ( $use ? '_logged' : '_unlogged' ) );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$summary = CommentStoreComment::newUnsavedComment( 'cmt' );
$updater = $page->newPageUpdater( $user )
@ -979,7 +984,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$title = $this->getDummyTitle( __METHOD__ . '-' . $this->getName() );
$this->insertPage( $title );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user )
->setContent( SlotRecord::MAIN, new \WikitextContent( $wikitext ) );
@ -1005,10 +1010,11 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
public function testChangeTagsSuppressRecentChange() {
$page = PageIdentityValue::localIdentity( 0, NS_MAIN, __METHOD__ );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$revision = $this->getServiceContainer()
->getPageUpdaterFactory()
->newPageUpdater(
WikiPage::factory( $page ),
$wikiPageFactory->newFromTitle( $page ),
$this->getTestUser()->getUser()
)
->setContent( SlotRecord::MAIN, new TextContent( 'Lorem Ipsum' ) )
@ -1020,7 +1026,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$revision2 = $this->getServiceContainer()
->getPageUpdaterFactory()
->newPageUpdater(
WikiPage::factory( $page ),
$wikiPageFactory->newFromTitle( $page ),
$this->getTestUser()->getUser()
)
->setContent( SlotRecord::MAIN, new TextContent( 'Other content' ) )
@ -1038,7 +1044,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$this->assertSame( $page->getCurrentUpdate(), $updater->prepareUpdate() );
@ -1052,7 +1058,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
public function testPreventChange_modify() {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
// Creation
@ -1090,7 +1096,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
public function testPreventChange_create() {
$user = $this->getTestUser()->getUser();
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$summary = CommentStoreComment::newUnsavedComment( 'one' );
@ -1104,7 +1110,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
public function testUpdateAuthor() {
$title = $this->getDummyTitle( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$user = new User;
$user->setName( 'PageUpdaterTest' );
$updater = $page->newPageUpdater( $user );

5
tests/phpunit/includes/TemplateCategoriesTest.php
View file

@ -11,9 +11,10 @@ class TemplateCategoriesTest extends MediaWikiIntegrationTestCase {
public function testTemplateCategories() {
$user = new User();
$this->overrideUserPermissions( $user, [ 'createpage', 'edit', 'purge', 'delete' ] );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$title = Title::newFromText( "Categorized from template" );
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
$page->doUserEditContent(
new WikitextContent( '{{Categorising template}}' ),
$user,
@ -27,7 +28,7 @@ class TemplateCategoriesTest extends MediaWikiIntegrationTestCase {
);
// Create template
$template = WikiPage::factory( Title::newFromText( 'Template:Categorising template' ) );
$template = $wikiPageFactory->newFromTitle( Title::newFromText( 'Template:Categorising template' ) );
$template->doUserEditContent(
new WikitextContent( '[[Category:Solved bugs]]' ),
$user,

2
tests/phpunit/includes/actions/ActionTest.php
View file

@ -93,7 +93,7 @@ class ActionTest extends MediaWikiIntegrationTestCase {
private function getPage(): WikiPage {
$title = Title::makeTitle( 0, 'Title' );
return WikiPage::factory( $title );
return $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
}
/**

40
tests/phpunit/includes/api/ApiEditPageTest.php
View file

@ -168,7 +168,8 @@ class ApiEditPageTest extends ApiTestCase {
*/
public function testEditSection() {
$name = 'Help:ApiEditPageTest_testEditSection';
$page = WikiPage::factory( Title::newFromText( $name ) );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( Title::newFromText( $name ) );
$text = "==section 1==\ncontent 1\n==section 2==\ncontent2";
// Preload the page with some text
$page->doUserEditContent(
@ -184,7 +185,7 @@ class ApiEditPageTest extends ApiTestCase {
'text' => "==section 1==\nnew content 1",
] );
$this->assertSame( 'Success', $re['edit']['result'] );
$newtext = WikiPage::factory( Title::newFromText( $name ) )
$newtext = $wikiPageFactory->newFromTitle( Title::newFromText( $name ) )
->getContent( RevisionRecord::RAW )
->getText();
$this->assertSame( "==section 1==\nnew content 1\n\n==section 2==\ncontent2", $newtext );
@ -211,6 +212,7 @@ class ApiEditPageTest extends ApiTestCase {
*/
public function testEditNewSection() {
$name = 'Help:ApiEditPageTest_testEditNewSection';
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
// Test on a page that does not already exist
$this->assertFalse( Title::newFromText( $name )->exists() );
@ -224,7 +226,7 @@ class ApiEditPageTest extends ApiTestCase {
$this->assertSame( 'Success', $re['edit']['result'] );
// Check the page text is correct
$text = WikiPage::factory( Title::newFromText( $name ) )
$text = $wikiPageFactory->newFromTitle( Title::newFromText( $name ) )
->getContent( RevisionRecord::RAW )
->getText();
$this->assertSame( "== header ==\n\ntest", $text );
@ -240,7 +242,7 @@ class ApiEditPageTest extends ApiTestCase {
] );
$this->assertSame( 'Success', $re2['edit']['result'] );
$text = WikiPage::factory( Title::newFromText( $name ) )
$text = $wikiPageFactory->newFromTitle( Title::newFromText( $name ) )
->getContent( RevisionRecord::RAW )
->getText();
$this->assertSame( "== header ==\n\ntest\n\n== header ==\n\ntest", $text );
@ -271,7 +273,8 @@ class ApiEditPageTest extends ApiTestCase {
'summary' => $summary,
] );
$wikiPage = WikiPage::factory( Title::newFromText( $name ) );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$wikiPage = $wikiPageFactory->newFromTitle( Title::newFromText( $name ) );
// Check the page text is correct
$savedText = $wikiPage->getContent( RevisionRecord::RAW )->getText();
@ -297,7 +300,7 @@ class ApiEditPageTest extends ApiTestCase {
'summary' => $summary,
] );
$wikiPage = WikiPage::factory( Title::newFromText( $name ) );
$wikiPage = $wikiPageFactory->newFromTitle( Title::newFromText( $name ) );
// Check the page text is correct
$savedText = $wikiPage->getContent( RevisionRecord::RAW )->getText();
@ -369,11 +372,12 @@ class ApiEditPageTest extends ApiTestCase {
// assume NS_HELP defaults to wikitext
$name = "Help:ApiEditPageTest_testEdit_redirect_$count";
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
$rname = "Help:ApiEditPageTest_testEdit_redirect_r$count";
$rtitle = Title::newFromText( $rname );
$rpage = WikiPage::factory( $rtitle );
$rpage = $wikiPageFactory->newFromTitle( $rtitle );
// base edit for content
$page->doUserEditContent(
@ -430,11 +434,12 @@ class ApiEditPageTest extends ApiTestCase {
// assume NS_HELP defaults to wikitext
$name = "Help:ApiEditPageTest_testEdit_redirectText_$count";
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
$rname = "Help:ApiEditPageTest_testEdit_redirectText_r$count";
$rtitle = Title::newFromText( $rname );
$rpage = WikiPage::factory( $rtitle );
$rpage = $wikiPageFactory->newFromTitle( $rtitle );
// base edit for content
$page->doUserEditContent(
@ -491,7 +496,7 @@ class ApiEditPageTest extends ApiTestCase {
$name = "Help:ApiEditPageTest_testEditConflict_$count";
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
// base edit
$page->doUserEditContent(
@ -537,7 +542,7 @@ class ApiEditPageTest extends ApiTestCase {
$name = "Help:ApiEditPageTest_testEditConflict_$count";
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
// base edit
$page->doUserEditContent(
@ -586,7 +591,7 @@ class ApiEditPageTest extends ApiTestCase {
$name = "Help:ApiEditPageTest_testEditConflict_newSection_$count";
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
// base edit
$page->doUserEditContent(
@ -635,11 +640,12 @@ class ApiEditPageTest extends ApiTestCase {
// assume NS_HELP defaults to wikitext
$name = "Help:ApiEditPageTest_testEditConflict_redirect_T43990_$count";
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
$rname = "Help:ApiEditPageTest_testEditConflict_redirect_T43990_r$count";
$rtitle = Title::newFromText( $rname );
$rpage = WikiPage::factory( $rtitle );
$rpage = $wikiPageFactory->newFromTitle( $rtitle );
// base edit for content
$page->doUserEditContent(
@ -735,7 +741,7 @@ class ApiEditPageTest extends ApiTestCase {
$this->assertArrayHasKey( 'pageid', $apiResult['edit'] );
// validate resulting revision
$page = WikiPage::factory( Title::newFromText( $name ) );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( Title::newFromText( $name ) );
$this->assertSame( "testing-nontext", $page->getContentModel() );
$this->assertSame( $data, $page->getContent()->serialize() );
}
@ -1822,7 +1828,7 @@ class ApiEditPageTest extends ApiTestCase {
$name = 'Help:' . ucfirst( __FUNCTION__ );
$title = Title::newFromText( $name );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
// base edit, currently in Wikitext
$page->doUserEditContent(

6
tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
View file

@ -35,7 +35,7 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
private function doMinorPageEdit( User $user, LinkTarget $target, $summary ) {
$title = Title::newFromLinkTarget( $target );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$page->doUserEditContent(
ContentHandler::makeContent( __CLASS__, $title ),
$user,
@ -46,7 +46,7 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
private function doBotPageEdit( User $user, LinkTarget $target, $summary ) {
$title = Title::newFromLinkTarget( $target );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$page->doUserEditContent(
ContentHandler::makeContent( __CLASS__, $title ),
$user,
@ -57,7 +57,7 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
private function doAnonPageEdit( LinkTarget $target, $summary ) {
$title = Title::newFromLinkTarget( $target );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$page->doUserEditContent(
ContentHandler::makeContent( __CLASS__, $title ),
User::newFromId( 0 ),

6
tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
View file

@ -42,7 +42,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
private function doMinorPageEdit( User $user, LinkTarget $target, $content, $summary ) {
$title = Title::newFromLinkTarget( $target );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$page->doUserEditContent(
ContentHandler::makeContent( $content, $title ),
$user,
@ -53,7 +53,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
private function doBotPageEdit( User $user, LinkTarget $target, $content, $summary ) {
$title = Title::newFromLinkTarget( $target );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$page->doUserEditContent(
ContentHandler::makeContent( $content, $title ),
$user,
@ -81,7 +81,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
) {
$title = Title::newFromLinkTarget( $target );
$summary = CommentStoreComment::newUnsavedComment( trim( $summary ) );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $user );
$updater->setContent( SlotRecord::MAIN, ContentHandler::makeContent( $content, $title ) );

2
tests/phpunit/includes/cache/BacklinkCacheTest.php vendored
View file

@ -21,7 +21,7 @@ class BacklinkCacheTest extends MediaWikiIntegrationTestCase {
$this->insertPage( 'BacklinkCacheTest_5', '[[BacklinkCacheTest_1]]' );
$cascade = 1;
WikiPage::factory( self::$backlinkCacheTest['title'] )->doUpdateRestrictions(
$this->getServiceContainer()->getWikiPageFactory()->newFromTitle( self::$backlinkCacheTest['title'] )->doUpdateRestrictions(
[ 'edit' => 'sysop' ],
[],
$cascade,

2
tests/phpunit/includes/changes/CategoryMembershipChangeTest.php
View file

@ -60,7 +60,7 @@ class CategoryMembershipChangeTest extends MediaWikiLangTestCase {
$info = $this->insertPage( self::$pageName );
$title = $info['title'];
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
self::$pageRev = $page->getRevisionRecord();
self::$revUser = self::$pageRev->getUser( RevisionRecord::RAW );
}

2
tests/phpunit/includes/content/ContentModelChangeTest.php
View file

@ -206,7 +206,7 @@ class ContentModelChangeTest extends MediaWikiIntegrationTestCase {
*/
public function testNoDirectEditing() {
$title = Title::newFromText( 'Dummy:NoDirectEditing' );
$wikipage = WikiPage::factory( $title );
$wikipage = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$dummyContent = ContentHandler::getForModelID( 'testing' )->makeEmptyContent();
$wikipage->doUserEditContent(

2
tests/phpunit/includes/context/RequestContextTest.php
View file

@ -25,7 +25,7 @@ class RequestContextTest extends MediaWikiIntegrationTestCase {
"When a title is first set WikiPage should be created on-demand for that title." );
$curTitle = Title::makeTitle( NS_MAIN, "B" );
$context->setWikiPage( WikiPage::factory( $curTitle ) );
$context->setWikiPage( $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $curTitle ) );
$this->assertTrue( $curTitle->equals( $context->getTitle() ),
"Title must be updated when a new WikiPage is provided." );

6
tests/phpunit/includes/deferred/RefreshSecondaryDataUpdateTest.php
View file

@ -49,7 +49,7 @@ class RefreshSecondaryDataUpdateTest extends MediaWikiIntegrationTestCase {
$this->assertSame( 0, $queue->getSize() );
$this->assertSame( 0, DeferredUpdates::pendingUpdatesCount() );
$wikiPage = WikiPage::factory( Title::makeTitle( NS_MAIN, 'TestPage' ) );
$wikiPage = $services->getWikiPageFactory()->newFromTitle( Title::makeTitle( NS_MAIN, 'TestPage' ) );
DeferredUpdates::addUpdate( new RefreshSecondaryDataUpdate(
$lbFactory,
$user,
@ -127,7 +127,7 @@ class RefreshSecondaryDataUpdateTest extends MediaWikiIntegrationTestCase {
$this->assertSame( 0, $queue->getSize() );
$this->assertSame( 0, DeferredUpdates::pendingUpdatesCount() );
$wikiPage = WikiPage::factory( Title::makeTitle( NS_MAIN, 'TestPage' ) );
$wikiPage = $services->getWikiPageFactory()->newFromTitle( Title::makeTitle( NS_MAIN, 'TestPage' ) );
DeferredUpdates::addUpdate( new RefreshSecondaryDataUpdate(
$lbFactory,
$user,
@ -205,7 +205,7 @@ class RefreshSecondaryDataUpdateTest extends MediaWikiIntegrationTestCase {
return [ $goodUpdate ];
} );
$wikiPage = WikiPage::factory( Title::makeTitle( NS_MAIN, 'UTPage' ) );
$wikiPage = $services->getWikiPageFactory()->newFromTitle( Title::makeTitle( NS_MAIN, 'UTPage' ) );
$update = new RefreshSecondaryDataUpdate(
$lbFactory,
$user,

2
tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
View file

@ -31,7 +31,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase {
*/
private function createPage( $name, array $content ) {
$title = Title::makeTitle( $this->getDefaultWikitextNS(), $name );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$updater = $page->newPageUpdater( $this->getTestUser()->getUser() );

5
tests/phpunit/includes/page/ArticleTablesTest.php
View file

@ -15,7 +15,8 @@ class ArticleTablesTest extends MediaWikiLangTestCase {
*/
public function testTemplatelinksUsesContentLanguage() {
$title = Title::newFromText( 'T16404' );
$page = WikiPage::factory( $title );
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$page = $wikiPageFactory->newFromTitle( $title );
$user = new User();
$this->overrideUserPermissions( $user, [ 'createpage', 'edit', 'purge' ] );
$this->setContentLang( 'es' );
@ -29,7 +30,7 @@ class ArticleTablesTest extends MediaWikiLangTestCase {
$templates1 = $title->getTemplateLinksFrom();
$this->setUserLang( 'de' );
$page = WikiPage::factory( $title ); // In order to force the re-rendering of the same wikitext
$page = $wikiPageFactory->newFromTitle( $title ); // In order to force the re-rendering of the same wikitext
// We need an edit, a purge is not enough to regenerate the tables
$page->doUserEditContent(

4
tests/phpunit/includes/page/WikiPageDbTest.php
View file

@ -453,7 +453,7 @@ class WikiPageDbTest extends MediaWikiLangTestCase {
*/
public function testDoUserEditContent_twice() {
$title = Title::newFromText( __METHOD__ );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$content = ContentHandler::makeContent( '$1 van $2', $title );
$user = $this->getTestUser()->getUser();
@ -1388,7 +1388,7 @@ more stuff
*/
public function testLoadPageData() {
$title = Title::makeTitle( NS_MAIN, 'SomePage' );
$page = WikiPage::factory( $title );
$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
$this->assertFalse( $page->wasLoadedFrom( IDBAccessObject::READ_NORMAL ) );
$this->assertFalse( $page->wasLoadedFrom( IDBAccessObject::READ_LATEST ) );

12
tests/phpunit/maintenance/PageDumpTestDataTrait.php
View file

@ -10,7 +10,6 @@ use RequestContext;
use RevisionDeleter;
use Title;
use Wikimedia\Rdbms\IDatabase;
use WikiPage;
use WikitextContent;
/**
@ -66,8 +65,9 @@ trait PageDumpTestDataTrait {
. " We can't currently deal with that." );
}
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
$this->pageTitle1 = Title::newFromText( 'BackupDumperTestP1', $this->namespace );
$page = WikiPage::factory( $this->pageTitle1 );
$page = $wikiPageFactory->newFromTitle( $this->pageTitle1 );
$this->rev1_1 = $this->addMultiSlotRevision(
$page,
[
@ -79,7 +79,7 @@ trait PageDumpTestDataTrait {
$this->pageId1 = $page->getId();
$this->pageTitle2 = Title::newFromText( 'BackupDumperTestP2', $this->namespace );
$page = WikiPage::factory( $this->pageTitle2 );
$page = $wikiPageFactory->newFromTitle( $this->pageTitle2 );
[ , , $this->rev2_1 ] = $this->addRevision( $page,
"BackupDumperTestP2Text1", "BackupDumperTestP2Summary1" );
[ , , $this->rev2_2 ] = $this->addRevision( $page,
@ -109,7 +109,7 @@ trait PageDumpTestDataTrait {
);
$this->pageTitle3 = Title::newFromText( 'BackupDumperTestP3', $this->namespace );
$page = WikiPage::factory( $this->pageTitle3 );
$page = $wikiPageFactory->newFromTitle( $this->pageTitle3 );
[ , , $this->rev3_1 ] = $this->addRevision( $page,
"BackupDumperTestP3Text1", "BackupDumperTestP2Summary1" );
[ , , $this->rev3_2 ] = $this->addRevision( $page,
@ -120,14 +120,14 @@ trait PageDumpTestDataTrait {
->deleteUnsafe( "Testing" );
$this->pageTitle4 = Title::newFromText( 'BackupDumperTestP1', $this->talk_namespace );
$page = WikiPage::factory( $this->pageTitle4 );
$page = $wikiPageFactory->newFromTitle( $this->pageTitle4 );
[ , , $this->rev4_1 ] = $this->addRevision( $page,
"Talk about BackupDumperTestP1 Text1",
"Talk BackupDumperTestP1 Summary1" );
$this->pageId4 = $page->getId();
$this->pageTitle5 = Title::newFromText( 'BackupDumperTestP5' );
$page = WikiPage::factory( $this->pageTitle5 );
$page = $wikiPageFactory->newFromTitle( $this->pageTitle5 );
[ , , $this->rev5_1 ] = $this->addRevision( $page,
"BackupDumperTestP5 Text1",
"BackupDumperTestP5 Summary1" );

5
tests/phpunit/maintenance/fetchTextTest.php
View file

@ -135,10 +135,11 @@ class FetchTextTest extends MediaWikiIntegrationTestCase {
public function addDBDataOnce() {
$wikitextNamespace = $this->getDefaultWikitextNS();
$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
try {
$title = Title::newFromText( 'FetchTextTestPage1', $wikitextNamespace );
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
self::$textId1 = $this->addRevision(
$page,
"FetchTextTestPage1Text1",
@ -146,7 +147,7 @@ class FetchTextTest extends MediaWikiIntegrationTestCase {
);
$title = Title::newFromText( 'FetchTextTestPage2', $wikitextNamespace );
$page = WikiPage::factory( $title );
$page = $wikiPageFactory->newFromTitle( $title );
self::$textId2 = $this->addRevision(
$page,
"FetchTextTestPage2Text1",