bug #15390 [php7] Fix for substr() always returning a string (nicolas-grekas)

fabpot · fabpot · commit 342c4b5fd1f1 · 2015-07-29T08:44:12.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [php7] Fix for substr() always returning a string | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14086 | License | MIT | Doc PR | - The remaining failures will stop once https://bugs.php.net/bug.php?id=70159 is fixed ([patch pending](php/php-src@a28115c)). Commits ------- d6dfe98 [php7] Fix for substr() always returning a string
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
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
-use Symfony\Component\VarDumper\Cloner\VarCloner;
-use Symfony\Component\VarDumper\Dumper\CliDumper;
 use Symfony\Component\VarDumper\Test\VarDumperTestCase;
 
 /**
@@ -34,7 +32,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)`