Move classes into includes/

Change-Id: Ie26b5be1bb2551ed339fdb4a587a89823c609b2e
This commit is contained in:
Kunal Mehta 2018-02-15 14:21:52 -08:00
parent dcd54e6c09
commit 141455aa33
7 changed files with 10 additions and 13 deletions

View file

@ -6,9 +6,6 @@
<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"/>
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
</rule>
<rule ref="MediaWiki.Files.ClassMatchesFilename.WrongCase">
<exclude-pattern>*/maintenance/*</exclude-pattern>
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>

View file

@ -22,12 +22,12 @@
]
},
"AutoloadClasses": {
"SyntaxHighlight": "SyntaxHighlight.php",
"SyntaxHighlight_GeSHi": "SyntaxHighlight.php",
"GeSHi": "GeSHi.php",
"SyntaxHighlightAce": "SyntaxHighlightAce.php",
"SyntaxHighlightGeSHiCompat": "SyntaxHighlightGeSHiCompat.php",
"ResourceLoaderSyntaxHighlightVisualEditorModule": "ResourceLoaderSyntaxHighlightVisualEditorModule.php"
"SyntaxHighlight": "includes/SyntaxHighlight.php",
"SyntaxHighlight_GeSHi": "includes/SyntaxHighlight.php",
"GeSHi": "includes/GeSHi.php",
"SyntaxHighlightAce": "includes/SyntaxHighlightAce.php",
"SyntaxHighlightGeSHiCompat": "includes/SyntaxHighlightGeSHiCompat.php",
"ResourceLoaderSyntaxHighlightVisualEditorModule": "includes/ResourceLoaderSyntaxHighlightVisualEditorModule.php"
},
"ResourceFileModulePaths": {
"localBasePath": "modules",

View file

@ -60,7 +60,7 @@ class ResourceLoaderSyntaxHighlightVisualEditorModule extends ResourceLoaderFile
* @return array
*/
private function getPygmentsLanguages() {
$lexers = require __DIR__ . '/SyntaxHighlight.lexers.php';
$lexers = require __DIR__ . '/../SyntaxHighlight.lexers.php';
return $lexers;
}

View file

@ -53,7 +53,7 @@ class SyntaxHighlight {
}
if ( !$lexers ) {
$lexers = require __DIR__ . '/SyntaxHighlight.lexers.php';
$lexers = require __DIR__ . '/../SyntaxHighlight.lexers.php';
}
$lexer = strtolower( $lang );
@ -184,7 +184,7 @@ class SyntaxHighlight {
// If $wgPygmentizePath is unset, use the bundled copy.
if ( $wgPygmentizePath === false ) {
$wgPygmentizePath = __DIR__ . '/pygments/pygmentize';
$wgPygmentizePath = __DIR__ . '/../pygments/pygmentize';
}
return $wgPygmentizePath;
@ -492,7 +492,7 @@ class SyntaxHighlight {
$resourceLoader->register( 'ext.geshi.visualEditor', [
'class' => ResourceLoaderSyntaxHighlightVisualEditorModule::class,
'localBasePath' => __DIR__ . DIRECTORY_SEPARATOR . 'modules',
'localBasePath' => __DIR__ . '/../modules',
'remoteExtPath' => 'SyntaxHighlight_GeSHi/modules',
'scripts' => [
've-syntaxhighlight/ve.dm.MWSyntaxHighlightNode.js',