diff options
24 files changed, 34 insertions, 9 deletions
diff --git a/autoload.php b/autoload.php index 6c679ae070c1..fc010473c995 100644 --- a/autoload.php +++ b/autoload.php @@ -1019,6 +1019,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\DB\\AbstractSchemaValidationError' => __DIR__ . '/includes/db/AbstractSchemaValidationError.php', 'MediaWiki\\DB\\AbstractSchemaValidator' => __DIR__ . '/includes/db/AbstractSchemaValidator.php', 'MediaWiki\\Debug\\DeprecatablePropertyArray' => __DIR__ . '/includes/debug/DeprecatablePropertyArray.php', + 'MediaWiki\\Debug\\MWDebug' => __DIR__ . '/includes/debug/MWDebug.php', 'MediaWiki\\Deferred\\AtomicSectionUpdate' => __DIR__ . '/includes/deferred/AtomicSectionUpdate.php', 'MediaWiki\\Deferred\\AutoCommitUpdate' => __DIR__ . '/includes/deferred/AutoCommitUpdate.php', 'MediaWiki\\Deferred\\CdnCacheUpdate' => __DIR__ . '/includes/deferred/CdnCacheUpdate.php', diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 13047b768169..d64c960ca491 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Libs\UnpackFailedException; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/HookContainer/HookContainer.php b/includes/HookContainer/HookContainer.php index bb9206f787d8..13f47b7c1f2a 100644 --- a/includes/HookContainer/HookContainer.php +++ b/includes/HookContainer/HookContainer.php @@ -29,7 +29,7 @@ use Closure; use Error; use InvalidArgumentException; use LogicException; -use MWDebug; +use MediaWiki\Debug\MWDebug; use UnexpectedValueException; use Wikimedia\Assert\Assert; use Wikimedia\NonSerializable\NonSerializableTrait; diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php index 798c282641eb..ba46af15274e 100644 --- a/includes/Output/OutputPage.php +++ b/includes/Output/OutputPage.php @@ -38,6 +38,7 @@ use MediaWiki\Config\Config; use MediaWiki\Context\ContextSource; use MediaWiki\Context\IContextSource; use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkTarget; @@ -62,7 +63,6 @@ use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\Utils\MWTimestamp; use MessageSpecifier; -use MWDebug; use OOUI\Element; use OOUI\Theme; use ParserOptions; diff --git a/includes/Request/HeaderCallback.php b/includes/Request/HeaderCallback.php index 18b12feb06e7..e5f73575e923 100644 --- a/includes/Request/HeaderCallback.php +++ b/includes/Request/HeaderCallback.php @@ -90,7 +90,7 @@ class HeaderCallback { public static function warnIfHeadersSent() { if ( headers_sent() && !self::$messageSent ) { self::$messageSent = true; - \MWDebug::warning( 'Headers already sent, should send headers earlier than ' . + \MediaWiki\Debug\MWDebug::warning( 'Headers already sent, should send headers earlier than ' . wfGetCaller( 3 ) ); $logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'headers-sent' ); $logger->error( 'Warning: headers were already sent from the location below', [ diff --git a/includes/Setup.php b/includes/Setup.php index 985256c2213a..2696755b5e23 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -53,6 +53,7 @@ // phpcs:disable MediaWiki.Usage.DeprecatedGlobalVariables use MediaWiki\Config\SiteConfiguration; use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\FauxGlobalHookArray; use MediaWiki\HookContainer\HookRunner; diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 4773d9b7d2a1..14777d699062 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -25,6 +25,7 @@ use MediaWiki\Api\Validator\ApiParamValidator; use MediaWiki\Context\DerivativeContext; use MediaWiki\Context\IContextSource; use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\Html\Html; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php index f2d3ec6cd5f1..aea6f2b7cecb 100644 --- a/includes/db/MWLBFactory.php +++ b/includes/db/MWLBFactory.php @@ -24,6 +24,7 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use MediaWiki\Config\Config; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Debug\MWDebug; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php index a9791ac17082..b013daf4a66a 100644 --- a/includes/debug/MWDebug.php +++ b/includes/debug/MWDebug.php @@ -18,6 +18,10 @@ * @file */ +namespace MediaWiki\Debug; + +use ApiResult; +use LogicException; use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Logger\LegacyLogger; @@ -25,6 +29,8 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Parser\Sanitizer; use MediaWiki\ResourceLoader\ResourceLoader; use MediaWiki\Utils\GitInfo; +use ReflectionMethod; +use UtfNormal; use Wikimedia\WrappedString; use Wikimedia\WrappedStringList; @@ -774,3 +780,6 @@ class MWDebug { ]; } } + +/** @deprecated class alias since 1.43 */ +class_alias( MWDebug::class, 'MWDebug' ); diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php index 5e7886d8027e..ed0b3124921a 100644 --- a/includes/debug/logger/LegacyLogger.php +++ b/includes/debug/logger/LegacyLogger.php @@ -23,8 +23,8 @@ namespace MediaWiki\Logger; use DateTimeZone; use Error; use LogicException; +use MediaWiki\Debug\MWDebug; use MediaWiki\WikiMap\WikiMap; -use MWDebug; use MWExceptionHandler; use Psr\Log\AbstractLogger; use Psr\Log\LogLevel; diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php index 43831d07adf1..d55d2ec93ea5 100644 --- a/includes/exception/MWException.php +++ b/includes/exception/MWException.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Debug\MWDebug; + /** * MediaWiki exception * diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index b2bb7979c92d..d0c6a68739c2 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php index e32795d79829..2bfb07d0b33f 100644 --- a/includes/export/WikiExporter.php +++ b/includes/export/WikiExporter.php @@ -28,6 +28,7 @@ */ use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/export/XmlDumpWriter.php b/includes/export/XmlDumpWriter.php index bcabe071384d..20f101e09b07 100644 --- a/includes/export/XmlDumpWriter.php +++ b/includes/export/XmlDumpWriter.php @@ -24,6 +24,7 @@ */ use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php index 0bd0937cb68d..d95124cf268c 100644 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@ -19,6 +19,7 @@ */ use MediaWiki\Context\ContextSource; +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index de9e28bbd2c1..f5d7070703c6 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Debug\MWDebug; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; diff --git a/includes/specialpage/QueryPage.php b/includes/specialpage/QueryPage.php index 2afe3c0b9f33..021ad759fffe 100644 --- a/includes/specialpage/QueryPage.php +++ b/includes/specialpage/QueryPage.php @@ -27,6 +27,7 @@ use Exception; use LogicException; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\Config\Config; +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; @@ -65,7 +66,6 @@ use MediaWiki\Specials\SpecialWantedFiles; use MediaWiki\Specials\SpecialWantedPages; use MediaWiki\Specials\SpecialWantedTemplates; use MediaWiki\Specials\SpecialWithoutInterwiki; -use MWDebug; use Skin; use stdClass; use Wikimedia\Rdbms\DBError; diff --git a/includes/utils/UrlUtils.php b/includes/utils/UrlUtils.php index 22c4c555b06b..2ba3057419ce 100644 --- a/includes/utils/UrlUtils.php +++ b/includes/utils/UrlUtils.php @@ -4,8 +4,8 @@ namespace MediaWiki\Utils; use BadMethodCallException; use InvalidArgumentException; +use MediaWiki\Debug\MWDebug; use MediaWiki\MainConfigSchema; -use MWDebug; /** * A service to expand, parse, and otherwise manipulate URLs. diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index f1df3bc404fb..74466f6ae1a4 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -22,6 +22,7 @@ */ use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\MainConfigNames; use MediaWiki\Settings\SettingsBuilder; use MediaWiki\Title\Title; diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php index 812973c0571d..766c031cf10c 100644 --- a/tests/phpunit/MediaWikiIntegrationTestCase.php +++ b/tests/phpunit/MediaWikiIntegrationTestCase.php @@ -5,6 +5,7 @@ use MediaWiki\Config\ConfigFactory; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\FauxGlobalHookArray; use MediaWiki\HookContainer\HookRunner; diff --git a/tests/phpunit/MediaWikiTestCaseTrait.php b/tests/phpunit/MediaWikiTestCaseTrait.php index adbc2c717903..b58d083567d8 100644 --- a/tests/phpunit/MediaWikiTestCaseTrait.php +++ b/tests/phpunit/MediaWikiTestCaseTrait.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookContainer; use PHPUnit\Framework\Constraint\Constraint; use PHPUnit\Framework\ExpectationFailedException; diff --git a/tests/phpunit/includes/debug/MWDebugTest.php b/tests/phpunit/includes/debug/MWDebugTest.php index 108027426397..357e145449e7 100644 --- a/tests/phpunit/includes/debug/MWDebugTest.php +++ b/tests/phpunit/includes/debug/MWDebugTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; @@ -8,7 +9,7 @@ use MediaWiki\Title\TitleValue; use Psr\Log\LoggerInterface; /** - * @covers \MWDebug + * @covers \MediaWiki\Debug\MWDebug */ class MWDebugTest extends MediaWikiIntegrationTestCase { diff --git a/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php b/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php index f967e9f53cbc..95d1d35d0934 100644 --- a/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php +++ b/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php @@ -4,13 +4,13 @@ namespace MediaWiki\Tests\Parser; use CacheTime; use JsonSerializable; +use MediaWiki\Debug\MWDebug; use MediaWiki\Json\JsonCodec; use MediaWiki\Parser\ParserOutput; use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWDebug; use Wikimedia\TestingAccessWrapper; use Wikimedia\Tests\SerializationTestUtils; diff --git a/tests/phpunit/includes/parser/ParserOutputTest.php b/tests/phpunit/includes/parser/ParserOutputTest.php index abec3772ae8b..1568890bbeed 100644 --- a/tests/phpunit/includes/parser/ParserOutputTest.php +++ b/tests/phpunit/includes/parser/ParserOutputTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Parser; use LogicException; use MediaWiki\Context\RequestContext; +use MediaWiki\Debug\MWDebug; use MediaWiki\MainConfigNames; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; @@ -12,7 +13,6 @@ use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\Utils\MWTimestamp; use MediaWikiLangTestCase; -use MWDebug; use ParserOptions; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\Parsoid\Core\SectionMetadata; |