[Console] fixed progress bar jumping

Thomas Adam · Thomas Adam · commit 6a0ee27de1b1 · 2012-10-17T09:31:31.000+02:00
diff --git a/src/Symfony/Component/Console/Helper/ProgressHelper.php b/src/Symfony/Component/Console/Helper/ProgressHelper.php
@@ -380,21 +380,12 @@ private function humaneTime($secs)
      *
      * @param OutputInterface $output   An Output instance
      * @param string|array    $messages The message as an array of lines or a single string
-     * @param Boolean         $newline  Whether to add a newline or not
-     * @param integer         $size     The size of line
      */
-    private function overwrite(OutputInterface $output, $messages, $newline = false, $size = 80)
+    private function overwrite(OutputInterface $output, $messages)
     {
-        $output->write(str_repeat("\x08", $size));
+        $output->write("\x0D"); // carriage return
+        $output->write("\x1B\x5B\x4B"); // clear line
         $output->write($messages);
-        $output->write(str_repeat(' ', $size - strlen($messages)));
-
-        // clean up the end line
-        $output->write(str_repeat("\x08", $size - strlen($messages)));
-
-        if ($newline) {
-            $output->writeln('');
-        }
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php
@@ -82,6 +82,6 @@ protected function getOutputStream()
 
     protected function generateOutput($expected)
     {
-        return str_repeat("\x08", 80).$expected.str_repeat(' ', 80 - strlen($expected)).str_repeat("\x08", 80 - strlen($expected));
+        return "\x0D\x1B\x5B\x4B".$expected;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,6 @@ protected function getOutputStream()`
`82`	`82`
`83`	`83`	`protected function generateOutput($expected)`
`84`	`84`	`{`
`85`		`- return str_repeat("\x08", 80).$expected.str_repeat(' ', 80 - strlen($expected)).str_repeat("\x08", 80 - strlen($expected));`
	`85`	`+ return "\x0D\x1B\x5B\x4B".$expected;`
`86`	`86`	`}`
`87`	`87`	`}`