UIMacros: {control x: 1} support named arguments

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -99,17 +99,16 @@ public function macroControl(MacroNode $node, PhpWriter $writer)
 
 		$tokens = $node->tokenizer;
 		$pos = $tokens->position;
-		$param = $writer->formatArray();
-		$tokens->position = $pos;
+		$wrap = false;
 		while ($tokens->nextToken()) {
-			if ($tokens->isCurrent('=>') && !$tokens->depth) {
+			if ($tokens->isCurrent('=>', '(expand)') && !$tokens->depth) {
 				$wrap = true;
 				break;
 			}
 		}
-		if (empty($wrap) && $param[0] === '[') {
-			$param = substr($param, 1, -1); // removes array() or []
-		}
+		$tokens->position = $pos;
+		$param = $wrap ? $writer->formatArray() : $writer->formatArgs();
+
 		return "/* line $node->startLine */ "
 			. ($name[0] === '$' ? "if (is_object($name)) \$_tmp = $name; else " : '')
 			. '$_tmp = $this->global->uiControl->getComponent(' . $name . '); '

tests/Bridges.Latte/UIMacros.control.phpt

@@ -27,3 +27,4 @@ Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->re
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType([\'param\' => 123]); ?>', $compiler->expandMacro('control', 'form:type param => 123', '')->openingCode);
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType([\'param\' => 123]); ?>', $compiler->expandMacro('control', 'form:type, param => 123', '')->openingCode);
 @Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->render(); echo ($this->filters->striptags)(%a%); ?>', $compiler->expandMacro('control', 'form', 'striptags')->openingCode); // @ deprecated
+Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType(param: 123); ?>', $compiler->expandMacro('control', 'form:type, param: 123', '')->openingCode);