[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/360128 ) 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.Public * MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment Change-Id: I5a7f01d6d5d8b56583940524b251d4de1ca09f5e --- M composer.json M includes/Cite.php M includes/CiteHooks.php M phpcs.xml 4 files changed, 13 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/composer.json b/composer.json index eb11804..bb4730c 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.7.2", + "mediawiki/mediawiki-codesniffer": "0.9.0", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { diff --git a/includes/Cite.php b/includes/Cite.php index e44fd50..96f11ed 100644 --- a/includes/Cite.php +++ b/includes/Cite.php @@ -759,7 +759,6 @@ } if ( !$data || !$this->mParser->isValidHalfParsedText( $data ) ) { - // Live hack: parse() adds two newlines on WM, can't reproduce it locally -ævar $ret = rtrim( $this->mParser->recursiveTagParse( $parserInput ), "\n" ); diff --git a/includes/CiteHooks.php b/includes/CiteHooks.php index c433384..3892253 100644 --- a/includes/CiteHooks.php +++ b/includes/CiteHooks.php @@ -78,7 +78,6 @@ * @return true */ public static function onResourceLoaderRegisterModules( &$resourceLoader ) { - if ( ! class_exists( 'VisualEditorHooks' ) ) { return true; } diff --git a/phpcs.xml b/phpcs.xml index d81a292..3b8880c 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,8 +1,17 @@ - + + + + + + + + + + . - - + + vendor -- To view, visit https://gerrit.wikimedia.org/r/360128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a7f01d6d5d8b56583940524b251d4de1ca09f5e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: LegoktmGerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/360128 ) 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.Public * MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment Change-Id: I5a7f01d6d5d8b56583940524b251d4de1ca09f5e --- M composer.json M includes/Cite.php M includes/CiteHooks.php M phpcs.xml 4 files changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/28/360128/1 diff --git a/composer.json b/composer.json index eb11804..bb4730c 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.7.2", + "mediawiki/mediawiki-codesniffer": "0.9.0", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { diff --git a/includes/Cite.php b/includes/Cite.php index e44fd50..96f11ed 100644 --- a/includes/Cite.php +++ b/includes/Cite.php @@ -759,7 +759,6 @@ } if ( !$data || !$this->mParser->isValidHalfParsedText( $data ) ) { - // Live hack: parse() adds two newlines on WM, can't reproduce it locally -ævar $ret = rtrim( $this->mParser->recursiveTagParse( $parserInput ), "\n" ); diff --git a/includes/CiteHooks.php b/includes/CiteHooks.php index c433384..3892253 100644 --- a/includes/CiteHooks.php +++ b/includes/CiteHooks.php @@ -78,7 +78,6 @@ * @return true */ public static function onResourceLoaderRegisterModules( &$resourceLoader ) { - if ( ! class_exists( 'VisualEditorHooks' ) ) { return true; } diff --git a/phpcs.xml b/phpcs.xml index d81a292..3b8880c 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,8 +1,17 @@ - + + + + + + + + + + . - - + + vendor -- To view, visit https://gerrit.wikimedia.org/r/360128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a7f01d6d5d8b56583940524b251d4de1ca09f5e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits