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

Reorg: Move MagicWord related files to under parser/

Browse source 
This is approved as part of T166010 RFC.

Bug: T321882
Change-Id: Ia4498c0a20e38a6a288dc14065ea8242c84fbc49
This commit is contained in:
Amir Sarabadani 2022-12-09 13:28:41 +01:00
parent ca9ec658cb
commit a1b4699fea
25 changed files with 61 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
autoload.php
View file

@ -814,9 +814,9 @@ $wgAutoloadLocalClasses = [
'MWTimestamp' => __DIR__ . '/includes/MWTimestamp.php',
'MWUnknownContentModelException' => __DIR__ . '/includes/exception/MWUnknownContentModelException.php',
'MachineReadableRCFeedFormatter' => __DIR__ . '/includes/rcfeed/MachineReadableRCFeedFormatter.php',
'MagicWord' => __DIR__ . '/includes/MagicWord.php',
'MagicWordArray' => __DIR__ . '/includes/MagicWordArray.php',
'MagicWordFactory' => __DIR__ . '/includes/MagicWordFactory.php',
'MagicWord' => __DIR__ . '/includes/parser/MagicWord.php',
'MagicWordArray' => __DIR__ . '/includes/parser/MagicWordArray.php',
'MagicWordFactory' => __DIR__ . '/includes/parser/MagicWordFactory.php',
'MailAddress' => __DIR__ . '/includes/mail/MailAddress.php',
'MainConfigDependency' => __DIR__ . '/includes/language/dependency/MainConfigDependency.php',
'MaintainableDBConnRef' => __DIR__ . '/includes/libs/rdbms/database/MaintainableDBConnRef.php',
@ -1562,6 +1562,9 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\ParamValidator\\TypeDef\\TagsDef' => __DIR__ . '/includes/ParamValidator/TypeDef/TagsDef.php',
'MediaWiki\\ParamValidator\\TypeDef\\TitleDef' => __DIR__ . '/includes/ParamValidator/TypeDef/TitleDef.php',
'MediaWiki\\ParamValidator\\TypeDef\\UserDef' => __DIR__ . '/includes/ParamValidator/TypeDef/UserDef.php',
'MediaWiki\\Parser\\MagicWord' => __DIR__ . '/includes/parser/MagicWord.php',
'MediaWiki\\Parser\\MagicWordArray' => __DIR__ . '/includes/parser/MagicWordArray.php',
'MediaWiki\\Parser\\MagicWordFactory' => __DIR__ . '/includes/parser/MagicWordFactory.php',
'MediaWiki\\Parser\\ParserCacheFactory' => __DIR__ . '/includes/parser/ParserCacheFactory.php',
'MediaWiki\\Parser\\ParserCacheMetadata' => __DIR__ . '/includes/parser/ParserCacheMetadata.php',
'MediaWiki\\Parser\\ParserObserver' => __DIR__ . '/includes/parser/ParserObserver.php',

2
includes/MediaWikiServices.php
View file

@ -43,7 +43,6 @@ use Language;
use LinkCache;
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use LocalisationCache;
use MagicWordFactory;
use MediaHandlerFactory;
use MediaWiki\Actions\ActionFactory;
use MediaWiki\Auth\AuthManager;
@ -99,6 +98,7 @@ use MediaWiki\Page\RedirectStore;
use MediaWiki\Page\RollbackPageFactory;
use MediaWiki\Page\UndeletePageFactory;
use MediaWiki\Page\WikiPageFactory;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\ParserCacheFactory;
use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;
use MediaWiki\Parser\Parsoid\HtmlTransformFactory;

1
includes/ServiceWiring.php
View file

@ -115,6 +115,7 @@ use MediaWiki\Page\RedirectStore;
use MediaWiki\Page\RollbackPageFactory;
use MediaWiki\Page\UndeletePageFactory;
use MediaWiki\Page\WikiPageFactory;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\ParserCacheFactory;
use MediaWiki\Parser\ParserObserver;
use MediaWiki\Parser\Parsoid\Config\DataAccess as MWDataAccess;

1
includes/actions/InfoAction.php
View file

@ -32,6 +32,7 @@ use MediaWiki\MediaWikiServices;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageProps;
use MediaWiki\Page\RedirectLookup;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Permissions\RestrictionStore;
use MediaWiki\Revision\RevisionLookup;
use MediaWiki\Revision\RevisionRecord;

1
includes/api/ApiQuerySiteinfo.php
View file

@ -27,6 +27,7 @@ use MediaWiki\Languages\LanguageFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\ResourceLoader\SkinModule;
use MediaWiki\SpecialPage\SpecialPageFactory;
use MediaWiki\User\UserGroupManager;

1
includes/content/AbstractContent.php
View file

@ -32,6 +32,7 @@ use MediaWiki\Content\Transform\PreloadTransformParamsValue;
use MediaWiki\Content\Transform\PreSaveTransformParamsValue;
use MediaWiki\Content\ValidationParams;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\MagicWord;
/**
* Base implementation for content objects.

2
includes/content/Content.php
View file

@ -18,6 +18,8 @@
* @file
*/
use MediaWiki\Parser\MagicWord;
/**
* Base interface for representing page content.
*

1
includes/content/WikitextContent.php
View file

@ -27,6 +27,7 @@
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\MagicWord;
/**
* Content object for wiki text pages.

1
includes/content/WikitextContentHandler.php
View file

@ -27,6 +27,7 @@ use MediaWiki\Content\Renderer\ContentParseParams;
use MediaWiki\Content\Transform\PreloadTransformParams;
use MediaWiki\Content\Transform\PreSaveTransformParams;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\ParserOutputFlags;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Title\TitleFactory;

1
includes/language/Language.php
View file

@ -38,6 +38,7 @@ use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\MagicWord;
use MediaWiki\User\UserIdentity;
use Wikimedia\Assert\Assert;
use Wikimedia\AtEase\AtEase;

1
includes/parser/CoreParserFunctions.php
View file

@ -24,6 +24,7 @@
use MediaWiki\Config\ServiceOptions;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\ParserOutputFlags;
use MediaWiki\Revision\RevisionAccessException;
use MediaWiki\Revision\RevisionRecord;

14
includes/MagicWord.php → includes/parser/MagicWord.php
View file

@ -21,7 +21,12 @@
* @ingroup Parser
*/
namespace MediaWiki\Parser;
use Language;
use MediaWiki\MediaWikiServices;
use MWException;
use StringUtils;
/**
* This class encapsulates "magic words" such as "#redirect", __NOTOC__, etc.
@ -152,8 +157,11 @@ class MagicWord {
$this->mRegexStart = "/^(?:{$this->mBaseRegex})/{$case}";
$this->mRegexStartToEnd = "/^(?:{$this->mBaseRegex})$/{$case}";
$this->mVariableRegex = str_replace( "\\$1", "(.*?)", $this->mRegex );
$this->mVariableStartToEndRegex = str_replace( "\\$1", "(.*?)",
"/^(?:{$this->mBaseRegex})$/{$case}" );
$this->mVariableStartToEndRegex = str_replace(
"\\$1",
"(.*?)",
"/^(?:{$this->mBaseRegex})$/{$case}"
);
}
/**
@ -460,3 +468,5 @@ class MagicWord {
return $this->mId;
}
}
class_alias( MagicWord::class, 'MagicWord' );

6
includes/MagicWordArray.php → includes/parser/MagicWordArray.php
View file

@ -22,8 +22,12 @@
* @ingroup Parser
*/
namespace MediaWiki\Parser;
use Exception;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MWException;
/**
* Class for handling an array of magic words
@ -368,3 +372,5 @@ class MagicWordArray {
return false;
}
}
class_alias( MagicWordArray::class, 'MagicWordArray' );

5
includes/MagicWordFactory.php → includes/parser/MagicWordFactory.php
View file

@ -21,6 +21,9 @@
* @ingroup Parser
*/
namespace MediaWiki\Parser;
use Language;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\HookContainer\HookRunner;
@ -294,3 +297,5 @@ class MagicWordFactory {
return new MagicWordArray( $names, $this );
}
}
class_alias( MagicWordFactory::class, 'MagicWordFactory' );

