Set the redraw frequency at least to 1. Setting it to 0 would otherwise produce an error.

dritter · dritter · commit 368423b08bf4 · 2015-11-30T18:31:41.000+01:00
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -68,10 +68,8 @@ public function __construct(OutputInterface $output, $max = 0)
             // disable overwrite when output does not support ANSI codes.
             $this->overwrite = false;
 
-            if ($this->max > 10) {
-                // set a reasonable redraw frequency so output isn't flooded
-                $this->setRedrawFrequency($max / 10);
-            }
+            // set a reasonable redraw frequency so output isn't flooded
+            $this->setRedrawFrequency($max / 10);
         }
 
         $this->startTime = time();
@@ -317,11 +315,11 @@ public function setFormat($format)
     /**
      * Sets the redraw frequency.
      *
-     * @param int $freq The frequency in steps
+     * @param int|float $freq The frequency in steps
      */
     public function setRedrawFrequency($freq)
     {
-        $this->redrawFreq = (int) $freq;
+        $this->redrawFreq = max((int) $freq, 1);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -307,6 +307,30 @@ public function testRedrawFrequency()
         $bar->advance(1);
     }
 
+    public function testRedrawFrequencyIsAtLeastOneIfZeroGiven()
+    {
+        $bar = $this->getMock('Symfony\Component\Console\Helper\ProgressBar', array('display'),
+            array($output = $this->getOutputStream(), 6));
+
+        $bar->expects($this->exactly(2))->method('display');
+        $bar->setRedrawFrequency(0);
+        $bar->start();
+        $bar->advance();
+    }
+
+    public function testRedrawFrequencyIsAtLeastOneIfSmallerOneGiven()
+    {
+        $bar = $this->getMock('Symfony\Component\Console\Helper\ProgressBar', array('display'), array($output = $this->getOutputStream(), 6));
+
+        $bar->expects($this->exactly(2))->method('display');
+        $bar->setRedrawFrequency(0.9);
+        $bar->start();
+        $bar->advance();
+    }
+
+    /**
+     * @requires extension mbstring
+     */
     public function testMultiByteSupport()
     {
         $bar = new ProgressBar($output = $this->getOutputStream());

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,8 @@ public function __construct(OutputInterface $output, $max = 0)`
`68`	`68`	`// disable overwrite when output does not support ANSI codes.`
`69`	`69`	`$this->overwrite = false;`
`70`	`70`
`71`		`- if ($this->max > 10) {`
`72`		`- // set a reasonable redraw frequency so output isn't flooded`
`73`		`- $this->setRedrawFrequency($max / 10);`
`74`		`- }`
	`71`	`+ // set a reasonable redraw frequency so output isn't flooded`
	`72`	`+ $this->setRedrawFrequency($max / 10);`
`75`	`73`	`}`
`76`	`74`
`77`	`75`	`$this->startTime = time();`
`@@ -317,11 +315,11 @@ public function setFormat($format)`
`317`	`315`	`/**`
`318`	`316`	`* Sets the redraw frequency.`
`319`	`317`	`*`
`320`		`- * @param int $freq The frequency in steps`
	`318`	`+ * @param int\|float $freq The frequency in steps`
`321`	`319`	`*/`
`322`	`320`	`public function setRedrawFrequency($freq)`
`323`	`321`	`{`
`324`		`- $this->redrawFreq = (int) $freq;`
	`322`	`+ $this->redrawFreq = max((int) $freq, 1);`
`325`	`323`	`}`
`326`	`324`
`327`	`325`	`/**`