enh(php) improves attribute highlighting (#4119)

Author: joshgoebel

src/languages/php.js

@@ -22,12 +22,15 @@ export default function(hljs) {
   const PASCAL_CASE_CLASS_NAME_RE = regex.concat(
     /(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/,
     NOT_PERL_ETC);
+  const UPCASE_NAME_RE = regex.concat(
+    /[A-Z]+/,
+    NOT_PERL_ETC);
   const VARIABLE = {
     scope: 'variable',
     match: '\\$+' + IDENT_RE,
   };
   const PREPROCESSOR = {
-    scope: 'meta',
+    scope: "meta",
     variants: [
       { begin: /<\?php/, relevance: 10 }, // boost for obvious PHP
       { begin: /<\?=/ },
@@ -441,7 +444,12 @@ export default function(hljs) {
   ];
 
   const ATTRIBUTES = {
-    begin: regex.concat(/#\[\s*/, PASCAL_CASE_CLASS_NAME_RE),
+    begin: regex.concat(/#\[\s*\\?/,
+      regex.either(
+        PASCAL_CASE_CLASS_NAME_RE,
+        UPCASE_NAME_RE
+      )
+    ),
     beginScope: "meta",
     end: /]/,
     endScope: "meta",
@@ -471,7 +479,10 @@ export default function(hljs) {
       ...ATTRIBUTE_CONTAINS,
       {
         scope: 'meta',
-        match: PASCAL_CASE_CLASS_NAME_RE
+        variants: [
+          { match: PASCAL_CASE_CLASS_NAME_RE },
+          { match: UPCASE_NAME_RE }
+        ]
       }
     ]
   };
@@ -551,6 +562,7 @@ export default function(hljs) {
             keywords: KEYWORDS,
             contains: [
               'self',
+              ATTRIBUTES,
               VARIABLE,
               LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
               hljs.C_BLOCK_COMMENT_MODE,

test/markup/php/attributes.expect.txt

@@ -4,6 +4,7 @@
 <span class="hljs-meta">#[\MyExample\MyAttribute</span><span class="hljs-meta">]</span>
 <span class="hljs-meta">#[MyAttribute</span>(<span class="hljs-number">1234</span>)<span class="hljs-meta">]</span>
 <span class="hljs-meta">#[MyAttribute</span>(<span class="hljs-attr">value</span>: <span class="hljs-number">1234</span>)<span class="hljs-meta">]</span>
+<span class="hljs-meta">#[ASSERT</span>(<span class="hljs-attr">value</span>: <span class="hljs-number">1234</span>)<span class="hljs-meta">]</span>
 <span class="hljs-meta">#[HTMLAttribute</span>(<span class="hljs-attr">tag</span>: <span class="hljs-string">&quot;h1&quot;</span>)<span class="hljs-meta">]</span>
 <span class="hljs-meta">#[MyAttribute</span>(<span class="hljs-title class_">MyAttribute</span>::<span class="hljs-variable constant_">VALUE</span>)<span class="hljs-meta">]</span>
 <span class="hljs-meta">#[MyAttribute</span>(<span class="hljs-keyword">array</span>(<span class="hljs-string">&quot;key&quot;</span> =&gt; <span class="hljs-string">&quot;value&quot;</span>))<span class="hljs-meta">]</span>

test/markup/php/attributes.txt

@@ -4,6 +4,7 @@ namespace Entity;
 #[\MyExample\MyAttribute]
 #[MyAttribute(1234)]
 #[MyAttribute(value: 1234)]
+#[ASSERT(value: 1234)]
 #[HTMLAttribute(tag: "h1")]
 #[MyAttribute(MyAttribute::VALUE)]
 #[MyAttribute(array("key" => "value"))]