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

REST: Move Helper classes to their own namespace

Browse source 
Mixing Handlers with Helpers doesn't look nice for consistency
reasons. Helpers should be in their own place (grouped) in the
Handlers directory as they're really "helpers for the handlers".

Change-Id: Ieeb7a0a706a4cb38778f312bfbfe781a1f366d14
This commit is contained in:
Derick Alangi 2023-01-13 22:30:21 +01:00
parent 1ecbfca5e2
commit 1afd52e3e4
29 changed files with 105 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
autoload.php
View file

@ -1691,23 +1691,30 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\Rest\\Handler\\ContributionsCountHandler' => __DIR__ . '/includes/Rest/Handler/ContributionsCountHandler.php',
'MediaWiki\\Rest\\Handler\\CreationHandler' => __DIR__ . '/includes/Rest/Handler/CreationHandler.php',
'MediaWiki\\Rest\\Handler\\EditHandler' => __DIR__ . '/includes/Rest/Handler/EditHandler.php',
'MediaWiki\\Rest\\Handler\\HtmlInputTransformHelper' => __DIR__ . '/includes/Rest/Handler/HtmlInputTransformHelper.php',
'MediaWiki\\Rest\\Handler\\HtmlMessageOutputHelper' => __DIR__ . '/includes/Rest/Handler/HtmlMessageOutputHelper.php',
'MediaWiki\\Rest\\Handler\\HtmlOutputHelper' => __DIR__ . '/includes/Rest/Handler/HtmlOutputHelper.php',
'MediaWiki\\Rest\\Handler\\HtmlOutputRendererHelper' => __DIR__ . '/includes/Rest/Handler/HtmlOutputRendererHelper.php',
'MediaWiki\\Rest\\Handler\\Helper\\HtmlInputTransformHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php',
'MediaWiki\\Rest\\Handler\\Helper\\HtmlMessageOutputHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php',
'MediaWiki\\Rest\\Handler\\Helper\\HtmlOutputHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlOutputHelper.php',
'MediaWiki\\Rest\\Handler\\Helper\\HtmlOutputRendererHelper' => __DIR__ . '/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php',
'MediaWiki\\Rest\\Handler\\Helper\\PageContentHelper' => __DIR__ . '/includes/Rest/Handler/Helper/PageContentHelper.php',
'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/PageContentHelper.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\\PageRedirectHandlerTrait' => __DIR__ . '/includes/Rest/Handler/PageRedirectHandlerTrait.php',
'MediaWiki\\Rest\\Handler\\PageRestHelperFactory' => __DIR__ . '/includes/Rest/Handler/PageRestHelperFactory.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/ParsoidFormatHelper.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/RevisionContentHelper.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',

2
includes/MediaWikiServices.php
View file

@ -111,7 +111,7 @@ use MediaWiki\Permissions\RestrictionStore;
use MediaWiki\Preferences\PreferencesFactory;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Rest\Handler\PageRestHelperFactory;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Revision\ArchivedRevisionLookup;
use MediaWiki\Revision\ContributionsLookup;
use MediaWiki\Revision\RevisionFactory;

5
includes/Rest/Handler/HtmlInputTransformHelper.php → includes/Rest/Handler/Helper/HtmlInputTransformHelper.php
View file

@ -17,7 +17,7 @@
*
* @file
*/
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use Content;
use InvalidArgumentException;
@ -686,3 +686,6 @@ class HtmlInputTransformHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( HtmlInputTransformHelper::class, "MediaWiki\\Rest\\Handler\\HtmlInputTransformHelper" );

5
includes/Rest/Handler/HtmlMessageOutputHelper.php → includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php
View file

@ -17,7 +17,7 @@
*
* @file
*/
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use LanguageCode;
use MediaWiki\Page\PageIdentity;
@ -121,3 +121,6 @@ class HtmlMessageOutputHelper implements HtmlOutputHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( HtmlMessageOutputHelper::class, "MediaWiki\\Rest\\Handler\\HtmlOutputHelper" );

2
includes/Rest/Handler/HtmlOutputHelper.php → includes/Rest/Handler/Helper/HtmlOutputHelper.php
View file

