Helpers::formatArgs() refactoring

Author: dg

src/PhpGenerator/Helpers.php

@@ -165,34 +165,30 @@ public static function format($statement, ...$args)
 	 */
 	public static function formatArgs($statement, array $args)
 	{
-		$a = strpos($statement, '?');
-		while ($a !== FALSE) {
-			if (!$args) {
+		$tokens = preg_split('#(\$\?|->\?|::\?|\?\*|\?)#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$res = '';
+		foreach ($tokens as $n => $token) {
+			if ($n % 2 === 0) {
+				$res .= $token;
+			} elseif (!$args) {
 				throw new Nette\InvalidArgumentException('Insufficient number of arguments.');
-			}
-			$arg = array_shift($args);
-			if (substr($statement, $a + 1, 1) === '*') { // ?*
+			} elseif ($token === '?') {
+				$res .= self::dump(array_shift($args));
+			} elseif ($token === '?*') {
+				$arg = array_shift($args);
 				if (!is_array($arg)) {
 					throw new Nette\InvalidArgumentException('Argument must be an array.');
 				}
-				$s = substr($statement, 0, $a);
 				$sep = '';
 				foreach ($arg as $tmp) {
-					$s .= $sep . self::dump($tmp);
-					$sep = strlen($s) - strrpos($s, "\n") > self::WRAP_LENGTH ? ",\n\t" : ', ';
+					$res .= $sep . self::dump($tmp);
+					$sep = strlen($res) - strrpos($res, "\n") > self::WRAP_LENGTH ? ",\n\t" : ', ';
 				}
-				$statement = $s . substr($statement, $a + 2);
-				$a = strlen($s);
-
-			} else {
-				$arg = substr($statement, $a - 1, 1) === '$' || in_array(substr($statement, $a - 2, 2), ['->', '::'], TRUE)
-					? self::formatMember($arg) : self::_dump($arg);
-				$statement = substr_replace($statement, $arg, $a, 1);
-				$a += strlen($arg);
+			} else { // $  ->  ::
+				$res .= substr($token, 0, -1) . self::formatMember(array_shift($args));
 			}
-			$a = strpos($statement, '?', $a);
 		}
-		return $statement;
+		return $res;
 	}
 
 

tests/PhpGenerator/Helpers.format.phpt

@@ -19,8 +19,8 @@ Assert::same('func(1)', Helpers::formatArgs('func(?)', [1, 2]));
 Assert::same('func([1, 2])', Helpers::formatArgs('func(?)', [[1, 2]]));
 Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', [[1, 2]]));
 Assert::same(
-	"func(10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,\n\t27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40)",
-	Helpers::formatArgs('func(?*)', [range(10, 40)])
+	"func(10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,\n\t27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,\n\t45, 46, 47, 48, 49, 50)",
+	Helpers::formatArgs('func(?*)', [range(10, 50)])
 );
 
 Assert::exception(function () {