Uniform term "a, b" and "base, changed" to "old, new"

[jfcherng]

• a, b, from, to ➡️ old, new (6f8e9dd)
• base, changed ➡️ old, new (Uniform the term "base, changed" into "old, new" #4)

[jfcherng]

For base, changed, it may be only changed when v5 is almost there.

php-diff/src/Renderer/Html/AbstractHtml.php

Lines 175 to 188 in be4d844

	protected function getDefaultBlock(string $tag, int $i1, int $j1): array
	{
	return [
	'tag' => $tag,
	'base' => [
	'offset' => $i1,
	'lines' => [],
	],
	'changed' => [
	'offset' => $j1,
	'lines' => [],
	],
	];
	}

php-diff/src/Renderer/Html/AbstractHtml.php

Lines 41 to 135 in be4d844

	public function getChanges(): array
	{
	$lineRenderer = LineRendererFactory::make(
	$this->options['detailLevel'],
	$this->diff->getOptions(),
	$this->options
	);
	// As we'll be modifying old & new to include our change markers,
	// we need to get the contents and store them here. That way
	// we're not going to destroy the original data
	$old = $this->diff->getOld();
	$new = $this->diff->getNew();
	$changes = [];
	foreach ($this->diff->getGroupedOpcodes() as $opcodes) {
	$blocks = [];
	$lastTag = null;
	$lastBlock = 0;
	foreach ($opcodes as [$tag, $i1, $i2, $j1, $j2]) {
	if (
	$tag === SequenceMatcher::OP_REP &&
	$i2 - $i1 === $j2 - $j1
	) {
	for ($i = 0; $i < $i2 - $i1; ++$i) {
	$this->renderChangedExtent($lineRenderer, $old[$i1 + $i], $new[$j1 + $i]);
	}
	}
	if ($tag !== $lastTag) {
	$blocks[] = $this->getDefaultBlock($tag, $i1, $j1);
	$lastBlock = \count($blocks) - 1;
	}
	$lastTag = $tag;
	if ($tag === SequenceMatcher::OP_EQ) {
	if (!empty($lines = \array_slice($old, $i1, ($i2 - $i1)))) {
	$formattedLines = $this->formatLines($lines);
	$blocks[$lastBlock]['base']['lines'] += $formattedLines;
	$blocks[$lastBlock]['changed']['lines'] += $formattedLines;
	}
	continue;
	}
	/**
	* @todo By setting option "useIntOpcodes" for the sequence matcher,
	* this "if" could be further optimized by using bit operations.
	*
	* Like this: "if ($tag & (OP_INT_REP | OP_INT_DEL))"
	*
	* But int tag would be less readable while debugging.
	* Also, this would be a BC break for the output of the JSON renderer.
	* Is it worth doing?
	*/
	if (
	$tag === SequenceMatcher::OP_REP ||
	$tag === SequenceMatcher::OP_DEL
	) {
	$lines = \array_slice($old, $i1, ($i2 - $i1));
	$lines = $this->formatLines($lines);
	$lines = \str_replace(
	RendererConstant::HTML_CLOSURES,
	RendererConstant::HTML_CLOSURES_DEL,
	$lines
	);
	$blocks[$lastBlock]['base']['lines'] += $lines;
	}
	if (
	$tag === SequenceMatcher::OP_REP ||
	$tag === SequenceMatcher::OP_INS
	) {
	$lines = \array_slice($new, $j1, ($j2 - $j1));
	$lines = $this->formatLines($lines);
	$lines = \str_replace(
	RendererConstant::HTML_CLOSURES,
	RendererConstant::HTML_CLOSURES_INS,
	$lines
	);
	$blocks[$lastBlock]['changed']['lines'] += $lines;
	}
	}
	$changes[] = $blocks;
	}
	return $changes;
	}

php-diff/src/Renderer/Html/Inline.php

Lines 123 to 138 in be4d844

	protected function renderTableEqual(array $change): string
	{
	$html = '';
	foreach ($change['base']['lines'] as $no => $line) {
	$oldLine = $change['base']['offset'] + $no + 1;
	$newLine = $change['changed']['offset'] + $no + 1;
	$html .=
	'<tr data-type="=">' .
	'<th class="f-num">' . $oldLine . '</th>' .
	'<th class="t-num">' . $newLine . '</th>' .
	'<th class="sign"></th>' .
	'<td class="old">' . $line . '</td>' .
	'</tr>';
	}

[jfcherng]

Also line number th tags' class should be changed like n-old and n-new.
Yeah. The CSS needs corresponding changes for sure.

php-diff/src/Renderer/Html/Inline.php

Lines 133 to 134 in be4d844

	'<th class="f-num">' . $oldLine . '</th>' .
	'<th class="t-num">' . $newLine . '</th>' .

[jfcherng]

Done in the v5 branch.