Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit bb06e2d7f8dd · 2024-12-09T08:30:10.000+01:00
* 6.4:
  fix risky test that doesn't perform any assertions
diff --git a/Tests/Helper/ProgressBarTest.php b/Tests/Helper/ProgressBarTest.php
@@ -112,8 +112,10 @@ public function testRegularTimeEstimation()
 
     public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()
     {
+        $this->expectNotToPerformAssertions();
+
         ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');
-        $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);
+        $bar = new ProgressBar($this->getOutputStream(), 1_200, 0);
         $bar->setFormat('custom');
         $bar->start(1_200, 600);
     }

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,10 @@ public function testRegularTimeEstimation()`
`112`	`112`
`113`	`113`	`public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()`
`114`	`114`	`{`
	`115`	`+ $this->expectNotToPerformAssertions();`
	`116`	`+`
`115`	`117`	`ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');`
`116`		`- $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);`
	`118`	`+ $bar = new ProgressBar($this->getOutputStream(), 1_200, 0);`
`117`	`119`	`$bar->setFormat('custom');`
`118`	`120`	`$bar->start(1_200, 600);`
`119`	`121`	`}`