2
includes/parser/Parser.php
View file

@ -37,6 +37,8 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageReference;
use MediaWiki\Parser\MagicWordArray;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\ParserOutputFlags;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\Request\FauxRequest;

1
includes/parser/ParserFactory.php
View file

@ -25,6 +25,7 @@ use MediaWiki\HookContainer\HookContainer;
use MediaWiki\Http\HttpRequestFactory;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Linker\LinkRendererFactory;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\SpecialPage\SpecialPageFactory;
use MediaWiki\Tidy\TidyDriverBase;

4
includes/parser/Parsoid/Config/SiteConfig.php
View file

@ -26,8 +26,6 @@ use ExtensionRegistry;
use Language;
use LanguageConverter;
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use MagicWordArray;
use MagicWordFactory;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Languages\LanguageConverterFactory;
@ -35,6 +33,8 @@ use MediaWiki\Languages\LanguageFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\Parser\MagicWordArray;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\SpecialPage\SpecialPageFactory;
use MediaWiki\User\UserOptionsLookup;
use MediaWiki\Utils\UrlUtils;

1
tests/phpunit/includes/content/ContentHandlerTest.php
View file

@ -5,6 +5,7 @@ use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MainConfigNames;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageIdentityValue;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Title\TitleFactory;
use Wikimedia\TestingAccessWrapper;
use Wikimedia\UUID\GlobalIdGenerator;

