Skip to content

Commit 09186cb

Browse files
committed
Make SequenceMatcher::linesAreDifferent() private
Should be a BC break in theory but I do not believe people use it. Signed-off-by: Jack Cherng <jfcherng@gmail.com>
1 parent 4a7ca55 commit 09186cb

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/SequenceMatcher.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -300,34 +300,6 @@ public function findLongestMatch(int $alo, int $ahi, int $blo, int $bhi): array
300300
return [$bestI, $bestJ, $bestSize];
301301
}
302302

303-
/**
304-
* Check if the two lines at the given indexes are different or not.
305-
*
306-
* @param int $aIndex line number to check against in a
307-
* @param int $bIndex line number to check against in b
308-
*
309-
* @return bool true if the lines are different and false if not
310-
*/
311-
public function linesAreDifferent(int $aIndex, int $bIndex): bool
312-
{
313-
$lineA = $this->a[$aIndex];
314-
$lineB = $this->b[$bIndex];
315-
316-
if ($this->options['ignoreWhitespace']) {
317-
static $whitespaces = ["\t", ' '];
318-
319-
$lineA = \str_replace($whitespaces, '', $lineA);
320-
$lineB = \str_replace($whitespaces, '', $lineB);
321-
}
322-
323-
if ($this->options['ignoreCase']) {
324-
$lineA = \strtolower($lineA);
325-
$lineB = \strtolower($lineB);
326-
}
327-
328-
return $lineA !== $lineB;
329-
}
330-
331303
/**
332304
* Return a nested set of arrays for all of the matching sub-sequences
333305
* in the strings $a and $b.
@@ -577,6 +549,34 @@ private function setOps(bool $useIntOpcodes): self
577549
return $this;
578550
}
579551

552+
/**
553+
* Check if the two lines at the given indexes are different or not.
554+
*
555+
* @param int $aIndex line number to check against in a
556+
* @param int $bIndex line number to check against in b
557+
*
558+
* @return bool true if the lines are different and false if not
559+
*/
560+
private function linesAreDifferent(int $aIndex, int $bIndex): bool
561+
{
562+
$lineA = $this->a[$aIndex];
563+
$lineB = $this->b[$bIndex];
564+
565+
if ($this->options['ignoreWhitespace']) {
566+
static $whitespaces = ["\t", ' '];
567+
568+
$lineA = \str_replace($whitespaces, '', $lineA);
569+
$lineB = \str_replace($whitespaces, '', $lineB);
570+
}
571+
572+
if ($this->options['ignoreCase']) {
573+
$lineA = \strtolower($lineA);
574+
$lineB = \strtolower($lineB);
575+
}
576+
577+
return $lineA !== $lineB;
578+
}
579+
580580
/**
581581
* Generate the internal arrays containing the list of junk and non-junk
582582
* characters for the second ($b) sequence.

0 commit comments

Comments
 (0)