From 66b73ea4560daf20cc64a74c60749721e273e71d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 24 Mar 2015 01:29:49 +0000 Subject: [PATCH] Revert "Disable overwrites when no-ansi is present, fixes #3612" This reverts commit e0d36e19eb8a5c96ccad3d145faf9024727e856c. Conflicts: src/Composer/IO/ConsoleIO.php --- src/Composer/IO/ConsoleIO.php | 9 --------- tests/Composer/Test/IO/ConsoleIOTest.php | 16 +++++----------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/Composer/IO/ConsoleIO.php b/src/Composer/IO/ConsoleIO.php index 7de4d8ede..38e722bf5 100644 --- a/src/Composer/IO/ConsoleIO.php +++ b/src/Composer/IO/ConsoleIO.php @@ -163,15 +163,6 @@ class ConsoleIO extends BaseIO $output = $this->output; } - if (!$output->isDecorated()) { - if (!$messages) { - return; - } - - $this->doWrite($messages, count($messages) === 1 || $newline, $stderr); - return; - } - // messages can be an array, let's convert it to string anyway $messages = join($newline ? "\n" : '', (array) $messages); diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php index 0edd34d99..d0af8cb42 100644 --- a/tests/Composer/Test/IO/ConsoleIOTest.php +++ b/tests/Composer/Test/IO/ConsoleIOTest.php @@ -99,27 +99,21 @@ class ConsoleIOTest extends TestCase ->method('write') ->with($this->equalTo('something (strlen = 23)')); $outputMock->expects($this->at(1)) - ->method('isDecorated') - ->willReturn(true); - $outputMock->expects($this->at(2)) ->method('write') ->with($this->equalTo(str_repeat("\x08", 23)), $this->equalTo(false)); - $outputMock->expects($this->at(3)) + $outputMock->expects($this->at(2)) ->method('write') ->with($this->equalTo('shorter (12)'), $this->equalTo(false)); - $outputMock->expects($this->at(4)) + $outputMock->expects($this->at(3)) ->method('write') ->with($this->equalTo(str_repeat(' ', 11)), $this->equalTo(false)); - $outputMock->expects($this->at(5)) + $outputMock->expects($this->at(4)) ->method('write') ->with($this->equalTo(str_repeat("\x08", 11)), $this->equalTo(false)); - $outputMock->expects($this->at(6)) - ->method('isDecorated') - ->willReturn(true); - $outputMock->expects($this->at(7)) + $outputMock->expects($this->at(5)) ->method('write') ->with($this->equalTo(str_repeat("\x08", 12)), $this->equalTo(false)); - $outputMock->expects($this->at(8)) + $outputMock->expects($this->at(6)) ->method('write') ->with($this->equalTo('something longer than initial (34)'));