@ -17,7 +17,7 @@
*
* @file
*/
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\ResponseInterface;

5
includes/Rest/Handler/HtmlOutputRendererHelper.php → includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php
View file

@ -17,7 +17,7 @@
*
* @file
*/
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use Content;
use HttpError;
@ -691,3 +691,6 @@ class HtmlOutputRendererHelper implements HtmlOutputHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( HtmlOutputRendererHelper::class, "MediaWiki\\Rest\\Handler\\HtmlOutputRendererHelper" );

5
includes/Rest/Handler/PageContentHelper.php → includes/Rest/Handler/Helper/PageContentHelper.php
View file

@ -1,6 +1,6 @@
<?php
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\MainConfigNames;
@ -358,3 +358,6 @@ class PageContentHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( PageContentHelper::class, "MediaWiki\\Rest\\Handler\\PageContentHelper" );

5
includes/Rest/Handler/PageRestHelperFactory.php → includes/Rest/Handler/Helper/PageRestHelperFactory.php
View file

@ -1,6 +1,6 @@
<?php
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use MediaWiki\Config\ServiceOptions;
@ -114,3 +114,6 @@ class PageRestHelperFactory {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( PageRestHelperFactory::class, "MediaWiki\\Rest\\Handler\\PageRestHelperFactory" );

5
includes/Rest/Handler/ParsoidFormatHelper.php → includes/Rest/Handler/Helper/ParsoidFormatHelper.php
View file

@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use InvalidArgumentException;
use MediaWiki\Rest\ResponseInterface;
@ -130,3 +130,6 @@ class ParsoidFormatHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( ParsoidFormatHelper::class, "MediaWiki\\Rest\\Handler\\ParsoidFormatHelper" );

5
includes/Rest/Handler/RevisionContentHelper.php → includes/Rest/Handler/Helper/RevisionContentHelper.php
View file

@ -1,6 +1,6 @@
<?php
namespace MediaWiki\Rest\Handler;
namespace MediaWiki\Rest\Handler\Helper;
use MediaWiki\MainConfigNames;
use MediaWiki\Page\ExistingPageRecord;
@ -185,3 +185,6 @@ class RevisionContentHelper extends PageContentHelper {
}
}
/** @deprecated since 1.40, remove in 1.41 */
class_alias( RevisionContentHelper::class, "MediaWiki\\Rest\\Handler\\RevisionContentHelper" );

3
includes/Rest/Handler/PageHTMLHandler.php
View file

@ -5,6 +5,9 @@ namespace MediaWiki\Rest\Handler;
use LogicException;
use MediaWiki\MediaWikiServices;
use MediaWiki\Page\RedirectStore;
use MediaWiki\Rest\Handler\Helper\HtmlOutputHelper;
use MediaWiki\Rest\Handler\Helper\PageContentHelper;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Rest\SimpleHandler;

2
includes/Rest/Handler/PageSourceHandler.php
View file

@ -5,6 +5,8 @@ namespace MediaWiki\Rest\Handler;
use LogicException;
use MediaWiki\Page\PageReference;
use MediaWiki\Page\RedirectStore;
use MediaWiki\Rest\Handler\Helper\PageContentHelper;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Rest\SimpleHandler;

3
includes/Rest/Handler/ParsoidHandler.php
View file

@ -32,6 +32,9 @@ use MediaWiki\Page\ExistingPageRecord;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\ProperPageIdentity;
use MediaWiki\Rest\Handler;
use MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\ParsoidFormatHelper;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;

3
includes/Rest/Handler/RevisionHTMLHandler.php
View file

@ -4,6 +4,9 @@ namespace MediaWiki\Rest\Handler;
use LogicException;
use MediaWiki\MediaWikiServices;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Rest\Handler\Helper\RevisionContentHelper;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Rest\SimpleHandler;

2
includes/Rest/Handler/RevisionSourceHandler.php
View file

@ -3,6 +3,8 @@
namespace MediaWiki\Rest\Handler;
use LogicException;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Rest\Handler\Helper\RevisionContentHelper;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Rest\SimpleHandler;

