Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit e03ab57139ca · 2021-05-07T16:48:44.000+02:00
* 5.2:
  [Console] hotfix
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -512,7 +512,7 @@ private function readInput($inputStream, Question $question)
             $cp = $this->setIOCodepage();
             $ret = fgets($inputStream, 4096);
 
-            return $this->resetIOCodepage($cp, $ret);
+            return false !== $ret ? $this->resetIOCodepage($cp, $ret) : false;
         }
 
         $multiLineStreamReader = $this->cloneInputStream($inputStream);

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ private function readInput($inputStream, Question $question)`
`512`	`512`	`$cp = $this->setIOCodepage();`
`513`	`513`	`$ret = fgets($inputStream, 4096);`
`514`	`514`
`515`		`- return $this->resetIOCodepage($cp, $ret);`
	`515`	`+ return false !== $ret ? $this->resetIOCodepage($cp, $ret) : false;`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`$multiLineStreamReader = $this->cloneInputStream($inputStream);`