b523ab0081
PHP 8.0 changed the behavior of numeric comparisons such that non-numeric strings no longer weakly equal 0.[1] This breaks the logic in Parser::extractSections(), which was relying on the old comparison behavior for section indexes and in turn causes the revisions API to return a bogus 'nosuchsection' for error when called with rvsection=new. Fix the logic by explicitly casting the section index to a number, which will yield the appropriate numeric section index for a numbered section index and 0 for a non-numeric section index (like 'new'). Also add test cases for the relevant API module. -- [1] https://wiki.php.net/rfc/string_to_number_comparison Change-Id: If32aa4d575cff66bd4eee56f9e3b0b0d9ba04fde Bug: T323373
144 lines
4.2 KiB
PHP
144 lines
4.2 KiB
PHP
<?php
|
|
|
|
use MediaWiki\Revision\SlotRecord;
|
|
|
|
/**
|
|
* @group API
|
|
* @group Database
|
|
* @group medium
|
|
* @covers ApiQueryRevisions
|
|
*/
|
|
class ApiQueryRevisionsTest extends ApiTestCase {
|
|
|
|
/**
|
|
* @group medium
|
|
*/
|
|
public function testContentComesWithContentModelAndFormat() {
|
|
$pageName = 'Help:' . __METHOD__;
|
|
$page = $this->getExistingTestPage( $pageName );
|
|
$user = $this->getTestUser()->getUser();
|
|
$page->newPageUpdater( $user )
|
|
->setContent( SlotRecord::MAIN, new WikitextContent( 'Some text' ) )
|
|
->saveRevision( CommentStoreComment::newUnsavedComment( 'inserting content' ) );
|
|
|
|
$apiResult = $this->doApiRequest( [
|
|
'action' => 'query',
|
|
'prop' => 'revisions',
|
|
'titles' => $pageName,
|
|
'rvprop' => 'content',
|
|
'rvslots' => 'main',
|
|
] );
|
|
$this->assertArrayHasKey( 'query', $apiResult[0] );
|
|
$this->assertArrayHasKey( 'pages', $apiResult[0]['query'] );
|
|
foreach ( $apiResult[0]['query']['pages'] as $page ) {
|
|
$this->assertArrayHasKey( 'revisions', $page );
|
|
foreach ( $page['revisions'] as $revision ) {
|
|
$this->assertArrayHasKey( 'slots', $revision );
|
|
$this->assertArrayHasKey( 'main', $revision['slots'] );
|
|
$this->assertArrayHasKey( 'contentformat', $revision['slots']['main'],
|
|
'contentformat should be included when asking content so client knows how to interpret it'
|
|
);
|
|
$this->assertArrayHasKey( 'contentmodel', $revision['slots']['main'],
|
|
'contentmodel should be included when asking content so client knows how to interpret it'
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @group medium
|
|
*/
|
|
public function testResolvesPrevNextInDiffto() {
|
|
$pageName = 'Help:' . __METHOD__;
|
|
$page = $this->getExistingTestPage( $pageName );
|
|
$user = $this->getTestUser()->getUser();
|
|
|
|
$revRecord = $page->newPageUpdater( $user )
|
|
->setContent( SlotRecord::MAIN, new WikitextContent( 'Some text' ) )
|
|
->saveRevision( CommentStoreComment::newUnsavedComment( 'inserting more content' ) );
|
|
|
|
[ $rvDiffToPrev ] = $this->doApiRequest( [
|
|
'action' => 'query',
|
|
'prop' => 'revisions',
|
|
'titles' => $pageName,
|
|
'rvdiffto' => 'prev',
|
|
] );
|
|
|
|
$this->assertSame(
|
|
$revRecord->getId(),
|
|
$rvDiffToPrev['query']['pages'][$page->getId()]['revisions'][0]['revid']
|
|
);
|
|
$this->assertSame(
|
|
$revRecord->getId(),
|
|
$rvDiffToPrev['query']['pages'][$page->getId()]['revisions'][0]['diff']['to']
|
|
);
|
|
$this->assertSame(
|
|
$revRecord->getParentId(),
|
|
$rvDiffToPrev['query']['pages'][$page->getId()]['revisions'][0]['diff']['from']
|
|
);
|
|
|
|
[ $rvDiffToNext ] = $this->doApiRequest( [
|
|
'action' => 'query',
|
|
'prop' => 'revisions',
|
|
'titles' => $pageName,
|
|
'rvdiffto' => 'next',
|
|
'rvdir' => 'newer'
|
|
] );
|
|
|
|
$this->assertSame(
|
|
$revRecord->getParentId(),
|
|
$rvDiffToNext['query']['pages'][$page->getId()]['revisions'][0]['revid']
|
|
);
|
|
$this->assertSame(
|
|
$revRecord->getId(),
|
|
$rvDiffToNext['query']['pages'][$page->getId()]['revisions'][0]['diff']['to']
|
|
);
|
|
$this->assertSame(
|
|
$revRecord->getParentId(),
|
|
$rvDiffToNext['query']['pages'][$page->getId()]['revisions'][0]['diff']['from']
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideSectionNewTestCases
|
|
* @param string $pageContent
|
|
* @param string $expectedSectionContent
|
|
* @group medium
|
|
*/
|
|
public function testSectionNewReturnsEmptyContentForPageWithSection(
|
|
$pageContent,
|
|
$expectedSectionContent
|
|
) {
|
|
$pageName = 'Help:' . __METHOD__;
|
|
$page = $this->getExistingTestPage( $pageName );
|
|
$user = $this->getTestUser()->getUser();
|
|
$revRecord = $page->newPageUpdater( $user )
|
|
->setContent( SlotRecord::MAIN, new WikitextContent( $pageContent ) )
|
|
->saveRevision( CommentStoreComment::newUnsavedComment( 'inserting content' ) );
|
|
|
|
[ $response ] = $this->doApiRequest( [
|
|
'action' => 'query',
|
|
'prop' => 'revisions',
|
|
'revids' => $revRecord->getId(),
|
|
'rvprop' => 'content|ids',
|
|
'rvslots' => 'main',
|
|
'rvsection' => 'new'
|
|
] );
|
|
|
|
$this->assertSame(
|
|
$expectedSectionContent,
|
|
$response['query']['pages'][$page->getId()]['revisions'][0]['slots']['main']['content']
|
|
);
|
|
}
|
|
|
|
public function provideSectionNewTestCases() {
|
|
yield 'page with existing section' => [
|
|
"==A section==\ntext",
|
|
''
|
|
];
|
|
yield 'page with no sections' => [
|
|
'This page has no sections',
|
|
'This page has no sections'
|
|
];
|
|
}
|
|
}
|