From 34659b0b42100cb8f61eef7cd1682c554fb1a39c Mon Sep 17 00:00:00 2001 From: umherirrender Date: Wed, 14 Oct 2015 12:21:55 +0200 Subject: [PATCH] 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 --- includes/diff/DairikiDiff.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php index d327433fce..14810da49c 100644 --- a/includes/diff/DairikiDiff.php +++ b/includes/diff/DairikiDiff.php @@ -420,7 +420,7 @@ class DiffEngine { } $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 @@ class DiffEngine { 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; -- 2.20.1