dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 'rsvg-convert' binary rather than 'rsvg' everywhere
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
parser
/
NewParserTest.php
diff --git
a/tests/phpunit/includes/parser/NewParserTest.php
b/tests/phpunit/includes/parser/NewParserTest.php
index
0df52f5
..
713c32d
100644
(file)
--- a/
tests/phpunit/includes/parser/NewParserTest.php
+++ b/
tests/phpunit/includes/parser/NewParserTest.php
@@
-124,7
+124,7
@@
class NewParserTest extends MediaWikiTestCase {
$tmpGlobals['wgFileExtensions'][] = 'svg';
$tmpGlobals['wgSVGConverter'] = 'rsvg';
$tmpGlobals['wgSVGConverters']['rsvg'] =
$tmpGlobals['wgFileExtensions'][] = 'svg';
$tmpGlobals['wgSVGConverter'] = 'rsvg';
$tmpGlobals['wgSVGConverters']['rsvg'] =
- '$path/rsvg-convert -w $width -h $height
$input -o $out
put';
+ '$path/rsvg-convert -w $width -h $height
-o $output $in
put';
if ( $GLOBALS['wgStyleDirectory'] === false ) {
$tmpGlobals['wgStyleDirectory'] = "$IP/skins";
if ( $GLOBALS['wgStyleDirectory'] === false ) {
$tmpGlobals['wgStyleDirectory'] = "$IP/skins";
@@
-434,7
+434,7
@@
class NewParserTest extends MediaWikiTestCase {
$this->savedGlobals = array();
/** @since 1.20 */
$this->savedGlobals = array();
/** @since 1.20 */
-
wfRunHooks
( 'ParserTestGlobals', array( &$settings ) );
+
Hooks::run
( 'ParserTestGlobals', array( &$settings ) );
$langObj = Language::factory( $lang );
$settings['wgContLang'] = $langObj;
$langObj = Language::factory( $lang );
$settings['wgContLang'] = $langObj;
@@
-939,7
+939,7
@@
class NewParserTest extends MediaWikiTestCase {
$class = $wgParserConf['class'];
$parser = new $class( array( 'preprocessorClass' => $preprocessor ) + $wgParserConf );
$class = $wgParserConf['class'];
$parser = new $class( array( 'preprocessorClass' => $preprocessor ) + $wgParserConf );
-
wfRunHooks
( 'ParserTestParser', array( &$parser ) );
+
Hooks::run
( 'ParserTestParser', array( &$parser ) );
return $parser;
}
return $parser;
}