wikimedia/mediawiki-extensions-SyntaxHighlight_GeSHi
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/SyntaxHighlight_GeSHi synced 2024-11-15 10:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make sure $wgPygmentizePath is sane only when we need it"

Browse source
This commit is contained in:
jenkins-bot 2017-07-07 23:16:25 +00:00 committed by Gerrit Code Review
parent 4f7fc275fb 987187935c
commit 73618fa360
4 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
SyntaxHighlight.class.php
View file

@ -41,15 +41,6 @@ class SyntaxHighlight {
'text/xml' => 'xml',
];
public static function onSetup() {
global $wgPygmentizePath;
// If $wgPygmentizePath is unset, use the bundled copy.
if ( $wgPygmentizePath === false ) {
$wgPygmentizePath = __DIR__ . '/pygments/pygmentize';
}
}
/**
* Get the Pygments lexer name for a particular language.
*
@ -187,6 +178,20 @@ class SyntaxHighlight {
return $out;
}
/**
* @return string
*/
public static function getPygmentizePath() {
global $wgPygmentizePath;
// If $wgPygmentizePath is unset, use the bundled copy.
if ( $wgPygmentizePath === false ) {
$wgPygmentizePath = __DIR__ . '/pygments/pygmentize';
}
return $wgPygmentizePath;
}
/**
* Highlight a code-block using a particular lexer.
*
@ -203,8 +208,6 @@ class SyntaxHighlight {
* code as its value.
*/
public static function highlight( $code, $lang = null, $args = [] ) {
global $wgPygmentizePath;
$status = new Status;
$lexer = self::getLexer( $lang );
@ -287,7 +290,7 @@ class SyntaxHighlight {
$optionPairs[] = "{$k}={$v}";
}
$builder = new ProcessBuilder();
$builder->setPrefix( $wgPygmentizePath );
$builder->setPrefix( self::getPygmentizePath() );
$process = $builder
->add( '-l' )->add( $lexer )
->add( '-f' )->add( 'html' )

3
extension.json
View file

@ -30,9 +30,6 @@
"ResourceLoaderGeSHiVisualEditorModule": "ResourceLoaderSyntaxHighlightVisualEditorModule.php",
"ResourceLoaderSyntaxHighlightVisualEditorModule": "ResourceLoaderSyntaxHighlightVisualEditorModule.php"
},
"ExtensionFunctions": [
"SyntaxHighlight::onSetup"
],
"ResourceFileModulePaths": {
"localBasePath": "modules",
"remoteExtPath": "SyntaxHighlight_GeSHi/modules"

4
maintenance/updateCSS.php
View file

@ -36,13 +36,11 @@ class UpdateCSS extends Maintenance {
}
public function execute() {
global $wgPygmentizePath;
$target = __DIR__ . '/../modules/pygments.generated.css';
$css = "/* Stylesheet generated by updateCSS.php */\n";
$builder = new ProcessBuilder();
$builder->setPrefix( $wgPygmentizePath );
$builder->setPrefix( SyntaxHighlight_GeSHi::getPygmentizePath() );
$process = $builder
->add( '-f' )->add( 'html' )

4
maintenance/updateLexerList.php
View file

@ -35,8 +35,6 @@ class UpdateLanguageList extends Maintenance {
}
public function execute() {
global $wgPygmentizePath;
function lang_filter( $val ) {
return preg_match( '/^[a-zA-Z0-9\-_]+$/', $val );
}
@ -46,7 +44,7 @@ class UpdateLanguageList extends Maintenance {
$lexers = [];
$builder = new ProcessBuilder();
$builder->setPrefix( $wgPygmentizePath );
$builder->setPrefix( SyntaxHighlight_GeSHi::getPygmentizePath() );
$process = $builder->add( '-L' )->add( 'lexer' )->getProcess();
$process->run();