Skip to content

Commit 4af7b5c

Browse files
committed
Merge pull request #9 from shanethehat/feature/support-windows-line-endings
Use PHP_EOL constant to represent line endings
2 parents 30e103d + d9afff9 commit 4af7b5c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Diff for: lib/Diff/Renderer/Text/Context.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ public function render()
7272
$j2 = $group[$lastItem][4];
7373

7474
if($i2 - $i1 >= 2) {
75-
$diff .= '*** '.($group[0][1] + 1).','.$i2." ****\n";
75+
$diff .= '*** '.($group[0][1] + 1).','.$i2." ****".PHP_EOL;
7676
}
7777
else {
7878
$diff .= '*** '.$i2." ****\n";
7979
}
8080

8181
if($j2 - $j1 >= 2) {
82-
$separator = '--- '.($j1 + 1).','.$j2." ----\n";
82+
$separator = '--- '.($j1 + 1).','.$j2." ----".PHP_EOL;
8383
}
8484
else {
85-
$separator = '--- '.$j2." ----\n";
85+
$separator = '--- '.$j2." ----".PHP_EOL;
8686
}
8787

8888
$hasVisible = false;
@@ -99,7 +99,7 @@ public function render()
9999
if($tag == 'insert') {
100100
continue;
101101
}
102-
$diff .= $this->tagMap[$tag].' '.implode("\n".$this->tagMap[$tag].' ', $this->diff->GetA($i1, $i2))."\n";
102+
$diff .= $this->tagMap[$tag].' '.implode(PHP_EOL.$this->tagMap[$tag].' ', $this->diff->GetA($i1, $i2)).PHP_EOL;
103103
}
104104
}
105105

@@ -119,7 +119,7 @@ public function render()
119119
if($tag == 'delete') {
120120
continue;
121121
}
122-
$diff .= $this->tagMap[$tag].' '.implode("\n".$this->tagMap[$tag].' ', $this->diff->GetB($j1, $j2))."\n";
122+
$diff .= $this->tagMap[$tag].' '.implode(PHP_EOL.$this->tagMap[$tag].' ', $this->diff->GetB($j1, $j2)).PHP_EOL;
123123
}
124124
}
125125
}

Diff for: lib/Diff/Renderer/Text/Unified.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ public function render()
6565
$i2 = -1;
6666
}
6767

68-
$diff .= '@@ -'.($i1 + 1).','.($i2 - $i1).' +'.($j1 + 1).','.($j2 - $j1)." @@\n";
68+
$diff .= '@@ -'.($i1 + 1).','.($i2 - $i1).' +'.($j1 + 1).','.($j2 - $j1)." @@".PHP_EOL;
6969
foreach($group as $code) {
7070
list($tag, $i1, $i2, $j1, $j2) = $code;
7171
if($tag == 'equal') {
72-
$diff .= ' '.implode("\n ", $this->diff->GetA($i1, $i2))."\n";
72+
$diff .= ' '.implode(PHP_EOL." ", $this->diff->GetA($i1, $i2)).PHP_EOL;
7373
}
7474
else {
7575
if($tag == 'replace' || $tag == 'delete') {
76-
$diff .= '-'.implode("\n-", $this->diff->GetA($i1, $i2))."\n";
76+
$diff .= '-'.implode(PHP_EOL."-", $this->diff->GetA($i1, $i2)).PHP_EOL;
7777
}
7878

7979
if($tag == 'replace' || $tag == 'insert') {
80-
$diff .= '+'.implode("\n+", $this->diff->GetB($j1, $j2))."\n";
80+
$diff .= '+'.implode(PHP_EOL."+", $this->diff->GetB($j1, $j2)).PHP_EOL;
8181
}
8282
}
8383
}

0 commit comments

Comments
 (0)