Allow both '{' and T_CURLY_OPEN as curly bracket (#732)

nikic · Dec 3, 2020 · c64986f · c64986f
1 parent bc7a9bf
commit c64986f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/PhpParser/Internal/TokenStream.php b/lib/PhpParser/Internal/TokenStream.php
@@ -46,7 +46,8 @@ public function haveParens(int $startPos, int $endPos) : bool {
      * @return bool
      */
     public function haveBraces(int $startPos, int $endPos) : bool {
-        return $this->haveTokenImmediatelyBefore($startPos, '{')
+        return ($this->haveTokenImmediatelyBefore($startPos, '{')
+                || $this->haveTokenImmediatelyBefore($startPos, T_CURLY_OPEN))
             && $this->haveTokenImmediatelyAfter($endPos, '}');
     }
 
@@ -201,6 +202,7 @@ public function haveTokenInRange(int $startPos, int $endPos, $tokenType) {
 
     public function haveBracesInRange(int $startPos, int $endPos) {
         return $this->haveTokenInRange($startPos, $endPos, '{')
+            || $this->haveTokenInRange($startPos, $endPos, T_CURLY_OPEN)
             || $this->haveTokenInRange($startPos, $endPos, '}');
     }
 

diff --git a/test/code/formatPreservation/rewriteVariableInterpolationString.test b/test/code/formatPreservation/rewriteVariableInterpolationString.test
@@ -0,0 +1,9 @@
+Rewrite string with variable interpolation
+-----
+<?php
+"{$e}";
+-----
+$stmts[0]->expr->parts[0]->setAttribute('origNode', null);
+-----
+<?php
+"{$e}";