From 67191f7f1d85ea8fa7598787e1e26b722acdb5e9 Mon Sep 17 00:00:00 2001
From: Sven Nolting <nolting@hochwarth-it.de>
Date: Mon, 2 Dec 2024 14:51:36 +0100
Subject: [PATCH] [Console] Fix division by 0 error

---
 Helper/ProgressBar.php           | 2 +-
 Tests/Helper/ProgressBarTest.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Helper/ProgressBar.php b/Helper/ProgressBar.php
index b406292b4..23157e3c7 100644
--- a/Helper/ProgressBar.php
+++ b/Helper/ProgressBar.php
@@ -229,7 +229,7 @@ public function getEstimated(): float
 
     public function getRemaining(): float
     {
-        if (!$this->step) {
+        if (0 === $this->step || $this->step === $this->startingStep) {
             return 0;
         }
 
diff --git a/Tests/Helper/ProgressBarTest.php b/Tests/Helper/ProgressBarTest.php
index a5a0eca24..c32307720 100644
--- a/Tests/Helper/ProgressBarTest.php
+++ b/Tests/Helper/ProgressBarTest.php
@@ -110,6 +110,14 @@ public function testRegularTimeEstimation()
         );
     }
 
+    public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()
+    {
+        ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');
+        $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);
+        $bar->setFormat('custom');
+        $bar->start(1_200, 600);
+    }
+
     public function testResumedTimeEstimation()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);