1
includes/Rest/Handler/TransformHandler.php
View file

@ -20,6 +20,7 @@
namespace MediaWiki\Rest\Handler;
use MediaWiki\Rest\Handler\Helper\ParsoidFormatHelper;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\Response;
use Wikimedia\ParamValidator\ParamValidator;

2
includes/ServiceWiring.php
View file

@ -136,7 +136,7 @@ use MediaWiki\Preferences\SignatureValidator;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\ResourceLoader\MessageBlobStore;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Rest\Handler\PageRestHelperFactory;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Revision\ArchivedRevisionLookup;
use MediaWiki\Revision\ContributionsLookup;
use MediaWiki\Revision\MainSlotRoleHandler;

2
maintenance/compareLanguageConverterOutput.php
View file

@ -22,7 +22,7 @@
*/
use MediaWiki\MediaWikiServices;
use MediaWiki\Rest\Handler\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWiki\Revision\SlotRecord;
require_once __DIR__ . '/Maintenance.php';

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

@ -1,6 +1,6 @@
<?php
namespace MediaWiki\Tests\Rest\Helper;
namespace MediaWiki\Tests\Rest\Handler\Helper;
use BufferingStatsdDataFactory;
use Exception;
@ -15,8 +15,8 @@ use MediaWiki\Parser\Parsoid\HtmlToContentTransform;
use MediaWiki\Parser\Parsoid\HtmlTransformFactory;
use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter;
use MediaWiki\Parser\Parsoid\ParsoidRenderID;
use MediaWiki\Rest\Handler\HtmlInputTransformHelper;
use MediaWiki\Rest\Handler\ParsoidFormatHelper;
use MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper;
use MediaWiki\Rest\Handler\Helper\ParsoidFormatHelper;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\ResponseFactory;
@ -37,7 +37,7 @@ use Wikimedia\Parsoid\Utils\ContentUtils;
use WikitextContent;
/**
* @covers \MediaWiki\Rest\Handler\HtmlInputTransformHelper
* @covers \MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper
* @group Database
*/
class HtmlInputTransformHelperTest extends MediaWikiIntegrationTestCase {
@ -99,7 +99,7 @@ class HtmlInputTransformHelperTest extends MediaWikiIntegrationTestCase {
}
private function getTextFromFile( string $name ): string {
return trim( file_get_contents( __DIR__ . "/data/Transform/$name" ) );
return trim( file_get_contents( __DIR__ . "/../data/Transform/$name" ) );
}
private function getJsonFromFile( string $name ): array {
@ -675,7 +675,7 @@ class HtmlInputTransformHelperTest extends MediaWikiIntegrationTestCase {
/**
* @dataProvider provideRequests()
* @covers \MediaWiki\Rest\Handler\HtmlInputTransformHelper
* @covers \MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper
* @covers \MediaWiki\Parser\Parsoid\HtmlToContentTransform
*/
public function testResponse( $body, $params, $expectedText, array $expectedHeaders = [] ) {
@ -873,7 +873,7 @@ class HtmlInputTransformHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlInputTransformHelper
* @covers \MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper
* @covers \MediaWiki\Parser\Parsoid\HtmlToContentTransform
*/
public function testResponseForFakeRevision() {

18
tests/phpunit/integration/includes/Rest/Handler/HtmlMessageOutputHelperTest.php → tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlMessageOutputHelperTest.php
View file

@ -1,12 +1,12 @@
<?php
namespace MediaWiki\Tests\Rest\Helper;
namespace MediaWiki\Tests\Rest\Handler\Helper;
use MediaWiki\Rest\Handler\HtmlMessageOutputHelper;
use MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper;
use MediaWikiIntegrationTestCase;
/**
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper
* @group Database
*/
class HtmlMessageOutputHelperTest extends MediaWikiIntegrationTestCase {
@ -15,8 +15,8 @@ class HtmlMessageOutputHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper::init
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper::getHtml
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper::init
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper::getHtml
*/
public function testGetHtml() {
$page = $this->getNonexistingTestPage( 'MediaWiki:Logouttext' );
@ -35,8 +35,8 @@ class HtmlMessageOutputHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper::init
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper::getETag
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper::init
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper::getETag
*/
public function testGetETag() {
$page = $this->getNonexistingTestPage( 'MediaWiki:Logouttext' );
@ -50,8 +50,8 @@ class HtmlMessageOutputHelperTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper::init
* @covers \MediaWiki\Rest\Handler\HtmlMessageOutputHelper::getHtml
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper::init
* @covers \MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper::getHtml
*/
public function testGetHtmlWithLanguageCode() {
$page = $this->getNonexistingTestPage( 'MediaWiki:Logouttext/de' );

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

@ -1,6 +1,6 @@
<?php
namespace MediaWiki\Tests\Rest\Helper;
namespace MediaWiki\Tests\Rest\Handler\Helper;
use BagOStuff;
use CssContent;
@ -22,7 +22,7 @@ use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter;
use MediaWiki\Parser\Parsoid\ParsoidOutputAccess;
use MediaWiki\Parser\Parsoid\ParsoidRenderID;
use MediaWiki\Parser\RevisionOutputCache;
use MediaWiki\Rest\Handler\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Rest\ResponseInterface;
@ -49,7 +49,7 @@ use Wikimedia\TestingAccessWrapper;
use WikitextContent;
/**
* @covers \MediaWiki\Rest\Handler\HtmlOutputRendererHelper
* @covers \MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper
* @group Database
*/
class HtmlOutputRendererHelperTest extends MediaWikiIntegrationTestCase {

6
tests/phpunit/integration/includes/Rest/Handler/PageContentHelperTest.php → tests/phpunit/integration/includes/Rest/Handler/Helper/PageContentHelperTest.php
View file

@ -1,12 +1,12 @@
<?php
namespace MediaWiki\Tests\Rest\Helper;
namespace MediaWiki\Tests\Rest\Handler\Helper;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\MainConfigNames;
use MediaWiki\Page\ExistingPageRecord;
use MediaWiki\Permissions\Authority;
use MediaWiki\Rest\Handler\PageContentHelper;
use MediaWiki\Rest\Handler\Helper\PageContentHelper;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Revision\RevisionRecord;
@ -16,7 +16,7 @@ use MediaWikiIntegrationTestCase;
use Title;
/**
* @covers \MediaWiki\Rest\Handler\PageContentHelper
* @covers \MediaWiki\Rest\Handler\Helper\PageContentHelper
* @group Database
*/
class PageContentHelperTest extends MediaWikiIntegrationTestCase {

14
tests/phpunit/integration/includes/Rest/Handler/PageRestHelperFactoryTest.php → tests/phpunit/integration/includes/Rest/Handler/Helper/PageRestHelperFactoryTest.php
View file

@ -1,20 +1,20 @@
<?php
namespace MediaWiki\Tests\Rest\Handler;
namespace MediaWiki\Tests\Rest\Handler\Helper;
use MediaWiki\Rest\Handler\HtmlMessageOutputHelper;
use MediaWiki\Rest\Handler\HtmlOutputHelper;
use MediaWiki\Rest\Handler\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWikiIntegrationTestCase;
/**
* @covers \MediaWiki\Rest\Handler\PageRestHelperFactory
* @covers \MediaWiki\Rest\Handler\Helper\PageRestHelperFactory
*/
class PageRestHelperFactoryTest extends MediaWikiIntegrationTestCase {
/**
* @covers \MediaWiki\Rest\Handler\PageRestHelperFactory::newHtmlMessageOutputHelper
* @covers \MediaWiki\Rest\Handler\PageRestHelperFactory::newHtmlOutputRendererHelper
* @covers \MediaWiki\Rest\Handler\Helper\PageRestHelperFactory::newHtmlMessageOutputHelper
* @covers \MediaWiki\Rest\Handler\Helper\PageRestHelperFactory::newHtmlOutputRendererHelper
*/
public function testNewHtmlOutputHelpers() {
$helperFactory = $this->getServiceContainer()->getPageRestHelperFactory();

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

@ -1,13 +1,13 @@
<?php
namespace MediaWiki\Tests\Rest\Helper;
namespace MediaWiki\Tests\Rest\Handler\Helper;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\MainConfigNames;
use MediaWiki\Page\ExistingPageRecord;
use MediaWiki\Permissions\Authority;
use MediaWiki\Rest\Handler\PageContentHelper;
use MediaWiki\Rest\Handler\RevisionContentHelper;
use MediaWiki\Rest\Handler\Helper\PageContentHelper;
use MediaWiki\Rest\Handler\Helper\RevisionContentHelper;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Revision\RevisionRecord;
@ -16,7 +16,7 @@ use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
use MediaWikiIntegrationTestCase;
/**
* @covers \MediaWiki\Rest\Handler\RevisionContentHelper
* @covers \MediaWiki\Rest\Handler\Helper\RevisionContentHelper
* @group Database
*/
class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {

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

@ -15,8 +15,8 @@ use MediaWiki\Parser\Parsoid\HtmlToContentTransform;
use MediaWiki\Parser\Parsoid\HtmlTransformFactory;
use MediaWiki\Parser\RevisionOutputCache;
use MediaWiki\Permissions\UltimateAuthority;
use MediaWiki\Rest\Handler\HtmlInputTransformHelper;
use MediaWiki\Rest\Handler\ParsoidFormatHelper;
use MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper;
use MediaWiki\Rest\Handler\Helper\ParsoidFormatHelper;
use MediaWiki\Rest\Handler\ParsoidHandler;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\LocalizedHttpException;

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

@ -603,7 +603,7 @@ class ParsoidOutputAccessTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \MediaWiki\Rest\Handler\HtmlOutputRendererHelper::getParserOutput
* @covers \MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper::getParserOutput
* @dataProvider provideParserOptionsWithLanguageOverride
*/
public function testGetParserOutputWithLanguageOverride( $parserOptions, $expectedLangCode ) {

6
tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php
View file

@ -11,9 +11,9 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MainConfigSchema;
use MediaWiki\Parser\ParserCacheFactory;
use MediaWiki\Parser\Parsoid\ParsoidOutputAccess;
use MediaWiki\Rest\Handler\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\PageRestHelperFactory;
use MediaWiki\Rest\Handler\RevisionContentHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Rest\Handler\Helper\RevisionContentHelper;
use MediaWiki\Rest\Handler\RevisionHTMLHandler;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\RequestData;

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

@ -4,7 +4,7 @@ namespace MediaWiki\Tests\Rest\Handler;
use MediaWiki\MainConfigNames;
use MediaWiki\MainConfigSchema;
use MediaWiki\Rest\Handler\ParsoidFormatHelper;
use MediaWiki\Rest\Handler\Helper\ParsoidFormatHelper;
use MediaWiki\Rest\Handler\TransformHandler;
use MediaWiki\Rest\RequestData;
use MediaWiki\Rest\RequestInterface;

8
tests/phpunit/unit/includes/Rest/Handler/PageHandlerTestTrait.php
View file

@ -8,14 +8,14 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MainConfigSchema;
use MediaWiki\Parser\ParserCacheFactory;
use MediaWiki\Parser\Parsoid\ParsoidOutputAccess;
use MediaWiki\Rest\Handler\HtmlMessageOutputHelper;
use MediaWiki\Rest\Handler\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\HtmlMessageOutputHelper;
use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
use MediaWiki\Rest\Handler\Helper\PageContentHelper;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Rest\Handler\LanguageLinksHandler;
use MediaWiki\Rest\Handler\PageContentHelper;
use MediaWiki\Rest\Handler\PageHistoryCountHandler;
use MediaWiki\Rest\Handler\PageHistoryHandler;
use MediaWiki\Rest\Handler\PageHTMLHandler;
use MediaWiki\Rest\Handler\PageRestHelperFactory;
use MediaWiki\Rest\Handler\PageSourceHandler;
use NullStatsdDataFactory;
use PHPUnit\Framework\MockObject\MockObject;