Dumper::format() placeholder ? must not be followed by \w

Author: dg

src/PhpGenerator/Dumper.php

@@ -192,12 +192,12 @@ private function dumpLiteral(Literal $var, int $level): string
 	 */
 	public function format(string $statement, ...$args): string
 	{
-		$tokens = preg_split('#(\.\.\.\?:?|\$\?|->\?|::\?|\\\\\?|\?\*|\?)#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$tokens = preg_split('#(\.\.\.\?:?|\$\?|->\?|::\?|\\\\\?|\?\*|\?(?!\w))#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
 		$res = '';
 		foreach ($tokens as $n => $token) {
 			if ($n % 2 === 0) {
 				$res .= $token;
-			} elseif ($token === '\\?') {
+			} elseif ($token === '\?') {
 				$res .= '?';
 			} elseif (!$args) {
 				throw new Nette\InvalidArgumentException('Insufficient number of arguments.');

tests/PhpGenerator/Dumper.format().phpt

@@ -16,6 +16,8 @@ require __DIR__ . '/../bootstrap.php';
 $dumper = new Dumper;
 Assert::same('func', $dumper->format('func'));
 Assert::same('func(1)', $dumper->format('func(?)', 1));
+Assert::same('fn(?string $x = 1)', $dumper->format('fn(?string $x = ?)', 1));
+Assert::same('fn(?string $x = 1)', $dumper->format('fn(\?string $x = ?)', 1));
 Assert::same('func(1 ? 2 : 3)', $dumper->format('func(1 \? 2 : 3)'));
 Assert::same('func([1, 2])', $dumper->format('func(?)', [1, 2]));
 Assert::same('func(1, 2)', $dumper->format('func(...?)', [1, 2]));