Dumper: changed placeholder for named arguments to ...?:

Author: dg

readme.md

@@ -425,7 +425,7 @@ function foo()
 
 You can use special placeholders for handy way to inject variables.
 
-Simple placeholders:
+Simple placeholders `?`
 
 ```php
 $str = 'any string';
@@ -444,7 +444,7 @@ function foo()
 }
 ```
 
-Variadic placeholder:
+Variadic placeholder `...?`
 
 ```php
 $items = [1, 2, 3];
@@ -462,16 +462,16 @@ function foo()
 }
 ```
 
-You can also use PHP 8 named parameters:
+You can also use PHP 8 named parameters using placeholder `...?:`
 
 ```php
 $items = ['foo' => 1, 'bar' => true];
-$function->setBody('myfunc(...?);', [$items]);
+$function->setBody('myfunc(...?:);', [$items]);
 
 // myfunc(foo: 1, bar: true);
 ```
 
-Escape placeholder using slash:
+Escape placeholder using slash `\?`
 
 ```php
 $num = 3;

src/PhpGenerator/Dumper.php

@@ -172,7 +172,7 @@ private function dumpObject(&$var, array $parents, int $level): string
 	 */
 	public function format(string $statement, ...$args): string
 	{
-		$tokens = preg_split('#(\.\.\.\?|\$\?|->\?|::\?|\\\\\?|\?\*|\?)#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$tokens = preg_split('#(\.\.\.\?:?|\$\?|->\?|::\?|\\\\\?|\?\*|\?)#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
 		$res = '';
 		foreach ($tokens as $n => $token) {
 			if ($n % 2 === 0) {
@@ -183,12 +183,12 @@ public function format(string $statement, ...$args): string
 				throw new Nette\InvalidArgumentException('Insufficient number of arguments.');
 			} elseif ($token === '?') {
 				$res .= $this->dump(array_shift($args), strlen($res) - strrpos($res, "\n"));
-			} elseif ($token === '...?' || $token === '?*') {
+			} elseif ($token === '...?' || $token === '...?:' || $token === '?*') {
 				$arg = array_shift($args);
 				if (!is_array($arg)) {
 					throw new Nette\InvalidArgumentException('Argument must be an array.');
 				}
-				$res .= $this->dumpArguments($arg, strlen($res) - strrpos($res, "\n"));
+				$res .= $this->dumpArguments($arg, strlen($res) - strrpos($res, "\n"), $token === '...?:');
 
 			} else { // $  ->  ::
 				$arg = array_shift($args);
@@ -205,12 +205,12 @@ public function format(string $statement, ...$args): string
 	}
 
 
-	private function dumpArguments(array &$var, int $column): string
+	private function dumpArguments(array &$var, int $column, bool $named): string
 	{
 		$outInline = $outWrapped = '';
 
 		foreach ($var as $k => &$v) {
-			$k = is_int($k) ? '' : $k . ': ';
+			$k = !$named || is_int($k) ? '' : $k . ': ';
 			$outInline .= $outInline === '' ? '' : ', ';
 			$outInline .= $k . $this->dumpVar($v, [$var], 0, $column + strlen($outInline));
 			$outWrapped .= ($outWrapped === '' ? '' : ',') . "\n\t" . $k . $this->dumpVar($v, [$var], 1);

src/PhpGenerator/Printer.php

@@ -311,7 +311,7 @@ private function printAttributes(array $attrs, ?PhpNamespace $namespace, bool $i
 		}
 		$items = [];
 		foreach ($attrs as $attr) {
-			$args = (new Dumper)->format('...?', $attr->getArguments());
+			$args = (new Dumper)->format('...?:', $attr->getArguments());
 			$items[] = $this->printType($attr->getName(), false, $namespace) . ($args ? "($args)" : '');
 		}
 		return $inline

tests/PhpGenerator/Dumper.format().phpt

@@ -19,7 +19,8 @@ Assert::same('func(1)', $dumper->format('func(?)', 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]));
-Assert::same('func(1, a: 2)', $dumper->format('func(...?)', [1, 'a' => 2]));
+Assert::same('func(1, 2)', $dumper->format('func(...?)', [1, 'a' => 2]));
+Assert::same('func(1, a: 2)', $dumper->format('func(...?:)', [1, 'a' => 2])); // named args
 Assert::same('func(1, 2)', $dumper->format('func(?*)', [1, 2])); // old way
 
 $dumper->wrapLength = 100;