From 33908cebed8eee8814c3a142bfe709d97cfecd60 Mon Sep 17 00:00:00 2001 From: Isabelle Hurbain-Palatin Date: Fri, 29 Sep 2023 12:35:16 +0200 Subject: [PATCH] Revert "Revert "Remove unused class_alias deprecated in MW 1.40"" This reverts commit cbde6b69deb702c51efdbbfee202eaf914a00495 to re-apply the initial patch. This should only be merged once I2acfd0b7a1e48aec107ded3bbe4963e2df24f4d3 is deployed. Change-Id: If12ab65b1d773946fca6c8601ff51290136549c8 --- RELEASE-NOTES-1.41 | 10 +++ autoload.php | 8 --- .../Helper/HtmlInputTransformHelper.php | 3 - .../Helper/HtmlMessageOutputHelper.php | 3 - .../Helper/HtmlOutputRendererHelper.php | 3 - .../Rest/Handler/Helper/PageContentHelper.php | 3 - .../Handler/Helper/PageRestHelperFactory.php | 3 - .../Handler/Helper/ParsoidFormatHelper.php | 3 - .../Handler/Helper/RevisionContentHelper.php | 3 - includes/search/TitleMatcher.php | 5 -- .../Helper/HtmlInputTransformHelperTest.php | 4 +- .../Helper/HtmlOutputRendererHelperTest.php | 2 +- .../Helper/RevisionContentHelperTest.php | 70 +++++++++---------- 13 files changed, 48 insertions(+), 72 deletions(-) diff --git a/RELEASE-NOTES-1.41 b/RELEASE-NOTES-1.41 index e32417232a0..48e2acc42ee 100644 --- a/RELEASE-NOTES-1.41 +++ b/RELEASE-NOTES-1.41 @@ -499,6 +499,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, diff --git a/autoload.php b/autoload.php index 48f3b0af104..c0f94a276ed 100644 --- a/autoload.php +++ b/autoload.php @@ -1799,21 +1799,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', @@ -2644,7 +2637,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', diff --git a/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php b/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php index dff960c0322..ac9a1db78ec 100644 --- a/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php +++ b/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php @@ -683,6 +683,3 @@ class HtmlInputTransformHelper { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( HtmlInputTransformHelper::class, "MediaWiki\\Rest\\Handler\\HtmlInputTransformHelper" ); diff --git a/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php b/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php index 9a523f71d31..6e6b256cab2 100644 --- a/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php +++ b/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php @@ -121,6 +121,3 @@ class HtmlMessageOutputHelper implements HtmlOutputHelper { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( HtmlMessageOutputHelper::class, "MediaWiki\\Rest\\Handler\\HtmlOutputHelper" ); diff --git a/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php b/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php index be4831c24a0..5fdda7d6953 100644 --- a/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php +++ b/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php @@ -788,6 +788,3 @@ class HtmlOutputRendererHelper implements HtmlOutputHelper { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( HtmlOutputRendererHelper::class, "MediaWiki\\Rest\\Handler\\HtmlOutputRendererHelper" ); diff --git a/includes/Rest/Handler/Helper/PageContentHelper.php b/includes/Rest/Handler/Helper/PageContentHelper.php index 49ac884c1bb..58d92512c9e 100644 --- a/includes/Rest/Handler/Helper/PageContentHelper.php +++ b/includes/Rest/Handler/Helper/PageContentHelper.php @@ -374,6 +374,3 @@ class PageContentHelper { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( PageContentHelper::class, "MediaWiki\\Rest\\Handler\\PageContentHelper" ); diff --git a/includes/Rest/Handler/Helper/PageRestHelperFactory.php b/includes/Rest/Handler/Helper/PageRestHelperFactory.php index 3f15c5c05f2..b176a0cf83f 100644 --- a/includes/Rest/Handler/Helper/PageRestHelperFactory.php +++ b/includes/Rest/Handler/Helper/PageRestHelperFactory.php @@ -147,6 +147,3 @@ class PageRestHelperFactory { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( PageRestHelperFactory::class, "MediaWiki\\Rest\\Handler\\PageRestHelperFactory" ); diff --git a/includes/Rest/Handler/Helper/ParsoidFormatHelper.php b/includes/Rest/Handler/Helper/ParsoidFormatHelper.php index e1cd131b760..f6a586f9c05 100644 --- a/includes/Rest/Handler/Helper/ParsoidFormatHelper.php +++ b/includes/Rest/Handler/Helper/ParsoidFormatHelper.php @@ -130,6 +130,3 @@ class ParsoidFormatHelper { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( ParsoidFormatHelper::class, "MediaWiki\\Rest\\Handler\\ParsoidFormatHelper" ); diff --git a/includes/Rest/Handler/Helper/RevisionContentHelper.php b/includes/Rest/Handler/Helper/RevisionContentHelper.php index 3cd0fcb1a80..bc8fe7f68e3 100644 --- a/includes/Rest/Handler/Helper/RevisionContentHelper.php +++ b/includes/Rest/Handler/Helper/RevisionContentHelper.php @@ -185,6 +185,3 @@ class RevisionContentHelper extends PageContentHelper { } } - -/** @deprecated since 1.40, remove in 1.41 */ -class_alias( RevisionContentHelper::class, "MediaWiki\\Rest\\Handler\\RevisionContentHelper" ); diff --git a/includes/search/TitleMatcher.php b/includes/search/TitleMatcher.php index da6df2235cc..7c7f1b876e3 100644 --- a/includes/search/TitleMatcher.php +++ b/includes/search/TitleMatcher.php @@ -252,8 +252,3 @@ class TitleMatcher { return null; } } - -/** - * @deprecated since 1.40, remove in 1.41. - */ -class_alias( TitleMatcher::class, 'SearchNearMatcher' ); diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php index 69d50d7de16..e158ea4057f 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php @@ -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' ); diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php index 5120d609986..17e68356c24 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php @@ -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() { diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/RevisionContentHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/RevisionContentHelperTest.php index 49847e8b603..b99b12c5506 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/RevisionContentHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/RevisionContentHelperTest.php @@ -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__ );