jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375259 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
The following sniffs are failing and were disabled:
* MediaWiki.Files.ClassMatchesFilename.NotMatch
* MediaWiki.Files.OneClassPerFile.MultipleFound
The following sniffs now pass and were enabled:
* MediaWiki.ControlStructures.IfElseStructure
Change-Id: Ia10258008fc28be6adbbea15f162bffa2be18880
---
M Expr.php
M composer.json
M phpcs.xml
3 files changed, 20 insertions(+), 21 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Expr.php b/Expr.php
index 96c45e5..e305b59 100644
--- a/Expr.php
+++ b/Expr.php
@@ -281,24 +281,22 @@
}
// Next the two-character operators
-
- elseif ( $char2 === '<=' ) {
+ elseif ( $char2 === '<=' ) {
$name = $char2;
$op = EXPR_LESSEQ;
$p += 2;
- } elseif ( $char2 === '>=' ) {
+ } elseif ( $char2 === '>=' ) {
$name = $char2;
$op = EXPR_GREATEREQ;
$p += 2;
- } elseif ( $char2 === '<>' || $char2 === '!=' ) {
+ } elseif ( $char2 === '<>' || $char2 === '!=' ) {
$name = $char2;
$op = EXPR_NOTEQ;
$p += 2;
- }
+ }
// Finally the single-character operators
-
- elseif ( $char === '+' ) {
+ elseif ( $char === '+' ) {
++$p;
if ( $expecting === 'expression' ) {
// Unary plus
@@ -308,7 +306,7 @@
// Binary plus
$op = EXPR_PLUS;
}
- } elseif ( $char === '-' ) {
+ } elseif ( $char === '-' ) {
++$p;
if ( $expecting === 'expression' ) {
// Unary minus
@@ -318,26 +316,26 @@
// Binary minus
$op = EXPR_MINUS;
}
- } elseif ( $char === '*' ) {
+ } elseif ( $char === '*' ) {
$name = $char;
$op = EXPR_TIMES;
++$p;
- } elseif ( $char === '/' ) {
+ } elseif ( $char === '/' ) {
$name = $char;
$op = EXPR_DIVIDE;
++$p;
- } elseif ( $char === '^' ) {
+ } elseif ( $char === '^' ) {
$name = $char;
$op = EXPR_POW;
++$p;
- } elseif ( $char === '(' ) {
+ } elseif ( $char === '(' ) {
if ( $expecting === 'operator' ) {
throw new ExprError(
'unexpected_operator', '(' );
}
$operators[] = EXPR_OPEN;
++$p;
continue;
- } elseif ( $char === ')' ) {
+ } elseif ( $char === ')' ) {
$lastOp = end( $operators );
while ( $lastOp && $lastOp != EXPR_OPEN ) {
$this->doOperation( $lastOp, $operands
);
@@ -352,21 +350,21 @@
$expecting = 'operator';
++$p;
continue;
- } elseif ( $char === '=' ) {
+ } elseif ( $char === '=' ) {
$name = $char;
$op = EXPR_EQUALITY;
++$p;
- } elseif ( $char === '<' ) {
+ } elseif ( $char === '<' ) {
$name = $char;
$op = EXPR_LESS;
++$p;
- } elseif ( $char === '>' ) {
+ } elseif ( $char === '>' ) {
$name = $char;
$op = EXPR_GREATER;
++$p;
- } else {
+ } else {
throw new ExprError(
'unrecognised_punctuation', Validator::cleanUp( $char ) );
- }
+ }
// Binary operator processing
if ( $expecting === 'expression' ) {
diff --git a/composer.json b/composer.json
index 1c2721a..021a14c 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.1"
+ "mediawiki/mediawiki-codesniffer": "0.12.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index ec9798b..403afb8 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
- <exclude name="MediaWiki.ControlStructures.IfElseStructure" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+ <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
</rule>
--
To view, visit https://gerrit.wikimedia.org/r/375259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia10258008fc28be6adbbea15f162bffa2be18880
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
