fixed logic

fabpot · fabpot · commit 97731914220f · 2016-06-09T18:00:23.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -35,7 +35,6 @@
 use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Exception\LogicException;
-use Symfony\Component\Console\Terminal;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -403,9 +403,7 @@ public function display()
             $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
         }
 
-        $line = $this->buildLine();
-        $line = $this->adjustLineWidthToTerminalWidth($line);
-        $this->overwrite($line);
+        $this->overwrite($this->buildLine());
     }
 
     /**
@@ -591,7 +589,8 @@ private static function initFormats()
      */
     private function buildLine()
     {
-        return preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) {
+        $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
+        $callback = function ($matches) {
             if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
                 $text = call_user_func($formatter, $this, $this->output);
             } elseif (isset($this->messages[$matches[1]])) {
@@ -605,25 +604,17 @@ private function buildLine()
             }
 
             return $text;
-        }, $this->format);
-    }
+        };
+        $line = preg_replace_callback($regex, $callback, $this->format);
 
-    /**
-     * @param string $line
-     *
-     * @return bool
-     */
-    private function adjustLineWidthToTerminalWidth($line)
-    {
         $lineLength = Helper::strlenWithoutDecoration($this->output->getFormatter(), $line);
         $terminalWidth = $this->terminal->getWidth();
-        if ($lineLength > $terminalWidth) {
-            $newBarWidth = $this->barWidth - $lineLength + $terminalWidth;
-            $this->setBarWidth($newBarWidth);
-
-            return $this->buildLine();
+        if ($lineLength <= $terminalWidth) {
+            return $line;
         }
 
-        return $line;
+        $this->setBarWidth($this->barWidth - $lineLength + $terminalWidth);
+
+        return preg_replace_callback($regex, $callback, $this->format);
     }
 }
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -25,7 +25,6 @@
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Console\Terminal;
 
 /**
  * Output decorator helpers for the Symfony Style Guide.
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Console\Terminal;
 
 /**
  * @group time-sensitive
