Helpers::expand supports concatenation of PhpLiteral

Author: dg

src/DI/Helpers.php

@@ -44,13 +44,14 @@ public static function expand($var, array $params, $recursive = FALSE)
 		}
 
 		$parts = preg_split('#%([\w.-]*)%#i', $var, -1, PREG_SPLIT_DELIM_CAPTURE);
-		$res = '';
+		$res = [];
+		$php = FALSE;
 		foreach ($parts as $n => $part) {
 			if ($n % 2 === 0) {
-				$res .= $part;
+				$res[] = $part;
 
 			} elseif ($part === '') {
-				$res .= '%';
+				$res[] = '%';
 
 			} elseif (isset($recursive[$part])) {
 				throw new Nette\InvalidArgumentException(sprintf('Circular reference detected for variables: %s.', implode(', ', array_keys($recursive))));
@@ -67,13 +68,20 @@ public static function expand($var, array $params, $recursive = FALSE)
 				if (strlen($part) + 2 === strlen($var)) {
 					return $val;
 				}
-				if (!is_scalar($val)) {
+				if ($val instanceof Nette\PhpGenerator\PhpLiteral) {
+					$php = TRUE;
+				} elseif (!is_scalar($val)) {
 					throw new Nette\InvalidArgumentException("Unable to concatenate non-scalar parameter '$part' into '$var'.");
 				}
-				$res .= $val;
+				$res[] = $val;
 			}
 		}
-		return $res;
+		if ($php) {
+			$res = array_filter($res, function ($val) { return $val !== ''; });
+			$res = array_map(function ($val) { return is_string($val) ? var_export($val, TRUE) : $val; }, $res);
+			return new Nette\PhpGenerator\PhpLiteral(implode(' . ', $res));
+		}
+		return implode('', $res);
 	}
 
 

tests/DI/Helpers.expand().phpt

@@ -5,6 +5,7 @@
  */
 
 use Nette\DI\Helpers;
+use Nette\PhpGenerator\PhpLiteral;
 use Tester\Assert;
 
 
@@ -28,6 +29,11 @@ Assert::same(
 	], TRUE)
 );
 
+Assert::equal(new PhpLiteral('func()'), Helpers::expand('%key%', ['key' => new PhpLiteral('func()')]));
+Assert::equal(new PhpLiteral("'text' . func()"), Helpers::expand('text%key%', ['key' => new PhpLiteral('func()')]));
+Assert::equal(new PhpLiteral("func() . 'text'"), Helpers::expand('%key%text', ['key' => new PhpLiteral('func()')]));
+Assert::equal(new PhpLiteral("'a' . func() . 'b' . 123 . func() . 'c'"), Helpers::expand('a%key1%b%key2%%key1%c', ['key1' => new PhpLiteral('func()'), 'key2' => 123]));
+
 
 Assert::exception(function () {
 	Helpers::expand('%missing%', []);