jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/385841 )
Change subject: Remove @codingStandardsIgnore from long lines ...................................................................... Remove @codingStandardsIgnore from long lines Breaks some line where the ignore is not needed. The sniff was changed upstream to be okay with long unbreakable lines in comments Change-Id: I2bbe2be7cedd4d3c0ce8dc3e62d0e268bc171876 --- M includes/api/ApiMain.php M includes/diff/DifferenceEngine.php M includes/http/PhpHttpRequest.php M includes/logging/LogFormatter.php M includes/shell/Shell.php M includes/tidy/Balancer.php 6 files changed, 6 insertions(+), 16 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index aea441b..edc1a3e 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -125,7 +125,6 @@ 'none' => 'ApiFormatNone', ]; - // @codingStandardsIgnoreStart String contenation on "msg" not allowed to break long line /** * List of user roles that are specifically relevant to the API. * [ 'right' => [ 'msg' => 'Some message with a $1', @@ -142,7 +141,6 @@ 'params' => [ ApiBase::LIMIT_SML2, ApiBase::LIMIT_BIG2 ] ] ]; - // @codingStandardsIgnoreEnd /** * @var ApiFormatBase diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 899054d..ef67477 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -605,14 +605,15 @@ $out->addHTML( "<hr class='diff-hr' id='mw-oldid' /> <h2 class='diff-currentversion-title'>{$revHeader}</h2>\n" ); # Page content may be handled by a hooked call instead... - # @codingStandardsIgnoreStart Ignoring long lines. if ( Hooks::run( 'ArticleContentOnDiff', [ $this, $out ] ) ) { $this->loadNewText(); $out->setRevisionId( $this->mNewid ); $out->setRevisionTimestamp( $this->mNewRev->getTimestamp() ); $out->setArticleFlag( true ); - if ( !Hooks::run( 'ArticleContentViewCustom', [ $this->mNewContent, $this->mNewPage, $out ] ) ) { + if ( !Hooks::run( 'ArticleContentViewCustom', + [ $this->mNewContent, $this->mNewPage, $out ] ) + ) { // Handled by extension } else { // Normal page @@ -631,13 +632,14 @@ # WikiPage::getParserOutput() should not return false, but just in case if ( $parserOutput ) { // Allow extensions to change parser output here - if ( Hooks::run( 'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, $wikiPage ] ) ) { + if ( Hooks::run( 'DifferenceEngineRenderRevisionAddParserOutput', + [ $this, $out, $parserOutput, $wikiPage ] ) + ) { $out->addParserOutput( $parserOutput ); } } } } - # @codingStandardsIgnoreEnd // Allow extensions to optionally not show the final patrolled link if ( Hooks::run( 'DifferenceEngineRenderRevisionShowFinalPatrolLink' ) ) { diff --git a/includes/http/PhpHttpRequest.php b/includes/http/PhpHttpRequest.php index 0c5d162..0636314 100644 --- a/includes/http/PhpHttpRequest.php +++ b/includes/http/PhpHttpRequest.php @@ -47,13 +47,11 @@ if ( $this->caInfo ) { $certLocations = [ 'manual' => $this->caInfo ]; } elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) { - // @codingStandardsIgnoreStart Generic.Files.LineLength // Default locations, based on // https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/ // PHP 5.5 and older doesn't have any defaults, so we try to guess ourselves. // PHP 5.6+ gets the CA location from OpenSSL as long as it is not set manually, // so we should leave capath/cafile empty there. - // @codingStandardsIgnoreEnd $certLocations = array_filter( [ getenv( 'SSL_CERT_DIR' ), getenv( 'SSL_CERT_PATH' ), diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php index ab7c5cb..b28bb7d 100644 --- a/includes/logging/LogFormatter.php +++ b/includes/logging/LogFormatter.php @@ -261,19 +261,15 @@ $text = wfMessage( 'undeletedarticle' ) ->rawParams( $target )->inContentLanguage()->escaped(); break; - // @codingStandardsIgnoreStart Long line //case 'revision': // Revision deletion //case 'event': // Log deletion // see https://github.com/wikimedia/mediawiki/commit/a9c243b7b5289dad204278dbe7ed571fd914e395 //default: - // @codingStandardsIgnoreEnd } break; case 'patrol': - // @codingStandardsIgnoreStart Long line // https://github.com/wikimedia/mediawiki/commit/1a05f8faf78675dc85984f27f355b8825b43efff - // @codingStandardsIgnoreEnd // Create a diff link to the patrolled revision if ( $entry->getSubtype() === 'patrol' ) { $diffLink = htmlspecialchars( diff --git a/includes/shell/Shell.php b/includes/shell/Shell.php index a660a22..604c96a 100644 --- a/includes/shell/Shell.php +++ b/includes/shell/Shell.php @@ -113,14 +113,12 @@ if ( wfIsWindows() ) { // Escaping for an MSVC-style command line parser and CMD.EXE - // @codingStandardsIgnoreStart For long URLs // Refs: // * https://web.archive.org/web/20020708081031/http://mailman.lyra.org/pipermail/scite-interest/2002-March/000436.html // * https://technet.microsoft.com/en-us/library/cc723564.aspx // * T15518 // * CR r63214 // Double the backslashes before any double quotes. Escape the double quotes. - // @codingStandardsIgnoreEnd $tokens = preg_split( '/(\\\\*")/', $arg, -1, PREG_SPLIT_DELIM_CAPTURE ); $arg = ''; $iteration = 0; diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php index fbe9270..82c35bb 100644 --- a/includes/tidy/Balancer.php +++ b/includes/tidy/Balancer.php @@ -1669,13 +1669,11 @@ $this->addToNoahList( $b ); } - // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong /** * Reconstruct the active formatting elements. * @param BalanceStack $stack The open elements stack * @see https://html.spec.whatwg.org/multipage/syntax.html#reconstruct-the-active-formatting-elements */ - // @codingStandardsIgnoreEnd public function reconstruct( $stack ) { $entry = $this->tail; // If there are no entries in the list of active formatting elements, -- To view, visit https://gerrit.wikimedia.org/r/385841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2bbe2be7cedd4d3c0ce8dc3e62d0e268bc171876 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits