Skip to content

Commit 6c95ccd

Browse files
committed
Document properties and constructor
- Added docblock for Merged::$lineOffset. - Fixed docBlock for Merged::$lastDeleted and Merged::__construct().
1 parent 4512c03 commit 6c95ccd

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lib/jblond/Diff/Renderer/Html/Merged.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,21 @@ class Merged extends MainRenderer implements SubRendererInterface
3535
'title1' => 'Version1',
3636
'title2' => 'Version2',
3737
];
38+
/**
39+
* @var int Line offset to keep correct line number for merged diff.
40+
*/
3841
protected $lineOffset = 0;
3942
/**
40-
* @var string
43+
* @var string last block of lines which where removed from version 2.
4144
*/
4245
protected $lastDeleted;
4346

4447
/**
4548
* Merged constructor.
4649
*
47-
* @param array $options Custom defined options for the inline diff renderer.
50+
* @param array $options Custom defined options for the merged diff renderer.
4851
*
49-
* @see Inline::$subOptions
52+
* @see Merged::$subOptions
5053
*/
5154
public function __construct(array $options = [])
5255
{

0 commit comments

Comments
 (0)