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

nicolas-grekas · nicolas-grekas · commit 77ee866dd860 · 2015-07-28T14:38:40.000+02:00
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -215,8 +215,8 @@ private function addLongOption($name, $value)
 
         $option = $this->definition->getOption($name);
 
-        // Convert false values (from a previous call to substr()) to null
-        if (false === $value) {
+        // Convert empty values to null
+        if (!isset($value[0])) {
             $value = null;
         }
 
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -121,11 +121,11 @@ public function testNotice()
             $that->assertEquals('->', $trace[0]['type']);
 
             $that->assertEquals(__FILE__, $trace[1]['file']);
-            $that->assertEquals(__CLASS__, $trace[1]['class']);
+            $that->assertEquals('Symfony\Component\Debug\Tests\ErrorHandlerTest', $trace[1]['class']);
             $that->assertEquals('triggerNotice', $trace[1]['function']);
             $that->assertEquals('::', $trace[1]['type']);
 
-            $that->assertEquals(__CLASS__, $trace[2]['class']);
+            $that->assertEquals('Symfony\Component\Debug\Tests\ErrorHandlerTest', $trace[2]['class']);
             $that->assertEquals('testNotice', $trace[2]['function']);
             $that->assertEquals('->', $trace[2]['type']);
         };
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -320,7 +320,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
             return;
         }
 
-        if ($inSequence && $oldLineIndentation === $newIndent && '-' === $data[0][0]) {
+        if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {
             // the previous line contained a dash but no item content, this line is a sequence item with the same indentation
             // and therefore no nested list or mapping
             $this->moveToPreviousLine();

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,8 @@ private function addLongOption($name, $value)`
`215`	`215`
`216`	`216`	`$option = $this->definition->getOption($name);`
`217`	`217`
`218`		`- // Convert false values (from a previous call to substr()) to null`
`219`		`- if (false === $value) {`
	`218`	`+ // Convert empty values to null`
	`219`	`+ if (!isset($value[0])) {`
`220`	`220`	`$value = null;`
`221`	`221`	`}`
`222`	`222`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)`
`320`	`320`	`return;`
`321`	`321`	`}`
`322`	`322`
`323`		`- if ($inSequence && $oldLineIndentation === $newIndent && '-' === $data[0][0]) {`
	`323`	`+ if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {`
`324`	`324`	`// the previous line contained a dash but no item content, this line is a sequence item with the same indentation`
`325`	`325`	`// and therefore no nested list or mapping`
`326`	`326`	`$this->moveToPreviousLine();`