Update ProgressBar::iterate to use is_countable

jvasseur · jvasseur · commit e9d3f0bce1f1 · 2019-01-03T21:08:56.000+01:00
diff --git a/composer.json b/composer.json
@@ -32,7 +32,8 @@
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/polyfill-php72": "~1.5"
+        "symfony/polyfill-php72": "~1.5",
+        "symfony/polyfill-php73": "^1.8.0"
     },
     "replace": {
         "symfony/asset": "self.version",
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -250,11 +250,7 @@ public function setRedrawFrequency(int $freq)
      */
     public function iterate(iterable $iterable, ?int $max = null): iterable
     {
-        if (null === $max) {
-            $max = \is_array($iterable) || $iterable instanceof \Countable ? \count($iterable) : 0;
-        }
-
-        $this->start($max);
+        $this->start($max ?? (\is_countable($iterable) ? \count($iterable) : 0));
 
         foreach ($iterable as $key => $value) {
             yield $key => $value;
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -18,7 +18,8 @@
     "require": {
         "php": "^7.1.3",
         "symfony/contracts": "^1.0",
-        "symfony/polyfill-mbstring": "~1.0"
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php73": "^1.8.0"
     },
     "require-dev": {
         "symfony/config": "~3.4|~4.0",
