Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362669 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
The following sniffs are failing and were disabled:
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
The following sniffs now pass and were enabled:
* MediaWiki.ControlStructures.AssignmentInControlStructures
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment
Change-Id: I76acfbd225ecded83e57a7576c4103afa87e5e07
---
M composer.json
M phpcs.xml
M tests/phpunit/Services/HttpRequestExecutorTest.php
3 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileImporter
refs/changes/69/362669/1
diff --git a/composer.json b/composer.json
index 3698cef..8216dc7 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.9.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 3c08269..039f2ac 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,11 +2,10 @@
<ruleset name="FileImporter">
<!-- See
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
-->
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude
name="MediaWiki.ControlStructures.AssignmentInControlStructures" />
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
- <exclude name="MediaWiki.FunctionComment.Missing.Public" />
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
</rule>
<rule ref="Generic.Files.InlineHTML" />
diff --git a/tests/phpunit/Services/HttpRequestExecutorTest.php
b/tests/phpunit/Services/HttpRequestExecutorTest.php
index ac50ecb..4cb0a89 100644
--- a/tests/phpunit/Services/HttpRequestExecutorTest.php
+++ b/tests/phpunit/Services/HttpRequestExecutorTest.php
@@ -25,7 +25,6 @@
$executor = new HttpRequestExecutor();
$factoryOverride = function ( $url, $options = null, $caller =
__METHOD__ )
use ( $testUrl, $expectedResult ) {
-
$this->assertEquals( $testUrl, $url );
$this->assertArrayHasKey( 'logger', $options );
$this->assertArrayHasKey( 'followRedirects', $options );
--
To view, visit https://gerrit.wikimedia.org/r/362669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76acfbd225ecded83e57a7576c4103afa87e5e07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FileImporter
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
