Add FORMAT_ to const names.

CesarScur · CesarScur · commit 3051c6c8dc14 · 2020-11-20T17:08:37.000-03:00
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -26,16 +26,16 @@
  */
 final class ProgressBar
 {
-    public const VERBOSE = 'verbose';
-    public const VERY_VERBOSE = 'very_verbose';
-    public const DEBUG = 'debug';
-    public const NORMAL = 'normal';
+    public const FORMAT_VERBOSE = 'verbose';
+    public const FORMAT_VERY_VERBOSE = 'very_verbose';
+    public const FORMAT_DEBUG = 'debug';
+    public const FORMAT_NORMAL = 'normal';
 
-    private const VERBOSE_NOMAX = 'verbose_nomax';
-    private const VERY_VERBOSE_NOMAX = 'very_verbose_nomax';
-    private const DEBUG_NOMAX = 'debug_nomax';
-    private const NORMAL_NOMAX = 'normal_nomax';
-    private const NOMAX_SUFIX = '_nomax';
+    private const FORMAT_VERBOSE_NOMAX = 'verbose_nomax';
+    private const FORMAT_VERY_VERBOSE_NOMAX = 'very_verbose_nomax';
+    private const FORMAT_DEBUG_NOMAX = 'debug_nomax';
+    private const FORMAT_NORMAL_NOMAX = 'normal_nomax';
+    private const FORMAT_NOMAX_SUFIX = '_nomax';
 
     private $barWidth = 28;
     private $barChar;
@@ -448,8 +448,8 @@ public function clear(): void
     private function setRealFormat(string $format)
     {
         // try to use the _nomax variant if available
-        if (!$this->max && null !== self::getFormatDefinition($format.self::NOMAX_SUFIX)) {
-            $this->format = self::getFormatDefinition($format.self::NOMAX_SUFIX);
+        if (!$this->max && null !== self::getFormatDefinition($format.self::FORMAT_NOMAX_SUFIX)) {
+            $this->format = self::getFormatDefinition($format.self::FORMAT_NOMAX_SUFIX);
         } elseif (null !== self::getFormatDefinition($format)) {
             $this->format = self::getFormatDefinition($format);
         } else {
@@ -500,13 +500,13 @@ private function determineBestFormat(): string
         switch ($this->output->getVerbosity()) {
             // OutputInterface::VERBOSITY_QUIET: display is disabled anyway
             case OutputInterface::VERBOSITY_VERBOSE:
-                return $this->max ? self::VERBOSE : self::VERBOSE_NOMAX;
+                return $this->max ? self::FORMAT_VERBOSE : self::FORMAT_VERBOSE_NOMAX;
             case OutputInterface::VERBOSITY_VERY_VERBOSE:
-                return $this->max ? self::VERY_VERBOSE : self::VERY_VERBOSE_NOMAX;
+                return $this->max ? self::FORMAT_VERY_VERBOSE : self::FORMAT_VERY_VERBOSE_NOMAX;
             case OutputInterface::VERBOSITY_DEBUG:
-                return $this->max ? self::DEBUG : self::DEBUG_NOMAX;
+                return $this->max ? self::FORMAT_DEBUG : self::FORMAT_DEBUG_NOMAX;
             default:
-                return $this->max ? self::NORMAL : self::NORMAL_NOMAX;
+                return $this->max ? self::FORMAT_NORMAL : self::FORMAT_NORMAL_NOMAX;
         }
     }
 
@@ -558,17 +558,17 @@ private static function initPlaceholderFormatters(): array
     private static function initFormats(): array
     {
         return [
-            self::NORMAL => ' %current%/%max% [%bar%] %percent:3s%%',
-            self::NORMAL_NOMAX => ' %current% [%bar%]',
+            self::FORMAT_NORMAL => ' %current%/%max% [%bar%] %percent:3s%%',
+            self::FORMAT_NORMAL_NOMAX => ' %current% [%bar%]',
 
-            self::VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
-            self::VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
+            self::FORMAT_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
+            self::FORMAT_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
 
-            self::VERY_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%',
-            self::VERY_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
+            self::FORMAT_VERY_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%',
+            self::FORMAT_VERY_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
 
-            self::DEBUG => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
-            self::DEBUG_NOMAX => ' %current% [%bar%] %elapsed:6s% %memory:6s%',
+            self::FORMAT_DEBUG => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
+            self::FORMAT_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
@@ -210,7 +210,7 @@ public function testFormat()
 
         // max in construct, explicit format before
         $bar = new ProgressBar($output = $this->getOutputStream(), 10, 0);
-        $bar->setFormat(ProgressBar::NORMAL);
+        $bar->setFormat(ProgressBar::FORMAT_NORMAL);
         $bar->start();
         $bar->advance(10);
         $bar->finish();
@@ -220,7 +220,7 @@ public function testFormat()
 
         // max in start, explicit format before
         $bar = new ProgressBar($output = $this->getOutputStream(), 0, 0);
-        $bar->setFormat(ProgressBar::NORMAL);
+        $bar->setFormat(ProgressBar::FORMAT_NORMAL);
         $bar->start(10);
         $bar->advance(10);
         $bar->finish();
@@ -828,7 +828,7 @@ public function testAnsiColorsAndEmojis()
     public function testSetFormat()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 0, 0);
-        $bar->setFormat(ProgressBar::NORMAL);
+        $bar->setFormat(ProgressBar::FORMAT_NORMAL);
         $bar->start();
         rewind($output->getStream());
         $this->assertEquals(
@@ -837,7 +837,7 @@ public function testSetFormat()
         );
 
         $bar = new ProgressBar($output = $this->getOutputStream(), 10, 0);
-        $bar->setFormat(ProgressBar::NORMAL);
+        $bar->setFormat(ProgressBar::FORMAT_NORMAL);
         $bar->start();
         rewind($output->getStream());
         $this->assertEquals(
