Skip to content

Commit fea80b0

Browse files
jfcherngjfcherng
committed
fix: Combined::renderArray isn't working properly
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
1 parent a8eabe3 commit fea80b0

File tree

4 files changed

+66
-39
lines changed

4 files changed

+66
-39
lines changed

‎src/Renderer/AbstractRenderer.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ abstract class AbstractRenderer implements RendererInterface
4343
*/
4444
protected $t;
4545

46+
/**
47+
* If the input "changes" have `<ins>...</ins>` or `<del>...</del>`,
48+
* which means they have been processed, then `false`. Otherwise, `true`.
49+
*
50+
* @var bool
51+
*/
52+
protected $changesAreRaw = true;
53+
4654
/**
4755
* @var array array of the default options that apply to this renderer
4856
*/
@@ -170,6 +178,7 @@ abstract public function getResultForIdenticalsDefault(): string;
170178
*/
171179
final public function render(Differ $differ): string
172180
{
181+
$this->changesAreRaw = true;
173182
// the "no difference" situation may happen frequently
174183
return $differ->getOldNewComparison() === 0
175184
? $this->getResultForIdenticals()
@@ -181,6 +190,8 @@ final public function render(Differ $differ): string
181190
*/
182191
final public function renderArray(array $differArray): string
183192
{
193+
$this->changesAreRaw = false;
194+
184195
return $this->renderArrayWorker($differArray);
185196
}
186197

‎src/Renderer/Html/Combined.php‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,24 @@ protected function renderTableHunks(array $hunks): string
110110
*/
111111
protected function renderTableBlock(array $block): string
112112
{
113-
static $callbacks;
114-
115-
// @todo rewrite with "first-class callable" (PHP 8.1)
116-
$callbacks ??= [
117-
SequenceMatcher::OP_EQ => [$this, 'renderTableBlockEqual'],
118-
SequenceMatcher::OP_INS => [$this, 'renderTableBlockInsert'],
119-
SequenceMatcher::OP_DEL => [$this, 'renderTableBlockDelete'],
120-
SequenceMatcher::OP_REP => [$this, 'renderTableBlockReplace'],
121-
];
113+
switch ($block['tag']) {
114+
case SequenceMatcher::OP_EQ:
115+
$content = $this->renderTableBlockEqual($block);
116+
break;
117+
case SequenceMatcher::OP_INS:
118+
$content = $this->renderTableBlockInsert($block);
119+
break;
120+
case SequenceMatcher::OP_DEL:
121+
$content = $this->renderTableBlockDelete($block);
122+
break;
123+
case SequenceMatcher::OP_REP:
124+
$content = $this->renderTableBlockReplace($block);
125+
break;
126+
default:
127+
$content = '';
128+
}
122129

123-
return
124-
'<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' .
125-
$callbacks[$block['tag']]($block) .
126-
'</tbody>';
130+
return '<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' . $content . '</tbody>';
127131
}
128132

129133
/**
@@ -491,6 +495,10 @@ static function (array $matches) use (&$parts, $part, $ld, $rd): string {
491495
*/
492496
protected function customFormatLines(array $lines, int $op): array
493497
{
498+
if (!$this->changesAreRaw) {
499+
return $lines;
500+
}
501+
494502
static $closureMap = [
495503
SequenceMatcher::OP_DEL => RendererConstant::HTML_CLOSURES_DEL,
496504
SequenceMatcher::OP_INS => RendererConstant::HTML_CLOSURES_INS,

‎src/Renderer/Html/Inline.php‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,24 @@ protected function renderTableHunks(array $hunks): string
112112
*/
113113
protected function renderTableBlock(array $block): string
114114
{
115-
static $callbacks;
116-
117-
// @todo rewrite with "first-class callable" (PHP 8.1)
118-
$callbacks ??= [
119-
SequenceMatcher::OP_EQ => [$this, 'renderTableBlockEqual'],
120-
SequenceMatcher::OP_INS => [$this, 'renderTableBlockInsert'],
121-
SequenceMatcher::OP_DEL => [$this, 'renderTableBlockDelete'],
122-
SequenceMatcher::OP_REP => [$this, 'renderTableBlockReplace'],
123-
];
115+
switch ($block['tag']) {
116+
case SequenceMatcher::OP_EQ:
117+
$content = $this->renderTableBlockEqual($block);
118+
break;
119+
case SequenceMatcher::OP_INS:
120+
$content = $this->renderTableBlockInsert($block);
121+
break;
122+
case SequenceMatcher::OP_DEL:
123+
$content = $this->renderTableBlockDelete($block);
124+
break;
125+
case SequenceMatcher::OP_REP:
126+
$content = $this->renderTableBlockReplace($block);
127+
break;
128+
default:
129+
$content = '';
130+
}
124131

125-
return
126-
'<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' .
127-
$callbacks[$block['tag']]($block) .
128-
'</tbody>';
132+
return '<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' . $content . '</tbody>';
129133
}
130134

131135
/**

‎src/Renderer/Html/SideBySide.php‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,24 @@ protected function renderTableHunks(array $hunks): string
104104
*/
105105
protected function renderTableBlock(array $block): string
106106
{
107-
static $callbacks;
108-
109-
// @todo rewrite with "first-class callable" (PHP 8.1)
110-
$callbacks ??= [
111-
SequenceMatcher::OP_EQ => [$this, 'renderTableBlockEqual'],
112-
SequenceMatcher::OP_INS => [$this, 'renderTableBlockInsert'],
113-
SequenceMatcher::OP_DEL => [$this, 'renderTableBlockDelete'],
114-
SequenceMatcher::OP_REP => [$this, 'renderTableBlockReplace'],
115-
];
107+
switch ($block['tag']) {
108+
case SequenceMatcher::OP_EQ:
109+
$content = $this->renderTableBlockEqual($block);
110+
break;
111+
case SequenceMatcher::OP_INS:
112+
$content = $this->renderTableBlockInsert($block);
113+
break;
114+
case SequenceMatcher::OP_DEL:
115+
$content = $this->renderTableBlockDelete($block);
116+
break;
117+
case SequenceMatcher::OP_REP:
118+
$content = $this->renderTableBlockReplace($block);
119+
break;
120+
default:
121+
$content = '';
122+
}
116123

117-
return
118-
'<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' .
119-
$callbacks[$block['tag']]($block) .
120-
'</tbody>';
124+
return '<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' . $content . '</tbody>';
121125
}
122126

123127
/**

0 commit comments

Comments
 (0)