jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360179 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.Commenting.FunctionComment.WrongStyle
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
Change-Id: I7f105c713e7e2f7a00c77d83ee841b040041a62e
---
M .gitignore
M BasePageFilter.php
M Hooks.php
M MoreLikePageSuggester.php
M PageSuggesterFactory.php
M composer.json
M maintenance/generate_config.php
M phpcs.xml
8 files changed, 17 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 0502731..5a87c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
tests/browser/.gem
node_modules/
/vendor
+composer.lock
diff --git a/BasePageFilter.php b/BasePageFilter.php
index e1ac2e5..2802e30 100644
--- a/BasePageFilter.php
+++ b/BasePageFilter.php
@@ -86,4 +86,3 @@
);
}
}
-
diff --git a/Hooks.php b/Hooks.php
index e01c992..9570cd8 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -191,7 +191,7 @@
// Set preference in memory now
$user->setOption( self::INTRO_OPTION,
$newOption );
// Promise to save to the DB post-send
- \DeferredUpdates::addCallableUpdate(
function() use ( $user ) {
+ \DeferredUpdates::addCallableUpdate(
function () use ( $user ) {
$user->saveSettings();
} );
}
diff --git a/MoreLikePageSuggester.php b/MoreLikePageSuggester.php
index 9161eca..6d787a7 100644
--- a/MoreLikePageSuggester.php
+++ b/MoreLikePageSuggester.php
@@ -38,7 +38,6 @@
if ( $wgSearchTypeAlternatives !== null &&
count( $wgSearchTypeAlternatives ) > 0 ) {
-
$params['srbackend'] = 'CirrusSearch';
}
diff --git a/PageSuggesterFactory.php b/PageSuggesterFactory.php
index 6b661a7..b35f6f4 100644
--- a/PageSuggesterFactory.php
+++ b/PageSuggesterFactory.php
@@ -40,7 +40,6 @@
} elseif ( class_exists( 'CirrusSearch' ) &&
$taskName === 'morelike' &&
$sourceTitle !== null ) {
-
return new MoreLikePageSuggester( $request,
$sourceTitle );
} else {
return null;
diff --git a/composer.json b/composer.json
index b8f68fb..4a8c744 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.7.2"
+ "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/maintenance/generate_config.php b/maintenance/generate_config.php
index 588095e..5994f9f 100644
--- a/maintenance/generate_config.php
+++ b/maintenance/generate_config.php
@@ -46,7 +46,6 @@
// default value, which could be included in the output of
// $ php /path/to/maintenance/script.php --help.
$this->addOption( 'dbnames', 'Location of the list of DB names
to filter by', false, true );
-
}
public function execute() {
diff --git a/phpcs.xml b/phpcs.xml
index 4ffde0b..56f8b2a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ <exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
+ <exclude name="MediaWiki.FunctionComment.Missing.Protected" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Public" />
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ </rule>
<file>.</file>
- <arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="UTF-8"/>
+ <arg name="extensions" value="php,php5,inc" />
+ <arg name="encoding" value="UTF-8" />
<exclude-pattern>vendor</exclude-pattern>
<exclude-pattern>node_modules</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/360179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f105c713e7e2f7a00c77d83ee841b040041a62e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: Swalling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
