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

Merge "Revert "Revert "Remove unused class_alias deprecated in MW 1.40"""

Browse source
This commit is contained in:
jenkins-bot 2023-10-03 17:03:31 +00:00 committed by Gerrit Code Review
commit c7fe8a109d
13 changed files with 48 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
RELEASE-NOTES-1.41
View file

@ -504,6 +504,16 @@ because of Phabricator reports.
- IDatabase (use Wikimedia\Rdbms\IDatabase)
- FakeResultWrapper (use Wikimedia\Rdbms\FakeResultWrapper)
- ResultWrapper (use Wikimedia\Rdbms\ResultWrapper)
* The following old, deprecated aliases for classes have now been removed:
- MediaWiki\Rest\Handler\HtmlInputTransformHelper
- MediaWiki\Rest\Handler\HtmlMessageOutputHelper
- MediaWiki\Rest\Handler\HtmlOutputRendererHelper
- MediaWiki\Rest\Handler\PageContentHelper
- MediaWiki\Rest\Handler\PageRestHelperFactory
- MediaWiki\Rest\Handler\ParsoidFormatHelper
- MediaWiki\Rest\Handler\RevisionContentHelper
(use the classes from namespace MediaWiki\Rest\Handler\Helper)
- SearchNearMatcher (use MediaWiki\Search\TitleMatcher)
* $CHANGEDORCREATED argument of 'enotif_body' message was removed.
It wasn't used in the default messages since 1.21.
* The AbstractBlock and DatabaseBlock public properties mExpiry, mHideName,

8
autoload.php
View file

