Improve recognition of constants in PHP (#1688)

The pattern for PHP constants now have to be a valid identifier and recognizes single-letter names.
PrismJS · Jan 2, 2019 · f1026b4 · f1026b4
1 parent 88434f7
commit f1026b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/components/prism-php.js b/components/prism-php.js
@@ -13,7 +13,7 @@
 (function (Prism) {
 	Prism.languages.php = Prism.languages.extend('clike', {
 		'keyword': /\b(?:and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,
-		'constant': /\b[A-Z0-9_]{2,}\b/,
+		'constant': /\b[A-Z_][A-Z0-9_]*\b/,
 		'comment': {
 			pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
 			lookbehind: true

diff --git a/components/prism-php.min.js b/components/prism-php.min.js
diff --git a/tests/languages/php/constant_feature.test b/tests/languages/php/constant_feature.test
@@ -1,10 +1,14 @@
+_
+X
 AZ
 PRISM
 FOOBAR_42
 
 ----------------------------------------------------
 
 [
+	["constant", "_"],
+	["constant", "X"],
 	["constant", "AZ"],
 	["constant", "PRISM"],
 	["constant", "FOOBAR_42"]