6
tests/phpunit/includes/MagicWordFactoryTest.php → tests/phpunit/includes/parser/MagicWordFactoryTest.php
View file

@ -1,7 +1,11 @@
<?php
use MediaWiki\Parser\MagicWord;
use MediaWiki\Parser\MagicWordArray;
use MediaWiki\Parser\MagicWordFactory;
/**
* @covers \MagicWordFactory
* @covers \MediaWiki\Parser\MagicWordFactory
*
* @author Derick N. Alangi
*/

2
tests/phpunit/includes/parser/ParserTest.php
View file

@ -4,6 +4,8 @@ use MediaWiki\Config\ServiceOptions;
use MediaWiki\Http\HttpRequestFactory;
use MediaWiki\Page\PageReference;
use MediaWiki\Page\PageReferenceValue;
use MediaWiki\Parser\MagicWord;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\User\UserNameUtils;
use MediaWiki\Utils\UrlUtils;

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

@ -5,9 +5,9 @@ namespace MediaWiki\Tests\Rest\Handler;
use ApiUsageException;
use FormatJson;
use HashConfig;
use MagicWordFactory;
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Rest\Handler\UpdateHandler;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\RequestData;

2
tests/phpunit/unit/includes/content/FileContentHandlerTest.php
View file

@ -3,8 +3,8 @@
namespace MediaWiki\Tests\Unit;
use FileContentHandler;
use MagicWordFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Title\TitleFactory;
use MediaWikiUnitTestCase;
use ParserFactory;

2
tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php
View file

@ -2,8 +2,8 @@
namespace MediaWiki\Tests\Unit;
use MagicWordFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Revision\SlotRecord;
use MediaWiki\Revision\SlotRenderingProvider;
use MediaWiki\Title\TitleFactory;

2
tests/phpunit/unit/includes/parser/ParserFactoryTest.php
View file

@ -5,6 +5,8 @@ use MediaWiki\Config\ServiceOptions;
use MediaWiki\Http\HttpRequestFactory;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Linker\LinkRendererFactory;
use MediaWiki\Parser\MagicWord;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\SpecialPage\SpecialPageFactory;
use MediaWiki\Tidy\TidyDriverBase;

6
tests/phpunit/unit/includes/parser/Parsoid/Config/SiteConfigTest.php
View file

@ -5,15 +5,15 @@ namespace MediaWiki\Tests\Unit\Parser\Parsoid\Config;
use HashConfig;
use ILanguageConverter;
use Language;
use MagicWord;
use MagicWordArray;
use MagicWordFactory;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Languages\LanguageFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MainConfigNames;
use MediaWiki\Parser\MagicWord;
use MediaWiki\Parser\MagicWordArray;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\Parsoid\Config\SiteConfig;
use MediaWiki\SpecialPage\SpecialPageFactory;
use MediaWiki\User\UserOptionsLookup;