[php7] Fix for substr() always returning a string

nicolas-grekas · nicolas-grekas · commit 378c946020ea · 2015-07-28T17:12:55.000+02:00
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -379,7 +379,7 @@ private function autoPrependBlock()
     {
         $chars = substr(str_replace(PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);
 
-        if (false === $chars) {
+        if (!isset($chars[0])) {
             return $this->newLine(); //empty history, so we should start with a new line.
         }
         //Prepend new line for each non LF chars (This means no blank line was output before)
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
@@ -34,7 +34,7 @@ public function testReflectionCaster()
   constants: array:3 [
     "IS_IMPLICIT_ABSTRACT" => 16
     "IS_EXPLICIT_ABSTRACT" => 32
-    "IS_FINAL" => 64
+    "IS_FINAL" => %d
   ]
   properties: array:%d [
     "name" => ReflectionProperty {

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ private function autoPrependBlock()`
`379`	`379`	`{`
`380`	`380`	`$chars = substr(str_replace(PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);`
`381`	`381`
`382`		`- if (false === $chars) {`
	`382`	`+ if (!isset($chars[0])) {`
`383`	`383`	`return $this->newLine(); //empty history, so we should start with a new line.`
`384`	`384`	`}`
`385`	`385`	`//Prepend new line for each non LF chars (This means no blank line was output before)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testReflectionCaster()`
`34`	`34`	`constants: array:3 [`
`35`	`35`	`"IS_IMPLICIT_ABSTRACT" => 16`
`36`	`36`	`"IS_EXPLICIT_ABSTRACT" => 32`
`37`		`- "IS_FINAL" => 64`
	`37`	`+ "IS_FINAL" => %d`
`38`	`38`	`]`
`39`	`39`	`properties: array:%d [`
`40`	`40`	`"name" => ReflectionProperty {`