X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdiff%2FUnifiedDiffFormatter.php;h=5f3ad3d7bb8a46d5eb4cbbaa71dbaaf5fe2fa6dd;hb=39ad19a6718d682e2d75b46355ba8b3ef2fe19a2;hp=0a86ccc0ab1de0d79a34acfe25f3690e2296fbfb;hpb=580d6f42d9835e5e64477c7f69fcd06787e9297f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/diff/UnifiedDiffFormatter.php b/includes/diff/UnifiedDiffFormatter.php index 0a86ccc0ab..5f3ad3d7bb 100644 --- a/includes/diff/UnifiedDiffFormatter.php +++ b/includes/diff/UnifiedDiffFormatter.php @@ -29,6 +29,7 @@ * @ingroup DifferenceEngine */ class UnifiedDiffFormatter extends DiffFormatter { + /** @var int */ protected $leadingContextLines = 2; @@ -36,22 +37,32 @@ class UnifiedDiffFormatter extends DiffFormatter { protected $trailingContextLines = 2; /** - * @param $lines + * @param string[] $lines + * @param string $prefix + */ + protected function lines( $lines, $prefix = ' ' ) { + foreach ( $lines as $line ) { + echo "{$prefix}{$line}\n"; + } + } + + /** + * @param string[] $lines */ protected function added( $lines ) { $this->lines( $lines, '+' ); } /** - * @param $lines + * @param string[] $lines */ protected function deleted( $lines ) { $this->lines( $lines, '-' ); } /** - * @param $orig - * @param $closing + * @param string[] $orig + * @param string[] $closing */ protected function changed( $orig, $closing ) { $this->deleted( $orig ); @@ -59,13 +70,15 @@ class UnifiedDiffFormatter extends DiffFormatter { } /** - * @param $xbeg - * @param $xlen - * @param $ybeg - * @param $ylen + * @param int $xbeg + * @param int $xlen + * @param int $ybeg + * @param int $ylen + * * @return string */ protected function blockHeader( $xbeg, $xlen, $ybeg, $ylen ) { return "@@ -$xbeg,$xlen +$ybeg,$ylen @@"; } + }