diff --git a/extensions/gii/components/DiffRendererHtmlInline.php b/extensions/gii/components/DiffRendererHtmlInline.php index c6df3df..757addb 100644 --- a/extensions/gii/components/DiffRendererHtmlInline.php +++ b/extensions/gii/components/DiffRendererHtmlInline.php @@ -1,6 +1,18 @@ + * @since 2.0 + */ class DiffRendererHtmlInline extends \Diff_Renderer_Html_Array { /** @@ -13,90 +25,111 @@ class DiffRendererHtmlInline extends \Diff_Renderer_Html_Array { $changes = parent::render(); $html = ''; - if(empty($changes)) { + if (empty($changes)) { return $html; } - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - foreach($changes as $i => $blocks) { + $html .= << + + + + + + + +HTML; + foreach ($changes as $i => $blocks) { // If this is a separate block, we're condensing code so output ..., // indicating a significant portion of the code has been collapsed as // it is the same - if($i > 0) { - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + if ($i > 0) { + $html .= << + + + + +HTML; } - foreach($blocks as $change) { - $html .= ''; + foreach ($blocks as $change) { + $tag = ucfirst($change['tag']); + $html .= << +HTML; // Equal changes should be shown on both sides of the diff - if($change['tag'] == 'equal') { - foreach($change['base']['lines'] as $no => $line) { + if ($change['tag'] === 'equal') { + foreach ($change['base']['lines'] as $no => $line) { $fromLine = $change['base']['offset'] + $no + 1; $toLine = $change['changed']['offset'] + $no + 1; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= << + + + + +HTML; } } // Added lines only on the right side - else if($change['tag'] == 'insert') { - foreach($change['changed']['lines'] as $no => $line) { + else if ($change['tag'] === 'insert') { + foreach ($change['changed']['lines'] as $no => $line) { $toLine = $change['changed']['offset'] + $no + 1; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= << + + + + +HTML; } } // Show deleted lines only on the left side - else if($change['tag'] == 'delete') { - foreach($change['base']['lines'] as $no => $line) { + else if ($change['tag'] === 'delete') { + foreach ($change['base']['lines'] as $no => $line) { $fromLine = $change['base']['offset'] + $no + 1; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= << + + + + +HTML; } } // Show modified lines on both sides - else if($change['tag'] == 'replace') { - foreach($change['base']['lines'] as $no => $line) { + else if ($change['tag'] === 'replace') { + foreach ($change['base']['lines'] as $no => $line) { $fromLine = $change['base']['offset'] + $no + 1; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= << + + + + +HTML; } - foreach($change['changed']['lines'] as $no => $line) { + foreach ($change['changed']['lines'] as $no => $line) { $toLine = $change['changed']['offset'] + $no + 1; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= << + + + + +HTML; } } - $html .= ''; + $html .= << +HTML; } } - $html .= '
OldNewDifferences
OldNewDifferences
 
 
'.$line.'
{$line}
'.$line.' 
{$line} 
'.$line.' 
{$line} 
'.$line.'
{$line}
'.$line.'
{$line}
'; + $html .= << +HTML; return $html; } } \ No newline at end of file