Fix incompatible implicit float-to-int conversions

derrabus · derrabus · commit f121acda69a9 · 2021-06-05T22:10:10.000+02:00
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -193,7 +193,7 @@ public function getProgressPercent(): float
 
     public function getBarOffset(): int
     {
-        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 setBarWidth(int $size)
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -454,7 +454,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/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/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();
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
@@ -72,7 +72,7 @@ public function testInvalidTtlConstruct()
     {
         $this->expectException(InvalidTtlException::class);
 
-        return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0.1);
+        return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0);
     }
 
     /**
diff --git a/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php b/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php
@@ -42,7 +42,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
         $io = $output instanceof SymfonyStyle ? $output : new SymfonyStyle(new ArrayInput([]), $output);
         $this->dumper->setColors($output->isDecorated());
 
-        $rows = [['date', date('r', $context['timestamp'])]];
+        $rows = [['date', date('r', (int) $context['timestamp'])]];
         $lastIdentifier = $this->lastIdentifier;
         $this->lastIdentifier = $clientId;
 
diff --git a/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php b/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php
@@ -94,7 +94,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
 
     private function extractDate(array $context, string $format = 'r'): string
     {
-        return date($format, $context['timestamp']);
+        return date($format, (int) $context['timestamp']);
     }
 
     private function renderTags(array $tags): string
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -525,7 +525,7 @@ public function getTestsForDump()
      */
     public function testParseTimestampAsUnixTimestampByDefault($yaml, $year, $month, $day, $hour, $minute, $second)
     {
-        $this->assertSame(gmmktime($hour, $minute, $second, $month, $day, $year), Inline::parse($yaml));
+        $this->assertSame(gmmktime($hour, $minute, (int) $second, $month, $day, $year), Inline::parse($yaml));
     }
 
     /**
@@ -536,7 +536,7 @@ public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $
         $expected = new \DateTime($yaml);
         $expected->setTimeZone(new \DateTimeZone('UTC'));
         $expected->setDate($year, $month, $day);
-        $expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
+        $expected->setTime($hour, $minute, (int) $second, (int) (1000000 * ($second - (int) $second)));
 
         $date = Inline::parse($yaml, Yaml::PARSE_DATETIME);
         $this->assertEquals($expected, $date);
@@ -561,7 +561,7 @@ public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $mont
         $expected = new \DateTime($yaml);
         $expected->setTimeZone(new \DateTimeZone('UTC'));
         $expected->setDate($year, $month, $day);
-        $expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
+        $expected->setTime($hour, $minute, (int) $second, (int) (1000000 * ($second - (int) $second)));
 
         $expectedNested = ['nested' => [$expected]];
         $yamlNested = "{nested: [$yaml]}";

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public function getProgressPercent(): float`
`193`	`193`
`194`	`194`	`public function getBarOffset(): int`
`195`	`195`	`{`
`196`		`- return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? min(5, $this->barWidth / 15) * $this->writeCount : $this->step) % $this->barWidth);`
	`196`	`+ return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? (int) (min(5, $this->barWidth / 15) * $this->writeCount) : $this->step) % $this->barWidth);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`public function setBarWidth(int $size)`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $tit`
`454`	`454`	`$formattedTitle = sprintf($titleFormat, Helper::substr($title, 0, $limit - $formatLength - 3).'...');`
`455`	`455`	`}`
`456`	`456`
`457`		`- $titleStart = ($markupLength - $titleLength) / 2;`
	`457`	`+ $titleStart = intdiv($markupLength - $titleLength, 2);`
`458`	`458`	`if (false === mb_detect_encoding($markup, null, true)) {`
`459`	`459`	`$markup = substr_replace($markup, $formattedTitle, $titleStart, $titleLength);`
`460`	`460`	`} 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`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function testInvalidTtlConstruct()`
`72`	`72`	`{`
`73`	`73`	`$this->expectException(InvalidTtlException::class);`
`74`	`74`
`75`		`- return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0.1);`
	`75`	`+ return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in`
`94`	`94`
`95`	`95`	`private function extractDate(array $context, string $format = 'r'): string`
`96`	`96`	`{`
`97`		`- return date($format, $context['timestamp']);`
	`97`	`+ return date($format, (int) $context['timestamp']);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`private function renderTags(array $tags): string`