Helpers::formatArgs() escaped \? means ? (possible BC break)

nette · Mar 14, 2017 · 361f671 · 361f671
1 parent 059135a
commit 361f671
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php
@@ -165,11 +165,13 @@ public static function format($statement, ...$args)
  */
  public static function formatArgs($statement, array $args)
  {
- $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) {
  $res .= $token;
+ } elseif ($token === '\\?') {
+ $res .= '?';
  } elseif (!$args) {
  throw new Nette\InvalidArgumentException('Insufficient number of arguments.');
  } elseif ($token === '?') {

diff --git a/tests/PhpGenerator/Helpers.format.phpt b/tests/PhpGenerator/Helpers.format.phpt
@@ -16,6 +16,7 @@ Assert::same('func(1)', Helpers::format('func(?)', 1, 2));
 
 Assert::same('func', Helpers::formatArgs('func', [1, 2]));
 Assert::same('func(1)', Helpers::formatArgs('func(?)', [1, 2]));
+Assert::same('func(1 ? 2 : 3)', Helpers::formatArgs('func(1 \? 2 : 3)', []));
 Assert::same('func([1, 2])', 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]])); // old way