Skip to content

Commit a6ff11a

Browse files
committed
Finish the HTML Combined renderer
1 parent 2cf8e84 commit a6ff11a

File tree

6 files changed

+235
-189
lines changed

6 files changed

+235
-189
lines changed

.phpstorm.meta.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,25 @@
1414
override(
1515
\Jfcherng\Diff\Factory\RendererFactory::getInstance(0),
1616
map([
17+
// html
18+
'Combined' => \Jfcherng\Diff\Renderer\Html\Combined::class,
1719
'Inline' => \Jfcherng\Diff\Renderer\Html\Inline::class,
1820
'Json' => \Jfcherng\Diff\Renderer\Html\Json::class,
1921
'SideBySide' => \Jfcherng\Diff\Renderer\Html\SideBySide::class,
22+
// text
2023
'Context' => \Jfcherng\Diff\Renderer\Text\Context::class,
2124
'Unified' => \Jfcherng\Diff\Renderer\Text\Unified::class,
2225
])
2326
);
2427
override(
2528
\Jfcherng\Diff\Factory\RendererFactory::make(0),
2629
map([
30+
// html
31+
'Combined' => \Jfcherng\Diff\Renderer\Html\Combined::class,
2732
'Inline' => \Jfcherng\Diff\Renderer\Html\Inline::class,
2833
'Json' => \Jfcherng\Diff\Renderer\Html\Json::class,
2934
'SideBySide' => \Jfcherng\Diff\Renderer\Html\SideBySide::class,
35+
// text
3036
'Context' => \Jfcherng\Diff\Renderer\Text\Context::class,
3137
'Unified' => \Jfcherng\Diff\Renderer\Text\Unified::class,
3238
])

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Generated diff can be rendered in all of the standard formats including:
2323

2424
**HTML** renderers:
2525

26+
- Combined
2627
- Inline
2728
- Side by Side
2829

@@ -69,7 +70,7 @@ $new = 'And this is the new one.';
6970

7071
// renderer class name:
7172
// Text renderers: Context, Json, Unified
72-
// HTML renderers: Inline, SideBySide
73+
// HTML renderers: Combined, Inline, SideBySide
7374
$rendererName = 'Unified';
7475

7576
// the Diff class options
@@ -171,6 +172,15 @@ $result = $htmlRenderer->renderArray(json_decode($jsonResult, true));
171172
![Side By Side](https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/side-by-side-renderer.png)
172173

173174

175+
### Renderer: Combined
176+
177+
```php
178+
<?php $rendererOptions = ['detailLevel' => 'char'];
179+
```
180+
181+
![Combined](https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/combined-renderer-char-level.png)
182+
183+
174184
### Renderer: Unified
175185

176186
```diff
Loading

example/new_file.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ B
1616
Donec rutrum test.
1717
There is a new inserted line.
1818
C
19-
gravida aliquet test.
20-
Sed dictum test.
19+
Sed dolor lorem ipsum hendrerit.

example/old_file.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ Just a context separator. 2
1515
B
1616
Donec rutrum.
1717
C
18-
Sed dictum.
19-
gravida aliquet.
18+
Sed dictum lorem ipsum.

0 commit comments

Comments
 (0)