fix merge

nicolas-grekas · nicolas-grekas · commit 98d5cf9e7371 · 2018-03-19T23:45:52.000+01:00
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -41,7 +41,7 @@ abstract class BaseNode implements NodeInterface
      */
     public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)
     {
-        if (false !== strpos($name = (string) , $pathSeparator)) {
+        if (false !== strpos($name = (string) $name, $pathSeparator)) {
             throw new \InvalidArgumentException('The name must not contain "'.$pathSeparator.'".');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ abstract class BaseNode implements NodeInterface`
`41`	`41`	`*/`
`42`	`42`	`public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)`
`43`	`43`	`{`
`44`		`- if (false !== strpos($name = (string) , $pathSeparator)) {`
	`44`	`+ if (false !== strpos($name = (string) $name, $pathSeparator)) {`
`45`	`45`	`throw new \InvalidArgumentException('The name must not contain "'.$pathSeparator.'".');`
`46`	`46`	`}`
`47`	`47`