Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368024 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I99cebc85671b3e8670729cb725a6026f233b639b
---
M Math.hooks.php
M MathInputCheck.php
M MathInputCheckRestbase.php
M MathInputCheckTexvc.php
M MathLaTeXML.php
M MathMathML.php
M MathRenderer.php
M MathRestbaseInterface.php
M MathSource.php
M MathTexvc.php
M composer.json
M phpcs.xml
12 files changed, 21 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/24/368024/1
diff --git a/Math.hooks.php b/Math.hooks.php
index 13b8845..ad33220 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -267,7 +267,7 @@
];
// If the default option is not in the valid options the
// user interface throws an exception (BUG 64844)
- $mode = MathHooks::mathModeToString(
$wgDefaultUserOptions['math'] );
+ $mode = self::mathModeToString( $wgDefaultUserOptions['math'] );
if ( ! in_array( $mode, MathRenderer::getValidModes() ) ) {
LoggerFactory::getInstance( 'Math' )->error(
'Misconfiguration: '.
"\$wgDefaultUserOptions['math'] is not in " .
MathRenderer::getValidModes() . ".\n".
@@ -297,7 +297,7 @@
* MaintenanceRefreshLinksInit handler; optimize settings for
refreshLinks batch job.
*
* @param Maintenance $maint
- * @return boolean hook return code
+ * @return bool hook return code
*/
static function onMaintenanceRefreshLinksInit( $maint ) {
global $wgUser;
@@ -422,7 +422,7 @@
*/
static function chemTagHook( $content, $attributes, $parser ) {
$attributes['chem'] = true;
- return MathHooks::mathTagHook( '\ce{' . $content . '}',
$attributes, $parser );
+ return self::mathTagHook( '\ce{' . $content . '}', $attributes,
$parser );
}
}
diff --git a/MathInputCheck.php b/MathInputCheck.php
index fb09836..f766728 100644
--- a/MathInputCheck.php
+++ b/MathInputCheck.php
@@ -27,7 +27,7 @@
/**
* Returns true if the TeX input String is valid
- * @return boolean
+ * @return bool
*/
public function isValid() {
return $this->isValid;
diff --git a/MathInputCheckRestbase.php b/MathInputCheckRestbase.php
index b72f88a..ab0dbf2 100644
--- a/MathInputCheckRestbase.php
+++ b/MathInputCheckRestbase.php
@@ -59,7 +59,7 @@
return $errorRenderer->getError( 'math_unknown_error' );
}
/**
- * @return boolean
+ * @return bool
*/
public function isValid() {
return $this->restbaseInterface->getSuccess();
diff --git a/MathInputCheckTexvc.php b/MathInputCheckTexvc.php
index 7d22f9d..df7fcd2 100644
--- a/MathInputCheckTexvc.php
+++ b/MathInputCheckTexvc.php
@@ -46,7 +46,7 @@
}
/**
- * @return boolean
+ * @return bool
*/
public function isValid() {
$us = $this;
@@ -59,7 +59,7 @@
}
/**
- * @return boolean
+ * @return bool
*/
public function doValidCheck() {
global $wgMathTexvcCheckExecutable;
diff --git a/MathLaTeXML.php b/MathLaTeXML.php
index aa0c055..e0c1323 100644
--- a/MathLaTeXML.php
+++ b/MathLaTeXML.php
@@ -92,7 +92,7 @@
/**
* Does the actual web request to convert TeX to MathML.
- * @return boolean
+ * @return bool
*/
protected function doRender() {
if ( trim( $this->getTex() ) === '' ) {
@@ -180,7 +180,7 @@
/**
* Calculates the SVG image based on the MathML input
* No cache is used.
- * @return boolean
+ * @return bool
*/
public function calculateSvg() {
$renderer = new MathMathML( $this->getTex() );
diff --git a/MathMathML.php b/MathMathML.php
index aa88b47..f5f7956 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -164,7 +164,7 @@
* @param mixed $res the result
* @param mixed $error the formatted error message or null
* @param String $httpRequestClass class name of MWHttpRequest (needed
for testing only)
- * @return boolean success
+ * @return bool success
*/
public function makeRequest(
$host, $post, &$res, &$error = '', $httpRequestClass =
'MWHttpRequest'
@@ -252,7 +252,7 @@
/**
* Does the actual web request to convert TeX to MathML.
- * @return boolean
+ * @return bool
*/
protected function doRender() {
if ( $this->getTex() === '' ) {
@@ -307,7 +307,7 @@
* Checks if the input is valid MathML,
* and if the root element has the name math
* @param string $XML
- * @return boolean
+ * @return bool
*/
public function isValidMathML( $XML ) {
$out = false;
diff --git a/MathRenderer.php b/MathRenderer.php
index 7b2db14..e75d0de 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -261,7 +261,7 @@
/**
* Reads rendering data from database
*
- * @return boolean true if read successfully, false otherwise
+ * @return bool true if read successfully, false otherwise
*/
public function readFromDatabase() {
$dbr = wfGetDB( DB_SLAVE );
@@ -508,7 +508,7 @@
/**
* Checks if the instance was modified i.e., because math was rendered
*
- * @return boolean true if something was changed false otherwise
+ * @return bool true if something was changed false otherwise
*/
public function isChanged() {
return $this->changed;
@@ -516,7 +516,7 @@
/**
* Checks if there is an explicit user request to rerender the math-tag.
- * @return boolean
+ * @return bool
*/
function isPurge() {
if ( $this->purge ) {
@@ -574,7 +574,7 @@
/**
* Get if the input tex was marked as secure
- * @return boolean
+ * @return bool
*/
public function isTexSecure() {
return $this->texSecure;
diff --git a/MathRestbaseInterface.php b/MathRestbaseInterface.php
index 4488753..68670f1 100644
--- a/MathRestbaseInterface.php
+++ b/MathRestbaseInterface.php
@@ -301,7 +301,7 @@
}
/**
- * @return boolean
+ * @return bool
*/
public function getSuccess() {
if ( $this->success === null ) {
diff --git a/MathSource.php b/MathSource.php
index 93d403d..9a1fd40 100644
--- a/MathSource.php
+++ b/MathSource.php
@@ -60,7 +60,7 @@
/**
* No rendering required in plain text mode
- * @return boolean
+ * @return bool
*/
function render() {
// assume unchanged to avoid unnecessary database access
diff --git a/MathTexvc.php b/MathTexvc.php
index 735be86..e6c6a55 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -372,7 +372,7 @@
/**
* Reads the rendering information from the database. If configured,
checks whether files exist
*
- * @return boolean true if retrieved, false otherwise
+ * @return bool true if retrieved, false otherwise
*/
public function readCache() {
global $wgMathCheckFiles;
diff --git a/composer.json b/composer.json
index 2ea4709..8cee85f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 8d5c16e..1dfdfc4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -14,6 +14,5 @@
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc" />
- <arg name="encoding" value="utf8" />
- <exclude-pattern>vendor</exclude-pattern>
+ <arg name="encoding" value="UTF-8" />
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/368024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99cebc85671b3e8670729cb725a6026f233b639b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
