fixed logic

symfony · fabpot · Jun 17, 2016 · Nov 6, 2015 · Jun 9, 2016 · Jun 9, 2016
commit bf7a5c58a99c46b8493c23d276692b7d86a57ef1
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -36,7 +36,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
@@ -413,9 +413,7 @@ public function display()
            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
        }

-        $line = $this->buildLine();
-        $line = $this->adjustLineWidthToTerminalWidth($line);
-        $this->overwrite($line);
+        $this->overwrite($this->buildLine());
    }

    /**
@@ -601,7 +599,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]])) {
@@ -615,25 +614,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
@@ -11,7 +11,6 @@

 namespace Symfony\Component\Console\Style;

-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;

diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
@@ -33,7 +33,7 @@ public function getWidth()
    /**
     * Sets the terminal width.
     *
-     * @param int
+     * @param int $width
     */
    public function setWidth($width)
    {
@@ -57,7 +57,7 @@ public function getHeight()
    /**
     * Sets the terminal height.
     *
-     * @param int
+     * @param int $height
     */
    public function setHeight($height)
    {

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