Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit d205904ae738 · 2024-12-07T09:49:48.000+01:00
* 6.4:
  [Console] Fix division by 0 error
  [ErrorHandler] Fix error message with PHP 8.5
  Add an experimental CI job for PHP 8.5
  [HttpClient] Always set CURLOPT_CUSTOMREQUEST to the correct HTTP method in CurlHttpClient
  evaluate access flags for properties with asymmetric visibility
  [Mime] Fix wrong PHPDoc in `FormDataPart` constructor
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public function getEstimated(): float`
`229`	`229`
`230`	`230`	`public function getRemaining(): float`
`231`	`231`	`{`
`232`		`- if (!$this->step) {`
	`232`	`+ if (0 === $this->step \|\| $this->step === $this->startingStep) {`
`233`	`233`	`return 0;`
`234`	`234`	`}`
`235`	`235`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,14 @@ public function testRegularTimeEstimation()`
`110`	`110`	`);`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()`
	`114`	`+ {`
	`115`	`+ ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');`
	`116`	`+ $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);`
	`117`	`+ $bar->setFormat('custom');`
	`118`	`+ $bar->start(1_200, 600);`
	`119`	`+ }`
	`120`	`+`
`113`	`121`	`public function testResumedTimeEstimation()`
`114`	`122`	`{`
`115`	`123`	`$bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);`