jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/375841 )
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.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment Change-Id: Ie7212a99741b6947baebc43fe52a41f1e1eb065f --- M composer.json M phpcs.xml R tests/ConvertibleTimestampTest.php 3 files changed, 10 insertions(+), 4 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 9dd2b11..51c06b0 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,12 @@ } ], "autoload": { - "classmap": ["src/"], - "files": ["src/defines.php"] + "classmap": [ + "src/" + ], + "files": [ + "src/defines.php" + ] }, "require": { "php": ">=5.5.9" @@ -19,7 +23,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "phpunit/phpunit": "4.8.24", - "mediawiki/mediawiki-codesniffer": "0.7.2" + "mediawiki/mediawiki-codesniffer": "0.12.0" }, "scripts": { "test": [ diff --git a/phpcs.xml b/phpcs.xml index 06c43bc..e2fb418 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,6 +1,8 @@ <?xml version="1.0"?> <ruleset> - <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/> + <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> + <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" /> + </rule> <file>.</file> <arg name="encoding" value="UTF-8"/> <arg name="extensions" value="php"/> diff --git a/tests/TimestampTest.php b/tests/ConvertibleTimestampTest.php similarity index 100% rename from tests/TimestampTest.php rename to tests/ConvertibleTimestampTest.php -- To view, visit https://gerrit.wikimedia.org/r/375841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7212a99741b6947baebc43fe52a41f1e1eb065f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/libs/Timestamp Gerrit-Branch: master Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits