Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 640b6c27fed4 · 2018-10-02T18:33:53.000+02:00
* 2.8:
  CS fix
  [Debug] fix compat with PHP 7.3
diff --git a/Inline.php b/Inline.php
@@ -325,7 +325,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
             if (null !== $delimiters) {
                 $tmp = ltrim(substr($scalar, $i), ' ');
                 if ('' === $tmp) {
-                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode('', $delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                 }
                 if (!\in_array($tmp[0], $delimiters)) {
                     throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i`
`325`	`325`	`if (null !== $delimiters) {`
`326`	`326`	`$tmp = ltrim(substr($scalar, $i), ' ');`
`327`	`327`	`if ('' === $tmp) {`
`328`		`- throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
	`328`	`+ throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode('', $delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
`329`	`329`	`}`
`330`	`330`	`if (!\in_array($tmp[0], $delimiters)) {`
`331`	`331`	`throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`