bug #21981 [Console] Use proper line endings in BufferedOutput (julienfalque)

fabpot · fabpot · commit 26198cf60aba · 2017-03-14T11:38:54.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Console] Use proper line endings in BufferedOutput | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - `BufferOutput` should be consistent with `StreamOutput` when writing newlines. I faced an issue using this class in tests where the expected output was platform dependent (using `PHP_EOL` too). Commits ------- 33946e6 Use proper line endings
diff --git a/src/Symfony/Component/Console/Output/BufferedOutput.php b/src/Symfony/Component/Console/Output/BufferedOutput.php
@@ -42,7 +42,7 @@ protected function doWrite($message, $newline)
         $this->buffer .= $message;
 
         if ($newline) {
-            $this->buffer .= "\n";
+            $this->buffer .= PHP_EOL;
         }
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php b/src/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php
@@ -26,7 +26,7 @@ class DummyOutput extends BufferedOutput
     public function getLogs()
     {
         $logs = array();
-        foreach (explode("\n", trim($this->fetch())) as $message) {
+        foreach (explode(PHP_EOL, trim($this->fetch())) as $message) {
             preg_match('/^\[(.*)\] (.*)/', $message, $matches);
             $logs[] = sprintf('%s %s', $matches[1], $matches[2]);
         }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected function doWrite($message, $newline)`
`42`	`42`	`$this->buffer .= $message;`
`43`	`43`
`44`	`44`	`if ($newline) {`
`45`		`- $this->buffer .= "\n";`
	`45`	`+ $this->buffer .= PHP_EOL;`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class DummyOutput extends BufferedOutput`
`26`	`26`	`public function getLogs()`
`27`	`27`	`{`
`28`	`28`	`$logs = array();`
`29`		`- foreach (explode("\n", trim($this->fetch())) as $message) {`
	`29`	`+ foreach (explode(PHP_EOL, trim($this->fetch())) as $message) {`
`30`	`30`	`preg_match('/^\[(.)\] (.)/', $message, $matches);`
`31`	`31`	`$logs[] = sprintf('%s %s', $matches[1], $matches[2]);`
`32`	`32`	`}`