jenkins-bot has submitted this change and it was merged.

Change subject: Use correct @codingStandardsIgnore in DairikiDiff.php
......................................................................


Use correct @codingStandardsIgnore in DairikiDiff.php

@codingStandardsIgnoreFile is for whole files, use
@codingStandardsIgnoreStart instead

Also correct a MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.
SingleSpaceBeforeSingleLineComment sniff in the same file

Follows I06cdab4616b5bff47c85152df28f18c861730a23

Change-Id: I75e6e936e2fb4453bd56848ff39cabd92ae171fc
---
M includes/diff/DairikiDiff.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index d327433..14810da 100644
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -420,7 +420,7 @@
                        }
 
                        $x1 = $xoff + (int)( ( $numer + ( $xlim - $xoff ) * 
$chunk ) / $nchunks );
-                       // @codingStandardsIgnoreFile Ignore 
Squiz.WhiteSpace.SemicolonSpacing.Incorrect
+                       // @codingStandardsIgnoreStart Ignore 
Squiz.WhiteSpace.SemicolonSpacing.Incorrect
                        for ( ; $x < $x1; $x++ ) {
                                // @codingStandardsIgnoreEnd
                                $line = $flip ? $this->yv[$x] : $this->xv[$x];
@@ -444,7 +444,7 @@
                                        if ( $y > $this->seq[$k - 1] ) {
                                                assert( '$y < $this->seq[$k]' );
                                                // Optimization: this is a 
common case:
-                                               //      next match is just 
replacing previous match.
+                                               // next match is just replacing 
previous match.
                                                $this->in_seq[$this->seq[$k]] = 
false;
                                                $this->seq[$k] = $y;
                                                $this->in_seq[$y] = 1;

-- 
To view, visit https://gerrit.wikimedia.org/r/246191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I75e6e936e2fb4453bd56848ff39cabd92ae171fc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to