Improve lexing PHP's variable variable syntax

pygments · Feb 27, 2023 · f861db8 · f861db8
1 parent f589ac6
commit f861db8
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/pygments/lexers/php.py b/pygments/lexers/php.py
@@ -224,7 +224,7 @@ class PhpLexer(RegexLexer):
              r'finally|match)\b', Keyword),
             (r'(true|false|null)\b', Keyword.Constant),
             include('magicconstants'),
-            (r'\$\{\$+' + _ident_inner + r'\}', Name.Variable),
+            (r'\$\{', Name.Variable, 'variablevariable'),
             (r'\$+' + _ident_inner, Name.Variable),
             (_ident_inner, Name.Other),
             (r'(\d+\.\d*|\d*\.\d+)(e[+-]?[0-9]+)?', Number.Float),
@@ -237,6 +237,10 @@ class PhpLexer(RegexLexer):
             (r'`([^`\\]*(?:\\.[^`\\]*)*)`', String.Backtick),
             (r'"', String.Double, 'string'),
         ],
+        'variablevariable': [
+            (r'\}', Name.Variable, '#pop'),
+            include('php')
+        ],
         'magicfuncs': [
             # source: http://php.net/manual/en/language.oop5.magic.php
             (words((

diff --git a/tests/examplefiles/php/test.php b/tests/examplefiles/php/test.php
@@ -545,4 +545,9 @@ public function nonMagic() {
 <?php
 #[Attribute]
 class Extra {}
-?>
+?>
+
+<?php
+${'whatever'} = '';
+${$whatever} = '';
+${${'whatever' . 'whatever'}} = '';
diff --git a/tests/examplefiles/php/test.php.output b/tests/examplefiles/php/test.php.output