Catch curly braces from other constructs.

horde · Feb 27, 2017 · 3215dcd · 3215dcd
1 parent 9920bd3
commit 3215dcd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/framework/Refactor/lib/Horde/Refactor/Tokens.php b/framework/Refactor/lib/Horde/Refactor/Tokens.php
@@ -214,7 +214,11 @@ public function findMatchingBracket($bracket = null, $backward = false)
                 }
                 $level--;
             }
-            if ($this->current() === $bracket) {
+            if ($this->current() === $bracket ||
+                ($bracket == '{' && is_array($this->current()) &&
+                 ($this->current()[0] == T_CURLY_OPEN ||
+                  $this->current()[0] == T_DOLLAR_OPEN_CURLY_BRACES ||
+                  $this->current()[0] == T_STRING_VARNAME))) {
                 $level++;
             }
             if ($backward) {