golem
/
Math
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "build: Bump mediawiki-codesniffer to 22.0.0"

This commit is contained in:
jenkins-bot 2018-09-06 15:53:12 +00:00 committed by Gerrit Code Review
parent b8153d0d24 087a973f30
commit be909fbe78
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "1.0.0",
"mediawiki/mediawiki-codesniffer": "21.0.0",
"mediawiki/mediawiki-codesniffer": "22.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.3.1"
},

6
src/MathHooks.php
View File

@ -22,7 +22,7 @@ class MathHooks {
if ( !defined( $defKey ) ) {
define( $defKey, $defValue );
} elseif ( $defValue !== constant( $defKey ) ) {
throw new Exception( 'Math constant "'. $defKey . '" has unexpected value "' .
throw new Exception( 'Math constant "' . $defKey . '" has unexpected value "' .
constant( $defKey ) . '" instead of "' . $defValue );
}
}
@ -270,8 +270,8 @@ class MathHooks {
// user interface throws an exception (BUG 64844)
$mode = self::mathModeToString( $wgDefaultUserOptions['math'] );
if ( ! in_array( $mode, MathRenderer::getValidModes() ) ) {
LoggerFactory::getInstance( 'Math' )->error( 'Misconfiguration: '.
"\$wgDefaultUserOptions['math'] is not in " . MathRenderer::getValidModes() . ".\n".
LoggerFactory::getInstance( 'Math' )->error( 'Misconfiguration: ' .
"\$wgDefaultUserOptions['math'] is not in " . MathRenderer::getValidModes() . ".\n" .
"Please check your LocalSetting.php file." );
// Display the checkbox in the first option.
$validModes = MathRenderer::getValidModes();

2
src/MathMathML.php
View File

@ -381,7 +381,7 @@ class MathMathML extends MathRenderer {
);
}
$style = trim( preg_replace( '/position:\s*absolute;\s*left:\s*0px;/', '', $style ),
"; \t\n\r\0\x0B" ) .'; ';
"; \t\n\r\0\x0B" ) . '; ';
}
// TODO: Figure out if there is a way to construct

2
src/MathSource.php
View File

@ -47,7 +47,7 @@ class MathSource extends MathRenderer {
[
// the former class name was 'tex'
// for backwards compatibility we keep this classname
'class' => $class. ' tex',
'class' => $class . ' tex',
'dir' => 'ltr'
]
),

2
src/SpecialMathShowImage.php
View File

@ -133,7 +133,7 @@ $escaped
</svg>
SVG;
if ( $wgDebugComments ) {
$result .= '<!--'. var_export( $this->renderer, true ) .'-->';
$result .= '<!--' . var_export( $this->renderer, true ) . '-->';
}
return $result;
}

2
src/SpecialMathStatus.php
View File

@ -183,7 +183,7 @@ class SpecialMathStatus extends SpecialPage {
$real = "<syntaxhighlight lang=\"xml\">$real</syntaxhighlight>";
$this->getOutput()->addWikiMsgArray( $message, [ $real, $expected ] );
} else {
LoggerFactory::getInstance( 'Math' )->warning( 'Can not display expected and real value.'.
LoggerFactory::getInstance( 'Math' )->warning( 'Can not display expected and real value.' .
'SyntaxHighlight is not installed.' );
}
}