@ -1798,21 +1798,14 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\Rest\\Handler\\Helper\\PageRestHelperFactory' => __DIR__ . '/includes/Rest/Handler/Helper/PageRestHelperFactory.php',
'MediaWiki\\Rest\\Handler\\Helper\\ParsoidFormatHelper' => __DIR__ . '/includes/Rest/Handler/Helper/ParsoidFormatHelper.php',
'MediaWiki\\Rest\\Handler\\Helper\\RevisionContentHelper' => __DIR__ . '/includes/Rest/Handler/Helper/RevisionContentHelper.php',
'MediaWiki\\Rest\\Handler\\HtmlInputTransformHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php',
'MediaWiki\\Rest\\Handler\\HtmlOutputHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php',
'MediaWiki\\Rest\\Handler\\HtmlOutputRendererHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php',
'MediaWiki\\Rest\\Handler\\LanguageLinksHandler' => __DIR__ . '/includes/Rest/Handler/LanguageLinksHandler.php',
'MediaWiki\\Rest\\Handler\\MediaFileHandler' => __DIR__ . '/includes/Rest/Handler/MediaFileHandler.php',
'MediaWiki\\Rest\\Handler\\MediaLinksHandler' => __DIR__ . '/includes/Rest/Handler/MediaLinksHandler.php',
'MediaWiki\\Rest\\Handler\\PageContentHelper' => __DIR__ . '/includes/Rest/Handler/Helper/PageContentHelper.php',
'MediaWiki\\Rest\\Handler\\PageHTMLHandler' => __DIR__ . '/includes/Rest/Handler/PageHTMLHandler.php',
'MediaWiki\\Rest\\Handler\\PageHistoryCountHandler' => __DIR__ . '/includes/Rest/Handler/PageHistoryCountHandler.php',
'MediaWiki\\Rest\\Handler\\PageHistoryHandler' => __DIR__ . '/includes/Rest/Handler/PageHistoryHandler.php',
'MediaWiki\\Rest\\Handler\\PageRestHelperFactory' => __DIR__ . '/includes/Rest/Handler/Helper/PageRestHelperFactory.php',
'MediaWiki\\Rest\\Handler\\PageSourceHandler' => __DIR__ . '/includes/Rest/Handler/PageSourceHandler.php',
'MediaWiki\\Rest\\Handler\\ParsoidFormatHelper' => __DIR__ . '/includes/Rest/Handler/Helper/ParsoidFormatHelper.php',
'MediaWiki\\Rest\\Handler\\ParsoidHandler' => __DIR__ . '/includes/Rest/Handler/ParsoidHandler.php',
'MediaWiki\\Rest\\Handler\\RevisionContentHelper' => __DIR__ . '/includes/Rest/Handler/Helper/RevisionContentHelper.php',
'MediaWiki\\Rest\\Handler\\RevisionHTMLHandler' => __DIR__ . '/includes/Rest/Handler/RevisionHTMLHandler.php',
'MediaWiki\\Rest\\Handler\\RevisionSourceHandler' => __DIR__ . '/includes/Rest/Handler/RevisionSourceHandler.php',
'MediaWiki\\Rest\\Handler\\SearchHandler' => __DIR__ . '/includes/Rest/Handler/SearchHandler.php',
@ -2643,7 +2636,6 @@ $wgAutoloadLocalClasses = [
'SearchIndexFieldDefinition' => __DIR__ . '/includes/search/SearchIndexFieldDefinition.php',
'SearchMySQL' => __DIR__ . '/includes/search/SearchMySQL.php',
'SearchNearMatchResultSet' => __DIR__ . '/includes/search/SearchNearMatchResultSet.php',
'SearchNearMatcher' => __DIR__ . '/includes/search/TitleMatcher.php',
'SearchPostgres' => __DIR__ . '/includes/search/SearchPostgres.php',
'SearchResult' => __DIR__ . '/includes/search/SearchResult.php',
'SearchResultSet' => __DIR__ . '/includes/search/SearchResultSet.php',

3
includes/Rest/Handler/Helper/HtmlInputTransformHelper.php
View file

@ -683,6 +683,3 @@ class HtmlInputTransformHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( HtmlInputTransformHelper::class, "MediaWiki\\Rest\\Handler\\HtmlInputTransformHelper" );

3
includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php
View file

@ -121,6 +121,3 @@ class HtmlMessageOutputHelper implements HtmlOutputHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( HtmlMessageOutputHelper::class, "MediaWiki\\Rest\\Handler\\HtmlOutputHelper" );

3
includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php
View file

@ -788,6 +788,3 @@ class HtmlOutputRendererHelper implements HtmlOutputHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( HtmlOutputRendererHelper::class, "MediaWiki\\Rest\\Handler\\HtmlOutputRendererHelper" );

3
includes/Rest/Handler/Helper/PageContentHelper.php
View file

@ -374,6 +374,3 @@ class PageContentHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( PageContentHelper::class, "MediaWiki\\Rest\\Handler\\PageContentHelper" );

3
includes/Rest/Handler/Helper/PageRestHelperFactory.php
View file

@ -147,6 +147,3 @@ class PageRestHelperFactory {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( PageRestHelperFactory::class, "MediaWiki\\Rest\\Handler\\PageRestHelperFactory" );

3
includes/Rest/Handler/Helper/ParsoidFormatHelper.php
View file

@ -130,6 +130,3 @@ class ParsoidFormatHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( ParsoidFormatHelper::class, "MediaWiki\\Rest\\Handler\\ParsoidFormatHelper" );

3
includes/Rest/Handler/Helper/RevisionContentHelper.php
View file

@ -185,6 +185,3 @@ class RevisionContentHelper extends PageContentHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( RevisionContentHelper::class, "MediaWiki\\Rest\\Handler\\RevisionContentHelper" );

5
includes/search/TitleMatcher.php
View file

@ -252,8 +252,3 @@ class TitleMatcher {
return null;
}
}
/**
* @deprecated since 1.40, remove in 1.41.
*/
class_alias( TitleMatcher::class, 'SearchNearMatcher' );

4
tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php
View file

@ -806,7 +806,7 @@ class HtmlInputTransformHelperTest extends MediaWikiIntegrationTestCase {
*
* @throws HttpException
* @throws \MWException
* @covers \MediaWiki\Rest\Handler\HtmlInputTransformHelper::setOriginal
* @covers \MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper::setOriginal
*/
public function testSetOriginal( ?SelserContext $stashed, $rev, $originalRendering, $expectedText ) {
if ( is_int( $rev ) && $rev > 0 ) {
@ -874,7 +874,7 @@ class HtmlInputTransformHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlInputTransformHelper::getTransform
* @covers \MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper::getTransform
*/
public function testGetTransform() {
$page = PageIdentityValue::localIdentity( 7, NS_MAIN, 'HtmlInputTransformHelperTest' );

2
tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php
View file

@ -588,7 +588,7 @@ class HtmlOutputRendererHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlOutputRendererHelper::init
* @covers \MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper::init
* @covers \MediaWiki\Parser\Parsoid\ParsoidOutputAccess::parse
*/
public function testEtagLastModifiedWithPageIdentity() {

70
tests/phpunit/integration/includes/Rest/Handler/Helper/RevisionContentHelperTest.php
View file

@ -78,7 +78,7 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getRole()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getRole()
*/
public function testGetRole() {
$helper = $this->newHelper();
@ -86,8 +86,8 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getPage()
*/
public function testGetPage() {
[ $page, $revisions ] = $this->getExistingPageWithRevisions( __METHOD__ );
@ -100,8 +100,8 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getContent()
*/
public function testGetTargetRevisionAndContent() {
[ $page, $revisions ] = $this->getExistingPageWithRevisions( __METHOD__ );
@ -120,15 +120,15 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::isAccessible()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::hasContent()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getLastModified()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getETag()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::checkAccess()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::isAccessible()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::hasContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getLastModified()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getETag()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::checkAccess()
*/
public function testNoTitle() {
$helper = $this->newHelper();
@ -160,15 +160,15 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::isAccessible()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::hasContent()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getLastModified()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getETag()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::checkAccess()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::isAccessible()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::hasContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getLastModified()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getETag()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::checkAccess()
*/
public function testNonExistingRevision() {
$helper = $this->newHelper( [ 'id' => 287436534 ] );
@ -201,15 +201,15 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::isAccessible()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::hasContent()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getLastModified()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getETag()
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::checkAccess()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTitleText()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getPage()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::isAccessible()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::hasContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getTargetRevision()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getContent()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getLastModified()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getETag()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::checkAccess()
*/
public function testForbidenPage() {
[ $page, $revisions ] = $this->getExistingPageWithRevisions( __METHOD__ );
@ -236,7 +236,7 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::getParamSettings()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::getParamSettings()
*/
public function testParameterSettings() {
$helper = $this->newHelper();
@ -245,7 +245,7 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::setCacheControl()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::setCacheControl()
*/
public function testCacheControl() {
$helper = $this->newHelper();
@ -263,7 +263,7 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper::constructMetadata()
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper::constructMetadata()
*/
public function testConstructMetadata() {
[ $page, $revisions ] = $this->getExistingPageWithRevisions( __METHOD__ );