Merge branch '4.4' into 5.2

derrabus · derrabus · commit 2f93c8c64295 · 2021-06-06T11:50:27.000+02:00
* 4.4:
  Fix incompatible implicit float-to-int conversions
  [Translation] Don't pass null to strtoupper()
  cs fix
  [DependencyInjection] Don't pass null to trim()
  Add return types to JsonSerializable implementations
  Fix Serializable deprecations triggered by token mocks
  Add missing security translations
diff --git a/Helper/ProgressBar.php b/Helper/ProgressBar.php
@@ -196,7 +196,7 @@ public function getProgressPercent(): float
 
     public function getBarOffset(): float
     {
-        return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? min(5, $this->barWidth / 15) * $this->writeCount : $this->step) % $this->barWidth);
+        return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? (int) (min(5, $this->barWidth / 15) * $this->writeCount) : $this->step) % $this->barWidth);
     }
 
     public function getEstimated(): float
@@ -270,7 +270,7 @@ public function setFormat(string $format)
     /**
      * Sets the redraw frequency.
      *
-     * @param int|float $freq The frequency in steps
+     * @param int|null $freq The frequency in steps
      */
     public function setRedrawFrequency(?int $freq)
     {
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -442,7 +442,7 @@ private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $tit
                 $formattedTitle = sprintf($titleFormat, Helper::substr($title, 0, $limit - $formatLength - 3).'...');
             }
 
-            $titleStart = ($markupLength - $titleLength) / 2;
+            $titleStart = intdiv($markupLength - $titleLength, 2);
             if (false === mb_detect_encoding($markup, null, true)) {
                 $markup = substr_replace($markup, $formattedTitle, $titleStart, $titleLength);
             } else {
diff --git a/Tests/Helper/ProgressBarTest.php b/Tests/Helper/ProgressBarTest.php
@@ -535,7 +535,7 @@ public function testRedrawFrequencyIsAtLeastOneIfZeroGiven()
     public function testRedrawFrequencyIsAtLeastOneIfSmallerOneGiven()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 0, 0);
-        $bar->setRedrawFrequency(0.9);
+        $bar->setRedrawFrequency(0);
         $bar->start();
         $bar->advance();
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function getProgressPercent(): float`
`196`	`196`
`197`	`197`	`public function getBarOffset(): float`
`198`	`198`	`{`
`199`		`- return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? min(5, $this->barWidth / 15) * $this->writeCount : $this->step) % $this->barWidth);`
	`199`	`+ return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? (int) (min(5, $this->barWidth / 15) * $this->writeCount) : $this->step) % $this->barWidth);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`public function getEstimated(): float`
`@@ -270,7 +270,7 @@ public function setFormat(string $format)`
`270`	`270`	`/**`
`271`	`271`	`* Sets the redraw frequency.`
`272`	`272`	`*`
`273`		`- * @param int\|float $freq The frequency in steps`
	`273`	`+ * @param int\|null $freq The frequency in steps`
`274`	`274`	`*/`
`275`	`275`	`public function setRedrawFrequency(?int $freq)`
`276`	`276`	`{`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $tit`
`442`	`442`	`$formattedTitle = sprintf($titleFormat, Helper::substr($title, 0, $limit - $formatLength - 3).'...');`
`443`	`443`	`}`
`444`	`444`
`445`		`- $titleStart = ($markupLength - $titleLength) / 2;`
	`445`	`+ $titleStart = intdiv($markupLength - $titleLength, 2);`
`446`	`446`	`if (false === mb_detect_encoding($markup, null, true)) {`
`447`	`447`	`$markup = substr_replace($markup, $formattedTitle, $titleStart, $titleLength);`
`448`	`448`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public function testRedrawFrequencyIsAtLeastOneIfZeroGiven()`
`535`	`535`	`public function testRedrawFrequencyIsAtLeastOneIfSmallerOneGiven()`
`536`	`536`	`{`
`537`	`537`	`$bar = new ProgressBar($output = $this->getOutputStream(), 0, 0);`
`538`		`- $bar->setRedrawFrequency(0.9);`
	`538`	`+ $bar->setRedrawFrequency(0);`
`539`	`539`	`$bar->start();`
`540`	`540`	`$bar->advance();`
`541`	`541`