From 2ac1bb45bc71d9cdfe76844adc1bedc05272db56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=83=C2=AEt=20Burnichon?= <bburnichon@gmail.com>
Date: Thu, 3 Jul 2014 14:18:43 +0200
Subject: [PATCH] [Console] Remove estimated field from debug_nomax

---
 .../Component/Console/Helper/ProgressBar.php  |  8 +++---
 .../Console/Tests/Helper/ProgressBarTest.php  | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index ff101ca5db..99c0dfc59b 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -547,13 +547,13 @@ class ProgressBar
             'normal_nomax'       => ' %current% [%bar%]',
 
             'verbose'            => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
-            'verbose_nomax'      => ' %current% [%bar%] %percent:3s%% %elapsed:6s%',
+            'verbose_nomax'      => ' %current% [%bar%] %elapsed:6s%',
 
-            'very_verbose'       => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
-            'very_verbose_nomax' => ' %current% [%bar%] %percent:3s%% %elapsed:6s%',
+            'very_verbose'       => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%',
+            'very_verbose_nomax' => ' %current% [%bar%] %elapsed:6s%',
 
             'debug'              => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
-            'debug_nomax'        => ' %current% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
+            'debug_nomax'        => ' %current% [%bar%] %elapsed:6s% %memory:6s%',
         );
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
index ba5db2921b..d087713867 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -404,6 +404,34 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * @dataProvider provideFormat
+     */
+    public function testFormatsWithoutMax($format)
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setFormat($format);
+        $bar->start();
+
+        rewind($output->getStream());
+        $this->assertNotEmpty(stream_get_contents($output->getStream()));
+    }
+
+    /**
+     * Provides each defined format
+     *
+     * @return array
+     */
+    public function provideFormat()
+    {
+        return array(
+            array('normal'),
+            array('verbose'),
+            array('very_verbose'),
+            array('debug'),
+        );
+    }
+
     protected function getOutputStream($decorated = true)
     {
         return new StreamOutput(fopen('php://memory', 'r+', false), StreamOutput::VERBOSITY_NORMAL, $decorated);